Upgrade the format of EFI_PEIM_ENTRY_POINT to EFI_PEIM_ENTRY_POINT2 according to...

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

diff --git a/MdePkg/Include/Library/PeiCoreEntryPoint.h b/MdePkg/Include/Library/PeiCoreEntryPoint.h
index 00105f5d0b5a7c786c54c1839e2949430d532b59..1d29b118d1bb7142af7b19edca36c2da40a4942b 100644 (file)
--- a/MdePkg/Include/Library/PeiCoreEntryPoint.h
+++ b/MdePkg/Include/Library/PeiCoreEntryPoint.h
@@ -71,7 +71,7 @@ EfiMain (
 VOID\r
 EFIAPI\r
 ProcessLibraryConstructorList (\r
 VOID\r
 EFIAPI\r
 ProcessLibraryConstructorList (\r

-  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r

   IN EFI_PEI_SERVICES     **PeiServices\r
   );\r
 \r
   IN EFI_PEI_SERVICES     **PeiServices\r
   );\r
 \r

diff --git a/MdePkg/Include/Library/PeimEntryPoint.h b/MdePkg/Include/Library/PeimEntryPoint.h
index e08845926dd3da8bb901baae377676c9f6c581bd..37d3476361ba7b2a4cedd7397e8b054e75a4161c 100644 (file)
--- a/MdePkg/Include/Library/PeimEntryPoint.h
+++ b/MdePkg/Include/Library/PeimEntryPoint.h
@@ -32,7 +32,7 @@ extern const UINT32                   _gPeimRevision;
 EFI_STATUS\r
 EFIAPI\r
 _ModuleEntryPoint (\r
 EFI_STATUS\r
 EFIAPI\r
 _ModuleEntryPoint (\r

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r

   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r


@@ -49,7 +49,7 @@ _ModuleEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 EfiMain (\r
 EFI_STATUS\r
 EFIAPI\r
 EfiMain (\r

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r

   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r


@@ -64,7 +64,7 @@ EfiMain (
 VOID\r
 EFIAPI\r
 ProcessLibraryConstructorList (\r
 VOID\r
 EFIAPI\r
 ProcessLibraryConstructorList (\r

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r

   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r


@@ -79,7 +79,7 @@ ProcessLibraryConstructorList (
 VOID\r
 EFIAPI\r
 ProcessLibraryDestructorList (\r
 VOID\r
 EFIAPI\r
 ProcessLibraryDestructorList (\r

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r

   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r


@@ -96,7 +96,7 @@ ProcessLibraryDestructorList (
 EFI_STATUS\r
 EFIAPI\r
 ProcessModuleEntryPointList (\r
 EFI_STATUS\r
 EFIAPI\r
 ProcessModuleEntryPointList (\r

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r

   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index 860c5272f46743dc69c70be4af902c76e59f750d..49c233ce73f1bea0d335df46074363348159576e 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -54,7 +54,7 @@ GetPeiServicesTablePointer (
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r

-  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r

   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h
index 0e0e4ffe011e134070eed7e81865232a9e591d16..8c66994a8b62dc7b9fd91e1710b1323f7f70770a 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h
@@ -29,7 +29,7 @@
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r

-  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r

   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 ;\r
   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 ;\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
index a37cc2d84bb1f2cf1a708c0e51e569127336e236..40321380d3456da55bbf1b7e6098b801068c9793 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
@@ -34,7 +34,7 @@
 \r
 [Sources.common]\r
   PeiServicesTablePointer.c\r
 \r
 [Sources.common]\r
   PeiServicesTablePointer.c\r

-\r
+  PeiServicesTablePointerInternal.h\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
index 94895b30c966764c78f9a8a27a78c894618ef5a4..95d6d254478f53c076ed7fef4a24b95f0fc8cc27 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
@@ -54,7 +54,7 @@ GetPeiServicesTablePointer (
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r

-  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r

   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
index e484337df8a372eeaad2d284fa7e665e1b06d2df..d26a0be939061802a52cba73cc51841e6411d423 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
@@ -59,7 +59,7 @@ GetPeiServicesTablePointer (
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiServicesTablePointerLibConstructor (\r

-  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r

   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r

diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
index 0b9bca3b87433f2fadd2b3f8a70a02e26170a897..e3f47d2673b6f791addb6f50867eb976a57baaa5 100644 (file)
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 EFIAPI\r
 _ModuleEntryPoint (\r
 EFI_STATUS\r
 EFIAPI\r
 _ModuleEntryPoint (\r

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r

   IN EFI_PEI_SERVICES          **PeiServices\r
   )\r
 {\r
   IN EFI_PEI_SERVICES          **PeiServices\r
   )\r
 {\r


@@ -67,7 +67,7 @@ _ModuleEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 EfiMain (\r
 EFI_STATUS\r
 EFIAPI\r
 EfiMain (\r

-  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r

   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   IN EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r