Rollback the change to EFI_BOOT_KEY_DATA structure since UEFI Spec adds the clarification that bitfields are ordered such that bit 0 is the least significant bit.

Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15000 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 13 insertions, 86 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
index 1a3ec1ff84..477411377d 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
@@ -2,7 +2,7 @@
   Provides a way for 3rd party applications to register themselves for launch by the

   Boot Manager based on hot key

 

-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -315,6 +315,7 @@ HotkeyInsertList (
   BDS_HOTKEY_OPTION  *HotkeyLeft;

   BDS_HOTKEY_OPTION  *HotkeyRight;

   UINTN              Index;

+  EFI_BOOT_KEY_DATA  KeyOptions;

   UINT32             KeyShiftStateLeft;

   UINT32             KeyShiftStateRight;

   EFI_INPUT_KEY      *InputKey;

@@ -327,28 +328,31 @@ HotkeyInsertList (
 

   HotkeyLeft->Signature = BDS_HOTKEY_OPTION_SIGNATURE;

   HotkeyLeft->BootOptionNumber = KeyOption->BootOption;

-  HotkeyLeft->CodeCount = (UINT8) KEY_OPTION_INPUT_KEY_COUNT (KeyOption);

+

+  KeyOptions = KeyOption->KeyData;

+

+  HotkeyLeft->CodeCount = (UINT8) KeyOptions.Options.InputKeyCount;

 

   //

   // Map key shift state from KeyOptions to EFI_KEY_DATA.KeyState

   //

   KeyShiftStateRight = EFI_SHIFT_STATE_VALID;

-  if (KEY_OPTION_SHIFT_PRESSED (KeyOption)) {

+  if (KeyOptions.Options.ShiftPressed) {

     KeyShiftStateRight |= EFI_RIGHT_SHIFT_PRESSED;

   }

-  if (KEY_OPTION_CONTROL_PRESSED (KeyOption)) {

+  if (KeyOptions.Options.ControlPressed) {

     KeyShiftStateRight |= EFI_RIGHT_CONTROL_PRESSED;

   }

-  if (KEY_OPTION_ALT_PRESSED (KeyOption)) {

+  if (KeyOptions.Options.AltPressed) {

     KeyShiftStateRight |= EFI_RIGHT_ALT_PRESSED;

   }

-  if (KEY_OPTION_LOGO_PRESSED (KeyOption)) {

+  if (KeyOptions.Options.LogoPressed) {

     KeyShiftStateRight |= EFI_RIGHT_LOGO_PRESSED;

   }

-  if (KEY_OPTION_MENU_PRESSED (KeyOption)) {

+  if (KeyOptions.Options.MenuPressed) {

     KeyShiftStateRight |= EFI_MENU_KEY_PRESSED;

   }

-  if (KEY_OPTION_SYS_REQ_PRESSED (KeyOption)) {

+  if (KeyOptions.Options.SysReqPressed) {

     KeyShiftStateRight |= EFI_SYS_REQ_PRESSED;

   }

 

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h
index c67df160c8..4ee5563a22 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h
@@ -2,7 +2,7 @@
   Provides a way for 3rd party applications to register themselves for launch by the

   Boot Manager based on hot key

 

-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -25,83 +25,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #define BDS_HOTKEY_OPTION_SIGNATURE SIGNATURE_32 ('B', 'd', 'K', 'O')

 

-/**

-  Get the revision of the EFI_KEY_OPTION structure.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @return  Revision.

-**/

-#define KEY_OPTION_REVISION(KeyOption)           ((KeyOption)->KeyData & EFI_KEY_OPTION_REVISION_MASK)

-

-/**

-  Get the actual number of entries in EFI_KEY_OPTION.Keys, from 0-3.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @return  Actual number of entries in EFI_KEY_OPTION.Keys.

-**/

-#define KEY_OPTION_INPUT_KEY_COUNT(KeyOption)    (((KeyOption)->KeyData & EFI_KEY_OPTION_INPUT_KEY_COUNT_MASK) >> LowBitSet32 (EFI_KEY_OPTION_INPUT_KEY_COUNT_MASK))

-

-/**

-  Return whether the Shift key needs pressed.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @retval  TRUE  Shift key needs pressed.

-  @retval  FALSE Shift key needn't pressed.

-**/

-#define KEY_OPTION_SHIFT_PRESSED(KeyOption)      (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_SHIFT_PRESSED_MASK) != 0)

-

-/**

-  Return whether the Control key needs pressed.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @retval  TRUE  Control key needs pressed.

-  @retval  FALSE Control key needn't pressed.

-**/

-#define KEY_OPTION_CONTROL_PRESSED(KeyOption)    (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_CONTROL_PRESSED_MASK) != 0)

-

-/**

-  Return whether the Alt key needs pressed.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @retval  TRUE  Alt key needs pressed.

-  @retval  FALSE Alt key needn't pressed.

-**/

-#define KEY_OPTION_ALT_PRESSED(KeyOption)        (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_ALT_PRESSED_MASK) != 0)

-

-/**

-  Return whether the Logo key needs pressed.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @retval  TRUE  Logo key needs pressed.

-  @retval  FALSE Logo key needn't pressed.

-**/

-#define KEY_OPTION_LOGO_PRESSED(KeyOption)       (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_LOGO_PRESSED_MASK) != 0)

-

-/**

-  Return whether the Menu key needs pressed.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @retval  TRUE  Menu key needs pressed.

-  @retval  FALSE Menu key needn't pressed.

-**/

-#define KEY_OPTION_MENU_PRESSED(KeyOption)       (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_MENU_PRESSED_MASK) != 0)

-

-/**

-  Return whether the SysReq key needs pressed.

-

-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. 

-

-  @retval  TRUE  SysReq key needs pressed.

-  @retval  FALSE SysReq key needn't pressed.

-**/

-#define KEY_OPTION_SYS_REQ_PRESSED(KeyOption)    (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_SYS_REQ_PRESSED_MASK) != 0)

 

 typedef struct {

   UINTN                     Signature;