Refine function comments for BdsDxe module.

[mirror_edk2.git] / MdeModulePkg / Universal / BdsDxe / Hotkey.c

diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.c b/MdeModulePkg/Universal/BdsDxe/Hotkey.c
index adcc3afbebf33bf10f0a22b87830883d96d4e727..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
@@ -228,7 +228,6 @@ RegisterHotkey (
 \r
   Delete Key#### for the given Key Option number.\r
 \r
-\r
   @param KeyOptionNumber Key option number for Key####\r
 \r
   @retval  EFI_SUCCESS            Unregister hotkey successfully.\r
@@ -328,7 +327,6 @@ HotkeyCallback (
   BDS_COMMON_OPTION  *BootOption;\r
   UINTN              ExitDataSize;\r
   CHAR16             *ExitData;\r
-  EFI_TPL            OldTpl;\r
   EFI_STATUS         Status;\r
   EFI_KEY_DATA       *HotkeyData;\r
 \r
@@ -403,18 +401,10 @@ HotkeyCallback (
       //\r
       gST->ConOut->Reset (gST->ConOut, FALSE);\r
 \r
-      //\r
-      // BdsLibBootViaBootOption() is expected to be invoked at TPL level TPL_APPLICATION,\r
-      // so raise the TPL to TPL_APPLICATION first, then restore it\r
-      //\r
-      OldTpl = gBS->RaiseTPL (TPL_APPLICATION);\r
-\r
       mHotkeyCallbackPending = TRUE;\r
       Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);\r
       mHotkeyCallbackPending = FALSE;\r
 \r
-      gBS->RestoreTPL (OldTpl);\r
-\r
       if (EFI_ERROR (Status)) {\r
         //\r
         // Call platform action to indicate the boot fail\r
@@ -569,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
@@ -634,11 +624,8 @@ HotkeyInsertList (
 \r
   Process all the "Key####" variables, associate Hotkeys with corresponding Boot Options.\r
 \r
-\r
-  @param VOID\r
-\r
   @retval  EFI_SUCCESS    Hotkey services successfully initialized.\r
-\r
+  @retval  EFI_NOT_FOUND  Can not find the "KeyOrder" variable\r
 **/\r
 EFI_STATUS\r
 InitializeHotkeyService (\r