diff options
Diffstat (limited to 'SecurityPkg/Tcg')
| -rw-r--r-- | SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr | 4 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c | 10 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf | 1 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c | 11 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h | 6 |
5 files changed, 13 insertions, 19 deletions
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr index 360e5569f2..291f9239f4 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "TcgConfigNvData.h"
formset
- guid = TCG_CONFIG_PRIVATE_GUID,
+ guid = TCG_CONFIG_FORM_SET_GUID,
title = STRING_TOKEN(STR_TPM_TITLE),
help = STRING_TOKEN(STR_TPM_HELP),
classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,
@@ -23,7 +23,7 @@ formset varstore TCG_CONFIGURATION,
varid = TCG_CONFIGURATION_VARSTORE_ID,
name = TCG_CONFIGURATION,
- guid = TCG_CONFIG_PRIVATE_GUID;
+ guid = TCG_CONFIG_FORM_SET_GUID;
form formid = TCG_CONFIGURATION_FORM_ID,
title = STRING_TOKEN(STR_TPM_TITLE);
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c index 2ec33e069e..2d3728cdb2 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c @@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "TcgConfigImpl.h"
-EFI_GUID gTcgConfigPrivateGuid = TCG_CONFIG_PRIVATE_GUID;
-
/**
The entry point for Tcg configuration driver.
@@ -52,7 +50,7 @@ TcgConfigDriverEntryPoint ( Status = gBS->OpenProtocol (
ImageHandle,
- &gTcgConfigPrivateGuid,
+ &gEfiCallerIdGuid,
NULL,
ImageHandle,
ImageHandle,
@@ -86,7 +84,7 @@ TcgConfigDriverEntryPoint ( //
Status = gBS->InstallMultipleProtocolInterfaces (
&ImageHandle,
- &gTcgConfigPrivateGuid,
+ &gEfiCallerIdGuid,
PrivateData,
NULL
);
@@ -125,7 +123,7 @@ TcgConfigDriverUnload ( Status = gBS->HandleProtocol (
ImageHandle,
- &gTcgConfigPrivateGuid,
+ &gEfiCallerIdGuid,
(VOID **) &PrivateData
);
if (EFI_ERROR (Status)) {
@@ -136,7 +134,7 @@ TcgConfigDriverUnload ( gBS->UninstallMultipleProtocolInterfaces (
&ImageHandle,
- &gTcgConfigPrivateGuid,
+ &gEfiCallerIdGuid,
PrivateData,
NULL
);
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf index d9d3102668..44abdc0acb 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf @@ -55,6 +55,7 @@ [Guids]
gEfiPhysicalPresenceGuid
gEfiIfrTianoGuid
+ gTcgConfigFormSetGuid
[Protocols]
gEfiHiiConfigAccessProtocolGuid ## PRODUCES
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c index 0127819a90..c172583441 100644 --- 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. #include "TcgConfigImpl.h"
-EFI_GUID mTcgFormSetGuid = TCG_CONFIG_PRIVATE_GUID;
CHAR16 mTcgStorageName[] = L"TCG_CONFIGURATION";
TCG_CONFIG_PRIVATE_DATA mTcgConfigPrivateDateTemplate = {
@@ -36,7 +35,7 @@ HII_VENDOR_DEVICE_PATH mTcgHiiVendorDevicePath = { (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- TCG_CONFIG_PRIVATE_GUID
+ TCG_CONFIG_FORM_SET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -166,7 +165,7 @@ TcgExtractConfig ( }
*Progress = Request;
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mTcgFormSetGuid, mTcgStorageName)) {
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gTcgConfigFormSetGuid, mTcgStorageName)) {
return EFI_NOT_FOUND;
}
@@ -220,7 +219,7 @@ TcgExtractConfig ( // Allocate and fill a buffer large enough to hold the <ConfigHdr> template
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator
//
- ConfigRequestHdr = HiiConstructConfigHdr (&mTcgFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);
+ ConfigRequestHdr = HiiConstructConfigHdr (&gTcgConfigFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
ConfigRequest = AllocateZeroPool (Size);
ASSERT (ConfigRequest != NULL);
@@ -290,7 +289,7 @@ TcgRouteConfig ( }
*Progress = Configuration;
- if (!HiiIsConfigHdrMatch (Configuration, &mTcgFormSetGuid, mTcgStorageName)) {
+ if (!HiiIsConfigHdrMatch (Configuration, &gTcgConfigFormSetGuid, mTcgStorageName)) {
return EFI_NOT_FOUND;
}
@@ -460,7 +459,7 @@ InstallTcgConfigForm ( // Publish the HII package list
//
HiiHandle = HiiAddPackages (
- &mTcgFormSetGuid,
+ &gTcgConfigFormSetGuid,
DriverHandle,
TcgConfigDxeStrings,
TcgConfigBin,
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h index 982764c65c..30f4dbfba6 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h @@ -17,11 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Guid/HiiPlatformSetupFormset.h>
#include <Guid/PhysicalPresenceData.h>
-
-#define TCG_CONFIG_PRIVATE_GUID \
- { \
- 0xb0f901e4, 0xc424, 0x45de, {0x90, 0x81, 0x95, 0xe2, 0xb, 0xde, 0x6f, 0xb5 } \
- }
+#include <Guid/TcgConfigHii.h>
#define TCG_CONFIGURATION_VARSTORE_ID 0x0001
#define TCG_CONFIGURATION_FORM_ID 0x0001
|