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

9 files changed, 10 insertions, 10 deletions

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
index 59c52c9718..ac15f7b7e0 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
@@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>BaseDebugLibReportStatusCode</Library>

     <Library>PeiServicesTablePointerLib</Library>

     <Library>PeiMemoryLib</Library>

-    <Library>PeiCoreLib</Library>

+    <Library>PeiServicesLib</Library>

     <Library>BaseLib</Library>

   </Libraries>

 </ModuleBuildDescription>

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
index 62ed7834eb..2764fb36ab 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <LibraryClassDefinitions>

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

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

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

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

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>BaseMemoryTest.c</Filename>

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 52390e404c..b41d3ed09b 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -76,7 +76,7 @@ PcdPeimInit (
 

   BuildPcdDatabase ();

   

-  Status = PeiCoreInstallPpi (&mPpiPCD);

+  Status = PeiServicesInstallPpi (&mPpiPCD);

 

   ASSERT_EFI_ERROR (Status);

   

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
index 5defea7d7d..8509b16d73 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.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 OverrideID="4444">PeiServicesTablePointerLib</Library>

     <Library>PeiHobLib</Library>

     <Library>BaseDebugLibReportStatusCode</Library>

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
index 60cd6449e7..f08a2fa072 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.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/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 247ebadcd7..2de061bdb0 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -144,7 +144,7 @@ GetHiiVariable (
   VOID       *Buffer;

   EFI_PEI_READ_ONLY_VARIABLE_PPI *VariablePpi;

 

-  Status = PeiCoreLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);

+  Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);

   ASSERT_EFI_ERROR (Status);

 

   Size = 0;

@@ -159,7 +159,7 @@ GetHiiVariable (
                             );

   ASSERT (Status == EFI_BUFFER_TOO_SMALL);

 

-  Status = PeiCoreAllocatePool (Size, &Buffer);

+  Status = PeiServicesAllocatePool (Size, &Buffer);

   ASSERT_EFI_ERROR (Status);

 

   Status = VariablePpi->PeiGetVariable (

diff --git a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd
index e601061991..3265c3db60 100644
--- a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd
+++ b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.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>BaseDebugLibReportStatusCode</Library>

     <Library>PeiMemoryLib</Library>

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.mbd b/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
index df87f466de..97bbde871a 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>BaseDebugLibReportStatusCode</Library>
     <Library>BaseLib</Library>
     <Library>PeiMemoryLib</Library>
-    <Library>PeiCoreLib</Library>
+    <Library>PeiServicesLib</Library>
     <Library OverrideID="4444">PeiServicesTablePointerLib</Library>
     <Library>PeiHobLib</Library>
     <Library>PeimEntryPoint</Library>
diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.msa b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
index bf331250c4..27f8a84e27 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <LibraryClassDefinitions>

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

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

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

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

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

   </LibraryClassDefinitions>

   <SourceFiles>