diff mbox

[edk2] Nt32Pkg/PlatformBootManagerLib: zero EFI_GRAPHICS_OUTPUT_BLT_PIXEL.Reserved

Message ID 1464217416-31233-1-git-send-email-lersek@redhat.com
State Accepted
Commit ef3216ebf35087ed7b99c8e980b581ece12c75b8
Headers show

Commit Message

Laszlo Ersek May 25, 2016, 11:03 p.m. UTC
The PlatformBootManagerWaitCallback() function sets White.Reserved to
0xFF; it should be 0x00. Also, use a more compact form to assign the
component fields.

Suggested-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

---
 Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

-- 
1.8.3.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek May 27, 2016, 9:24 a.m. UTC | #1
On 05/26/16 05:47, Jordan Justen wrote:
> For this, and the related patch for OVMF:

> 

> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>


Thanks guys! I committed this patch as ef3216ebf350.

Laszlo

> On 2016-05-25 16:03:36, Laszlo Ersek wrote:

>> The PlatformBootManagerWaitCallback() function sets White.Reserved to

>> 0xFF; it should be 0x00. Also, use a more compact form to assign the

>> component fields.

>>

>> Suggested-by: Jordan Justen <jordan.l.justen@intel.com>

>> Cc: Andrew Fish <afish@apple.com>

>> Cc: Jordan Justen <jordan.l.justen@intel.com>

>> Cc: Ruiyu Ni <ruiyu.ni@intel.com>

>> Contributed-under: TianoCore Contribution Agreement 1.0

>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

>> ---

>>  Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 16 ++++++++--------

>>  1 file changed, 8 insertions(+), 8 deletions(-)

>>

>> diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c

>> index 82f7647c7039..007e18a956c4 100644

>> --- a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c

>> +++ b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c

>> @@ -262,20 +262,20 @@ PlatformBootManagerWaitCallback (

>>    UINT16          TimeoutRemain

>>    )

>>  {

>> -  EFI_GRAPHICS_OUTPUT_BLT_PIXEL Black;

>> -  EFI_GRAPHICS_OUTPUT_BLT_PIXEL White;

>> -  UINT16                        Timeout;

>> +  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black;

>> +  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White;

>> +  UINT16                              Timeout;

>>  

>>    Timeout = PcdGet16 (PcdPlatformBootTimeOut);

>>  

>> -  Black.Blue = Black.Green = Black.Red = Black.Reserved = 0;

>> -  White.Blue = White.Green = White.Red = White.Reserved = 0xFF;

>> +  Black.Raw = 0x00000000;

>> +  White.Raw = 0x00FFFFFF;

>>  

>>    BootLogoUpdateProgress (

>> -    White,

>> -    Black,

>> +    White.Pixel,

>> +    Black.Pixel,

>>      L"Start boot option",

>> -    White,

>> +    White.Pixel,

>>      (Timeout - TimeoutRemain) * 100 / Timeout,

>>      0

>>      );

>> -- 

>> 1.8.3.1

>>

> _______________________________________________

> edk2-devel mailing list

> edk2-devel@lists.01.org

> https://lists.01.org/mailman/listinfo/edk2-devel

> 


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox

Patch

diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index 82f7647c7039..007e18a956c4 100644
--- a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
@@ -262,20 +262,20 @@  PlatformBootManagerWaitCallback (
   UINT16          TimeoutRemain
   )
 {
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL Black;
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL White;
-  UINT16                        Timeout;
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black;
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White;
+  UINT16                              Timeout;
 
   Timeout = PcdGet16 (PcdPlatformBootTimeOut);
 
-  Black.Blue = Black.Green = Black.Red = Black.Reserved = 0;
-  White.Blue = White.Green = White.Red = White.Reserved = 0xFF;
+  Black.Raw = 0x00000000;
+  White.Raw = 0x00FFFFFF;
 
   BootLogoUpdateProgress (
-    White,
-    Black,
+    White.Pixel,
+    Black.Pixel,
     L"Start boot option",
-    White,
+    White.Pixel,
     (Timeout - TimeoutRemain) * 100 / Timeout,
     0
     );