\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
(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
//\r
if ((TpmEnable != NULL) || (TpmActivate != NULL)) {\r
TpmSendSize = sizeof (TPM_RQU_COMMAND_HDR) + sizeof (UINT32) * 3;\r
- *(UINT16*)&CmdBuf[0] = H2NS (TPM_TAG_RQU_COMMAND);\r
- *(UINT32*)&CmdBuf[2] = H2NL (TpmSendSize);\r
- *(UINT32*)&CmdBuf[6] = H2NL (TPM_ORD_GetCapability);\r
+ *(UINT16*)&CmdBuf[0] = SwapBytes16 (TPM_TAG_RQU_COMMAND);\r
+ *(UINT32*)&CmdBuf[2] = SwapBytes32 (TpmSendSize);\r
+ *(UINT32*)&CmdBuf[6] = SwapBytes32 (TPM_ORD_GetCapability);\r
\r
- *(UINT32*)&CmdBuf[10] = H2NL (TPM_CAP_FLAG);\r
- *(UINT32*)&CmdBuf[14] = H2NL (sizeof (TPM_CAP_FLAG_PERMANENT));\r
- *(UINT32*)&CmdBuf[18] = H2NL (TPM_CAP_FLAG_PERMANENT);\r
+ *(UINT32*)&CmdBuf[10] = SwapBytes32 (TPM_CAP_FLAG);\r
+ *(UINT32*)&CmdBuf[14] = SwapBytes32 (sizeof (TPM_CAP_FLAG_PERMANENT));\r
+ *(UINT32*)&CmdBuf[18] = SwapBytes32 (TPM_CAP_FLAG_PERMANENT);\r
\r
Status = TcgProtocol->PassThroughToTpm (\r
TcgProtocol,\r
CmdBuf\r
); \r
TpmRsp = (TPM_RSP_COMMAND_HDR *) &CmdBuf[0];\r
- if (EFI_ERROR (Status) || (TpmRsp->tag != H2NS (TPM_TAG_RSP_COMMAND)) || (TpmRsp->returnCode != 0)) {\r
+ if (EFI_ERROR (Status) || (TpmRsp->tag != SwapBytes16 (TPM_TAG_RSP_COMMAND)) || (TpmRsp->returnCode != 0)) {\r
return EFI_DEVICE_ERROR;\r
}\r
\r
}\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
ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));\r
\r
Configuration.MorState = PcdGetBool (PcdMorEnable);\r
- Configuration.TpmOperation = ENABLE;\r
+ Configuration.TpmOperation = PHYSICAL_PRESENCE_ENABLE;\r
Configuration.HideTpm = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));\r
//\r
// Read the original value of HideTpm from PrivateData which won't be changed by Setup in this boot.\r
// 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
}\r
\r
*Progress = Configuration;\r
- if (!HiiIsConfigHdrMatch (Configuration, &mTcgFormSetGuid, mTcgStorageName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gTcgConfigFormSetGuid, mTcgStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if ((Action != EFI_BROWSER_ACTION_CHANGING) || (QuestionId != KEY_TPM_ACTION)) {\r
+ if ((Action != EFI_BROWSER_ACTION_CHANGED) || (QuestionId != KEY_TPM_ACTION)) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
// Publish the HII package list\r
//\r
HiiHandle = HiiAddPackages (\r
- &mTcgFormSetGuid,\r
+ &gTcgConfigFormSetGuid,\r
DriverHandle,\r
TcgConfigDxeStrings,\r
TcgConfigBin,\r