Update EFI_KEY_OPTION.KeyOptions --> EFI_KEY_OPTION.KeyData to follow UEFI spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6975 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.c b/MdeModulePkg/Universal/BdsDxe/Hotkey.c
index 387c6d6a48b45c267f98adc5188c631060af1f19..96ce6d7238fb5ea2c8071a4f572fbee3edbed245 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/MdeModulePkg/Universal/BdsDxe/Hotkey.c
@@ -104,7 +104,7 @@ RegisterHotkey (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  KeyOptionSize = sizeof (EFI_KEY_OPTION) + GET_KEY_CODE_COUNT (KeyOption->KeyOptions.PackedValue) * sizeof (EFI_INPUT_KEY);\r
+  KeyOptionSize = sizeof (EFI_KEY_OPTION) + GET_KEY_CODE_COUNT (KeyOption->KeyData.PackedValue) * sizeof (EFI_INPUT_KEY);\r
   UpdateBootOption = FALSE;\r
 \r
   //\r
@@ -146,8 +146,8 @@ RegisterHotkey (
       return EFI_SUCCESS;\r
     }\r
 \r
-    if (KeyOption->KeyOptions.PackedValue == TempOption->KeyOptions.PackedValue) {\r
-      if (GET_KEY_CODE_COUNT (KeyOption->KeyOptions.PackedValue) == 0 ||\r
+    if (KeyOption->KeyData.PackedValue == TempOption->KeyData.PackedValue) {\r
+      if (GET_KEY_CODE_COUNT (KeyOption->KeyData.PackedValue) == 0 ||\r
           CompareMem (\r
             ((UINT8 *) TempOption) + sizeof (EFI_KEY_OPTION),\r
             ((UINT8 *) KeyOption) + sizeof (EFI_KEY_OPTION),\r
@@ -559,7 +559,7 @@ HotkeyInsertList (
   HotkeyLeft->Signature = BDS_HOTKEY_OPTION_SIGNATURE;\r
   HotkeyLeft->BootOptionNumber = KeyOption->BootOption;\r
 \r
-  KeyOptions = KeyOption->KeyOptions.PackedValue;\r
+  KeyOptions = KeyOption->KeyData.PackedValue;\r
 \r
   HotkeyLeft->CodeCount = (UINT8) GET_KEY_CODE_COUNT (KeyOptions);\r
 \r