Remove SafeFreePool from MemoryAllocationLib as this API's name is misleading. Its...

[mirror_edk2.git] / MdeModulePkg / Universal / BdsDxe / BootMaint / UpdatePage.c

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 1791a5cca2cc6edd94678ee85c8092e7a2c10200..2ffb1ff037a7259751f37598e72dff5ade905175 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -17,10 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Refresh the global UpdateData structure.\r
 \r
-  @param VOID\r
-\r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 RefreshUpdateData (\r
@@ -33,12 +29,9 @@ RefreshUpdateData (
 /**\r
   Add a "Go back to main page" tag in front of the form when there are no\r
   "Apply changes" and "Discard changes" tags in the end of the form.\r
-  \r
-\r
+ \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdatePageStart (\r
@@ -70,8 +63,6 @@ UpdatePageStart (
 \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdatePageEnd (\r
@@ -130,8 +121,6 @@ UpdatePageEnd (
                          opcode deletion.\r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 CleanUpPage (\r
@@ -161,7 +150,7 @@ CleanUpPage (
                          of the file to be boot from.\r
 \r
   @retval EFI_SUCCESS    The function completed successfull.\r
-  @retun                 Other value if the boot from the file fails.\r
+  @return                 Other value if the boot from the file fails.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -185,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
@@ -202,9 +187,6 @@ BootThisFile (
   by TerminaMenu. This list will be inserted to form FORM_CON_COM_SETUP_ID.\r
 \r
   @param CallbackData    The BMM context data.\r
-\r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateConCOMPage (\r
@@ -241,8 +223,6 @@ UpdateConCOMPage (
 \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateBootDelPage (\r
@@ -288,8 +268,6 @@ UpdateBootDelPage (
 \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateDrvAddHandlePage (\r
@@ -323,11 +301,8 @@ UpdateDrvAddHandlePage (
   Create a lit of driver option from global DriverOptionMenu. It\r
   allow user to delete the driver option.\r
 \r
-\r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateDrvDelPage (\r
@@ -372,8 +347,6 @@ UpdateDrvDelPage (
 \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateDriverAddHandleDescPage (\r
@@ -438,14 +411,12 @@ UpdateDriverAddHandleDescPage (
 }\r
 \r
 /**\r
-  EDES_TODO: Add function description.\r
+  Update console page.\r
 \r
-  @param UpdatePageId    EDES_TODO: Add parameter description\r
-  @param ConsoleMenu     EDES_TODO: Add parameter description\r
+  @param UpdatePageId    The form ID to be updated.\r
+  @param ConsoleMenu     The console menu list.\r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateConsolePage (\r
@@ -528,8 +499,6 @@ UpdateConsolePage (
   @param OptionMenu      The new list.\r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateOrderPage (\r
@@ -580,7 +549,7 @@ UpdateOrderPage (
       );\r
   }\r
 \r
-  SafeFreePool (IfrOptionList);\r
+  FreePool (IfrOptionList);\r
 \r
   UpdatePageEnd (CallbackData);\r
 \r
@@ -597,8 +566,6 @@ UpdateOrderPage (
 \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateBootNextPage (\r
@@ -659,7 +626,7 @@ UpdateBootNextPage (
       &gUpdateData\r
       );\r
 \r
-    SafeFreePool (IfrOptionList);\r
+    FreePool (IfrOptionList);\r
   }\r
 \r
   UpdatePageEnd (CallbackData);\r
@@ -671,8 +638,6 @@ UpdateBootNextPage (
 \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateTimeOutPage (\r
@@ -710,11 +675,8 @@ UpdateTimeOutPage (
 /**\r
   Refresh the text mode page\r
 \r
-\r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateConModePage (\r
@@ -809,8 +771,8 @@ UpdateConModePage (
     ValidMode,\r
     &gUpdateData\r
     );\r
-  SafeFreePool (IfrOptionList);\r
-  SafeFreePool (ModeToken);\r
+  FreePool (IfrOptionList);\r
+  FreePool (ModeToken);\r
 \r
   UpdatePageEnd (CallbackData);\r
 }\r
@@ -822,8 +784,6 @@ UpdateConModePage (
 \r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdateTerminalPage (\r
@@ -986,7 +946,7 @@ UpdateTerminalPage (
     &gUpdateData\r
     );\r
 \r
-  SafeFreePool (IfrOptionList);\r
+  FreePool (IfrOptionList);\r
 \r
   UpdatePageEnd (CallbackData);\r
 }\r
@@ -998,8 +958,6 @@ UpdateTerminalPage (
   @param UpdatePageId    The form ID.\r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdatePageBody (\r
@@ -1043,8 +1001,6 @@ UpdatePageBody (
   @param OptionIndex     Returns the index number (#### in Boot####).\r
   @param OptionSize      Return the size of the Boot### variable.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID *\r
 GetLegacyBootOptionVar (\r
@@ -1107,14 +1063,14 @@ GetLegacyBootOptionVar (
         (BBS_BBS_DP == DevicePath->SubType)\r
         ) {\r
       *OptionIndex = OrderBuffer[Index];\r
-      SafeFreePool (OrderBuffer);\r
+      FreePool (OrderBuffer);\r
       return OptionBuffer;\r
     } else {\r
-      SafeFreePool (OptionBuffer);\r
+      FreePool (OptionBuffer);\r
     }\r
   }\r
 \r
-  SafeFreePool (OrderBuffer);\r
+  FreePool (OrderBuffer);\r
   return NULL;\r
 }\r
 \r
@@ -1125,7 +1081,6 @@ GetLegacyBootOptionVar (
   @param UpdatePageId    The form ID. It also spefies the legacy device type.\r
   @param CallbackData    The BMM context data.\r
 \r
-  @return VOID\r
 \r
 **/\r
 VOID\r
@@ -1179,8 +1134,8 @@ UpdateSetLegacyDeviceOrderPage (
   case FORM_SET_FD_ORDER_ID:\r
     OptionMenu  = (BM_MENU_OPTION *) &LegacyFDMenu;\r
     Key         = (UINT16) LEGACY_FD_QUESTION_ID;\r
-    TypeStr     = StrFloppy;\r
-    TypeStrHelp = StrFloppyHelp;\r
+    TypeStr     = STR_FLOPPY;\r
+    TypeStrHelp = STR_FLOPPY_HELP;\r
     BbsType     = BBS_FLOPPY;\r
     LegacyOrder = CallbackData->BmmFakeNvData.LegacyFD;\r
     OldData     = CallbackData->BmmOldFakeNVData.LegacyFD;\r
@@ -1189,8 +1144,8 @@ UpdateSetLegacyDeviceOrderPage (
   case FORM_SET_HD_ORDER_ID:\r
     OptionMenu  = (BM_MENU_OPTION *) &LegacyHDMenu;\r
     Key         = (UINT16) LEGACY_HD_QUESTION_ID;\r
-    TypeStr     = StrHardDisk;\r
-    TypeStrHelp = StrHardDiskHelp;\r
+    TypeStr     = STR_HARDDISK;\r
+    TypeStrHelp = STR_HARDDISK_HELP;\r
     BbsType     = BBS_HARDDISK;\r
     LegacyOrder = CallbackData->BmmFakeNvData.LegacyHD;\r
     OldData     = CallbackData->BmmOldFakeNVData.LegacyHD;\r
@@ -1199,8 +1154,8 @@ UpdateSetLegacyDeviceOrderPage (
   case FORM_SET_CD_ORDER_ID:\r
     OptionMenu  = (BM_MENU_OPTION *) &LegacyCDMenu;\r
     Key         = (UINT16) LEGACY_CD_QUESTION_ID;\r
-    TypeStr     = StrCDROM;\r
-    TypeStrHelp = StrCDROMHelp;\r
+    TypeStr     = STR_CDROM;\r
+    TypeStrHelp = STR_CDROM_HELP;\r
     BbsType     = BBS_CDROM;\r
     LegacyOrder = CallbackData->BmmFakeNvData.LegacyCD;\r
     OldData     = CallbackData->BmmOldFakeNVData.LegacyCD;\r
@@ -1209,8 +1164,8 @@ UpdateSetLegacyDeviceOrderPage (
   case FORM_SET_NET_ORDER_ID:\r
     OptionMenu  = (BM_MENU_OPTION *) &LegacyNETMenu;\r
     Key         = (UINT16) LEGACY_NET_QUESTION_ID;\r
-    TypeStr     = StrNET;\r
-    TypeStrHelp = StrNETHelp;\r
+    TypeStr     = STR_NET;\r
+    TypeStrHelp = STR_NET_HELP;\r
     BbsType     = BBS_EMBED_NETWORK;\r
     LegacyOrder = CallbackData->BmmFakeNvData.LegacyNET;\r
     OldData     = CallbackData->BmmOldFakeNVData.LegacyNET;\r
@@ -1219,8 +1174,8 @@ UpdateSetLegacyDeviceOrderPage (
   case FORM_SET_BEV_ORDER_ID:\r
     OptionMenu  = (BM_MENU_OPTION *) &LegacyBEVMenu;\r
     Key         = (UINT16) LEGACY_BEV_QUESTION_ID;\r
-    TypeStr     = StrBEV;\r
-    TypeStrHelp = StrBEVHelp;\r
+    TypeStr     = STR_BEV;\r
+    TypeStrHelp = STR_BEV_HELP;\r
     BbsType     = BBS_BEV_DEVICE;\r
     LegacyOrder = CallbackData->BmmFakeNvData.LegacyBEV;\r
     OldData     = CallbackData->BmmOldFakeNVData.LegacyBEV;\r
@@ -1316,7 +1271,7 @@ UpdateSetLegacyDeviceOrderPage (
   CopyMem (OldData, LegacyOrder, 100);\r
 \r
   if (IfrOptionList != NULL) {\r
-    SafeFreePool (IfrOptionList);\r
+    FreePool (IfrOptionList);\r
     IfrOptionList = NULL;\r
   }\r
 \r
@@ -1329,8 +1284,6 @@ UpdateSetLegacyDeviceOrderPage (
   @param Private         The BMM context data.\r
   @param NewPageId       The original page ID.\r
 \r
-  @return VOID\r
-\r
 **/\r
 VOID\r
 UpdatePageId (\r