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@3772 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 4 insertions, 13 deletions

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 4e66531979..ea65581ebc 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -20,6 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include <Ppi/Pcd.h>

 

+#include <Library/PeiServicesLib.h>

 #include <Library/PcdLib.h>

 #include <Library/DebugLib.h>

 #include <Library/PeiServicesTablePointerLib.h>

@@ -41,19 +42,8 @@ GetPcdPpiPtr (
 {

   EFI_STATUS        Status;

   PCD_PPI           *PcdPpi;

-  EFI_PEI_SERVICES  **PeiServices;

-

-

-  PeiServices = GetPeiServicesTablePointer ();

-

-  Status = (**PeiServices).LocatePpi (

-                             PeiServices,

-                             &gPcdPpiGuid,

-                             0,

-                             NULL,

-                             (VOID **)&PcdPpi

-                             );

-

+  

+  Status = PeiServicesLocatePpi (&gPcdPpiGuid, 0, NULL, (VOID **)&PcdPpi);

   ASSERT_EFI_ERROR (Status);

 

   return PcdPpi;

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
index dc9ca4c169..f48f929a44 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
@@ -42,6 +42,7 @@
 [LibraryClasses]

   BaseMemoryLib

   PeiServicesTablePointerLib

+  PeiServicesLib

   DebugLib