MdePkg: Tpm2Acpi.h: Fix incompatible change

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Tpm20.h

diff --git a/MdePkg/Include/IndustryStandard/Tpm20.h b/MdePkg/Include/IndustryStandard/Tpm20.h
index a159953cf822e9cdd6503f64a0aac1885835f81c..cd68ce7c76e4e8e151aae7c44bea547adad0efca 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm20.h
+++ b/MdePkg/Include/IndustryStandard/Tpm20.h
@@ -5,7 +5,7 @@
 \r
   Check http://trustedcomputinggroup.org for latest specification updates.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved. <BR>\r
+Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved. <BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <IndustryStandard/Tpm12.h>\r
 \r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 \r
 // Annex A Algorithm Constants\r
 \r
@@ -147,7 +147,6 @@ typedef UINT64                        CONTEXT_COUNTER;
 \r
 // Table 3 - Definition of Base Types\r
 typedef UINT8 BYTE;\r
-typedef UINT8 BOOL;\r
 \r
 // Table 4 - Definition of Types for Documentation Clarity\r
 //\r
@@ -676,7 +675,10 @@ typedef UINT32 TPM_RH;
 #define TPM_RH_LOCKOUT     (TPM_RH)(0x4000000A)\r
 #define TPM_RH_ENDORSEMENT (TPM_RH)(0x4000000B)\r
 #define TPM_RH_PLATFORM    (TPM_RH)(0x4000000C)\r
-#define TPM_RH_LAST        (TPM_RH)(0x4000000C)\r
+#define TPM_RH_PLATFORM_NV (TPM_RH)(0x4000000D)\r
+#define TPM_RH_AUTH_00     (TPM_RH)(0x40000010)\r
+#define TPM_RH_AUTH_FF     (TPM_RH)(0x4000010F)\r
+#define TPM_RH_LAST        (TPM_RH)(0x4000010F)\r
 \r
 // Table 28 - TPM_HC Constants\r
 typedef TPM_HANDLE TPM_HC;\r
@@ -1804,6 +1806,15 @@ typedef struct {
   TPM_RC responseCode;\r
 } TPM2_RESPONSE_HEADER;\r
 \r
-#pragma pack (pop)\r
+#pragma pack ()\r
+\r
+//\r
+// TCG Algorithm Registry\r
+//\r
+#define HASH_ALG_SHA1    0x00000001\r
+#define HASH_ALG_SHA256  0x00000002\r
+#define HASH_ALG_SHA384  0x00000004\r
+#define HASH_ALG_SHA512  0x00000008\r
+#define HASH_ALG_SM3_256 0x00000010\r
 \r
 #endif\r