Clean up the private GUID definition in module Level.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
index 24b7c1364a2645bbf10ed5c47579ba70a78d5759..a4b6b53a06e4689d810aa723900d368965db8efb 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
@@ -1046,7 +1046,7 @@ BdsFillDevOrderBuf (
   @param BbsCount        The BBS Count.\r
 \r
   @retval EFI_SUCCES             The buffer is created and the EFI variable named \r
-                                 VAR_LEGACY_DEV_ORDER and EfiLegacyDevOrderGuid is\r
+                                 VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid is\r
                                  set correctly.\r
   @retval EFI_OUT_OF_RESOURCES   Memmory or storage is not enough.\r
   @retval EFI_DEVICE_ERROR       Fail to add the device order into EFI variable fail\r
@@ -1066,8 +1066,8 @@ BdsCreateDevOrder (
   UINTN                       BEVCount;\r
   UINTN                       TotalSize;\r
   UINTN                       HeaderSize;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;\r
   EFI_STATUS                  Status;\r
 \r
   FDCount     = 0;\r
@@ -1131,23 +1131,23 @@ BdsCreateDevOrder (
 \r
   DevOrderPtr->BbsType = BBS_FLOPPY;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (DevOrderPtr->Length) + FDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_HARDDISK;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);\r
   \r
   DevOrderPtr->BbsType = BBS_CDROM;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);\r
   \r
   DevOrderPtr->BbsType = BBS_EMBED_NETWORK;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_BEV_DEVICE;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);\r
 \r
   ASSERT (TotalSize == (UINTN) ((UINT8 *) DevOrderPtr - (UINT8 *) DevOrder));\r
 \r
@@ -1156,7 +1156,7 @@ BdsCreateDevOrder (
   //\r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
-                  &EfiLegacyDevOrderGuid,\r
+                  &gEfiLegacyDevOrderVariableGuid,\r
                   VAR_FLAG,\r
                   TotalSize,\r
                   DevOrder\r
@@ -1182,10 +1182,10 @@ BdsUpdateLegacyDevOrder (
   VOID\r
   )\r
 {\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *NewDevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *Ptr;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *NewPtr;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *NewDevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *Ptr;\r
+  LEGACY_DEV_ORDER_ENTRY      *NewPtr;\r
   UINTN                       DevOrderSize;\r
   EFI_LEGACY_BIOS_PROTOCOL    *LegacyBios;\r
   EFI_STATUS                  Status;\r
@@ -1248,7 +1248,7 @@ BdsUpdateLegacyDevOrder (
 \r
   DevOrder = BdsLibGetVariableAndSize (\r
                VAR_LEGACY_DEV_ORDER,\r
-               &EfiLegacyDevOrderGuid,\r
+               &gEfiLegacyDevOrderVariableGuid,\r
                &DevOrderSize\r
                );\r
   if (NULL == DevOrder) {\r
@@ -1326,8 +1326,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy HD\r
   //\r
-  Ptr             = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr             = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1347,8 +1347,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy CD\r
   //\r
-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1368,8 +1368,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy NET\r
   //\r
-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1389,8 +1389,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy BEV\r
   //\r
-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1477,7 +1477,7 @@ BdsUpdateLegacyDevOrder (
 \r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
-                  &EfiLegacyDevOrderGuid,\r
+                  &gEfiLegacyDevOrderVariableGuid,\r
                   VAR_FLAG,\r
                   TotalSize,\r
                   NewDevOrder\r
@@ -1508,14 +1508,14 @@ BdsSetBootPriority4SameTypeDev (
   IN OUT UINT16                                          *Priority\r
   )\r
 {\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;\r
   UINTN                       DevOrderSize;\r
   UINTN                       Index;\r
 \r
   DevOrder = BdsLibGetVariableAndSize (\r
                VAR_LEGACY_DEV_ORDER,\r
-               &EfiLegacyDevOrderGuid,\r
+               &gEfiLegacyDevOrderVariableGuid,\r
                &DevOrderSize\r
                );\r
   if (NULL == DevOrder) {\r
@@ -1528,7 +1528,7 @@ BdsSetBootPriority4SameTypeDev (
       break;\r
     }\r
 \r
-    DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
+    DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
   }\r
 \r
   if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) {\r