Remove unnecessary TPL operations in BDS module & library.

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

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 03b3818167edde1e695129b06861468a90f10566..fffcd681408c2d27d09bf0185c1fb256706f8aa9 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -1249,21 +1249,11 @@ BdsStartBootMaint (
   //\r
   BdsLibEnumerateAllBootOption (&BdsBootOptionList);\r
 \r
-  //\r
-  // Drop the TPL level from TPL_APPLICATION to TPL_APPLICATION\r
-  //\r
-  gBS->RestoreTPL (TPL_APPLICATION);\r
-\r
   //\r
   // Init the BMM\r
   //\r
   Status = InitializeBM ();\r
 \r
-  //\r
-  // Raise the TPL level back to TPL_APPLICATION\r
-  //\r
-  gBS->RaiseTPL (TPL_APPLICATION);\r
-\r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index ff3d42f00dfe24af789be5e55fd5110a0a860d30..3de4a0d6874965170630461a042a0ff105e18542 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -174,14 +174,10 @@ BootThisFile (
   //\r
   gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
-  gBS->RaiseTPL (TPL_APPLICATION);\r
-\r
   ExitDataSize  = 0;\r
 \r
   Status        = BdsLibBootViaBootOption (Option, Option->DevicePath, &ExitDataSize, &ExitData);\r
 \r
-  gBS->RestoreTPL (TPL_APPLICATION);\r
-\r
   return Status;\r
 \r
 }\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index c3ef654bf1cae58fa4364cd68c26912a15dc1c51..459a396a697419352f06eb0a7d103a4bdb168d6a 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -255,11 +255,6 @@ CallBootManager (
     );\r
   FreePool (UpdateData.Data);\r
 \r
-  //\r
-  // Drop the TPL level from TPL_APPLICATION to TPL_APPLICATION\r
-  //\r
-  gBS->RestoreTPL (TPL_APPLICATION);\r
-\r
   ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
   Status = gFormBrowser2->SendForm (\r
                            gFormBrowser2,\r
@@ -275,7 +270,6 @@ CallBootManager (
   }\r
 \r
   if (gOption == NULL) {\r
-    gBS->RaiseTPL (TPL_APPLICATION);\r
     return ;\r
   }\r
 \r
@@ -284,11 +278,6 @@ CallBootManager (
   //\r
   SetupResetReminder ();\r
 \r
-  //\r
-  // Raise the TPL level back to TPL_APPLICATION\r
-  //\r
-  gBS->RaiseTPL (TPL_APPLICATION);\r
-\r
   //\r
   // parse the selected option\r
   //\r
@@ -304,11 +293,6 @@ CallBootManager (
                   gST->ConOut,\r
                   GetStringById (STRING_TOKEN (STR_ANY_KEY_CONTINUE))\r
                   );\r
-    gBS->RestoreTPL (TPL_APPLICATION);\r
-    //\r
-    // BdsLibUiWaitForSingleEvent (gST->ConIn->WaitForKey, 0);\r
-    //\r
-    gBS->RaiseTPL (TPL_APPLICATION);\r
     gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
   }\r
 }\r

diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index c030d1319ee02ea46ebe9ef4d6bd09aeef955519..5621efde6f073d6f3d8f6c4afb669381121dbb9b 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -348,11 +348,6 @@ CallDeviceManager (
     &UpdateData[0]\r
     );\r
 \r
-  //\r
-  // Drop the TPL level from TPL_APPLICATION to TPL_APPLICATION\r
-  //\r
-  gBS->RestoreTPL (TPL_APPLICATION);\r
-\r
   ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
   Status = gFormBrowser2->SendForm (\r
                            gFormBrowser2,\r
@@ -412,7 +407,5 @@ CallDeviceManager (
   }\r
   FreePool (HiiHandles);\r
 \r
-  gBS->RaiseTPL (TPL_APPLICATION);\r
-\r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.c b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
index 914f177ed6d725c165a0787e101cc5bcb975546c..75c9f91375faea823df95c1067d46f59d5107c92 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
@@ -467,12 +467,6 @@ CallFrontPage (
     (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_PC_INPUT_WAIT)\r
     );\r
 \r
-\r
-  //\r
-  // Drop the TPL level from TPL_APPLICATION to TPL_APPLICATION\r
-  //\r
-  gBS->RestoreTPL (TPL_APPLICATION);\r
-\r
   ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
   Status = gFormBrowser2->SendForm (\r
                             gFormBrowser2,\r
@@ -490,7 +484,6 @@ CallFrontPage (
     EnableResetRequired ();\r
   }\r
 \r
-  gBS->RaiseTPL (TPL_APPLICATION);\r
   return Status;\r
 }\r
 \r
@@ -883,9 +876,7 @@ PlatformBdsEnterFrontPage (
   }\r
 \r
   if (TimeoutDefault != 0xffff) {\r
-    gBS->RestoreTPL (TPL_APPLICATION);\r
     Status = ShowProgress (TimeoutDefault);\r
-    gBS->RaiseTPL (TPL_APPLICATION);\r
 \r
     //\r
     // Ensure screen is clear when switch Console from Graphics mode to Text mode\r
@@ -979,9 +970,7 @@ PlatformBdsEnterFrontPage (
   //\r
   //Will leave browser, check any reset required change is applied? if yes, reset system\r
   //\r
-  gBS->RestoreTPL (TPL_APPLICATION);\r
   SetupResetReminder ();\r
-  gBS->RaiseTPL (TPL_APPLICATION);\r
 \r
 Exit:\r
   //\r

diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.c b/MdeModulePkg/Universal/BdsDxe/Hotkey.c
index 9ad5009537a79058b8460f2333e5dfb306215f8a..387c6d6a48b45c267f98adc5188c631060af1f19 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/MdeModulePkg/Universal/BdsDxe/Hotkey.c
@@ -327,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
@@ -402,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