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

28 files changed, 68 insertions, 68 deletions

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd
index 3b5ae36e0d..36219e68c3 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.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 OverrideID="4444">PeiServicesTablePointerLib</Library>
     <Library>PeiHobLib</Library>
     <Library>BaseCacheMaintenanceLib</Library>
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
index 318df3574b..ade4d013a6 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.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">HobLib</LibraryClass>

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

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

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

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

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

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

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd
index ef039fc800..460044147c 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd
@@ -29,7 +29,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 OverrideID="4444">PeiServicesTablePointerLib</Library>
     <Library>PeiHobLib</Library>
     <Library>BaseCacheMaintenanceLib</Library>
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
index 68a2a984c6..cd6c30ab60 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">PerformanceLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">ReportStatusCodeLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">CacheMaintenanceLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">EdkPeCoffLoaderLib</LibraryClass>
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
index a181095813..7800841275 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -119,11 +119,11 @@ Returns:
   EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader;

   EFI_BOOT_MODE                             BootMode;

 

-  Status = PeiCoreGetBootMode (&BootMode);

+  Status = PeiServicesGetBootMode (&BootMode);

 

   ASSERT_EFI_ERROR (Status);

 

-  Status = PeiCoreLocatePpi (

+  Status = PeiServicesLocatePpi (

              &gPeiInMemoryGuid,

              0,

              NULL,

@@ -154,7 +154,7 @@ Returns:
     //

     // Install LoadFile PPI

     //

-    Status = PeiCoreInstallPpi (&mPpiLoadFile);

+    Status = PeiServicesInstallPpi (&mPpiLoadFile);

 

     if (EFI_ERROR (Status)) {

       return Status;

@@ -163,7 +163,7 @@ Returns:
     //

     // Install DxeIpl PPI

     //

-    PeiCoreInstallPpi (&mPpiList);

+    PeiServicesInstallPpi (&mPpiList);

 

     if (EFI_ERROR (Status)) {

       return Status;

@@ -223,10 +223,10 @@ Returns:
   //

   // if in S3 Resume, restore configure

   //

-  Status = PeiCoreGetBootMode (&BootMode);

+  Status = PeiServicesGetBootMode (&BootMode);

 

   if (!EFI_ERROR (Status) && (BootMode == BOOT_ON_S3_RESUME)) {

-    Status = PeiCoreLocatePpi (

+    Status = PeiServicesLocatePpi (

                &gEfiPeiS3ResumePpiGuid,

                0,

                NULL,

@@ -307,11 +307,11 @@ Returns:
   //

   // See if we are in crisis recovery

   //

-  Status = PeiCoreGetBootMode (&BootMode);

+  Status = PeiServicesGetBootMode (&BootMode);

 

   if (!EFI_ERROR (Status) && (BootMode == BOOT_IN_RECOVERY_MODE)) {

 

-    Status = PeiCoreLocatePpi (

+    Status = PeiServicesLocatePpi (

                &gEfiPeiRecoveryModulePpiGuid,

                0,

                NULL,

@@ -373,7 +373,7 @@ Returns:
   //

 //  PERF_END (PeiServices, L"DxeIpl", NULL, 0);

 

-  Status = PeiCoreInstallPpi (&mPpiSignal);

+  Status = PeiServicesInstallPpi (&mPpiSignal);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -464,7 +464,7 @@ Returns:
   Hob.Raw = GetHobList ();

   while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_FV, Hob.Raw)) != NULL) {

     FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) (Hob.FirmwareVolume->BaseAddress);

-    Status = PeiCoreFfsFindNextFile (

+    Status = PeiServicesFfsFindNextFile (

                Type,

                FwVolHeader,

                &FfsFileHeader

@@ -620,7 +620,7 @@ Returns:
     //

     // Install PeiInMemory to indicate the Dxeipl is shadowed

     //

-    Status = PeiCoreInstallPpi (&mPpiPeiInMemory);

+    Status = PeiServicesInstallPpi (&mPpiPeiInMemory);

 

     if (EFI_ERROR (Status)) {

       return Status;

@@ -757,7 +757,7 @@ Returns:
   EFI_FIRMWARE_VOLUME_HEADER      *FvHeader;

   EFI_COMPRESSION_SECTION         *CompressionSection;

 

-  Status = PeiCoreFfsFindSectionData (

+  Status = PeiServicesFfsFindSectionData (

              EFI_SECTION_COMPRESSION,

              FfsFileHeader,

              &SectionData

@@ -795,7 +795,7 @@ Returns:
         //

         AuthenticationStatus = 0;

 

-        Status = PeiCoreLocatePpi (

+        Status = PeiServicesLocatePpi (

                    &gEfiPeiSectionExtractionPpiGuid,

                    0,

                    NULL,

@@ -828,7 +828,7 @@ Returns:
         // If not ask the Security PPI, if exists, for disposition

         //

         //

-        Status = PeiCoreLocatePpi (

+        Status = PeiServicesLocatePpi (

                    &gEfiPeiSecurityPpiGuid,

                    0,

                    NULL,

@@ -940,7 +940,7 @@ Returns:
           if (FvHeader->Signature == EFI_FVH_SIGNATURE) {

             FfsFileHeader = NULL;

             BuildFvHob ((EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader, FvHeader->FvLength);

-            Status = PeiCoreFfsFindNextFile (

+            Status = PeiServicesFfsFindNextFile (

                        EFI_FV_FILETYPE_DXE_CORE,

                        FvHeader,

                        &FfsFileHeader

@@ -986,14 +986,14 @@ Returns:
     //

   } else {

 

-    Status = PeiCoreFfsFindSectionData (

+    Status = PeiServicesFfsFindSectionData (

                EFI_SECTION_PE32,

                FfsFileHeader,

                &SectionData

                );

 

     if (EFI_ERROR (Status)) {

-      Status = PeiCoreFfsFindSectionData (

+      Status = PeiServicesFfsFindSectionData (

                  EFI_SECTION_TE,

                  FfsFileHeader,

                  &SectionData

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c b/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c
index 43b755423b..451d239eb6 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeLoadX64.c
@@ -130,11 +130,11 @@ Returns:
   EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader;

   EFI_BOOT_MODE                             BootMode;

 

-  Status = PeiCoreGetBootMode (&BootMode);

+  Status = PeiServicesGetBootMode (&BootMode);

 

   ASSERT_EFI_ERROR (Status);

 

-  Status = PeiCoreLocatePpi (

+  Status = PeiServicesLocatePpi (

              &gPeiInMemoryGuid,

              0,

              NULL,

@@ -165,7 +165,7 @@ Returns:
     //

     // Install LoadFile PPI

     //

-    Status = PeiCoreInstallPpi (&mPpiLoadFile);

+    Status = PeiServicesInstallPpi (&mPpiLoadFile);

 

     if (EFI_ERROR (Status)) {

       return Status;

@@ -174,7 +174,7 @@ Returns:
     //

     // Install DxeIpl PPI

     //

-    PeiCoreInstallPpi (&mPpiList);

+    PeiServicesInstallPpi (&mPpiList);

 

     if (EFI_ERROR (Status)) {

       return Status;

@@ -234,10 +234,10 @@ Returns:
   //

   // if in S3 Resume, restore configure

   //

-  Status = PeiCoreGetBootMode (&BootMode);

+  Status = PeiServicesGetBootMode (&BootMode);

 

   if (!EFI_ERROR (Status) && (BootMode == BOOT_ON_S3_RESUME)) {

-    Status = PeiCoreLocatePpi (

+    Status = PeiServicesLocatePpi (

                &gEfiPeiS3ResumePpiGuid,

                0,

                NULL,

@@ -270,7 +270,7 @@ Returns:
   //

   // Allocate 128KB for the Stack

   //

-  PeiCoreAllocatePages (EfiBootServicesData, EFI_SIZE_TO_PAGES (STACK_SIZE), &BaseOfStack);

+  PeiServicesAllocatePages (EfiBootServicesData, EFI_SIZE_TO_PAGES (STACK_SIZE), &BaseOfStack);

   ASSERT (BaseOfStack != 0);

 

   //

@@ -288,9 +288,9 @@ Returns:
   //

   // See if we are in crisis recovery

   //

-  Status = PeiCoreGetBootMode (&BootMode);

+  Status = PeiServicesGetBootMode (&BootMode);

   if (!EFI_ERROR (Status) && (BootMode == BOOT_IN_RECOVERY_MODE)) {

-    Status = PeiCoreLocatePpi (

+    Status = PeiServicesLocatePpi (

                &gEfiPeiRecoveryModulePpiGuid,

                0,

                NULL,

@@ -319,7 +319,7 @@ Returns:
   //

   // PEI_PERF_END (PeiServices, L"DxeIpl", NULL, 0);

 

-  Status = PeiCoreInstallPpi (&mPpiSignal);

+  Status = PeiServicesInstallPpi (&mPpiSignal);

   ASSERT_EFI_ERROR (Status);

 

   //

@@ -439,7 +439,7 @@ Returns:
   Hob.Raw = GetHobList ();

   while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_FV, Hob.Raw)) != NULL) {

     FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) (Hob.FirmwareVolume->BaseAddress);

-    Status = PeiCoreFfsFindNextFile (

+    Status = PeiServicesFfsFindNextFile (

                Type,

                FwVolHeader,

                &FfsFileHeader

@@ -512,7 +512,7 @@ Returns:
   //

   // Allocate Memory for the image

   //

-  PeiCoreAllocatePages (MemoryType, EFI_SIZE_TO_PAGES ((UINT32) ImageContext.ImageSize), &MemoryBuffer);

+  PeiServicesAllocatePages (MemoryType, EFI_SIZE_TO_PAGES ((UINT32) ImageContext.ImageSize), &MemoryBuffer);

   ImageContext.ImageAddress = MemoryBuffer;

   ASSERT (ImageContext.ImageAddress != 0);

 

@@ -604,7 +604,7 @@ Returns:
     //

     // Install PeiInMemory to indicate the Dxeipl is shadowed

     //

-    Status = PeiCoreInstallPpi (&mPpiPeiInMemory);

+    Status = PeiServicesInstallPpi (&mPpiPeiInMemory);

 

     if (EFI_ERROR (Status)) {

       return Status;

@@ -737,7 +737,7 @@ Returns:
   EFI_FIRMWARE_VOLUME_HEADER      *FvHeader;

   EFI_COMPRESSION_SECTION         *CompressionSection;

 

-  Status = PeiCoreFfsFindSectionData (

+  Status = PeiServicesFfsFindSectionData (

              EFI_SECTION_COMPRESSION,

              FfsFileHeader,

              &SectionData

@@ -775,7 +775,7 @@ Returns:
         //

         AuthenticationStatus = 0;

 

-        Status = PeiCoreLocatePpi (

+        Status = PeiServicesLocatePpi (

                    &gEfiPeiSectionExtractionPpiGuid,

                    0,

                    NULL,

@@ -808,7 +808,7 @@ Returns:
         // If not ask the Security PPI, if exists, for disposition

         //

         //

-        Status = PeiCoreLocatePpi (

+        Status = PeiServicesLocatePpi (

                    &gEfiPeiSecurityPpiGuid,

                    0,

                    NULL,

@@ -920,7 +920,7 @@ Returns:
           if (FvHeader->Signature == EFI_FVH_SIGNATURE) {

             FfsFileHeader = NULL;

             BuildFvHob ((EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader, FvHeader->FvLength);

-            Status = PeiCoreFfsFindNextFile (

+            Status = PeiServicesFfsFindNextFile (

                        EFI_FV_FILETYPE_DXE_CORE,

                        FvHeader,

                        &FfsFileHeader

@@ -966,14 +966,14 @@ Returns:
     //

   } else {

 

-    Status = PeiCoreFfsFindSectionData (

+    Status = PeiServicesFfsFindSectionData (

                EFI_SECTION_PE32,

                FfsFileHeader,

                &SectionData

                );

 

     if (EFI_ERROR (Status)) {

-      Status = PeiCoreFfsFindSectionData (

+      Status = PeiServicesFfsFindSectionData (

                  EFI_SECTION_TE,

                  FfsFileHeader,

                  &SectionData

diff --git a/EdkModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c b/EdkModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
index 95fb0937c5..bcf59f970a 100644
--- a/EdkModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
+++ b/EdkModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
@@ -55,7 +55,7 @@ Returns:
   //

   // Allocate 16KB for the BspStore

   //

-  Status = PeiCoreAllocatePages (EfiBootServicesData, EFI_SIZE_TO_PAGES (BSP_STORE_SIZE), BspStore);

+  Status = PeiServicesAllocatePages (EfiBootServicesData, EFI_SIZE_TO_PAGES (BSP_STORE_SIZE), BspStore);

   if (EFI_ERROR (Status)) {

     return Status;

   }

diff --git a/EdkModulePkg/Core/Pei/Dependency/dependency.c b/EdkModulePkg/Core/Pei/Dependency/dependency.c
index b893cbe6fc..0d9d797826 100644
--- a/EdkModulePkg/Core/Pei/Dependency/dependency.c
+++ b/EdkModulePkg/Core/Pei/Dependency/dependency.c
@@ -72,7 +72,7 @@ Returns:
   //

   // Check if the PPI is installed.

   //

-  Status = PeiCoreLocatePpi(

+  Status = PeiServicesLocatePpi(

              &PpiGuid,        // GUID

              0,               // INSTANCE

              NULL,            // EFI_PEI_PPI_DESCRIPTOR

diff --git a/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index b4e09e3fca..0bec576e6d 100644
--- a/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -230,7 +230,7 @@ Returns:
         // anymore FVs, then exit the PEIM search loop.

         //

         if (DispatchData->FindFv == NULL) {

-          Status = PeiCoreLocatePpi (

+          Status = PeiServicesLocatePpi (

                      &gEfiFindFvPpiGuid,

                      0,

                      NULL,

@@ -484,7 +484,7 @@ Returns:
   INT8        *DepexData;

   BOOLEAN     Runnable;

 

-  Status = PeiCoreFfsFindSectionData (

+  Status = PeiServicesFfsFindSectionData (

              EFI_SECTION_PEI_DEPEX,

              CurrentPeimAddress,

              (VOID **)&DepexData

diff --git a/EdkModulePkg/Core/Pei/FwVol/FwVol.c b/EdkModulePkg/Core/Pei/FwVol/FwVol.c
index d034513bb0..d06590cd98 100644
--- a/EdkModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/EdkModulePkg/Core/Pei/FwVol/FwVol.c
@@ -451,7 +451,7 @@ Returns:
     // Locate all instances of FindFV

     // Alternately, could use FV HOBs, but the PPI is cleaner

     //

-    Status = PeiCoreLocatePpi (

+    Status = PeiServicesLocatePpi (

                &gEfiFindFvPpiGuid,

                0,

                NULL,

diff --git a/EdkModulePkg/Core/Pei/Image/Image.c b/EdkModulePkg/Core/Pei/Image/Image.c
index 42ecc862fd..8fd7197636 100644
--- a/EdkModulePkg/Core/Pei/Image/Image.c
+++ b/EdkModulePkg/Core/Pei/Image/Image.c
@@ -65,7 +65,7 @@ Returns:
   //

   // Try to find a PE32 section.

   //

-  Status = PeiCoreFfsFindSectionData (

+  Status = PeiServicesFfsFindSectionData (

              EFI_SECTION_PE32,

              PeimFileHeader,

              &Pe32Data

@@ -74,7 +74,7 @@ Returns:
   // If we didn't find a PE32 section, try to find a TE section.

   //

   if (EFI_ERROR (Status)) {

-    Status = PeiCoreFfsFindSectionData (

+    Status = PeiServicesFfsFindSectionData (

                EFI_SECTION_TE,

                PeimFileHeader,

                (VOID **) &TEImageHeader

@@ -84,7 +84,7 @@ Returns:
       // There was not a PE32 or a TE section, so assume that it's a Compressed section

       // and use the LoadFile

       //

-      Status = PeiCoreLocatePpi (

+      Status = PeiServicesLocatePpi (

                 &gEfiPeiFvFileLoaderPpiGuid,

                 0,

                 NULL,

diff --git a/EdkModulePkg/Core/Pei/Memory/MemoryServices.c b/EdkModulePkg/Core/Pei/Memory/MemoryServices.c
index eb99a8040d..3da3e53185 100644
--- a/EdkModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/EdkModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -306,7 +306,7 @@ Returns:
  // it should use AllocatePages service instead.

  //

  ASSERT (Size < 0x10000 - sizeof (EFI_HOB_MEMORY_POOL));

- Status = PeiCoreCreateHob (

+ Status = PeiServicesCreateHob (

              EFI_HOB_TYPE_PEI_MEMORY_POOL,

              (UINT16)(sizeof (EFI_HOB_MEMORY_POOL) + Size),

              (VOID **)&Hob

diff --git a/EdkModulePkg/Core/Pei/PeiMain.mbd b/EdkModulePkg/Core/Pei/PeiMain.mbd
index 145a5443a0..4bf137aa9f 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.mbd
+++ b/EdkModulePkg/Core/Pei/PeiMain.mbd
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>BaseLib</Library>
     <Library>BaseMemoryLib</Library>
     <Library OverrideID="4444">PeiServicesTablePointerLib</Library>
-    <Library>PeiCoreLib</Library>
+    <Library>PeiServicesLib</Library>
     <Library>PeiHobLib</Library>
     <Library>PeiReportStatusCodeLib</Library>
     <Library>BaseDebugLibReportStatusCode</Library>
diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index 1f5342e9f9..43c29de349 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.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">HobLib</LibraryClass>

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

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

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

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

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

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

diff --git a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
index f27b0274f5..b6d57f96d5 100644
--- a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -179,7 +179,7 @@ Returns:
     // Alert any listeners that there is permanent memory available

     //

     PERF_START (NULL,"DisMem", NULL, 0);

-    Status = PeiCoreInstallPpi (&mMemoryDiscoveredPpi);

+    Status = PeiServicesInstallPpi (&mMemoryDiscoveredPpi);

     PERF_END (NULL,"DisMem", NULL, 0);

 

   } else {

@@ -201,7 +201,7 @@ Returns:
     // If SEC provided any PPI services to PEI, install them.

     //

     if (PeiStartupDescriptor->DispatchTable != NULL) {

-      Status = PeiCoreInstallPpi (PeiStartupDescriptor->DispatchTable);

+      Status = PeiServicesInstallPpi (PeiStartupDescriptor->DispatchTable);

       ASSERT_EFI_ERROR (Status);

     }

   }

@@ -220,7 +220,7 @@ Returns:
 

   PERF_END (NULL, "PostMem", NULL, 0);

 

-  Status = PeiCoreLocatePpi (

+  Status = PeiServicesLocatePpi (

              &gEfiDxeIplPpiGuid,

              0,

              NULL,

diff --git a/EdkModulePkg/Core/Pei/Reset/Reset.c b/EdkModulePkg/Core/Pei/Reset/Reset.c
index 6bcb4ce31b..ef0ceb3b19 100644
--- a/EdkModulePkg/Core/Pei/Reset/Reset.c
+++ b/EdkModulePkg/Core/Pei/Reset/Reset.c
@@ -50,7 +50,7 @@ Returns:
   EFI_STATUS        Status;

   EFI_PEI_RESET_PPI *ResetPpi;

 

-  Status = PeiCoreLocatePpi (

+  Status = PeiServicesLocatePpi (

              &gEfiPeiResetPpiGuid,         

              0,                         

              NULL,                      

diff --git a/EdkModulePkg/Core/Pei/Security/Security.c b/EdkModulePkg/Core/Pei/Security/Security.c
index 5908928c7b..0bc175a856 100644
--- a/EdkModulePkg/Core/Pei/Security/Security.c
+++ b/EdkModulePkg/Core/Pei/Security/Security.c
@@ -58,7 +58,7 @@ Returns:
 --*/

 {

   if (OldCoreData == NULL) {

-    PeiCoreNotifyPpi (&mNotifyList);

+    PeiServicesNotifyPpi (&mNotifyList);

   }

   return;

 }

diff --git a/EdkModulePkg/Core/Pei/StatusCode/StatusCode.c b/EdkModulePkg/Core/Pei/StatusCode/StatusCode.c
index 496effa5e5..b9316b6e9e 100644
--- a/EdkModulePkg/Core/Pei/StatusCode/StatusCode.c
+++ b/EdkModulePkg/Core/Pei/StatusCode/StatusCode.c
@@ -67,7 +67,7 @@ Returns:
   //

   //Locate StatusCode Ppi.

   //

-  Status = PeiCoreLocatePpi (

+  Status = PeiServicesLocatePpi (

              &gEfiPeiStatusCodePpiGuid,         

              0,                         

              NULL,                      

diff --git a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.msa b/EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.msa
index d402cbaa19..7d60671c90 100644
--- a/EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.msa
+++ b/EdkModulePkg/Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.msa
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</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>

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

   </LibraryClassDefinitions>

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>