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

12 files changed, 62 insertions, 64 deletions

diff --git a/MdePkg/Include/Uefi/UefiTcgPlatform.h b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
index c99a905ed7..d3e340263c 100644
--- a/MdePkg/Include/Uefi/UefiTcgPlatform.h
+++ b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
@@ -16,7 +16,6 @@
 #define __UEFI_TCG_PLATFOMR_H__

 

 #include <IndustryStandard/Tpm12.h>

-

 #include <Uefi.h>

 

 //

diff --git a/MdePkg/Include/Library/PeiCoreEntryPoint.h b/MdePkg/Include/Library/PeiCoreEntryPoint.h
index 42ba464fbe..29c1d9c2e6 100644
--- a/MdePkg/Include/Library/PeiCoreEntryPoint.h
+++ b/MdePkg/Include/Library/PeiCoreEntryPoint.h
@@ -91,7 +91,7 @@ EfiMain (
   The PEI Core must call this function with a NULL FileHandle value as soon as the initial PEI

   Services Table has been established.

 

-  @param  FileHandle   Handle of the file being invoked.Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

+  @param  FileHandle   Handle of the file being invoked.

   @param  PeiServices  Describes the list of possible PEI Services.

 

 **/

diff --git a/MdePkg/Include/Library/PeimEntryPoint.h b/MdePkg/Include/Library/PeimEntryPoint.h
index ae53b2f94d..16ad7cce0a 100644
--- a/MdePkg/Include/Library/PeimEntryPoint.h
+++ b/MdePkg/Include/Library/PeimEntryPoint.h
@@ -22,10 +22,13 @@ extern CONST UINT32       _gPeimRevision;
 

 

 /**

-  Image entry point of Peim.

+  The entry point of PE/COFF Image for a PEIM.

+

+  This function is the entry point for a PEIM.  This function must call ProcessLibraryConstructorList() 

+  and ProcessModuleEntryPointList().  The return value from ProcessModuleEntryPointList() is returned.

+  If _gPeimRevision is not zero and PeiServices->Hdr.Revision is less than _gPeimRevison, then ASSERT().

 

   @param  FileHandle  Handle of the file being invoked. 

-                      Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

   @param  PeiServices Describes the list of possible PEI Services.

 

   @retval  EFI_SUCCESS   The PEIM executed normally.

@@ -41,9 +44,10 @@ _ModuleEntryPoint (
 

 /**

   Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().

+  

+  This function is required to call _ModuleEntryPoint() passing in FileHandle and PeiServices.

 

   @param  FileHandle  Handle of the file being invoked. 

-                      Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

   @param  PeiServices Describes the list of possible PEI Services.

 

   @retval EFI_SUCCESS  The PEIM executed normally.

@@ -57,13 +61,20 @@ EfiMain (
   IN CONST EFI_PEI_SERVICES    **PeiServices

   );

 

-

 /**

-  Call constructs for all libraries. Automatics Generated by tool.

+  Autogenerated function that calls the library constructors for all of the module's

+  dependent libraries.

 

-  @param  FileHandle  Handle of the file being invoked. 

-                      Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

-  @param  PeiServices Describes the list of possible PEI Services.

+  This function must be called by the PEI Core once an initial PEI Services Table has been established.

+  This function calls the set of library constructors for the set of library instances that a

+  module depends on.  This include library instances that a module depends on directly and library

+  instances that a module depends on indirectly through other libraries.  

+  This function is autogenerated by build tools and those build tools are responsible for collecting

+  the set of library instances, determine which ones have constructors, and calling the library

+  constructors in the proper order based upon each of the library instances own dependencies.

+

+  @param  FileHandle   Handle of the file being invoked.

+  @param  PeiServices  Describes the list of possible PEI Services.

 

 **/

 VOID

@@ -73,28 +84,15 @@ ProcessLibraryConstructorList (
   IN CONST EFI_PEI_SERVICES    **PeiServices

   );

 

-

 /**

-  Call destructors for all libraries. Automatics Generated by tool.

-

-  @param  FileHandle  Handle of the file being invoked. 

-                      Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

-  @param  PeiServices Describes the list of possible PEI Services.

+  Autogenerated function that calls a set of module entry points.

 

-**/

-VOID

-EFIAPI

-ProcessLibraryDestructorList (

-  IN EFI_PEI_FILE_HANDLE       FileHandle,

-  IN CONST EFI_PEI_SERVICES    **PeiServices

-  );

-

-

-/**

-  Call the list of driver entry points. Automatics Generated by tool.

+  This function must be called by _ModuleEntryPoint().

+  This function calls the set of module entry points.  

+  This function is autogenerated by build tools and those build tools are responsible

+  for collecting the module entry points and calling them in a specified order.

 

   @param  FileHandle  Handle of the file being invoked. 

-                      Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

   @param  PeiServices Describes the list of possible PEI Services.

 

   @retval EFI_SUCCESS  The PEIM executed normally.

diff --git a/MdePkg/Include/Library/UefiApplicationEntryPoint.h b/MdePkg/Include/Library/UefiApplicationEntryPoint.h
index 9497f9a162..94aa0c539d 100644
--- a/MdePkg/Include/Library/UefiApplicationEntryPoint.h
+++ b/MdePkg/Include/Library/UefiApplicationEntryPoint.h
@@ -66,7 +66,7 @@ EfiMain (
 

 

 /**

-  Invokes the library destructors fror all dependent libraries and terminates

+  Invokes the library destructors for all dependent libraries and terminates

   the UEFI Application. 

 

   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()

@@ -132,12 +132,13 @@ ProcessLibraryDestructorList (
   );

 

 /**

-  Call driver entry point. For UEFI application, user

-  can only specify one entry point. Tool will automatically insert

-  this to Autogen.c.

+  This function calls the set of module entry points. It must be called by _ModuleEntryPoint().

 

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

+  This function is autogenerated by build tools and those build tools are 

+  responsible for collecting the module entry points and calling them in a specified order.

+

+  @param  ImageHandle    The image handle of the UEFI Application.

+  @param  SystemTable    A pointer to the EFI System Table.

 

   @retval  EFI_SUCCESS   The UEFI Application executed normally.

   @retval  !EFI_SUCCESS  The UEFI Application failed to execute normally.

diff --git a/MdePkg/Include/Library/UefiDriverEntryPoint.h b/MdePkg/Include/Library/UefiDriverEntryPoint.h
index 2e520582ec..7946cb13f8 100644
--- a/MdePkg/Include/Library/UefiDriverEntryPoint.h
+++ b/MdePkg/Include/Library/UefiDriverEntryPoint.h
@@ -46,8 +46,8 @@ extern CONST UINT8                    _gDriverUnloadImageCount;
   then return EFI_INCOMPATIBLE_VERSION.

 

 

-  @param  ImageHandle  ImageHandle of the loaded driver.

-  @param  SystemTable  Pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

+  @param  SystemTable  A pointer to the EFI System Table.

 

   @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM Driver,

                                      or UEFI Driver exited normally.

@@ -68,8 +68,8 @@ _ModuleEntryPoint (
 

   This function is required to call _ModuleEntryPoint() passing in ImageHandle, and SystemTable.

 

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

+  @param  SystemTable  A pointer to the EFI System Table.

 

   @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM Driver,

                                      or UEFI Driver exited normally.

@@ -85,7 +85,7 @@ EfiMain (
 

 

 /**

-  Invokes the library destructors fror all dependent libraries and terminates the

+  Invokes the library destructors for all dependent libraries and terminates the

   DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver. 

 

   This function calls ProcessLibraryDestructorList() and the EFI Boot Service Exit()

@@ -114,8 +114,8 @@ ExitDriver (
   and calling the library constructors in the proper order based upon each of the library

   instances own dependencies.

 

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

+  @param  SystemTable  A pointer to the EFI System Table.

 

 **/

 VOID

@@ -138,8 +138,8 @@ ProcessLibraryConstructorList (
   collecting the set of library instances, determine which ones have destructors, and calling

   the library destructors in the proper order based upon each of the library instances own dependencies.

 

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

+  @param  SystemTable  A pointer to the EFI System Table.

 

 **/

 VOID

@@ -158,11 +158,11 @@ ProcessLibraryDestructorList (
   This function is autogenerated by build tools and those build tools are responsible

   for collecting the module entry points and calling them in a specified order.

 

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

+  @param  SystemTable  A pointer to the EFI System Table.

 

-  @retval  EFI_SUCCESS   The UEFI Application executed normally.

-  @retval  !EFI_SUCCESS  The UEFI Application failed to execute normally.

+  @retval  EFI_SUCCESS   The DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver executed normally.

+  @retval  !EFI_SUCCESS  The DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver failed to execute normally.

 **/

 EFI_STATUS

 EFIAPI

@@ -180,7 +180,7 @@ ProcessModuleEntryPointList (
   This function is autogenerated by build tools and those build tools are responsible

   for collecting the module unload handlers and calling them in a specified order.

 

-  @param  ImageHandle ImageHandle of the loaded driver.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

 

   @retval  EFI_SUCCESS  The unoad handlers executed normally.

   @retval  !EFI_SUCCESS The unload handlers failed to execute normally.

diff --git a/MdePkg/Include/Protocol/TcgService.h b/MdePkg/Include/Protocol/TcgService.h
index 1f378535cf..5502121480 100644
--- a/MdePkg/Include/Protocol/TcgService.h
+++ b/MdePkg/Include/Protocol/TcgService.h
@@ -16,7 +16,7 @@
 #ifndef _TCG_SERVICE_PROTOCOL_H_

 #define _TCG_SERVICE_PROTOCOL_H_

 

-#include <Uefi/UefiTcgPlatform.h>

+#include <IndustryStandard/UefiTcgPlatform.h>

 

 #define EFI_TCG_PROTOCOL_GUID  \

   {0xf541796d, 0xa62e, 0x4954, { 0xa7, 0x75, 0x95, 0x84, 0xf6, 0x1b, 0x9c, 0xdd } } 

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/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
index b80f420d70..3fb668b453 100644
--- a/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+++ b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
@@ -1,7 +1,5 @@
 #/** @file

 #  Instance of Debug Library based on Serial Port Library.

-#

-#  Instance of Debug Library based on Serial Port Library.

 #  It uses Print Library to produce formatted output strings.

 #

 #  Copyright (c) 2006 - 2008, Intel Corporation.

diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
index 68e4f6acec..bb038b71d6 100644
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
+++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
@@ -1,7 +1,7 @@
 /** @file

   Resource Publication Library that uses PEI Core Services to publish system memory.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2008, Intel Corporation<BR>

   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        

diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
index a03c377059..59503e4b77 100644
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
@@ -20,10 +20,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DebugLib.h>

 

 /**

-  Image entry point of Peim.

+  The entry point of PE/COFF Image for a PEIM.

+

+  This function is the entry point for a PEIM.  This function must call ProcessLibraryConstructorList() 

+  and ProcessModuleEntryPointList().  The return value from ProcessModuleEntryPointList() is returned.

+  If _gPeimRevision is not zero and PeiServices->Hdr.Revision is less than _gPeimRevison, then ASSERT().

 

   @param  FileHandle  Handle of the file being invoked. 

-                      Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

   @param  PeiServices Describes the list of possible PEI Services.

 

   @retval  EFI_SUCCESS   The PEIM executed normally.

@@ -57,9 +60,10 @@ _ModuleEntryPoint (
 

 /**

   Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().

+  

+  This function is required to call _ModuleEntryPoint() passing in FileHandle and PeiServices.

 

   @param  FileHandle  Handle of the file being invoked. 

-                      Type EFI_PEI_FILE_HANDLE is defined in FfsFindNextFile().

   @param  PeiServices Describes the list of possible PEI Services.

 

   @retval EFI_SUCCESS  The PEIM executed normally.

diff --git a/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c b/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
index 68d6a4bb94..9d925ef70b 100644
--- a/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
+++ b/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
@@ -76,8 +76,8 @@ _DriverUnloadHandler (
   then return EFI_INCOMPATIBLE_VERSION.

 

 

-  @param  ImageHandle  ImageHandle of the loaded driver.

-  @param  SystemTable  Pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

+  @param  SystemTable  A pointer to the EFI System Table.

 

   @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM Driver,

                                      or UEFI Driver exited normally.

@@ -146,8 +146,8 @@ _ModuleEntryPoint (
 

   This function is required to call _ModuleEntryPoint() passing in ImageHandle, and SystemTable.

 

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of the DXE Driver, DXE Runtime Driver, DXE SMM Driver, or UEFI Driver.

+  @param  SystemTable  A pointer to the EFI System Table.

 

   @retval  EFI_SUCCESS               The DXE Driver, DXE Runtime Driver, DXE SMM Driver,

                                      or UEFI Driver exited normally.