X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FBootMaint%2FVariable.c;h=6e6c7266d03ca0dcf4f0f2fc842db30fbed01648;hb=e24fc1032db5d5d2395260f6d7af94aa5a2a0802;hp=579036fff3028a2a11f5880c39f68f65beda0e23;hpb=22d1f97835d6c532d0cceb3b70853bf56fb5864a;p=mirror_edk2.git

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index 579036fff3..6e6c7266d0 100644
--- 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
                             );
       ASSERT (TerminalDevicePath != NULL);
-      ChangeTerminalDevicePath (TerminalDevicePath, TRUE);
+      ChangeTerminalDevicePath (&TerminalDevicePath, TRUE);
       ConDevicePath = AppendDevicePathInstance (
                         ConDevicePath,
                         TerminalDevicePath
@@ -1071,14 +1071,14 @@ Var_UpdateDriverOrder (
 }
 
 /**
-  Update the legacy BBS boot option. L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable
+  Update the legacy BBS boot option. VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable
   is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid
   is also updated.
 
   @param CallbackData    The context data for BMM.
 
   @return EFI_SUCCESS           The function completed successfully.
-  @retval EFI_NOT_FOUND         If L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable can be found.
+  @retval EFI_NOT_FOUND         If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can be found.
   @retval EFI_OUT_OF_RESOURCES  Fail to allocate memory resource
 **/
 EFI_STATUS
@@ -1097,7 +1097,7 @@ Var_UpdateBBSOption (
   UINT8                       *LegacyDev;
   UINT8                       *VarData;
   UINTN                       VarSize;
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;
   UINT8                       *OriginalPtr;
   UINT8                       *DisMap;
   UINTN                       Pos;
@@ -1155,7 +1155,7 @@ Var_UpdateBBSOption (
   //
   VarData = (UINT8 *) BdsLibGetVariableAndSize (
                         VAR_LEGACY_DEV_ORDER,
-                        &EfiLegacyDevOrderGuid,
+                        &gEfiLegacyDevOrderVariableGuid,
                         &VarSize
                         );
 
@@ -1164,7 +1164,7 @@ Var_UpdateBBSOption (
   }
 
   OriginalPtr = VarData;
-  DevOrder    = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;
+  DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;
 
   while (VarData < OriginalPtr + VarSize) {
     if (DevOrder->BbsType == CallbackData->BbsType) {
@@ -1172,7 +1172,7 @@ Var_UpdateBBSOption (
     }
 
     VarData += sizeof (BBS_TYPE) + DevOrder->Length;
-    DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;
+    DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;
   }
 
   if (VarData >= OriginalPtr + VarSize) {
@@ -1218,7 +1218,7 @@ Var_UpdateBBSOption (
 
   Status = gRT->SetVariable (
                   VAR_LEGACY_DEV_ORDER,
-                  &EfiLegacyDevOrderGuid,
+                  &gEfiLegacyDevOrderVariableGuid,
                   VAR_FLAG,
                   VarSize,
                   OriginalPtr