Update EntryPoint library header

Remove UefiTcgPlatform.h from Uefi Directory to IndustryStandard
Change EFI_OPTIONAL_POINTER to EFI_OPTIONAL_PTR aligned to UEFI spec.

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

3 files changed, 3 insertions, 155 deletions

diff --git a/MdePkg/Include/Uefi/UefiGpt.h b/MdePkg/Include/Uefi/UefiGpt.h
index da5f187c52..59704e3362 100644
--- a/MdePkg/Include/Uefi/UefiGpt.h
+++ b/MdePkg/Include/Uefi/UefiGpt.h
@@ -20,11 +20,10 @@
 /// located in LBA 1 (i.e., the second logical block).

 ///

 #define PRIMARY_PART_HEADER_LBA 1

-

 ///

 /// EFI Partition Table Signature: "EFI PART"

 /// 

-#define EFI_PTAB_HEADER_ID      0x5452415020494645ULL

+#define EFI_PTAB_HEADER_ID      SIGNATURE_64 ('E','F','I',' ','P','A','R','T')

 

 #pragma pack(1)

 

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 906bf68899..12611c7c1c 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -328,7 +328,6 @@ EFI_STATUS
 // ConvertPointer DebugDisposition type.

 //

 #define EFI_OPTIONAL_PTR     0x00000001

-#define EFI_OPTIONAL_POINTER EFI_OPTIONAL_PTR

 

 /**

   Determines the new virtual address that is to be used on subsequent memory accesses.

@@ -1582,8 +1581,8 @@ typedef struct {
   UINT32            HeaderSize;

   ///

   /// Bit-mapped list describing the capsule attributes. The Flag values

-  /// of 0x0000 ¨C 0xFFFF are defined by CapsuleGuid. Flag values

-  /// of 0x10000 ¨C 0xFFFF0000 are defined by this specification

+  /// of 0x0000 - 0xFFFF are defined by CapsuleGuid. Flag values

+  /// of 0x10000 - 0xFFFF0000 are defined by this specification

   ///

   UINT32            Flags;

   ///

diff --git a/MdePkg/Include/Uefi/UefiTcgPlatform.h b/MdePkg/Include/Uefi/UefiTcgPlatform.h
deleted file mode 100644
index c99a905ed7..0000000000
--- a/MdePkg/Include/Uefi/UefiTcgPlatform.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/** @file

-  TCG EFI Platform Definition in TCG_EFI_Platform_1_20_Final

-

-  Copyright (c) 2006 - 2008, Intel Corporation

-  All rights reserved. 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

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#ifndef __UEFI_TCG_PLATFORM_H__

-#define __UEFI_TCG_PLATFOMR_H__

-

-#include <IndustryStandard/Tpm12.h>

-

-#include <Uefi.h>

-

-//

-// Standard event types

-//

-#define EV_POST_CODE                ((TCG_EVENTTYPE) 0x00000001)

-#define EV_SEPARATOR                ((TCG_EVENTTYPE) 0x00000004)

-#define EV_S_CRTM_CONTENTS          ((TCG_EVENTTYPE) 0x00000007)

-#define EV_S_CRTM_VERSION           ((TCG_EVENTTYPE) 0x00000008)

-

-//

-// EFI specific event types

-//

-#define EV_EFI_EVENT_BASE                   ((TCG_EVENTTYPE) 0x80000000)

-#define EV_EFI_VARIABLE_DRIVER_CONFIG       (EV_EFI_EVENT_BASE + 1)

-#define EV_EFI_VARIABLE_BOOT                (EV_EFI_EVENT_BASE + 2)

-#define EV_EFI_BOOT_SERVICES_APPLICATION    (EV_EFI_EVENT_BASE + 3)

-#define EV_EFI_BOOT_SERVICES_DRIVER         (EV_EFI_EVENT_BASE + 4)

-#define EV_EFI_RUNTIME_SERVICES_DRIVER      (EV_EFI_EVENT_BASE + 5)

-#define EV_EFI_GPT_EVENT                    (EV_EFI_EVENT_BASE + 6)

-#define EV_EFI_ACTION                       (EV_EFI_EVENT_BASE + 7)

-#define EV_EFI_PLATFORM_FIRMWARE_BLOB       (EV_EFI_EVENT_BASE + 8)

-#define EV_EFI_HANDOFF_TABLES               (EV_EFI_EVENT_BASE + 9)

-

-#define EFI_CALLING_EFI_APPLICATION         \

-  "Calling EFI Application from Boot Option"

-#define EFI_RETURNING_FROM_EFI_APPLICATOIN  \

-  "Returning from EFI Application from Boot Option"

-#define EFI_EXIT_BOOT_SERVICES_INVOCATION   \

-  "Exit Boot Services Invocation"

-#define EFI_EXIT_BOOT_SERVICES_FAILED       \

-  "Exit Boot Services Returned with Failure"

-#define EFI_EXIT_BOOT_SERVICES_SUCCEEDED    \

-  "Exit Boot Services Returned with Success"

-

-//

-// Set structure alignment to 1-byte

-//

-#pragma pack (1)

-

-typedef UINT32                     TCG_EVENTTYPE;

-typedef TPM_PCRINDEX               TCG_PCRINDEX;

-typedef TPM_DIGEST                 TCG_DIGEST;

-///

-/// Event Log Entry Structure Definition

-///

-typedef struct tdTCG_PCR_EVENT {

-  TCG_PCRINDEX                      PCRIndex;  ///< PCRIndex event extended to

-  TCG_EVENTTYPE                     EventType; ///< TCG EFI event type

-  TCG_DIGEST                        Digest;    ///< Value extended into PCRIndex

-  UINT32                            EventSize; ///< Size of the event data

-  UINT8                             Event[1];  ///< The event data

-} TCG_PCR_EVENT;

-

-#define TSS_EVENT_DATA_MAX_SIZE   256

-

-///

-/// TCG_PCR_EVENT_HDR

-///

-typedef struct tdTCG_PCR_EVENT_HDR {

-  TCG_PCRINDEX                      PCRIndex;

-  TCG_EVENTTYPE                     EventType;

-  TCG_DIGEST                        Digest;

-  UINT32                            EventSize;

-} TCG_PCR_EVENT_HDR;

-

-///

-/// EFI_PLATFORM_FIRMWARE_BLOB

-///

-/// BlobLength should be of type UINTN but we use UINT64 here

-/// because PEI is 32-bit while DXE is 64-bit on x64 platforms

-///

-typedef struct tdEFI_PLATFORM_FIRMWARE_BLOB {

-  EFI_PHYSICAL_ADDRESS              BlobBase;

-  UINT64                            BlobLength;

-} EFI_PLATFORM_FIRMWARE_BLOB;

-

-///

-/// EFI_IMAGE_LOAD_EVENT

-///

-/// This structure is used in EV_EFI_BOOT_SERVICES_APPLICATION,

-/// EV_EFI_BOOT_SERVICES_DRIVER and EV_EFI_RUNTIME_SERVICES_DRIVER

-///

-typedef struct tdEFI_IMAGE_LOAD_EVENT {

-  EFI_PHYSICAL_ADDRESS              ImageLocationInMemory;

-  UINTN                             ImageLengthInMemory;

-  UINTN                             ImageLinkTimeAddress;

-  UINTN                             LengthOfDevicePath;

-  EFI_DEVICE_PATH_PROTOCOL          DevicePath[1];

-} EFI_IMAGE_LOAD_EVENT;

-

-///

-/// EFI_HANDOFF_TABLE_POINTERS

-///

-/// This structure is used in EV_EFI_HANDOFF_TABLES event to facilitate

-/// the measurement of given configuration tables.

-///

-typedef struct tdEFI_HANDOFF_TABLE_POINTERS {

-  UINTN                             NumberOfTables;

-  EFI_CONFIGURATION_TABLE           TableEntry[1];

-} EFI_HANDOFF_TABLE_POINTERS;

-

-///

-/// EFI_VARIABLE_DATA

-///

-/// This structure serves as the header for measuring variables. The name of the

-/// variable (in Unicode format) should immediately follow, then the variable

-/// data.

-///

-typedef struct tdEFI_VARIABLE_DATA {

-  EFI_GUID                          VariableName;

-  UINTN                             UnicodeNameLength;

-  UINTN                             VariableDataLength;

-  CHAR16                            UnicodeName[1];

-  INT8                              VariableData[1];  ///< Driver or platform-specific data

-} EFI_VARIABLE_DATA;

-

-typedef struct tdEFI_GPT_DATA {

-  EFI_PARTITION_TABLE_HEADER  EfiPartitionHeader;

-  UINTN                       NumberOfPartitions; 

-  EFI_PARTITION_ENTRY         Partitions[1];

-} EFI_GPT_DATA;

-

-//

-// Restore original structure alignment

-//

-#pragma pack ()

-

-#endif

-

-