Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Include / EfiTpm.h

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
index ea89f5658b4312ad75b28c81ba57d26bdbe5b3ae..07a7fec735bf1eba5ec30c31b09c9d8f4958d0dd 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -30,7 +30,7 @@ Abstract:
 // The start of TPM return codes\r
 //\r
 #define TPM_BASE                    (EFI_MAX_BIT + (EFI_MAX_BIT >> 1))\r
-#include "IndustryStandard/Tpm12.h"\r
+#include "Tpm12.h"\r
 \r
 //\r
 // Standard event types\r
@@ -57,7 +57,7 @@ Abstract:
 //\r
 // Set structure alignment to 1-byte\r
 //\r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 \r
 typedef UINT32                     TCG_EVENTTYPE;\r
 \r
@@ -117,7 +117,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
@@ -139,6 +139,6 @@ typedef struct tdEFI_VARIABLE_DATA {
 //\r
 // Restore original structure alignment\r
 //\r
-#pragma pack (pop)\r
+#pragma pack ()\r
 \r
 #endif  // _EFI_TPM_H_\r