diff options
| -rw-r--r-- | EdkCompatibilityPkg/Foundation/Include/EfiTpm.h | 9 | ||||
| -rw-r--r-- | EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h | 6 | ||||
| -rw-r--r-- | MdePkg/Include/IndustryStandard/Tpm12.h | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h index 994cc2bb75..6d03ec4896 100644 --- a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h +++ b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -25,11 +25,6 @@ Abstract: #define _EFI_TPM_H_
#include "Tiano.h"
-
-//
-// The start of TPM return codes
-//
-#define TPM_BASE (EFI_MAX_BIT + (EFI_MAX_BIT >> 1))
#include "IndustryStandard/Tpm12.h"
//
@@ -117,7 +112,7 @@ typedef struct tdEFI_IMAGE_LOAD_EVENT { // the measurement of given configuration tables.
//
typedef struct tdEFI_HANDOFF_TABLE_POINTERS {
- UINTN NumberOfTables;
+ UINTN NumberOfTables;
EFI_CONFIGURATION_TABLE TableEntry[1];
} EFI_HANDOFF_TABLE_POINTERS;
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h index 74065cdf04..0ba14cecfb 100644 --- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h +++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/Tpm12.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -1137,9 +1137,7 @@ typedef struct tdTPM_AUDIT_EVENT_OUT //
// Part 2, section 16: Return Codes
//
-#ifndef TPM_BASE
-#error "TPM Error Codes require definition of TPM_BASE"
-#endif
+#define TPM_BASE 0
#define TPM_VENDOR_ERROR TPM_Vendor_Specific32
#define TPM_NON_FATAL 0x00000800
diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h index 73cd34d1f3..5bcc16ca7e 100644 --- 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)
See http://trustedcomputinggroup.org for latest specification updates
- Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -19,7 +19,7 @@ ///
/// The start of TPM return codes
///
-#define TPM_BASE (MAX_BIT + (MAX_BIT >> 1))
+#define TPM_BASE 0
//
// All structures MUST be packed on a byte boundary.
|