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

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

diff --git a/IntelFrameworkPkg/Include/Framework/PeiCis.h b/IntelFrameworkPkg/Include/Framework/PeiCis.h
new file mode 100644 (file)
index 0000000..da09a8a
--- /dev/null
+++ b/IntelFrameworkPkg/Include/Framework/PeiCis.h
@@ -0,0 +1,40 @@
+/** @file\r
+  PI PEI master include file. This file should match the PI spec.\r
+\r
+  Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
+  All rights reserved. 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
+  http://opensource.org/licenses/bsd-license.php                                            \r
+\r
+  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
+  @par Revision Reference:\r
+  Version 1.0.\r
+\r
+**/\r
+\r
+#ifndef __PEICIS_H__\r
+#define __PEICIS_H__\r
+\r
+#include <PiPei.h>\r
+\r
+/**\r
+  The PEI Dispatcher will invoke each PEIM one time.  During this pass, the PEI \r
+  Dispatcher will pass control to the PEIM at the AddressOfEntryPoint in the PE Header. \r
+\r
+  @param  FfsHeader        Pointer to the FFS file header.\r
+  @param  PeiServices      Describes the list of possible PEI Services.\r
+\r
+  @return Status code\r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_PEIM_ENTRY_POINT)(\r
+  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_SERVICES          **PeiServices\r
+  );\r
+  \r
+#endif  
\ No newline at end of file

diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index 33d0dab178103a52e41338405626bb669cd5da65..b5e5770b414b453e04d4de8511b1ece9c237907c 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -22,6 +22,7 @@
 \r
 #include <PiPei.h>\r
 \r
+#include <Framework/PeiCis.h>\r
 #include <Framework/DataHubRecords.h>\r
 #include <Framework/FirmwareVolumeImageFormat.h>\r
 #include <Framework/FirmwareVolumeHeader.h>\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 7ec7d52039ad6a4f74cd3ef621ace625cb596d6c..8d3c29a5798fce41a5ab2b0689935487a66e984f 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -538,7 +538,7 @@ Returns:
     // Set gInMemory global variable to TRUE to indicate the dxeipl is shadowed.\r
     //\r
     *(BOOLEAN *) ((UINTN) &gInMemory + (UINTN) DxeIplEntryPoint - (UINTN) _ModuleEntryPoint) = TRUE;\r
-    Status = ((EFI_PEIM_ENTRY_POINT) (UINTN) DxeIplEntryPoint) ((EFI_PEI_FILE_HANDLE *) DxeIplFileHeader, GetPeiServicesTablePointer());\r
+    Status = ((EFI_PEIM_ENTRY_POINT2) (UINTN) DxeIplEntryPoint) ((EFI_PEI_FILE_HANDLE *) DxeIplFileHeader, GetPeiServicesTablePointer());\r
   }\r
 \r
   return Status;\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index a46036b50ff901d4ecfd6430efbf22760340f2c2..7cdcf30a2a32a176923e904ef9f661f57a53bda0 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -129,7 +129,7 @@ EFI_STATUS
 //\r
 typedef union {\r
   PEI_CORE_ENTRY_POINT         PeiCore;\r
-  EFI_PEIM_ENTRY_POINT         PeimEntry;\r
+  EFI_PEIM_ENTRY_POINT2        PeimEntry;\r
   EFI_PEIM_NOTIFY_ENTRY_POINT  PeimNotifyEntry;\r
   EFI_DXE_IPL_PPI              *DxeIpl;\r
   EFI_PEI_PPI_DESCRIPTOR       *PpiDescriptor;\r

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index c7cf4ef6cc5a68465ab2ada9691fed0a1b29a7aa..0e2f30ae4b6b7b1d0f96c1fd8ba3a6fe69b05bd7 100644 (file)
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -50,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
@@ -103,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