Clean up the private GUID definition in module Level.

[mirror_edk2.git] / SecurityPkg / Tcg / TcgConfigDxe / TcgConfigImpl.c

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 0127819a904056319e27494503ee6e3466604be9..c172583441d6e7e5b6144863b76f44fa2d0a5741 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "TcgConfigImpl.h"\r
 \r
-EFI_GUID                        mTcgFormSetGuid = TCG_CONFIG_PRIVATE_GUID;\r
 CHAR16                          mTcgStorageName[] = L"TCG_CONFIGURATION";\r
 \r
 TCG_CONFIG_PRIVATE_DATA         mTcgConfigPrivateDateTemplate = {\r
@@ -36,7 +35,7 @@ HII_VENDOR_DEVICE_PATH          mTcgHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    TCG_CONFIG_PRIVATE_GUID\r
+    TCG_CONFIG_FORM_SET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -166,7 +165,7 @@ TcgExtractConfig (
   }\r
 \r
   *Progress = Request;\r
-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mTcgFormSetGuid, mTcgStorageName)) {\r
+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gTcgConfigFormSetGuid, mTcgStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -220,7 +219,7 @@ TcgExtractConfig (
     // 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 (&mTcgFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gTcgConfigFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
@@ -290,7 +289,7 @@ TcgRouteConfig (
   }\r
 \r
   *Progress = Configuration;\r
-  if (!HiiIsConfigHdrMatch (Configuration, &mTcgFormSetGuid, mTcgStorageName)) {\r
+  if (!HiiIsConfigHdrMatch (Configuration, &gTcgConfigFormSetGuid, mTcgStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -460,7 +459,7 @@ InstallTcgConfigForm (
   // Publish the HII package list\r
   //\r
   HiiHandle = HiiAddPackages (\r
-                &mTcgFormSetGuid,\r
+                &gTcgConfigFormSetGuid,\r
                 DriverHandle,\r
                 TcgConfigDxeStrings,\r
                 TcgConfigBin,\r