]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
MdePkg: Apply uncrustify changes
[mirror_edk2.git] / MdePkg / Include / IndustryStandard / UefiTcgPlatform.h
index d5bc7861170477951440462cb011e151ff11fbc6..e07840c9dd6abb46cf0e5e5a41374610c43dd318 100644 (file)
 //\r
 // EFI specific event types\r
 //\r
-#define EV_EFI_EVENT_BASE                   ((TCG_EVENTTYPE) 0x80000000)\r
-#define EV_EFI_VARIABLE_DRIVER_CONFIG       (EV_EFI_EVENT_BASE + 1)\r
-#define EV_EFI_VARIABLE_BOOT                (EV_EFI_EVENT_BASE + 2)\r
-#define EV_EFI_BOOT_SERVICES_APPLICATION    (EV_EFI_EVENT_BASE + 3)\r
-#define EV_EFI_BOOT_SERVICES_DRIVER         (EV_EFI_EVENT_BASE + 4)\r
-#define EV_EFI_RUNTIME_SERVICES_DRIVER      (EV_EFI_EVENT_BASE + 5)\r
-#define EV_EFI_GPT_EVENT                    (EV_EFI_EVENT_BASE + 6)\r
-#define EV_EFI_ACTION                       (EV_EFI_EVENT_BASE + 7)\r
-#define EV_EFI_PLATFORM_FIRMWARE_BLOB       (EV_EFI_EVENT_BASE + 8)\r
-#define EV_EFI_HANDOFF_TABLES               (EV_EFI_EVENT_BASE + 9)\r
-#define EV_EFI_PLATFORM_FIRMWARE_BLOB2      (EV_EFI_EVENT_BASE + 0xA)\r
-#define EV_EFI_HANDOFF_TABLES2              (EV_EFI_EVENT_BASE + 0xB)\r
-#define EV_EFI_HCRTM_EVENT                  (EV_EFI_EVENT_BASE + 0x10)\r
-#define EV_EFI_VARIABLE_AUTHORITY           (EV_EFI_EVENT_BASE + 0xE0)\r
-#define EV_EFI_SPDM_FIRMWARE_BLOB           (EV_EFI_EVENT_BASE + 0xE1)\r
-#define EV_EFI_SPDM_FIRMWARE_CONFIG         (EV_EFI_EVENT_BASE + 0xE2)\r
+#define EV_EFI_EVENT_BASE                 ((TCG_EVENTTYPE) 0x80000000)\r
+#define EV_EFI_VARIABLE_DRIVER_CONFIG     (EV_EFI_EVENT_BASE + 1)\r
+#define EV_EFI_VARIABLE_BOOT              (EV_EFI_EVENT_BASE + 2)\r
+#define EV_EFI_BOOT_SERVICES_APPLICATION  (EV_EFI_EVENT_BASE + 3)\r
+#define EV_EFI_BOOT_SERVICES_DRIVER       (EV_EFI_EVENT_BASE + 4)\r
+#define EV_EFI_RUNTIME_SERVICES_DRIVER    (EV_EFI_EVENT_BASE + 5)\r
+#define EV_EFI_GPT_EVENT                  (EV_EFI_EVENT_BASE + 6)\r
+#define EV_EFI_ACTION                     (EV_EFI_EVENT_BASE + 7)\r
+#define EV_EFI_PLATFORM_FIRMWARE_BLOB     (EV_EFI_EVENT_BASE + 8)\r
+#define EV_EFI_HANDOFF_TABLES             (EV_EFI_EVENT_BASE + 9)\r
+#define EV_EFI_PLATFORM_FIRMWARE_BLOB2    (EV_EFI_EVENT_BASE + 0xA)\r
+#define EV_EFI_HANDOFF_TABLES2            (EV_EFI_EVENT_BASE + 0xB)\r
+#define EV_EFI_HCRTM_EVENT                (EV_EFI_EVENT_BASE + 0x10)\r
+#define EV_EFI_VARIABLE_AUTHORITY         (EV_EFI_EVENT_BASE + 0xE0)\r
+#define EV_EFI_SPDM_FIRMWARE_BLOB         (EV_EFI_EVENT_BASE + 0xE1)\r
+#define EV_EFI_SPDM_FIRMWARE_CONFIG       (EV_EFI_EVENT_BASE + 0xE2)\r
 \r
 #define EFI_CALLING_EFI_APPLICATION         \\r
   "Calling EFI Application from Boot Option"\r
 #define EFI_EXIT_BOOT_SERVICES_SUCCEEDED    \\r
   "Exit Boot Services Returned with Success"\r
 \r
+#define EV_POSTCODE_INFO_POST_CODE  "POST CODE"\r
+#define POST_CODE_STR_LEN           (sizeof(EV_POSTCODE_INFO_POST_CODE) - 1)\r
 \r
-#define EV_POSTCODE_INFO_POST_CODE    "POST CODE"\r
-#define POST_CODE_STR_LEN             (sizeof(EV_POSTCODE_INFO_POST_CODE) - 1)\r
+#define EV_POSTCODE_INFO_SMM_CODE  "SMM CODE"\r
+#define SMM_CODE_STR_LEN           (sizeof(EV_POSTCODE_INFO_SMM_CODE) - 1)\r
 \r
-#define EV_POSTCODE_INFO_SMM_CODE     "SMM CODE"\r
-#define SMM_CODE_STR_LEN              (sizeof(EV_POSTCODE_INFO_SMM_CODE) - 1)\r
+#define EV_POSTCODE_INFO_ACPI_DATA  "ACPI DATA"\r
+#define ACPI_DATA_LEN               (sizeof(EV_POSTCODE_INFO_ACPI_DATA) - 1)\r
 \r
-#define EV_POSTCODE_INFO_ACPI_DATA    "ACPI DATA"\r
-#define ACPI_DATA_LEN                 (sizeof(EV_POSTCODE_INFO_ACPI_DATA) - 1)\r
+#define EV_POSTCODE_INFO_BIS_CODE  "BIS CODE"\r
+#define BIS_CODE_LEN               (sizeof(EV_POSTCODE_INFO_BIS_CODE) - 1)\r
 \r
-#define EV_POSTCODE_INFO_BIS_CODE     "BIS CODE"\r
-#define BIS_CODE_LEN                  (sizeof(EV_POSTCODE_INFO_BIS_CODE) - 1)\r
+#define EV_POSTCODE_INFO_UEFI_PI  "UEFI PI"\r
+#define UEFI_PI_LEN               (sizeof(EV_POSTCODE_INFO_UEFI_PI) - 1)\r
 \r
-#define EV_POSTCODE_INFO_UEFI_PI      "UEFI PI"\r
-#define UEFI_PI_LEN                   (sizeof(EV_POSTCODE_INFO_UEFI_PI) - 1)\r
-\r
-#define EV_POSTCODE_INFO_OPROM        "Embedded Option ROM"\r
-#define OPROM_LEN                     (sizeof(EV_POSTCODE_INFO_OPROM) - 1)\r
+#define EV_POSTCODE_INFO_OPROM  "Embedded Option ROM"\r
+#define OPROM_LEN               (sizeof(EV_POSTCODE_INFO_OPROM) - 1)\r
 \r
 #define EV_POSTCODE_INFO_EMBEDDED_UEFI_DRIVER  "Embedded UEFI Driver"\r
 #define EMBEDDED_UEFI_DRIVER_LEN               (sizeof(EV_POSTCODE_INFO_EMBEDDED_UEFI_DRIVER) - 1)\r
 //\r
 #pragma pack (1)\r
 \r
-typedef UINT32                     TCG_EVENTTYPE;\r
-typedef TPM_PCRINDEX               TCG_PCRINDEX;\r
-typedef TPM_DIGEST                 TCG_DIGEST;\r
+typedef UINT32        TCG_EVENTTYPE;\r
+typedef TPM_PCRINDEX  TCG_PCRINDEX;\r
+typedef TPM_DIGEST    TCG_DIGEST;\r
 ///\r
 /// Event Log Entry Structure Definition\r
 ///\r
 typedef struct tdTCG_PCR_EVENT {\r
-  TCG_PCRINDEX                      PCRIndex;  ///< PCRIndex event extended to\r
-  TCG_EVENTTYPE                     EventType; ///< TCG EFI event type\r
-  TCG_DIGEST                        Digest;    ///< Value extended into PCRIndex\r
-  UINT32                            EventSize; ///< Size of the event data\r
-  UINT8                             Event[1];  ///< The event data\r
+  TCG_PCRINDEX     PCRIndex;                   ///< PCRIndex event extended to\r
+  TCG_EVENTTYPE    EventType;                  ///< TCG EFI event type\r
+  TCG_DIGEST       Digest;                     ///< Value extended into PCRIndex\r
+  UINT32           EventSize;                  ///< Size of the event data\r
+  UINT8            Event[1];                   ///< The event data\r
 } TCG_PCR_EVENT;\r
 \r
-#define TSS_EVENT_DATA_MAX_SIZE   256\r
+#define TSS_EVENT_DATA_MAX_SIZE  256\r
 \r
 ///\r
 /// TCG_PCR_EVENT_HDR\r
 ///\r
 typedef struct tdTCG_PCR_EVENT_HDR {\r
-  TCG_PCRINDEX                      PCRIndex;\r
-  TCG_EVENTTYPE                     EventType;\r
-  TCG_DIGEST                        Digest;\r
-  UINT32                            EventSize;\r
+  TCG_PCRINDEX     PCRIndex;\r
+  TCG_EVENTTYPE    EventType;\r
+  TCG_DIGEST       Digest;\r
+  UINT32           EventSize;\r
 } TCG_PCR_EVENT_HDR;\r
 \r
 ///\r
@@ -128,8 +127,8 @@ typedef struct tdTCG_PCR_EVENT_HDR {
 /// because PEI is 32-bit while DXE is 64-bit on x64 platforms\r
 ///\r
 typedef struct tdEFI_PLATFORM_FIRMWARE_BLOB {\r
-  EFI_PHYSICAL_ADDRESS              BlobBase;\r
-  UINT64                            BlobLength;\r
+  EFI_PHYSICAL_ADDRESS    BlobBase;\r
+  UINT64                  BlobLength;\r
 } EFI_PLATFORM_FIRMWARE_BLOB;\r
 \r
 ///\r
@@ -139,8 +138,8 @@ typedef struct tdEFI_PLATFORM_FIRMWARE_BLOB {
 /// event to facilitate the measurement of firmware volume.\r
 ///\r
 typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB {\r
-  EFI_PHYSICAL_ADDRESS              BlobBase;\r
-  UINT64                            BlobLength;\r
+  EFI_PHYSICAL_ADDRESS    BlobBase;\r
+  UINT64                  BlobLength;\r
 } UEFI_PLATFORM_FIRMWARE_BLOB;\r
 \r
 ///\r
@@ -150,10 +149,10 @@ typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB {
 /// event to facilitate the measurement of firmware volume.\r
 ///\r
 typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB2 {\r
-  UINT8                             BlobDescriptionSize;\r
-//UINT8                             BlobDescription[BlobDescriptionSize];\r
-//EFI_PHYSICAL_ADDRESS              BlobBase;\r
-//UINT64                            BlobLength;\r
+  UINT8    BlobDescriptionSize;\r
+  // UINT8                             BlobDescription[BlobDescriptionSize];\r
+  // EFI_PHYSICAL_ADDRESS              BlobBase;\r
+  // UINT64                            BlobLength;\r
 } UEFI_PLATFORM_FIRMWARE_BLOB2;\r
 \r
 ///\r
@@ -163,11 +162,11 @@ typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB2 {
 /// EV_EFI_BOOT_SERVICES_DRIVER and EV_EFI_RUNTIME_SERVICES_DRIVER\r
 ///\r
 typedef struct tdEFI_IMAGE_LOAD_EVENT {\r
-  EFI_PHYSICAL_ADDRESS              ImageLocationInMemory;\r
-  UINTN                             ImageLengthInMemory;\r
-  UINTN                             ImageLinkTimeAddress;\r
-  UINTN                             LengthOfDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL          DevicePath[1];\r
+  EFI_PHYSICAL_ADDRESS        ImageLocationInMemory;\r
+  UINTN                       ImageLengthInMemory;\r
+  UINTN                       ImageLinkTimeAddress;\r
+  UINTN                       LengthOfDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    DevicePath[1];\r
 } EFI_IMAGE_LOAD_EVENT;\r
 \r
 ///\r
@@ -177,11 +176,11 @@ typedef struct tdEFI_IMAGE_LOAD_EVENT {
 /// EV_EFI_BOOT_SERVICES_DRIVER and EV_EFI_RUNTIME_SERVICES_DRIVER\r
 ///\r
 typedef struct tdUEFI_IMAGE_LOAD_EVENT {\r
-  EFI_PHYSICAL_ADDRESS              ImageLocationInMemory;\r
-  UINT64                            ImageLengthInMemory;\r
-  UINT64                            ImageLinkTimeAddress;\r
-  UINT64                            LengthOfDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL          DevicePath[1];\r
+  EFI_PHYSICAL_ADDRESS        ImageLocationInMemory;\r
+  UINT64                      ImageLengthInMemory;\r
+  UINT64                      ImageLinkTimeAddress;\r
+  UINT64                      LengthOfDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    DevicePath[1];\r
 } UEFI_IMAGE_LOAD_EVENT;\r
 \r
 ///\r
@@ -191,8 +190,8 @@ typedef struct tdUEFI_IMAGE_LOAD_EVENT {
 /// the measurement of given configuration tables.\r
 ///\r
 typedef struct tdEFI_HANDOFF_TABLE_POINTERS {\r
-  UINTN                             NumberOfTables;\r
-  EFI_CONFIGURATION_TABLE           TableEntry[1];\r
+  UINTN                      NumberOfTables;\r
+  EFI_CONFIGURATION_TABLE    TableEntry[1];\r
 } EFI_HANDOFF_TABLE_POINTERS;\r
 \r
 ///\r
@@ -202,8 +201,8 @@ typedef struct tdEFI_HANDOFF_TABLE_POINTERS {
 /// the measurement of given configuration tables.\r
 ///\r
 typedef struct tdUEFI_HANDOFF_TABLE_POINTERS {\r
-  UINT64                            NumberOfTables;\r
-  EFI_CONFIGURATION_TABLE           TableEntry[1];\r
+  UINT64                     NumberOfTables;\r
+  EFI_CONFIGURATION_TABLE    TableEntry[1];\r
 } UEFI_HANDOFF_TABLE_POINTERS;\r
 \r
 ///\r
@@ -213,10 +212,10 @@ typedef struct tdUEFI_HANDOFF_TABLE_POINTERS {
 /// the measurement of given configuration tables.\r
 ///\r
 typedef struct tdUEFI_HANDOFF_TABLE_POINTERS2 {\r
-  UINT8                             TableDescriptionSize;\r
-//UINT8                             TableDescription[TableDescriptionSize];\r
-//UINT64                            NumberOfTables;\r
-//EFI_CONFIGURATION_TABLE           TableEntry[1];\r
+  UINT8    TableDescriptionSize;\r
+  // UINT8                             TableDescription[TableDescriptionSize];\r
+  // UINT64                            NumberOfTables;\r
+  // EFI_CONFIGURATION_TABLE           TableEntry[1];\r
 } UEFI_HANDOFF_TABLE_POINTERS2;\r
 \r
 ///\r
@@ -228,11 +227,11 @@ typedef struct tdUEFI_HANDOFF_TABLE_POINTERS2 {
 /// This is defined in TCG EFI Platform Spec for TPM1.1 or 1.2 V1.22\r
 ///\r
 typedef struct tdEFI_VARIABLE_DATA {\r
-  EFI_GUID                          VariableName;\r
-  UINTN                             UnicodeNameLength;\r
-  UINTN                             VariableDataLength;\r
-  CHAR16                            UnicodeName[1];\r
-  INT8                              VariableData[1];  ///< Driver or platform-specific data\r
+  EFI_GUID    VariableName;\r
+  UINTN       UnicodeNameLength;\r
+  UINTN       VariableDataLength;\r
+  CHAR16      UnicodeName[1];\r
+  INT8        VariableData[1];                        ///< Driver or platform-specific data\r
 } EFI_VARIABLE_DATA;\r
 \r
 ///\r
@@ -244,38 +243,38 @@ typedef struct tdEFI_VARIABLE_DATA {
 /// This is defined in TCG PC Client Firmware Profile Spec 00.21\r
 ///\r
 typedef struct tdUEFI_VARIABLE_DATA {\r
-  EFI_GUID                          VariableName;\r
-  UINT64                            UnicodeNameLength;\r
-  UINT64                            VariableDataLength;\r
-  CHAR16                            UnicodeName[1];\r
-  INT8                              VariableData[1];  ///< Driver or platform-specific data\r
+  EFI_GUID    VariableName;\r
+  UINT64      UnicodeNameLength;\r
+  UINT64      VariableDataLength;\r
+  CHAR16      UnicodeName[1];\r
+  INT8        VariableData[1];                        ///< Driver or platform-specific data\r
 } UEFI_VARIABLE_DATA;\r
 \r
 //\r
 // For TrEE1.0 compatibility\r
 //\r
 typedef struct {\r
-  EFI_GUID                          VariableName;\r
-  UINT64                            UnicodeNameLength;   // The TCG Definition used UINTN\r
-  UINT64                            VariableDataLength;  // The TCG Definition used UINTN\r
-  CHAR16                            UnicodeName[1];\r
-  INT8                              VariableData[1];\r
+  EFI_GUID    VariableName;\r
+  UINT64      UnicodeNameLength;                         // The TCG Definition used UINTN\r
+  UINT64      VariableDataLength;                        // The TCG Definition used UINTN\r
+  CHAR16      UnicodeName[1];\r
+  INT8        VariableData[1];\r
 } EFI_VARIABLE_DATA_TREE;\r
 \r
 typedef struct tdEFI_GPT_DATA {\r
-  EFI_PARTITION_TABLE_HEADER  EfiPartitionHeader;\r
-  UINTN                       NumberOfPartitions;\r
-  EFI_PARTITION_ENTRY         Partitions[1];\r
+  EFI_PARTITION_TABLE_HEADER    EfiPartitionHeader;\r
+  UINTN                         NumberOfPartitions;\r
+  EFI_PARTITION_ENTRY           Partitions[1];\r
 } EFI_GPT_DATA;\r
 \r
 typedef struct tdUEFI_GPT_DATA {\r
-  EFI_PARTITION_TABLE_HEADER  EfiPartitionHeader;\r
-  UINT64                      NumberOfPartitions;\r
-  EFI_PARTITION_ENTRY         Partitions[1];\r
+  EFI_PARTITION_TABLE_HEADER    EfiPartitionHeader;\r
+  UINT64                        NumberOfPartitions;\r
+  EFI_PARTITION_ENTRY           Partitions[1];\r
 } UEFI_GPT_DATA;\r
 \r
-#define TCG_DEVICE_SECURITY_EVENT_DATA_SIGNATURE "SPDM Device Sec"\r
-#define TCG_DEVICE_SECURITY_EVENT_DATA_VERSION   1\r
+#define TCG_DEVICE_SECURITY_EVENT_DATA_SIGNATURE  "SPDM Device Sec"\r
+#define TCG_DEVICE_SECURITY_EVENT_DATA_VERSION    1\r
 \r
 #define TCG_DEVICE_SECURITY_EVENT_DATA_DEVICE_TYPE_NULL  0\r
 #define TCG_DEVICE_SECURITY_EVENT_DATA_DEVICE_TYPE_PCI   1\r
@@ -287,12 +286,12 @@ typedef struct tdUEFI_GPT_DATA {
 /// used in EV_EFI_SPDM_FIRMWARE_BLOB and EV_EFI_SPDM_FIRMWARE_CONFIG.\r
 ///\r
 typedef struct {\r
-  UINT8                          Signature[16];\r
-  UINT16                         Version;\r
-  UINT16                         Length;\r
-  UINT32                         SpdmHashAlgo;\r
-  UINT32                         DeviceType;\r
-//SPDM_MEASUREMENT_BLOCK         SpdmMeasurementBlock;\r
+  UINT8     Signature[16];\r
+  UINT16    Version;\r
+  UINT16    Length;\r
+  UINT32    SpdmHashAlgo;\r
+  UINT32    DeviceType;\r
+  // SPDM_MEASUREMENT_BLOCK         SpdmMeasurementBlock;\r
 } TCG_DEVICE_SECURITY_EVENT_DATA_HEADER;\r
 \r
 #define TCG_DEVICE_SECURITY_EVENT_DATA_PCI_CONTEXT_VERSION  0\r
@@ -303,14 +302,14 @@ typedef struct {
 /// used in EV_EFI_SPDM_FIRMWARE_BLOB and EV_EFI_SPDM_FIRMWARE_CONFIG.\r
 ///\r
 typedef struct {\r
-  UINT16  Version;\r
-  UINT16  Length;\r
-  UINT16  VendorId;\r
-  UINT16  DeviceId;\r
-  UINT8   RevisionID;\r
-  UINT8   ClassCode[3];\r
-  UINT16  SubsystemVendorID;\r
-  UINT16  SubsystemID;\r
+  UINT16    Version;\r
+  UINT16    Length;\r
+  UINT16    VendorId;\r
+  UINT16    DeviceId;\r
+  UINT8     RevisionID;\r
+  UINT8     ClassCode[3];\r
+  UINT16    SubsystemVendorID;\r
+  UINT16    SubsystemID;\r
 } TCG_DEVICE_SECURITY_EVENT_DATA_PCI_CONTEXT;\r
 \r
 #define TCG_DEVICE_SECURITY_EVENT_DATA_USB_CONTEXT_VERSION  0\r
@@ -321,33 +320,33 @@ typedef struct {
 /// used in EV_EFI_SPDM_FIRMWARE_BLOB and EV_EFI_SPDM_FIRMWARE_CONFIG.\r
 ///\r
 typedef struct {\r
-  UINT16  Version;\r
-  UINT16  Length;\r
-//UINT8   DeviceDescriptor[DescLen];\r
-//UINT8   BodDescriptor[DescLen];\r
-//UINT8   ConfigurationDescriptor[DescLen][NumOfConfiguration];\r
+  UINT16    Version;\r
+  UINT16    Length;\r
+  // UINT8   DeviceDescriptor[DescLen];\r
+  // UINT8   BodDescriptor[DescLen];\r
+  // UINT8   ConfigurationDescriptor[DescLen][NumOfConfiguration];\r
 } TCG_DEVICE_SECURITY_EVENT_DATA_USB_CONTEXT;\r
 \r
 //\r
 // Crypto Agile Log Entry Format\r
 //\r
 typedef struct tdTCG_PCR_EVENT2 {\r
-  TCG_PCRINDEX        PCRIndex;\r
-  TCG_EVENTTYPE       EventType;\r
-  TPML_DIGEST_VALUES  Digest;\r
-  UINT32              EventSize;\r
-  UINT8               Event[1];\r
+  TCG_PCRINDEX          PCRIndex;\r
+  TCG_EVENTTYPE         EventType;\r
+  TPML_DIGEST_VALUES    Digest;\r
+  UINT32                EventSize;\r
+  UINT8                 Event[1];\r
 } TCG_PCR_EVENT2;\r
 \r
 //\r
 // TCG PCR Event2 Header\r
 // Follow TCG EFI Protocol Spec 5.2 Crypto Agile Log Entry Format\r
 //\r
-typedef struct tdTCG_PCR_EVENT2_HDR{\r
-  TCG_PCRINDEX        PCRIndex;\r
-  TCG_EVENTTYPE       EventType;\r
-  TPML_DIGEST_VALUES  Digests;\r
-  UINT32              EventSize;\r
+typedef struct tdTCG_PCR_EVENT2_HDR {\r
+  TCG_PCRINDEX          PCRIndex;\r
+  TCG_EVENTTYPE         EventType;\r
+  TPML_DIGEST_VALUES    Digests;\r
+  UINT32                EventSize;\r
 } TCG_PCR_EVENT2_HDR;\r
 \r
 //\r
@@ -357,19 +356,19 @@ typedef struct {
   //\r
   // TCG defined hashing algorithm ID.\r
   //\r
-  UINT16              algorithmId;\r
+  UINT16    algorithmId;\r
   //\r
   // The size of the digest for the respective hashing algorithm.\r
   //\r
-  UINT16              digestSize;\r
+  UINT16    digestSize;\r
 } TCG_EfiSpecIdEventAlgorithmSize;\r
 \r
-#define TCG_EfiSpecIDEventStruct_SIGNATURE_02 "Spec ID Event02"\r
-#define TCG_EfiSpecIDEventStruct_SIGNATURE_03 "Spec ID Event03"\r
+#define TCG_EfiSpecIDEventStruct_SIGNATURE_02  "Spec ID Event02"\r
+#define TCG_EfiSpecIDEventStruct_SIGNATURE_03  "Spec ID Event03"\r
 \r
-#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM12   1\r
-#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM12   2\r
-#define TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM12          2\r
+#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM12  1\r
+#define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM12  2\r
+#define TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM12         2\r
 \r
 #define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM2   2\r
 #define TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM2   0\r
@@ -377,124 +376,120 @@ typedef struct {
 #define TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105  105\r
 \r
 typedef struct {\r
-  UINT8               signature[16];\r
+  UINT8     signature[16];\r
   //\r
   // The value for the Platform Class.\r
   // The enumeration is defined in the TCG ACPI Specification Client Common Header.\r
   //\r
-  UINT32              platformClass;\r
+  UINT32    platformClass;\r
   //\r
   // The TCG EFI Platform Specification minor version number this BIOS supports.\r
   // Any BIOS supporting version (1.22) MUST set this value to 02h.\r
   // Any BIOS supporting version (2.0) SHALL set this value to 0x00.\r
   //\r
-  UINT8               specVersionMinor;\r
+  UINT8     specVersionMinor;\r
   //\r
   // The TCG EFI Platform Specification major version number this BIOS supports.\r
   // Any BIOS supporting version (1.22) MUST set this value to 01h.\r
   // Any BIOS supporting version (2.0) SHALL set this value to 0x02.\r
   //\r
-  UINT8               specVersionMajor;\r
+  UINT8     specVersionMajor;\r
   //\r
   // The TCG EFI Platform Specification errata for this specification this BIOS supports.\r
   // Any BIOS supporting version and errata (1.22) MUST set this value to 02h.\r
   // Any BIOS supporting version and errata (2.0) SHALL set this value to 0x00.\r
   //\r
-  UINT8               specErrata;\r
+  UINT8     specErrata;\r
   //\r
   // Specifies the size of the UINTN fields used in various data structures used in this specification.\r
   // 0x01 indicates UINT32 and 0x02 indicates UINT64.\r
   //\r
-  UINT8               uintnSize;\r
+  UINT8     uintnSize;\r
   //\r
   // This field is added in "Spec ID Event03".\r
   // The number of hashing algorithms used in this event log (except the first event).\r
   // All events in this event log use all hashing algorithms defined here.\r
   //\r
-//UINT32              numberOfAlgorithms;\r
+  // UINT32              numberOfAlgorithms;\r
   //\r
   // This field is added in "Spec ID Event03".\r
   // An array of size numberOfAlgorithms of value pairs.\r
   //\r
-//TCG_EfiSpecIdEventAlgorithmSize digestSize[numberOfAlgorithms];\r
+  // TCG_EfiSpecIdEventAlgorithmSize digestSize[numberOfAlgorithms];\r
   //\r
   // Size in bytes of the VendorInfo field.\r
   // Maximum value SHALL be FFh bytes.\r
   //\r
-//UINT8               vendorInfoSize;\r
+  // UINT8               vendorInfoSize;\r
   //\r
   // Provided for use by the BIOS implementer.\r
   // The value might be used, for example, to provide more detailed information about the specific BIOS such as BIOS revision numbers, etc.\r
   // The values within this field are not standardized and are implementer-specific.\r
   // Platform-specific or -unique information SHALL NOT be provided in this field.\r
   //\r
-//UINT8               vendorInfo[vendorInfoSize];\r
+  // UINT8               vendorInfo[vendorInfoSize];\r
 } TCG_EfiSpecIDEventStruct;\r
 \r
 typedef struct tdTCG_PCClientTaggedEvent {\r
-  UINT32              taggedEventID;\r
-  UINT32              taggedEventDataSize;\r
-//UINT8               taggedEventData[taggedEventDataSize];\r
+  UINT32    taggedEventID;\r
+  UINT32    taggedEventDataSize;\r
+  // UINT8               taggedEventData[taggedEventDataSize];\r
 } TCG_PCClientTaggedEvent;\r
 \r
-#define TCG_Sp800_155_PlatformId_Event_SIGNATURE  "SP800-155 Event"\r
-#define TCG_Sp800_155_PlatformId_Event2_SIGNATURE "SP800-155 Event2"\r
+#define TCG_Sp800_155_PlatformId_Event_SIGNATURE   "SP800-155 Event"\r
+#define TCG_Sp800_155_PlatformId_Event2_SIGNATURE  "SP800-155 Event2"\r
 \r
 typedef struct tdTCG_Sp800_155_PlatformId_Event2 {\r
-  UINT8               Signature[16];\r
+  UINT8       Signature[16];\r
   //\r
   // Where Vendor ID is an integer defined\r
   // at http://www.iana.org/assignments/enterprisenumbers\r
   //\r
-  UINT32              VendorId;\r
+  UINT32      VendorId;\r
   //\r
   // 16-byte identifier of a given platform's static configuration of code\r
   //\r
-  EFI_GUID            ReferenceManifestGuid;\r
+  EFI_GUID    ReferenceManifestGuid;\r
   //\r
   // Below structure is newly added in TCG_Sp800_155_PlatformId_Event2.\r
   //\r
-//UINT8               PlatformManufacturerStrSize;\r
-//UINT8               PlatformManufacturerStr[PlatformManufacturerStrSize];\r
-//UINT8               PlatformModelSize;\r
-//UINT8               PlatformModel[PlatformModelSize];\r
-//UINT8               PlatformVersionSize;\r
-//UINT8               PlatformVersion[PlatformVersionSize];\r
-//UINT8               PlatformModelSize;\r
-//UINT8               PlatformModel[PlatformModelSize];\r
-//UINT8               FirmwareManufacturerStrSize;\r
-//UINT8               FirmwareManufacturerStr[FirmwareManufacturerStrSize];\r
-//UINT32              FirmwareManufacturerId;\r
-//UINT8               FirmwareVersion;\r
-//UINT8               FirmwareVersion[FirmwareVersionSize]];\r
+  // UINT8               PlatformManufacturerStrSize;\r
+  // UINT8               PlatformManufacturerStr[PlatformManufacturerStrSize];\r
+  // UINT8               PlatformModelSize;\r
+  // UINT8               PlatformModel[PlatformModelSize];\r
+  // UINT8               PlatformVersionSize;\r
+  // UINT8               PlatformVersion[PlatformVersionSize];\r
+  // UINT8               PlatformModelSize;\r
+  // UINT8               PlatformModel[PlatformModelSize];\r
+  // UINT8               FirmwareManufacturerStrSize;\r
+  // UINT8               FirmwareManufacturerStr[FirmwareManufacturerStrSize];\r
+  // UINT32              FirmwareManufacturerId;\r
+  // UINT8               FirmwareVersion;\r
+  // UINT8               FirmwareVersion[FirmwareVersionSize]];\r
 } TCG_Sp800_155_PlatformId_Event2;\r
 \r
-#define TCG_EfiStartupLocalityEvent_SIGNATURE      "StartupLocality"\r
-\r
+#define TCG_EfiStartupLocalityEvent_SIGNATURE  "StartupLocality"\r
 \r
 //\r
 // The Locality Indicator which sent the TPM2_Startup command\r
 //\r
-#define LOCALITY_0_INDICATOR        0x00\r
-#define LOCALITY_3_INDICATOR        0x03\r
+#define LOCALITY_0_INDICATOR  0x00\r
+#define LOCALITY_3_INDICATOR  0x03\r
 \r
 //\r
 // Startup Locality Event\r
 //\r
-typedef struct tdTCG_EfiStartupLocalityEvent{\r
-  UINT8       Signature[16];\r
+typedef struct tdTCG_EfiStartupLocalityEvent {\r
+  UINT8    Signature[16];\r
   //\r
   // The Locality Indicator which sent the TPM2_Startup command\r
   //\r
-  UINT8       StartupLocality;\r
+  UINT8    StartupLocality;\r
 } TCG_EfiStartupLocalityEvent;\r
 \r
-\r
 //\r
 // Restore original structure alignment\r
 //\r
 #pragma pack ()\r
 \r
 #endif\r
-\r
-\r