Merge the PI enabling works from the branch

First round of PI enabling work:
1) PiPeiCis changes (CONST, EFI_PEI_FILE_HANDLE.. etc)
2) Make use of FirmwareVolume 2 protocol.
3) Verified for Nt32Pkg and real platform for S3.

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

4 files changed, 6 insertions, 6 deletions

diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c
index f1ab82d87a..f51869c773 100644
--- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c
+++ b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c
@@ -20,6 +20,7 @@ Abstract:
 --*/

 

 #include <BaseMemoryTest.h>

+#include <Library/PeiServicesLib.h>

 

 static PEI_BASE_MEMORY_TEST_PPI mPeiBaseMemoryTestPpi = { BaseMemoryTest };

 

@@ -51,11 +52,9 @@ Returns:
 

 --*/  

 {

-  EFI_STATUS  Status;

 

-  Status = (**PeiServices).InstallPpi (PeiServices, &PpiListPeiBaseMemoryTest);

-

-  return Status;

+  return PeiServicesInstallPpi (&PpiListPeiBaseMemoryTest);

+  

 }

 

 EFI_STATUS

diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
index c0b2f87d68..5a410e20c3 100644
--- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
+++ b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
@@ -39,6 +39,7 @@
   ReportStatusCodeLib

   PeimEntryPoint

   DebugLib

+  PeiServicesLib

 

 [Ppis]

   gPeiBaseMemoryTestPpiGuid                     # PPI ALWAYS_PRODUCED

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index bf1fb2d887..d0ebe8de62 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
@@ -364,7 +364,7 @@ PeimInitializePciCfg (
   ASSERT ((**PeiServices).Hdr.Revision >= PEI_SERVICES_REVISION);

 

   (**PeiServices).PciCfg = &gPciCfg2Ppi;

-  Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);

+  Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);

 

   return Status;

 }

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index ba8a23d67a..7385af7157 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -64,7 +64,7 @@ Returns:
   //

   // Publish the variable capability to other modules

   //

-  return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable);

+  return (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &mPpiListVariable);

 

 }