diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-26 01:54:49 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-26 01:54:49 +0000 |
| commit | 3e99020dbf0a159e34b84e7ae9125f2e368d5390 (patch) | |
| tree | 0eb6339318f7bf7da1b679b8009cf267b2234566 /EdkCompatibilityPkg/Foundation/Protocol | |
| parent | 68bb5ce77e51cf35791e46f2202e36da97e5e6be (diff) | |
| download | edk2-platforms-3e99020dbf0a159e34b84e7ae9125f2e368d5390.tar.xz | |
Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkCompatibilityPkg/Foundation/Protocol')
3 files changed, 16 insertions, 9 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Protocol/ConsoleControl/ConsoleControl.h b/EdkCompatibilityPkg/Foundation/Protocol/ConsoleControl/ConsoleControl.h index f6f2c44fb7..c52ef47f73 100644 --- a/EdkCompatibilityPkg/Foundation/Protocol/ConsoleControl/ConsoleControl.h +++ b/EdkCompatibilityPkg/Foundation/Protocol/ConsoleControl/ConsoleControl.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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
@@ -68,7 +68,7 @@ typedef EFI_STATUS
(EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE) (
IN EFI_CONSOLE_CONTROL_PROTOCOL *This,
- OUT EFI_CONSOLE_CONTROL_SCREEN_MODE Mode
+ IN EFI_CONSOLE_CONTROL_SCREEN_MODE Mode
)
/*++
diff --git a/EdkCompatibilityPkg/Foundation/Protocol/NicIp4Config/NicIp4Config.h b/EdkCompatibilityPkg/Foundation/Protocol/NicIp4Config/NicIp4Config.h index c9c96f762c..56e03e2266 100644 --- a/EdkCompatibilityPkg/Foundation/Protocol/NicIp4Config/NicIp4Config.h +++ b/EdkCompatibilityPkg/Foundation/Protocol/NicIp4Config/NicIp4Config.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006, 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
@@ -42,7 +42,7 @@ enum { IP4_CONFIG_SOURCE_MAX,
IP4_NIC_NAME_LENGTH = 64,
- MAX_IP4_CONFIG_IN_VARIABLE = 16
+ MAX_IP4_CONFIG_IN_VARIABLE = 128
};
//
diff --git a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h index 84d244555e..e0290c0b0a 100644 --- a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h +++ b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006, 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
@@ -111,8 +111,8 @@ typedef EFI_STATUS
(EFIAPI *EFI_TCG_PASS_THROUGH_TO_TPM) (
IN EFI_TCG_PROTOCOL *This,
- IN UINT32 TpmInputParamterBlockSize,
- IN UINT8 *TpmInputParamterBlock,
+ IN UINT32 TpmInputParameterBlockSize,
+ IN UINT8 *TpmInputParameterBlock,
IN UINT32 TpmOutputParameterBlockSize,
IN UINT8 *TpmOutputParameterBlock
);
@@ -121,7 +121,7 @@ typedef EFI_STATUS
(EFIAPI *EFI_TCG_HASH_LOG_EXTEND_EVENT) (
IN EFI_TCG_PROTOCOL *This,
- IN UINT8 *HashData,
+ IN EFI_PHYSICAL_ADDRESS HashData,
IN UINT64 HashDataLen,
IN TCG_ALGORITHM_ID AlgorithmId,
IN OUT TCG_PCR_EVENT *TCGLogData,
@@ -160,9 +160,16 @@ EFI_STATUS IN CHAR8 *ActionString
);
-typedef struct tdEFI_TCG_PLATFORM_PROTOCOL {
+typedef
+EFI_STATUS
+(EFIAPI *EFI_TCG_MEASURE_GPT_TABLE) (
+ IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
+ );
+
+typedef struct _EFI_TCG_PLATFORM_PROTOCOL {
EFI_TCG_MEASURE_PE_IMAGE MeasurePeImage;
EFI_TCG_MEASURE_ACTION MeasureAction;
+ EFI_TCG_MEASURE_GPT_TABLE MeasureGptTable;
} EFI_TCG_PLATFORM_PROTOCOL;
extern EFI_GUID gEfiTcgPlatformProtocolGuid;
|