Add missing definition EFI_PEIM_ENTRY_POINT to IntelFrameworkPkg and rename original...

[mirror_edk2.git] / MdePkg / Include / Pi / PiPeiCis.h

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index 44cf1672ec80d6a606729dac02c875ed74493d91..0e2f30ae4b6b7b1d0f96c1fd8ba3a6fe69b05bd7 100644 (file)
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -11,8 +11,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-  Module Name:  PiPeiCis.h\r
-\r
   @par Revision Reference:\r
   Version 1.0.\r
 \r
@@ -23,8 +21,6 @@
 \r
 #include <Pi/PiMultiPhase.h>\r
 \r
-#define EFI_NOT_AVAILABLE_YET   EFIERR (28)\r
-\r
 //\r
 // Handles of EFI FV/FFS.\r
 // \r
@@ -54,8 +50,8 @@ typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR;
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEIM_ENTRY_POINT)(\r
-  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r
+(EFIAPI *EFI_PEIM_ENTRY_POINT2)(\r
+  IN EFI_PEI_FILE_HANDLE       *FileHandle,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
@@ -107,8 +103,8 @@ struct _EFI_PEI_NOTIFY_DESCRIPTOR {
 typedef struct _EFI_HOB_LOAD_PEIM {\r
   EFI_HOB_GENERIC_HEADER            Header;\r
   EFI_PEI_FILE_HANDLE               FileHandle;\r
-  EFI_PEIM_ENTRY_POINT              EntryPoint;\r
-  EFI_PEIM_ENTRY_POINT              InMemEntryPoint;\r
+  EFI_PEIM_ENTRY_POINT2             EntryPoint;\r
+  EFI_PEIM_ENTRY_POINT2             InMemEntryPoint;\r
 } EFI_HOB_LOAD_PEIM;\r
 \r
 \r
@@ -686,9 +682,9 @@ EFI_STATUS
 // PEI Services Table\r
 //\r
 #define PEI_SERVICES_SIGNATURE  0x5652455320494550\r
-#define PEI_SERVICES_REVISION   (PEI_SPECIFICATION_MAJOR_REVISION<<16) | (PEI_SPECIFICATION_MINOR_REVISION)\r
+#define PEI_SERVICES_REVISION   ((PEI_SPECIFICATION_MAJOR_REVISION<<16) | (PEI_SPECIFICATION_MINOR_REVISION))\r
 \r
-struct EFI_PEI_SERVICES {\r
+struct _EFI_PEI_SERVICES {\r
   EFI_TABLE_HEADER            Hdr;\r
   //\r
   // PPI Functions\r