Clean up the private GUID definition in module Level.

[mirror_edk2.git] / MdeModulePkg / Universal / DriverSampleDxe / DriverSample.c

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 1484404687e5cc789a29f972d87a6e060a5de817..b6621a93e275033a0c21edc50d306bd52537e80a 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -18,10 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #define DISPLAY_ONLY_MY_ITEM  0x0002\r
 \r
-EFI_GUID   mFormSetGuid = FORMSET_GUID;\r
-EFI_GUID   mInventoryGuid = INVENTORY_GUID;\r
-EFI_GUID   MyEventGroupGuid = EFI_IFR_REFRESH_ID_OP_GUID;\r
-\r
 CHAR16     VariableName[] = L"MyIfrNVData";\r
 CHAR16     MyEfiVar[] = L"MyEfiVar";\r
 EFI_HANDLE                      DriverHandle[2] = {NULL, NULL};\r
@@ -38,10 +34,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath0 = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {C153B68D-EBFC-488e-B110-662867745B87}\r
-    //\r
-    { 0xc153b68d, 0xebfc, 0x488e, { 0xb1, 0x10, 0x66, 0x28, 0x67, 0x74, 0x5b, 0x87 } }\r
+    DRIVER_SAMPLE_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -63,10 +56,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath1 = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {06F37F07-0C48-40e9-8436-0A08A0BB76B0}\r
-    //\r
-    { 0x6f37f07, 0xc48, 0x40e9, { 0x84, 0x36, 0xa, 0x8, 0xa0, 0xbb, 0x76, 0xb0 } }\r
+    DRIVER_SAMPLE_INVENTORY_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -293,7 +283,7 @@ ValidatePassword (
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
   Status = gRT->GetVariable (\r
                   VariableName,\r
-                  &mFormSetGuid,\r
+                  &gDriverSampleFormSetGuid,\r
                   NULL,\r
                   &BufferSize,\r
                   &PrivateData->Configuration\r
@@ -386,7 +376,7 @@ SetPassword (
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
   Status = gRT->GetVariable (\r
                   VariableName,\r
-                  &mFormSetGuid,\r
+                  &gDriverSampleFormSetGuid,\r
                   NULL,\r
                   &BufferSize,\r
                   &PrivateData->Configuration\r
@@ -418,7 +408,7 @@ SetPassword (
   //\r
   Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_CONFIGURATION));\r
   ASSERT (Configuration != NULL);\r
-  if (HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
+  if (HiiGetBrowserData (&gDriverSampleFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
     //\r
     // Update password's clear text in the screen\r
     //\r
@@ -428,7 +418,7 @@ SetPassword (
     // Update uncommitted data of Browser\r
     //\r
     HiiSetBrowserData (\r
-       &mFormSetGuid,\r
+       &gDriverSampleFormSetGuid,\r
        VariableName,\r
        sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
        (UINT8 *) Configuration,\r
@@ -448,7 +438,7 @@ SetPassword (
   EncodePassword (Password, StrLen (Password) * 2);\r
   Status = gRT->SetVariable(\r
                   VariableName,\r
-                  &mFormSetGuid,\r
+                  &gDriverSampleFormSetGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                   &PrivateData->Configuration\r
@@ -834,7 +824,7 @@ ExtractConfig (
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
   Status = gRT->GetVariable (\r
             VariableName,\r
-            &mFormSetGuid,\r
+            &gDriverSampleFormSetGuid,\r
             NULL,\r
             &BufferSize,\r
             &PrivateData->Configuration\r
@@ -852,7 +842,7 @@ ExtractConfig (
     // 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 (&mFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
@@ -865,14 +855,14 @@ ExtractConfig (
     // Check routing data in <ConfigHdr>.\r
     // Note: if only one Storage is used, then this checking could be skipped.\r
     //\r
-    if (!HiiIsConfigHdrMatch (Request, &mFormSetGuid, NULL)) {\r
+    if (!HiiIsConfigHdrMatch (Request, &gDriverSampleFormSetGuid, NULL)) {\r
       return EFI_NOT_FOUND;\r
     }\r
     //\r
     // Check whether request for EFI Varstore. EFI varstore get data\r
     // through hii database, not support in this path.\r
     //\r
-    if (HiiIsConfigHdrMatch(Request, &mFormSetGuid, MyEfiVar)) {\r
+    if (HiiIsConfigHdrMatch(Request, &gDriverSampleFormSetGuid, MyEfiVar)) {\r
       return EFI_UNSUPPORTED;\r
     }\r
     //\r
@@ -996,7 +986,7 @@ ExtractConfig (
                                   Progress\r
                                   );\r
     if (!EFI_ERROR (Status)) {\r
-      ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
+      ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
       AppendAltCfgString(Results, ConfigRequestHdr);\r
     }\r
   }\r
@@ -1074,7 +1064,7 @@ RouteConfig (
   // Check routing data in <ConfigHdr>.\r
   // Note: if only one Storage is used, then this checking could be skipped.\r
   //\r
-  if (!HiiIsConfigHdrMatch (Configuration, &mFormSetGuid, NULL)) {\r
+  if (!HiiIsConfigHdrMatch (Configuration, &gDriverSampleFormSetGuid, NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -1082,7 +1072,7 @@ RouteConfig (
   // Check whether request for EFI Varstore. EFI varstore get data\r
   // through hii database, not support in this path.\r
   //\r
-  if (HiiIsConfigHdrMatch(Configuration, &mFormSetGuid, MyEfiVar)) {\r
+  if (HiiIsConfigHdrMatch(Configuration, &gDriverSampleFormSetGuid, MyEfiVar)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -1092,7 +1082,7 @@ RouteConfig (
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
   Status = gRT->GetVariable (\r
             VariableName,\r
-            &mFormSetGuid,\r
+            &gDriverSampleFormSetGuid,\r
             NULL,\r
             &BufferSize,\r
             &PrivateData->Configuration\r
@@ -1211,7 +1201,7 @@ RouteConfig (
     //\r
     Status = gRT->SetVariable(\r
       VariableName,\r
-      &mFormSetGuid,\r
+      &gDriverSampleFormSetGuid,\r
       EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
       sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
       &PrivateData->Configuration\r
@@ -1240,7 +1230,7 @@ RouteConfig (
   //\r
   Status = gRT->SetVariable(\r
                   VariableName,\r
-                  &mFormSetGuid,\r
+                  &gDriverSampleFormSetGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                   &PrivateData->Configuration\r
@@ -1340,7 +1330,7 @@ DriverCallback (
 \r
         HiiUpdateForm (\r
           PrivateData->HiiHandle[0],  // HII handle\r
-          &mFormSetGuid,              // Formset GUID\r
+          &gDriverSampleFormSetGuid,  // Formset GUID\r
           0x3,                        // Form ID\r
           StartOpCodeHandle,          // Label for where to insert opcodes\r
           NULL                        // Insert data\r
@@ -1498,7 +1488,7 @@ DriverCallback (
       PrivateData->Configuration.DynamicOneof = 2;\r
       Status = gRT->SetVariable(\r
                       VariableName,\r
-                      &mFormSetGuid,\r
+                      &gDriverSampleFormSetGuid,\r
                       EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                       sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                       &PrivateData->Configuration\r
@@ -1509,14 +1499,14 @@ DriverCallback (
       //\r
       Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_CONFIGURATION));\r
       ASSERT (Configuration != NULL);\r
-      if (HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
+      if (HiiGetBrowserData (&gDriverSampleFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
         Configuration->DynamicOneof = 2;\r
 \r
         //\r
         // Update uncommitted data of Browser\r
         //\r
         HiiSetBrowserData (\r
-          &mFormSetGuid,\r
+          &gDriverSampleFormSetGuid,\r
           VariableName,\r
           sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
           (UINT8 *) Configuration,\r
@@ -1595,7 +1585,7 @@ DriverCallback (
 \r
       HiiUpdateForm (\r
         PrivateData->HiiHandle[0],  // HII handle\r
-        &mFormSetGuid,              // Formset GUID\r
+        &gDriverSampleFormSetGuid,  // Formset GUID\r
         0x1234,                     // Form ID\r
         StartOpCodeHandle,          // Label for where to insert opcodes\r
         EndOpCodeHandle             // Replace data\r
@@ -1644,7 +1634,7 @@ DriverCallback (
 \r
       HiiUpdateForm (\r
         PrivateData->HiiHandle[0],  // HII handle\r
-        &mFormSetGuid,              // Formset GUID\r
+        &gDriverSampleFormSetGuid,              // Formset GUID\r
         FormId,                        // Form ID\r
         StartOpCodeHandle,          // Label for where to insert opcodes\r
         NULL                        // Insert data\r
@@ -1657,7 +1647,7 @@ DriverCallback (
       //\r
       Status = gRT->SetVariable(\r
                       VariableName,\r
-                      &mFormSetGuid,\r
+                      &gDriverSampleFormSetGuid,\r
                       EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                       sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                       &PrivateData->Configuration\r
@@ -1669,10 +1659,10 @@ DriverCallback (
         //\r
         EfiData = AllocateZeroPool (sizeof (MY_EFI_VARSTORE_DATA));\r
         ASSERT (EfiData != NULL);\r
-        if (HiiGetBrowserData (&mFormSetGuid, MyEfiVar, sizeof (MY_EFI_VARSTORE_DATA), (UINT8 *) EfiData)) {\r
+        if (HiiGetBrowserData (&gDriverSampleFormSetGuid, MyEfiVar, sizeof (MY_EFI_VARSTORE_DATA), (UINT8 *) EfiData)) {\r
           EfiData->Field8 = 111;\r
           HiiSetBrowserData (\r
-            &mFormSetGuid,\r
+            &gDriverSampleFormSetGuid,\r
             MyEfiVar,\r
             sizeof (MY_EFI_VARSTORE_DATA),\r
             (UINT8 *) EfiData,\r
@@ -1886,7 +1876,7 @@ DriverSampleInit (
   // Publish our HII data\r
   //\r
   HiiHandle[0] = HiiAddPackages (\r
-                   &mFormSetGuid,\r
+                   &gDriverSampleFormSetGuid,\r
                    DriverHandle[0],\r
                    DriverSampleStrings,\r
                    VfrBin,\r
@@ -1912,7 +1902,7 @@ DriverSampleInit (
   PrivateData->DriverHandle[1] = DriverHandle[1];\r
 \r
   HiiHandle[1] = HiiAddPackages (\r
-                   &mInventoryGuid,\r
+                   &gDriverSampleInventoryGuid,\r
                    DriverHandle[1],\r
                    DriverSampleStrings,\r
                    InventoryBin,\r
@@ -1954,18 +1944,18 @@ DriverSampleInit (
   //\r
   // Try to read NV config EFI variable first\r
   //\r
-  ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, DriverHandle[0]);\r
+  ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, DriverHandle[0]);\r
   ASSERT (ConfigRequestHdr != NULL);\r
 \r
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
-  Status = gRT->GetVariable (VariableName, &mFormSetGuid, NULL, &BufferSize, Configuration);\r
+  Status = gRT->GetVariable (VariableName, &gDriverSampleFormSetGuid, NULL, &BufferSize, Configuration);\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // Store zero data Buffer Storage to EFI variable\r
     //\r
     Status = gRT->SetVariable(\r
                     VariableName,\r
-                    &mFormSetGuid,\r
+                    &gDriverSampleFormSetGuid,\r
                     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                     sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                     Configuration\r
@@ -1992,18 +1982,18 @@ DriverSampleInit (
   VarStoreConfig = &PrivateData->VarStoreConfig;\r
   ZeroMem (VarStoreConfig, sizeof (MY_EFI_VARSTORE_DATA));\r
 \r
-  ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, MyEfiVar, DriverHandle[0]);\r
+  ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, MyEfiVar, DriverHandle[0]);\r
   ASSERT (ConfigRequestHdr != NULL);\r
 \r
   BufferSize = sizeof (MY_EFI_VARSTORE_DATA);\r
-  Status = gRT->GetVariable (MyEfiVar, &mFormSetGuid, NULL, &BufferSize, VarStoreConfig);\r
+  Status = gRT->GetVariable (MyEfiVar, &gDriverSampleFormSetGuid, NULL, &BufferSize, VarStoreConfig);\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // Store zero data to EFI variable Storage.\r
     //\r
     Status = gRT->SetVariable(\r
                     MyEfiVar,\r
-                    &mFormSetGuid,\r
+                    &gDriverSampleFormSetGuid,\r
                     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                     sizeof (MY_EFI_VARSTORE_DATA),\r
                     VarStoreConfig\r
@@ -2029,7 +2019,7 @@ DriverSampleInit (
         TPL_NOTIFY,\r
         DriverSampleInternalEmptyFunction,\r
         NULL,\r
-        &MyEventGroupGuid,\r
+        &gEfiIfrRefreshIdOpGuid,\r
         &mEvent\r
         );\r
   ASSERT_EFI_ERROR (Status);\r