Update PEIM entry point to follow PEIM entry point.

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

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
index 3a1888d073b59e6bfc67d9a771abed9b07965713..1695aab65df82980973e1f8fa8e1abea807fea10 100644 (file)
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
@@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <Guid/CustomDecompress.h>\r
 #include "BaseUefiTianoCustomDecompressLibInternals.h"\r
+#include <Guid/CustomDecompress.h>\r
 \r
 /**\r
   Shift mBitBuf NumOfBits left. Read in NumOfBits of bits from source.\r
@@ -815,7 +815,7 @@ TianoDecompress (
   @retval  RETURN_SUCCESS            Register successfully.\r
   @retval  RETURN_OUT_OF_RESOURCES   No enough memory to store this handler.\r
 **/\r
-EFI_STATUS\r
+RETURN_STATUS\r
 EFIAPI\r
 TianoDecompressLibConstructor (\r
 )\r

diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
index a524fc346298822f3de23773c84cdb58b3621a43..6dd47324ca38d28761a2314d40fc5e85646e6c2b 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
+++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
@@ -265,15 +265,16 @@ PciCfg2Modify (
   This routine will install EFI_PEI_PCI_CFG2_PPI or EFI_PEI_PCI_CFG_PPI\r
   according to PeiServices's version.\r
   \r
-  @param FfsHeader    Image's header\r
-  @param PeiServices  Pointer of EFI_PEI_SERVICES\r
+  @param  FileHandle  Handle of the file being invoked.\r
+  @param  PeiServices Describes the list of possible PEI Services.\r
+\r
   @return Whether success to install service\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 PeimInitializePciCfg (\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   EFI_STATUS            Status;\r
@@ -292,16 +293,16 @@ PeimInitializePciCfg (
     // FrameworkPeiServices = (FRAMEWORK_PEI_SERVICES **) PeiServices;\r
     // (**FrameworkPeiServices).PciCfg = &mPciCfgPpi;\r
     // \r
-    (**PeiServices).PciCfg = (EFI_PEI_PCI_CFG2_PPI *) &gPciCfgPpi;\r
+    (**(EFI_PEI_SERVICES**)PeiServices).PciCfg = (EFI_PEI_PCI_CFG2_PPI *) &gPciCfgPpi;\r
   } else {\r
-    (**PeiServices).PciCfg = &gPciCfg2Ppi;\r
+    (**(EFI_PEI_SERVICES**)PeiServices).PciCfg = &gPciCfg2Ppi;\r
   }\r
   \r
   if (!FeaturePcdGet (PcdPciCfgDisable)) {\r
-    Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfgPpiList);\r
+    Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfgPpiList);\r
   } \r
   if (!FeaturePcdGet (PcdPciCfg2Disable)) {\r
-    Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);\r
+    Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);\r
   }\r
 \r
   return Status;\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index 5b4553da3f40544894134fe94493513259588281..07b6b1af0c758e20a7e8e0e4f255ea9c3b7c69ee 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -98,16 +98,16 @@ ReportDispatcher (
   Initialize PEI status codes and publish the status code\r
   PPI.\r
 \r
-  @param   FfsHeader       FV this PEIM was loaded from.\r
-  @param   PeiServices     General purpose services available to every PEIM.\r
+  @param  FileHandle  Handle of the file being invoked.\r
+  @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @return                  The function always returns success.\r
 \r
 **/\r
 EFI_STATUS\r
 PeiStatusCodeDriverEntry (\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   EFI_STATUS                  Status;\r

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 0abbb9e63ccd246bec46a324e2c5dd26486a8740..33363e67eaed69ae7deb920b7b8e741e1d7fac9c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -47,8 +47,8 @@ EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;
 /**\r
   Provide the functionality of the variable services.\r
 \r
-  @param FfsHeadher  - The FFS file header\r
-  @param PeiServices - General purpose services available to every PEIM.\r
+  @param  FileHandle  Handle of the file being invoked.\r
+  @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @return Status -  EFI_SUCCESS if the interface could be successfully\r
           installed\r
@@ -57,14 +57,14 @@ EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;
 EFI_STATUS\r
 EFIAPI\r
 PeimInitializeVariableServices (\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   //\r
   // Publish the variable capability to other modules\r
   //\r
-  return (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **) PeiServices, &mPpiListVariable[0]);\r
+  return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable[0]);\r
 \r
 }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
index 389ee6d001cf07e7010f2abdea07260f3cbd1ac8..cc5e603607beaa98b69a724d25b8774af364f2e3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
@@ -59,12 +59,6 @@ typedef struct {
 //\r
 // Functions\r
 //\r
-EFI_STATUS\r
-EFIAPI\r
-PeimInitializeVariableServices (\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
-  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index c9615a07703f646be275c4e6978bd104c0c05b9a..b6fff5409b7153e5e2fcd59d456dfc158bb79740 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -65,8 +65,8 @@ EFI_PEI_PPI_DESCRIPTOR  mPpiPCD = {
   \r
   This routine initialize the PCD database for PEI phase and install PCD_PPI.\r
 \r
-  @param FfsHeader       Pointer to PEIM FFS header image\r
-  @param PeiServices     Pointer to EFI_PEI_SERVICES\r
+  @param  FileHandle  Handle of the file being invoked.\r
+  @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @return Status of install PCD_PPI\r
 \r
@@ -74,8 +74,8 @@ EFI_PEI_PPI_DESCRIPTOR  mPpiPCD = {
 EFI_STATUS\r
 EFIAPI\r
 PcdPeimInit (\r
-  IN EFI_FFS_FILE_HEADER      *FfsHeader,\r
-  IN EFI_PEI_SERVICES         **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   BuildPcdDatabase ();\r

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index b3adf72befc8ba3f6c6a2b62f7c47e3b4588220c..722c800378c99936fc11a6e08050264e883bdf0b 100644 (file)
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
@@ -355,15 +355,15 @@ PciCfg2Modify (
 EFI_STATUS\r
 EFIAPI\r
 PeimInitializePciCfg (\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   EFI_STATUS            Status;\r
 \r
   ASSERT ((**PeiServices).Hdr.Revision >= PEI_SERVICES_REVISION);\r
 \r
-  (**PeiServices).PciCfg = &gPciCfg2Ppi;\r
+  (**(EFI_PEI_SERVICES **)PeiServices).PciCfg = &gPciCfg2Ppi;\r
   Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);\r
 \r
   return Status;\r