1. Rename PeiCoreLib to PeiServicesLib and rename all the interfaces from PeiCoreXXX() to PeiServicesXXX().

	2. Remove PostCode interfaces from ReportStatusCodeLib


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

15 files changed, 17 insertions, 17 deletions

diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd
index c6a123ddf9..49bc8eb9b8 100644
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd
+++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>

     <Library>PeimEntryPoint</Library>

     <Library>PeiMemoryLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

     <Library>PeiServicesTablePointerLib</Library>

     <Library>PeiHobLib</Library>

     <Library>PeiReportStatusCodeLib</Library>

diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
index 887eaf6fc5..05781af256 100644
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
+++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
@@ -37,7 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.mbd b/EdkNt32Pkg/Pei/BootMode/BootMode.mbd
index 5dd1a6fe20..12d95b1147 100644
--- a/EdkNt32Pkg/Pei/BootMode/BootMode.mbd
+++ b/EdkNt32Pkg/Pei/BootMode/BootMode.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>

     <Library>PeimEntryPoint</Library>

     <Library>PeiMemoryLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

     <Library>PeiServicesTablePointerLib</Library>

     <Library>PeiReportStatusCodeLib</Library>

     <Library>BaseDebugLibReportStatusCode</Library>

diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.msa b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
index bbc56e6ed8..4c94945bdd 100644
--- a/EdkNt32Pkg/Pei/BootMode/BootMode.msa
+++ b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd
index 3c61664ecc..8a65521b48 100644
--- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd
+++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>

     <Library>PeimEntryPoint</Library>

     <Library>PeiMemoryLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

     <Library>PeiServicesTablePointerLib</Library>

     <Library>PeiHobLib</Library>

     <Library>PeiReportStatusCodeLib</Library>

diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
index e70d4dd7db..b6cff5ec31 100644
--- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
+++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.c b/EdkNt32Pkg/Pei/FlashMap/FlashMap.c
index a8f7ba06ad..b459257285 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.c
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.c
@@ -136,14 +136,14 @@ Returns:
   //

   // Install FlashMap PPI

   //

-  Status = PeiCoreInstallPpi (&mPpiListFlashMap);

+  Status = PeiServicesInstallPpi (&mPpiListFlashMap);

   ASSERT_EFI_ERROR (Status);

 

 

   //

   // Get the Fwh Information PPI

   //

-  Status = PeiCoreLocatePpi (

+  Status = PeiServicesLocatePpi (

             &gNtFwhPpiGuid, // GUID

             0,              // INSTANCE

             &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR

@@ -249,7 +249,7 @@ GetAreaInfo (
   EFI_PEI_HOB_POINTERS          Hob;

   EFI_HOB_FLASH_MAP_ENTRY_TYPE  *FlashMapEntry;

 

-  Status = PeiCoreGetHobList (&Hob.Raw);

+  Status = PeiServicesGetHobList (&Hob.Raw);

   while (!END_OF_HOB_LIST (Hob)) {

     if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION && CompareGuid (&Hob.Guid->Name, &gEfiFlashMapHobGuid)) {

       FlashMapEntry = (EFI_HOB_FLASH_MAP_ENTRY_TYPE *) Hob.Raw;

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd b/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd
index 8c38ee9f59..351e86dffd 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>

     <Library>PeimEntryPoint</Library>

     <Library>PeiMemoryLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

     <Library>PeiServicesTablePointerLib</Library>

     <Library>PeiHobLib</Library>

     <Library>PeiReportStatusCodeLib</Library>

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index f347ca45db..672199920a 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

   </LibraryClassDefinitions>

diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd b/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd
index f48b4c7f0e..950b450647 100644
--- a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd
+++ b/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>PeiHobLib</Library>

     <Library>PeimEntryPoint</Library>

     <Library>EdkMemoryStatusCodeLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

   </Libraries>

   <BuildOptions ToolChain="MSFT">

     <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>

diff --git a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c
index 69261b952b..76399048fd 100644
--- a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c
+++ b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c
@@ -621,7 +621,7 @@ PeimPcdEmulatorEntry (
   //

   // Install PCD service PPI

   //

-  Status = PeiCoreInstallPpi (&mPpiPCD);

+  Status = PeiServicesInstallPpi (&mPpiPCD);

 

   ASSERT_EFI_ERROR (Status);

   return Status;

diff --git a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd
index 816cf6f869..1b3e35ad6d 100644
--- a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd
+++ b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>

     <Library>PeimEntryPoint</Library>

     <Library>BaseLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

     <Library>PeiServicesTablePointerLib</Library>

     <Library>PeiHobLib</Library>

     <Library>BaseDebugLibReportStatusCode</Library>

diff --git a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa
index ad11084476..feb0c07011 100644
--- a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa
+++ b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PcdLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd
index ab862efcae..e931679d39 100644
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd
+++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>

     <Library>PeimEntryPoint</Library>

     <Library>PeiMemoryLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

     <Library>PeiServicesTablePointerLib</Library>

     <Library>PeiHobLib</Library>

     <Library>PeiReportStatusCodeLib</Library>

diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
index 2890c9d5a2..a227dd0133 100644
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
+++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>