Clean up the private GUID definition in module Level.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 35c965f316c94e9ef4ccfe1f67752f3f56a14bec..4c8e3c8a4da07b530dd85b46ae97a59eb52dc376 100644 (file)
--- 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)\r
       }\r
     },\r
-    //\r
-    // {165A028F-0BB2-4b5f-8747-77592E3F6499}\r
-    //\r
-    { 0x165a028f, 0xbb2, 0x4b5f, { 0x87, 0x47, 0x77, 0x59, 0x2e, 0x3f, 0x64, 0x99 } }\r
+    BOOT_MAINT_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -63,10 +60,7 @@ HII_VENDOR_DEVICE_PATH  mFeHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {91DB4238-B0C8-472e-BBCF-F3A6541010F4}\r
-    //\r
-    { 0x91db4238, 0xb0c8, 0x472e, { 0xbb, 0xcf, 0xf3, 0xa6, 0x54, 0x10, 0x10, 0xf4 } }\r
+    FILE_EXPLORE_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -78,10 +72,6 @@ HII_VENDOR_DEVICE_PATH  mFeHiiVendorDevicePath = {
   }\r
 };\r
 \r
-EFI_GUID EfiLegacyDevOrderGuid  = EFI_LEGACY_DEV_ORDER_VARIABLE_GUID;\r
-EFI_GUID mBootMaintGuid         = BOOT_MAINT_FORMSET_GUID;\r
-EFI_GUID mFileExplorerGuid      = FILE_EXPLORE_FORMSET_GUID;\r
-\r
 CHAR16  mBootMaintStorageName[]     = L"BmmData";\r
 CHAR16  mFileExplorerStorageName[]  = L"FeData";\r
 \r
@@ -194,7 +184,7 @@ BootMaintExtractConfig (
   }\r
 \r
   *Progress = Request;\r
-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mBootMaintGuid, mBootMaintStorageName)) {\r
+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gBootMaintFormSetGuid, mBootMaintStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -215,7 +205,7 @@ BootMaintExtractConfig (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
-    ConfigRequestHdr = HiiConstructConfigHdr (&mBootMaintGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gBootMaintFormSetGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
@@ -319,7 +309,7 @@ BootMaintCallback (
     // Retrive uncommitted data from Form Browser\r
     //\r
     CurrentFakeNVMap = &Private->BmmFakeNvData;\r
-    HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
+    HiiGetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
 \r
     //\r
     // need to be subtituded.\r
@@ -630,7 +620,7 @@ BootMaintCallback (
     //\r
     // Pass changed uncommitted data back to Form Browser\r
     //\r
-    Status = HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);\r
+    Status = HiiSetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);\r
     return Status;\r
   }\r
 \r
@@ -985,7 +975,7 @@ InitializeBM (
   // Post our Boot Maint VFR binary to the HII database.\r
   //\r
   BmmCallbackInfo->BmmHiiHandle = HiiAddPackages (\r
-                                    &mBootMaintGuid,\r
+                                    &gBootMaintFormSetGuid,\r
                                     BmmCallbackInfo->BmmDriverHandle,\r
                                     BmBin,\r
                                     BdsDxeStrings,\r
@@ -997,7 +987,7 @@ InitializeBM (
   // Post our File Explorer VFR binary to the HII database.\r
   //\r
   BmmCallbackInfo->FeHiiHandle = HiiAddPackages (\r
-                                   &mFileExplorerGuid,\r
+                                   &gFileExploreFormSetGuid,\r
                                    BmmCallbackInfo->FeDriverHandle,\r
                                    FEBin,\r
                                    BdsDxeStrings,\r
@@ -1109,7 +1099,7 @@ InitializeBM (
     \r
     HiiUpdateForm (\r
       BmmCallbackInfo->BmmHiiHandle,\r
-      &mBootMaintGuid,\r
+      &gBootMaintFormSetGuid,\r
       FORM_BOOT_SETUP_ID,\r
       mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID\r
       mEndOpCodeHandle    // LABEL_END\r
@@ -1399,7 +1389,7 @@ FormSetDispatcher (
                              gFormBrowser2,\r
                              &CallbackData->BmmHiiHandle,\r
                              1,\r
-                             &mBootMaintGuid,\r
+                             &gBootMaintFormSetGuid,\r
                              0,\r
                              NULL,\r
                              &ActionRequest\r
@@ -1421,7 +1411,7 @@ FormSetDispatcher (
                                gFormBrowser2,\r
                                &CallbackData->FeHiiHandle,\r
                                1,\r
-                               &mFileExplorerGuid,\r
+                               &gFileExploreFormSetGuid,\r
                                0,\r
                                NULL,\r
                                &ActionRequest\r