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

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Protocol / TcgService / TcgService.h

diff --git a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
index 84d244555e4b3d440e512b2bcee6a7eed495277a..e0290c0b0acc099ba21504c5ecae83e8a531870b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
+++ b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, 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
 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


@@ -111,8 +111,8 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_TCG_PASS_THROUGH_TO_TPM) (\r
   IN      EFI_TCG_PROTOCOL          *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_TCG_PASS_THROUGH_TO_TPM) (\r
   IN      EFI_TCG_PROTOCOL          *This,\r

-  IN      UINT32                    TpmInputParamterBlockSize,\r
-  IN      UINT8                     *TpmInputParamterBlock,\r
+  IN      UINT32                    TpmInputParameterBlockSize,\r
+  IN      UINT8                     *TpmInputParameterBlock,\r

   IN      UINT32                    TpmOutputParameterBlockSize,\r
   IN      UINT8                     *TpmOutputParameterBlock\r
   );\r
   IN      UINT32                    TpmOutputParameterBlockSize,\r
   IN      UINT8                     *TpmOutputParameterBlock\r
   );\r


@@ -121,7 +121,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_TCG_HASH_LOG_EXTEND_EVENT) (\r
   IN      EFI_TCG_PROTOCOL          *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_TCG_HASH_LOG_EXTEND_EVENT) (\r
   IN      EFI_TCG_PROTOCOL          *This,\r

-  IN      UINT8                     *HashData,\r
+  IN      EFI_PHYSICAL_ADDRESS      HashData,\r

   IN      UINT64                    HashDataLen,\r
   IN      TCG_ALGORITHM_ID          AlgorithmId,\r
   IN OUT  TCG_PCR_EVENT             *TCGLogData,\r
   IN      UINT64                    HashDataLen,\r
   IN      TCG_ALGORITHM_ID          AlgorithmId,\r
   IN OUT  TCG_PCR_EVENT             *TCGLogData,\r


@@ -160,9 +160,16 @@ EFI_STATUS
   IN      CHAR8                     *ActionString\r
   );\r
 \r
   IN      CHAR8                     *ActionString\r
   );\r
 \r

-typedef struct tdEFI_TCG_PLATFORM_PROTOCOL {\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_TCG_MEASURE_GPT_TABLE) (\r
+  IN      EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
+  );\r
+\r
+typedef struct _EFI_TCG_PLATFORM_PROTOCOL {\r

   EFI_TCG_MEASURE_PE_IMAGE          MeasurePeImage;\r
   EFI_TCG_MEASURE_ACTION            MeasureAction;\r
   EFI_TCG_MEASURE_PE_IMAGE          MeasurePeImage;\r
   EFI_TCG_MEASURE_ACTION            MeasureAction;\r

+  EFI_TCG_MEASURE_GPT_TABLE         MeasureGptTable;\r

 } EFI_TCG_PLATFORM_PROTOCOL;\r
 \r
 extern EFI_GUID                     gEfiTcgPlatformProtocolGuid;\r
 } EFI_TCG_PLATFORM_PROTOCOL;\r
 \r
 extern EFI_GUID                     gEfiTcgPlatformProtocolGuid;\r