Rollback the change to EFI_BOOT_KEY_DATA structure since UEFI Spec adds the clarifica...

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / Hotkey.h

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.h
index c67df160c826034a0214f10e76628cc28abf2d22..4ee5563a2278a1bc85eeb5d5e0fb00d8b4375b0b 100644 (file)
--- 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\r
   Boot Manager based on hot key\r
 \r
-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -25,83 +25,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #define BDS_HOTKEY_OPTION_SIGNATURE SIGNATURE_32 ('B', 'd', 'K', 'O')\r
 \r
-/**\r
-  Get the revision of the EFI_KEY_OPTION structure.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @return  Revision.\r
-**/\r
-#define KEY_OPTION_REVISION(KeyOption)           ((KeyOption)->KeyData & EFI_KEY_OPTION_REVISION_MASK)\r
-\r
-/**\r
-  Get the actual number of entries in EFI_KEY_OPTION.Keys, from 0-3.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @return  Actual number of entries in EFI_KEY_OPTION.Keys.\r
-**/\r
-#define KEY_OPTION_INPUT_KEY_COUNT(KeyOption)    (((KeyOption)->KeyData & EFI_KEY_OPTION_INPUT_KEY_COUNT_MASK) >> LowBitSet32 (EFI_KEY_OPTION_INPUT_KEY_COUNT_MASK))\r
-\r
-/**\r
-  Return whether the Shift key needs pressed.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @retval  TRUE  Shift key needs pressed.\r
-  @retval  FALSE Shift key needn't pressed.\r
-**/\r
-#define KEY_OPTION_SHIFT_PRESSED(KeyOption)      (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_SHIFT_PRESSED_MASK) != 0)\r
-\r
-/**\r
-  Return whether the Control key needs pressed.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @retval  TRUE  Control key needs pressed.\r
-  @retval  FALSE Control key needn't pressed.\r
-**/\r
-#define KEY_OPTION_CONTROL_PRESSED(KeyOption)    (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_CONTROL_PRESSED_MASK) != 0)\r
-\r
-/**\r
-  Return whether the Alt key needs pressed.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @retval  TRUE  Alt key needs pressed.\r
-  @retval  FALSE Alt key needn't pressed.\r
-**/\r
-#define KEY_OPTION_ALT_PRESSED(KeyOption)        (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_ALT_PRESSED_MASK) != 0)\r
-\r
-/**\r
-  Return whether the Logo key needs pressed.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @retval  TRUE  Logo key needs pressed.\r
-  @retval  FALSE Logo key needn't pressed.\r
-**/\r
-#define KEY_OPTION_LOGO_PRESSED(KeyOption)       (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_LOGO_PRESSED_MASK) != 0)\r
-\r
-/**\r
-  Return whether the Menu key needs pressed.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @retval  TRUE  Menu key needs pressed.\r
-  @retval  FALSE Menu key needn't pressed.\r
-**/\r
-#define KEY_OPTION_MENU_PRESSED(KeyOption)       (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_MENU_PRESSED_MASK) != 0)\r
-\r
-/**\r
-  Return whether the SysReq key needs pressed.\r
-\r
-  @param   KeyOption  Pointer to the EFI_KEY_OPTION structure. \r
-\r
-  @retval  TRUE  SysReq key needs pressed.\r
-  @retval  FALSE SysReq key needn't pressed.\r
-**/\r
-#define KEY_OPTION_SYS_REQ_PRESSED(KeyOption)    (BOOLEAN) (((KeyOption)->KeyData & EFI_KEY_OPTION_SYS_REQ_PRESSED_MASK) != 0)\r
 \r
 typedef struct {\r
   UINTN                     Signature;\r