Clean up the private GUID definition in module Level.

0. Remove the unused private GUID from module source files.
1. Use gEfiCallerIdGuid replace of the private module GUID.
2. Add the public header files to define HII FormSet and PackageList GUID used in every HII driver.
3. Publish EFI_LEGACY_DEV_ORDER_VARIABLE_GUID from BdsDxe driver and EFI_UPDATE_DATA_FILE_GUID from UpdateDriverDxe to IntelFrameworkModulePkg Include directory.

Signed-off-by: lgao4
Reviewed-by: ydong10 gdong1 tye jfan12 wli12 rsun3 jyao1 ftian



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

7 files changed, 57 insertions, 100 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
index 24b7c1364a..a4b6b53a06 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
@@ -1046,7 +1046,7 @@ BdsFillDevOrderBuf (
   @param BbsCount        The BBS Count.

 

   @retval EFI_SUCCES             The buffer is created and the EFI variable named 

-                                 VAR_LEGACY_DEV_ORDER and EfiLegacyDevOrderGuid is

+                                 VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid is

                                  set correctly.

   @retval EFI_OUT_OF_RESOURCES   Memmory or storage is not enough.

   @retval EFI_DEVICE_ERROR       Fail to add the device order into EFI variable fail

@@ -1066,8 +1066,8 @@ BdsCreateDevOrder (
   UINTN                       BEVCount;

   UINTN                       TotalSize;

   UINTN                       HeaderSize;

-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;

-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;

+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;

+  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;

   EFI_STATUS                  Status;

 

   FDCount     = 0;

@@ -1131,23 +1131,23 @@ BdsCreateDevOrder (
 

   DevOrderPtr->BbsType = BBS_FLOPPY;

   DevOrderPtr->Length  = (UINT16) (sizeof (DevOrderPtr->Length) + FDCount * sizeof (UINT16));

-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);

+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);

 

   DevOrderPtr->BbsType = BBS_HARDDISK;

   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));

-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);

+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);

   

   DevOrderPtr->BbsType = BBS_CDROM;

   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));

-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);

+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);

   

   DevOrderPtr->BbsType = BBS_EMBED_NETWORK;

   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));

-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);

+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);

 

   DevOrderPtr->BbsType = BBS_BEV_DEVICE;

   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));

-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);

+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);

 

   ASSERT (TotalSize == (UINTN) ((UINT8 *) DevOrderPtr - (UINT8 *) DevOrder));

 

@@ -1156,7 +1156,7 @@ BdsCreateDevOrder (
   //

   Status = gRT->SetVariable (

                   VAR_LEGACY_DEV_ORDER,

-                  &EfiLegacyDevOrderGuid,

+                  &gEfiLegacyDevOrderVariableGuid,

                   VAR_FLAG,

                   TotalSize,

                   DevOrder

@@ -1182,10 +1182,10 @@ BdsUpdateLegacyDevOrder (
   VOID

   )

 {

-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;

-  BM_LEGACY_DEV_ORDER_CONTEXT *NewDevOrder;

-  BM_LEGACY_DEV_ORDER_CONTEXT *Ptr;

-  BM_LEGACY_DEV_ORDER_CONTEXT *NewPtr;

+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;

+  LEGACY_DEV_ORDER_ENTRY      *NewDevOrder;

+  LEGACY_DEV_ORDER_ENTRY      *Ptr;

+  LEGACY_DEV_ORDER_ENTRY      *NewPtr;

   UINTN                       DevOrderSize;

   EFI_LEGACY_BIOS_PROTOCOL    *LegacyBios;

   EFI_STATUS                  Status;

@@ -1248,7 +1248,7 @@ BdsUpdateLegacyDevOrder (
 

   DevOrder = BdsLibGetVariableAndSize (

                VAR_LEGACY_DEV_ORDER,

-               &EfiLegacyDevOrderGuid,

+               &gEfiLegacyDevOrderVariableGuid,

                &DevOrderSize

                );

   if (NULL == DevOrder) {

@@ -1326,8 +1326,8 @@ BdsUpdateLegacyDevOrder (
   //

   // copy HD

   //

-  Ptr             = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

-  NewPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

+  Ptr             = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

+  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

   NewPtr->BbsType = Ptr->BbsType;

   NewPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));

   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {

@@ -1347,8 +1347,8 @@ BdsUpdateLegacyDevOrder (
   //

   // copy CD

   //

-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

   NewPtr->BbsType = Ptr->BbsType;

   NewPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));

   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {

@@ -1368,8 +1368,8 @@ BdsUpdateLegacyDevOrder (
   //

   // copy NET

   //

-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

   NewPtr->BbsType = Ptr->BbsType;

   NewPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));

   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {

@@ -1389,8 +1389,8 @@ BdsUpdateLegacyDevOrder (
   //

   // copy BEV

   //

-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);

+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);

   NewPtr->BbsType = Ptr->BbsType;

   NewPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));

   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {

@@ -1477,7 +1477,7 @@ BdsUpdateLegacyDevOrder (
 

   Status = gRT->SetVariable (

                   VAR_LEGACY_DEV_ORDER,

-                  &EfiLegacyDevOrderGuid,

+                  &gEfiLegacyDevOrderVariableGuid,

                   VAR_FLAG,

                   TotalSize,

                   NewDevOrder

@@ -1508,14 +1508,14 @@ BdsSetBootPriority4SameTypeDev (
   IN OUT UINT16                                          *Priority

   )

 {

-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;

-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;

+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;

+  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;

   UINTN                       DevOrderSize;

   UINTN                       Index;

 

   DevOrder = BdsLibGetVariableAndSize (

                VAR_LEGACY_DEV_ORDER,

-               &EfiLegacyDevOrderGuid,

+               &gEfiLegacyDevOrderVariableGuid,

                &DevOrderSize

                );

   if (NULL == DevOrder) {

@@ -1528,7 +1528,7 @@ BdsSetBootPriority4SameTypeDev (
       break;

     }

 

-    DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);

+    DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);

   }

 

   if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) {

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 35c965f316..4c8e3c8a4d 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -38,10 +38,7 @@ HII_VENDOR_DEVICE_PATH  mBmmHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)

       }

     },

-    //

-    // {165A028F-0BB2-4b5f-8747-77592E3F6499}

-    //

-    { 0x165a028f, 0xbb2, 0x4b5f, { 0x87, 0x47, 0x77, 0x59, 0x2e, 0x3f, 0x64, 0x99 } }

+    BOOT_MAINT_FORMSET_GUID

   },

   {

     END_DEVICE_PATH_TYPE,

@@ -63,10 +60,7 @@ HII_VENDOR_DEVICE_PATH  mFeHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)

       }

     },

-    //

-    // {91DB4238-B0C8-472e-BBCF-F3A6541010F4}

-    //

-    { 0x91db4238, 0xb0c8, 0x472e, { 0xbb, 0xcf, 0xf3, 0xa6, 0x54, 0x10, 0x10, 0xf4 } }

+    FILE_EXPLORE_FORMSET_GUID

   },

   {

     END_DEVICE_PATH_TYPE,

@@ -78,10 +72,6 @@ HII_VENDOR_DEVICE_PATH  mFeHiiVendorDevicePath = {
   }

 };

 

-EFI_GUID EfiLegacyDevOrderGuid  = EFI_LEGACY_DEV_ORDER_VARIABLE_GUID;

-EFI_GUID mBootMaintGuid         = BOOT_MAINT_FORMSET_GUID;

-EFI_GUID mFileExplorerGuid      = FILE_EXPLORE_FORMSET_GUID;

-

 CHAR16  mBootMaintStorageName[]     = L"BmmData";

 CHAR16  mFileExplorerStorageName[]  = L"FeData";

 

@@ -194,7 +184,7 @@ BootMaintExtractConfig (
   }

 

   *Progress = Request;

-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mBootMaintGuid, mBootMaintStorageName)) {

+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gBootMaintFormSetGuid, mBootMaintStorageName)) {

     return EFI_NOT_FOUND;

   }

 

@@ -215,7 +205,7 @@ BootMaintExtractConfig (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template

     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator

     //

-    ConfigRequestHdr = HiiConstructConfigHdr (&mBootMaintGuid, mBootMaintStorageName, Private->BmmDriverHandle);

+    ConfigRequestHdr = HiiConstructConfigHdr (&gBootMaintFormSetGuid, mBootMaintStorageName, Private->BmmDriverHandle);

     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);

     ConfigRequest = AllocateZeroPool (Size);

     ASSERT (ConfigRequest != NULL);

@@ -319,7 +309,7 @@ BootMaintCallback (
     // Retrive uncommitted data from Form Browser

     //

     CurrentFakeNVMap = &Private->BmmFakeNvData;

-    HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);

+    HiiGetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);

 

     //

     // need to be subtituded.

@@ -630,7 +620,7 @@ BootMaintCallback (
     //

     // Pass changed uncommitted data back to Form Browser

     //

-    Status = HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);

+    Status = HiiSetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);

     return Status;

   }

 

@@ -985,7 +975,7 @@ InitializeBM (
   // Post our Boot Maint VFR binary to the HII database.

   //

   BmmCallbackInfo->BmmHiiHandle = HiiAddPackages (

-                                    &mBootMaintGuid,

+                                    &gBootMaintFormSetGuid,

                                     BmmCallbackInfo->BmmDriverHandle,

                                     BmBin,

                                     BdsDxeStrings,

@@ -997,7 +987,7 @@ InitializeBM (
   // Post our File Explorer VFR binary to the HII database.

   //

   BmmCallbackInfo->FeHiiHandle = HiiAddPackages (

-                                   &mFileExplorerGuid,

+                                   &gFileExploreFormSetGuid,

                                    BmmCallbackInfo->FeDriverHandle,

                                    FEBin,

                                    BdsDxeStrings,

@@ -1109,7 +1099,7 @@ InitializeBM (
     

     HiiUpdateForm (

       BmmCallbackInfo->BmmHiiHandle,

-      &mBootMaintGuid,

+      &gBootMaintFormSetGuid,

       FORM_BOOT_SETUP_ID,

       mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID

       mEndOpCodeHandle    // LABEL_END

@@ -1399,7 +1389,7 @@ FormSetDispatcher (
                              gFormBrowser2,

                              &CallbackData->BmmHiiHandle,

                              1,

-                             &mBootMaintGuid,

+                             &gBootMaintFormSetGuid,

                              0,

                              NULL,

                              &ActionRequest

@@ -1421,7 +1411,7 @@ FormSetDispatcher (
                                gFormBrowser2,

                                &CallbackData->FeHiiHandle,

                                1,

-                               &mFileExplorerGuid,

+                               &gFileExploreFormSetGuid,

                                0,

                                NULL,

                                &ActionRequest

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index 67eaeec011..57acf85541 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -23,19 +23,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // Constants which are variable names used to access variables

 //

-#define VAR_LEGACY_DEV_ORDER L"LegacyDevOrder"

-

 #define VAR_CON_OUT_MODE L"ConOutMode"

 

-///

-/// Guid of a NV Variable which store the information about the

-/// FD/HD/CD/NET/BEV order

-///

-#define EFI_LEGACY_DEV_ORDER_VARIABLE_GUID \

-  { \

-  0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52} \

-  }

-

 //

 // String Contant

 //

@@ -55,8 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 #define VAR_FLAG  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE

 

-extern EFI_GUID mBootMaintGuid;

-extern EFI_GUID mFileExplorerGuid;

 extern CHAR16   mFileExplorerStorageName[];

 extern CHAR16   mBootMaintStorageName[];

 //

@@ -85,8 +72,6 @@ extern UINT8    FEBin[];
 //

 // Enumeration type definition

 //

-typedef UINT8 BBS_TYPE;

-

 typedef enum _TYPE_OF_TERMINAL {

   TerminalTypePcAnsi                             = 0,

   TerminalTypeVt100,

@@ -263,15 +248,6 @@ typedef struct {
   UINT16    BbsIndex;

   UINT16    BbsType;

 } BOOT_OPTION_BBS_MAPPING;

-

-typedef struct {

-  BBS_TYPE  BbsType;

-  ///

-  /// Length = sizeof (UINT16) + SIZEOF (Data)

-  ///

-  UINT16    Length;

-  UINT16    Data[1];

-} BM_LEGACY_DEV_ORDER_CONTEXT;

 #pragma pack()

 

 typedef struct {

@@ -967,14 +943,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 not be found.

+  @retval EFI_NOT_FOUND  If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can not be found.

 

 **/

 EFI_STATUS

@@ -1566,7 +1542,6 @@ extern STRING_DEPOSITORY          *DriverOptionStrDepository;
 extern STRING_DEPOSITORY          *DriverOptionHelpStrDepository;

 extern STRING_DEPOSITORY          *TerminalStrDepository;

 extern EFI_DEVICE_PATH_PROTOCOL   EndDevicePath[];

-extern EFI_GUID                   EfiLegacyDevOrderGuid;

 extern UINT16                     mFlowControlType[2];

 extern UINT32                     mFlowControlValue[2];

 //

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index e078a722d8..8ff5fa0a16 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -82,7 +82,7 @@ UpdateFileExplorePage (
 

   HiiUpdateForm (

     CallbackData->FeHiiHandle,

-    &mFileExplorerGuid,

+    &gFileExploreFormSetGuid,

     FORM_FILE_EXPLORER_ID,

     mStartOpCodeHandle, // Label FORM_FILE_EXPLORER_ID

     mEndOpCodeHandle    // LABEL_END

@@ -191,7 +191,7 @@ UpdateFileExplorer (
 

         HiiUpdateForm (

           CallbackData->FeHiiHandle,

-          &mFileExplorerGuid,

+          &gFileExploreFormSetGuid,

           FormId,

           mStartOpCodeHandle, // Label FormId

           mEndOpCodeHandle    // LABEL_END

@@ -262,7 +262,7 @@ FileExplorerCallback (
     // Retrieve uncommitted data from Form Browser

     //

     NvRamMap = &Private->FeFakeNvData;

-    HiiGetBrowserData (&mFileExplorerGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);

+    HiiGetBrowserData (&gFileExploreFormSetGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);

 

     if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_SAVE_AND_EXIT_DRIVER) {

       //

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
index d55981ca20..1087db8472 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
@@ -14,15 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _FORM_GUID_H_

 #define _FORM_GUID_H_

 

-#define BOOT_MAINT_FORMSET_GUID \

-  { \

-  0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22} \

-  }

-

-#define FILE_EXPLORE_FORMSET_GUID \

-  { \

-  0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b} \

-  }

+#include <Guid/BdsHii.h>

 

 #define FORM_MAIN_ID                         0x1001

 #define FORM_BOOT_ADD_ID                     0x1002

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index ece88524cb..f77b9f82ed 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -123,7 +123,7 @@ UpdatePageEnd (
 

   HiiUpdateForm (

     CallbackData->BmmHiiHandle,

-    &mBootMaintGuid,

+    &gBootMaintFormSetGuid,

     CallbackData->BmmCurrentPageId,

     mStartOpCodeHandle, // Label CallbackData->BmmCurrentPageId

     mEndOpCodeHandle    // LABEL_END

@@ -151,7 +151,7 @@ CleanUpPage (
   mStartLabel->Number = LabelId;

   HiiUpdateForm (

     CallbackData->BmmHiiHandle,

-    &mBootMaintGuid,

+    &gBootMaintFormSetGuid,

     LabelId,

     mStartOpCodeHandle, // Label LabelId

     mEndOpCodeHandle    // LABEL_END

@@ -1251,7 +1251,7 @@ UpdateSetLegacyDeviceOrderPage (
   IN BMM_CALLBACK_DATA                *CallbackData

   )

 {

-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;

+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;

   BM_MENU_OPTION              *OptionMenu;

   BM_MENU_ENTRY               *NewMenuEntry;

   EFI_STRING_ID               StrRef;

@@ -1382,12 +1382,12 @@ UpdateSetLegacyDeviceOrderPage (
   //

   VarData = BdsLibGetVariableAndSize (

               VAR_LEGACY_DEV_ORDER,

-              &EfiLegacyDevOrderGuid,

+              &gEfiLegacyDevOrderVariableGuid,

               &VarSize

               );

 

   if (NULL != VarData) {

-    DevOrder    = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;

+    DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;

     while (VarData < VarData + VarSize) {

       if (DevOrder->BbsType == BbsType) {

         break;

@@ -1395,7 +1395,7 @@ UpdateSetLegacyDeviceOrderPage (
 

       VarData += sizeof (BBS_TYPE);

       VarData += *(UINT16 *) VarData;

-      DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;

+      DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;

     }

     //

     // Create oneof tag here for FD/HD/CD #1 #2

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index cf5d295c84..6e6c7266d0 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -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