Update for IntelFrameworkModulePkg.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMaint / Variable.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index 579036fff3028a2a11f5880c39f68f65beda0e23..c4b83ba0ffa4476d6c2d17a09e9fdb2d45cd9a31 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -449,7 +449,7 @@ Var_UpdateConsoleOption (
                             (EFI_DEVICE_PATH_PROTOCOL *) &Vendor\r
                             );\r
       ASSERT (TerminalDevicePath != NULL);\r
-      ChangeTerminalDevicePath (TerminalDevicePath, TRUE);\r
+      ChangeTerminalDevicePath (&TerminalDevicePath, TRUE);\r
       ConDevicePath = AppendDevicePathInstance (\r
                         ConDevicePath,\r
                         TerminalDevicePath\r
@@ -675,11 +675,11 @@ Var_UpdateDriverOption (
                       );\r
   NewDriverOrderList = AllocateZeroPool (DriverOrderListSize + sizeof (UINT16));\r
   ASSERT (NewDriverOrderList != NULL);\r
-  CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);\r
-  NewDriverOrderList[DriverOrderListSize / sizeof (UINT16)] = Index;\r
   if (DriverOrderList != NULL) {\r
+    CopyMem (NewDriverOrderList, DriverOrderList, DriverOrderListSize);\r
     EfiLibDeleteVariable (L"DriverOrder", &gEfiGlobalVariableGuid);\r
   }\r
+  NewDriverOrderList[DriverOrderListSize / sizeof (UINT16)] = Index;\r
 \r
   Status = gRT->SetVariable (\r
                   L"DriverOrder",\r
@@ -842,7 +842,7 @@ Var_UpdateBootOption (
                     &gEfiGlobalVariableGuid,\r
                     &BootOrderListSize\r
                     );\r
-\r
+  ASSERT (BootOrderList != NULL);\r
   NewBootOrderList = AllocateZeroPool (BootOrderListSize + sizeof (UINT16));\r
   ASSERT (NewBootOrderList != NULL);\r
   CopyMem (NewBootOrderList, BootOrderList, BootOrderListSize);\r
@@ -1071,14 +1071,14 @@ Var_UpdateDriverOrder (
 }\r
 \r
 /**\r
-  Update the legacy BBS boot option. L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable\r
+  Update the legacy BBS boot option. VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable\r
   is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid\r
   is also updated.\r
 \r
   @param CallbackData    The context data for BMM.\r
 \r
   @return EFI_SUCCESS           The function completed successfully.\r
-  @retval EFI_NOT_FOUND         If L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable can be found.\r
+  @retval EFI_NOT_FOUND         If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can be found.\r
   @retval EFI_OUT_OF_RESOURCES  Fail to allocate memory resource\r
 **/\r
 EFI_STATUS\r
@@ -1097,7 +1097,7 @@ Var_UpdateBBSOption (
   UINT8                       *LegacyDev;\r
   UINT8                       *VarData;\r
   UINTN                       VarSize;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
   UINT8                       *OriginalPtr;\r
   UINT8                       *DisMap;\r
   UINTN                       Pos;\r
@@ -1155,7 +1155,7 @@ Var_UpdateBBSOption (
   //\r
   VarData = (UINT8 *) BdsLibGetVariableAndSize (\r
                         VAR_LEGACY_DEV_ORDER,\r
-                        &EfiLegacyDevOrderGuid,\r
+                        &gEfiLegacyDevOrderVariableGuid,\r
                         &VarSize\r
                         );\r
 \r
@@ -1164,7 +1164,7 @@ Var_UpdateBBSOption (
   }\r
 \r
   OriginalPtr = VarData;\r
-  DevOrder    = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+  DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
 \r
   while (VarData < OriginalPtr + VarSize) {\r
     if (DevOrder->BbsType == CallbackData->BbsType) {\r
@@ -1172,7 +1172,7 @@ Var_UpdateBBSOption (
     }\r
 \r
     VarData += sizeof (BBS_TYPE) + DevOrder->Length;\r
-    DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+    DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
   }\r
 \r
   if (VarData >= OriginalPtr + VarSize) {\r
@@ -1218,7 +1218,7 @@ Var_UpdateBBSOption (
 \r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
-                  &EfiLegacyDevOrderGuid,\r
+                  &gEfiLegacyDevOrderVariableGuid,\r
                   VAR_FLAG,\r
                   VarSize,\r
                   OriginalPtr\r
@@ -1344,8 +1344,8 @@ Var_UpdateConMode (
 \r
   Status = gST->ConOut->QueryMode (gST->ConOut, Mode, &(ModeInfo.Column), &(ModeInfo.Row));\r
   if (!EFI_ERROR(Status)) {\r
-    PcdSet32 (PcdConOutColumn, (UINT32) ModeInfo.Column);\r
-    PcdSet32 (PcdConOutRow, (UINT32) ModeInfo.Row);\r
+    PcdSet32 (PcdSetupConOutColumn, (UINT32) ModeInfo.Column);\r
+    PcdSet32 (PcdSetupConOutRow, (UINT32) ModeInfo.Row);\r
   }\r
 \r
   return EFI_SUCCESS;\r