Clean up the private GUID definition in module Level.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiConfig.c

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 7a528198ef8e78bd9a1014157d573cab74da8c9c..d347d8dc70c3c79afff7ddd625e81afe898b4c5c 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "IScsiImpl.h"\r
 \r
-EFI_GUID        mVendorGuid              = ISCSI_CONFIG_GUID;\r
 CHAR16          mVendorStorageName[]     = L"ISCSI_CONFIG_IFR_NVDATA";\r
 BOOLEAN         mIScsiDeviceListUpdated  = FALSE;\r
 UINTN           mNumberOfIScsiDevices    = 0;\r
@@ -30,10 +29,7 @@ HII_VENDOR_DEVICE_PATH  mIScsiHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {49D7B73E-143D-4716-977B-C45F1CB038CC}\r
-    //\r
-    { 0x49d7b73e, 0x143d, 0x4716, { 0x97, 0x7b, 0xc4, 0x5f, 0x1c, 0xb0, 0x38, 0xcc } }\r
+    ISCSI_CONFIG_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -758,7 +754,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
     //\r
     AttemptConfigOrder = IScsiGetVariableAndSize (\r
                            L"AttemptOrder",\r
-                           &mVendorGuid,\r
+                           &gIScsiConfigGuid,\r
                            &AttemptConfigOrderSize\r
                            );\r
 \r
@@ -787,7 +783,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
 \r
     Status = gRT->SetVariable (\r
                     L"AttemptOrder",\r
-                    &mVendorGuid,\r
+                    &gIScsiConfigGuid,\r
                     EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
                     AttemptConfigOrderSize,\r
                     AttemptConfigOrder\r
@@ -1028,7 +1024,7 @@ IScsiConfigAddAttempt (
 \r
   Status = HiiUpdateForm (\r
              mCallbackInfo->RegisteredHandle, // HII handle\r
-             &mVendorGuid,                    // Formset GUID\r
+             &gIScsiConfigGuid,               // Formset GUID\r
              FORMID_MAC_FORM,                 // Form ID\r
              StartOpCodeHandle,               // Label for where to insert opcodes\r
              EndOpCodeHandle                  // Replace data\r
@@ -1098,7 +1094,7 @@ IScsiConfigUpdateAttempt (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->RegisteredHandle, // HII handle\r
-    &mVendorGuid,                    // Formset GUID\r
+    &gIScsiConfigGuid,               // Formset GUID\r
     FORMID_MAIN_FORM,                // Form ID\r
     StartOpCodeHandle,               // Label for where to insert opcodes\r
     EndOpCodeHandle                  // Replace data\r
@@ -1143,7 +1139,7 @@ IScsiConfigDeleteAttempts (
 \r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
-                         &mVendorGuid,\r
+                         &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
   if ((AttemptConfigOrder == NULL) || (AttemptConfigOrderSize == 0)) {\r
@@ -1258,7 +1254,7 @@ IScsiConfigDeleteAttempts (
   //\r
   Status = gRT->SetVariable (\r
                   L"AttemptOrder",\r
-                  &mVendorGuid,\r
+                  &gIScsiConfigGuid,\r
                   Attribute,\r
                   NewTotal * sizeof (UINT8),\r
                   AttemptNewOrder\r
@@ -1317,7 +1313,7 @@ IScsiConfigDisplayDeleteAttempts (
 \r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
-                         &mVendorGuid,\r
+                         &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
   if (AttemptConfigOrder != NULL) {\r
@@ -1354,7 +1350,7 @@ IScsiConfigDisplayDeleteAttempts (
 \r
   Status = HiiUpdateForm (\r
              mCallbackInfo->RegisteredHandle, // HII handle\r
-             &mVendorGuid,                    // Formset GUID\r
+             &gIScsiConfigGuid,               // Formset GUID\r
              FORMID_DELETE_FORM,              // Form ID\r
              StartOpCodeHandle,               // Label for where to insert opcodes\r
              EndOpCodeHandle                  // Replace data\r
@@ -1454,7 +1450,7 @@ IScsiConfigDisplayOrderAttempts (
 Exit:\r
   Status = HiiUpdateForm (\r
              mCallbackInfo->RegisteredHandle, // HII handle\r
-             &mVendorGuid,                    // Formset GUID\r
+             &gIScsiConfigGuid,               // Formset GUID\r
              FORMID_ORDER_FORM,               // Form ID\r
              StartOpCodeHandle,               // Label for where to insert opcodes\r
              EndOpCodeHandle                  // Replace data\r
@@ -1498,7 +1494,7 @@ IScsiConfigOrderAttempts (
 \r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
-                         &mVendorGuid,\r
+                         &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
   if (AttemptConfigOrder == NULL) {\r
@@ -1560,7 +1556,7 @@ IScsiConfigOrderAttempts (
 \r
   Status = gRT->SetVariable (\r
                   L"AttemptOrder",\r
-                  &mVendorGuid,\r
+                  &gIScsiConfigGuid,\r
                   EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
                   AttemptConfigOrderSize,\r
                   AttemptConfigOrderTmp\r
@@ -1674,7 +1670,7 @@ IScsiConfigProcessDefault (
     //\r
     AttemptConfigOrder = IScsiGetVariableAndSize (\r
                            L"AttemptOrder",\r
-                           &mVendorGuid,\r
+                           &gIScsiConfigGuid,\r
                            &AttemptConfigOrderSize\r
                            );\r
 \r
@@ -1899,7 +1895,7 @@ IScsiFormExtractConfig (
   }\r
 \r
   *Progress = Request;\r
-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVendorGuid, mVendorStorageName)) {\r
+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gIScsiConfigGuid, mVendorStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -1943,7 +1939,7 @@ IScsiFormExtractConfig (
     // 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 (&mVendorGuid, mVendorStorageName, Private->DriverHandle);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gIScsiConfigGuid, mVendorStorageName, Private->DriverHandle);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
@@ -2039,7 +2035,7 @@ IScsiFormRouteConfig (
   // Check routing data in <ConfigHdr>.\r
   // Note: if only one Storage is used, then this checking could be skipped.\r
   //\r
-  if (!HiiIsConfigHdrMatch (Configuration, &mVendorGuid, mVendorStorageName)) {\r
+  if (!HiiIsConfigHdrMatch (Configuration, &gIScsiConfigGuid, mVendorStorageName)) {\r
     *Progress = Configuration;\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -2494,7 +2490,7 @@ IScsiConfigFormInit (
   // Publish our HII data.\r
   //\r
   CallbackInfo->RegisteredHandle = HiiAddPackages (\r
-                                     &mVendorGuid,\r
+                                     &gIScsiConfigGuid,\r
                                      CallbackInfo->DriverHandle,\r
                                      IScsiDxeStrings,\r
                                      IScsiConfigVfrBin,\r