Clean up the private GUID definition in module Level.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4ConfigDxe / Ip4ConfigNv.c

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index d57605e02dc752ba40b7aeb7c985e2f09803b4c3..59e5127b44a7d683b21d462d04a5cffe71f54c45 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -15,9 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Ip4ConfigNv.h"\r
 #include "NicIp4Variable.h"\r
 \r
-EFI_GUID  mNicIp4ConfigNvDataGuid = EFI_NIC_IP4_CONFIG_NVDATA_GUID;\r
-\r
-\r
 /**\r
   Calculate the prefix length of the IPv4 subnet mask.\r
 \r
@@ -431,7 +428,7 @@ Ip4DeviceExtractConfig (
     }\r
   }\r
 \r
-  if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
+  if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
 \r
     IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG_IFR_NVDATA));\r
     if (IfrFormNvData == NULL) {\r
@@ -447,7 +444,7 @@ Ip4DeviceExtractConfig (
       // 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 (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, Ip4ConfigInstance->ChildHandle);\r
+      ConfigRequestHdr = HiiConstructConfigHdr (&gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, Ip4ConfigInstance->ChildHandle);\r
       Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
       ConfigRequest = AllocateZeroPool (Size);\r
       ASSERT (ConfigRequest != NULL);\r
@@ -498,7 +495,7 @@ Ip4DeviceExtractConfig (
     FreePool (FormResult);\r
   } else if (HiiIsConfigHdrMatch (Request, &gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
     *Results = DeviceResult;\r
-  } else if (HiiIsConfigHdrMatch (Request, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
+  } else if (HiiIsConfigHdrMatch (Request, &gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
     *Results = FormResult;\r
   } else {\r
     return EFI_NOT_FOUND;\r
@@ -582,7 +579,7 @@ Ip4DeviceRouteConfig (
   //\r
   // Check Routing data in <ConfigHdr>.\r
   //\r
-  if (HiiIsConfigHdrMatch (Configuration, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
+  if (HiiIsConfigHdrMatch (Configuration, &gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
     //\r
     // Convert buffer data to <ConfigResp> by helper function BlockToConfig()\r
     //\r
@@ -703,7 +700,7 @@ Ip4FormCallback (
     //\r
     // Retrive uncommitted data from Browser\r
     //\r
-    if (!HiiGetBrowserData (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
+    if (!HiiGetBrowserData (&gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
       FreePool (IfrFormNvData);\r
       return EFI_NOT_FOUND;\r
     }\r
@@ -841,7 +838,7 @@ Ip4ConfigDeviceInit (
   // Publish our HII data\r
   //\r
   Instance->RegisteredHandle = HiiAddPackages (\r
-                                 &mNicIp4ConfigNvDataGuid,\r
+                                 &gNicIp4ConfigNvDataGuid,\r
                                  Instance->ChildHandle,\r
                                  Ip4ConfigDxeStrings,\r
                                  Ip4ConfigDxeBin,\r