Change TPM_BASE to 0 per TPM spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10499 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
index 994cc2bb75e9f600029315ca3c645ee3aabc45d5..6d03ec48960f160b8afd4b8b4ffa4a3ac8c3b89b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2010, 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
@@ -25,11 +25,6 @@ Abstract:
 #define _EFI_TPM_H_\r
 \r
 #include "Tiano.h"\r
-\r
-//\r
-// The start of TPM return codes\r
-//\r
-#define TPM_BASE                    (EFI_MAX_BIT + (EFI_MAX_BIT >> 1))\r
 #include "IndustryStandard/Tpm12.h"\r
 \r
 //\r
@@ -117,7 +112,7 @@ typedef struct tdEFI_IMAGE_LOAD_EVENT {
 // the measurement of given configuration tables.\r
 //\r
 typedef struct tdEFI_HANDOFF_TABLE_POINTERS {\r
-  UINTN                                  NumberOfTables;\r
+  UINTN                             NumberOfTables;\r
   EFI_CONFIGURATION_TABLE           TableEntry[1];\r
 } EFI_HANDOFF_TABLE_POINTERS;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h
index 74065cdf04a269670dbdf784161bab0c87e8c065..0ba14cecfb2631c5ea10bbac838c497283572b82 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2010, 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
@@ -1137,9 +1137,7 @@ typedef struct tdTPM_AUDIT_EVENT_OUT
 //\r
 // Part 2, section 16: Return Codes\r
 //\r
-#ifndef TPM_BASE\r
-#error "TPM Error Codes require definition of TPM_BASE"\r
-#endif\r
+#define TPM_BASE                    0\r
 \r
 #define TPM_VENDOR_ERROR            TPM_Vendor_Specific32\r
 #define TPM_NON_FATAL               0x00000800\r

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index 73cd34d1f3ef8af2dea7715d409f9cf3abd2c25f..5bcc16ca7e3cef3b28d008860104a17346ceb8af 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -2,7 +2,7 @@
   TPM Specification data structures (TCG TPM Specification Version 1.2 Revision 103)\r
   See http://trustedcomputinggroup.org for latest specification updates\r
 \r
-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2010, 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
@@ -19,7 +19,7 @@
 ///\r
 /// The start of TPM return codes\r
 ///\r
-#define TPM_BASE                    (MAX_BIT + (MAX_BIT >> 1))\r
+#define TPM_BASE                    0\r
 \r
 //\r
 // All structures MUST be packed on a byte boundary.\r