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

19 files changed, 533 insertions, 545 deletions

diff --git a/MdePkg/Include/Library/PeiCoreLib.h b/MdePkg/Include/Library/PeiServicesLib.h
index dfbe51c..64bd253 100644
--- a/MdePkg/Include/Library/PeiCoreLib.h
+++ b/MdePkg/Include/Library/PeiServicesLib.h
@@ -10,12 +10,12 @@
 	THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

 	WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

 

-	Module Name:	PeiCoreLib.h

+	Module Name:	PeiServicesLib.h

 

 **/

 

-#ifndef __PEI_CORE_LIB_H__

-#define __PEI_CORE_LIB_H__

+#ifndef __PEI_SERVICES_LIB_H__

+#define __PEI_SERVICES_LIB_H__

 

 /**

 	This service enables a given PEIM to register an interface into the PEI Foundation. 

@@ -31,7 +31,7 @@
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreInstallPpi (

+PeiServicesInstallPpi (

   IN EFI_PEI_PPI_DESCRIPTOR           *PpiList

   )

 ;

@@ -52,7 +52,7 @@ PeiCoreInstallPpi (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreReinstallPpi (

+PeiServicesReinstallPpi (

   IN EFI_PEI_PPI_DESCRIPTOR           *OldPpi,

   IN EFI_PEI_PPI_DESCRIPTOR           *NewPpi

   )

@@ -72,7 +72,7 @@ PeiCoreReinstallPpi (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreLocatePpi (

+PeiServicesLocatePpi (

   IN EFI_GUID                         *Guid,

   IN UINTN                            Instance,

   IN OUT EFI_PEI_PPI_DESCRIPTOR       **PpiDescriptor,

@@ -95,7 +95,7 @@ PeiCoreLocatePpi (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreNotifyPpi (

+PeiServicesNotifyPpi (

   IN EFI_PEI_NOTIFY_DESCRIPTOR        *NotifyList

   )

 ;

@@ -111,7 +111,7 @@ PeiCoreNotifyPpi (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreGetBootMode (

+PeiServicesGetBootMode (

   IN OUT EFI_BOOT_MODE                *BootMode

   )

 ;

@@ -126,7 +126,7 @@ PeiCoreGetBootMode (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreSetBootMode (

+PeiServicesSetBootMode (

   IN EFI_BOOT_MODE                    BootMode

   )

 ;

@@ -142,7 +142,7 @@ PeiCoreSetBootMode (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreGetHobList (

+PeiServicesGetHobList (

   IN OUT VOID                         **HobList

   )

 ;

@@ -160,7 +160,7 @@ PeiCoreGetHobList (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreCreateHob (

+PeiServicesCreateHob (

   IN UINT16                           Type,

   IN UINT16                           Length,

   IN OUT VOID                         **Hob

@@ -181,7 +181,7 @@ PeiCoreCreateHob (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreFfsFindNextVolume (

+PeiServicesFfsFindNextVolume (

   IN UINTN                            Instance,

   IN OUT EFI_FIRMWARE_VOLUME_HEADER   **FwVolHeader

   )

@@ -202,7 +202,7 @@ PeiCoreFfsFindNextVolume (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreFfsFindNextFile (

+PeiServicesFfsFindNextFile (

   IN EFI_FV_FILETYPE                  SearchType,

   IN EFI_FIRMWARE_VOLUME_HEADER       *FwVolHeader,

   IN OUT EFI_FFS_FILE_HEADER          **FileHeader

@@ -222,7 +222,7 @@ PeiCoreFfsFindNextFile (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreFfsFindSectionData (

+PeiServicesFfsFindSectionData (

   IN EFI_SECTION_TYPE                 SectionType,

   IN EFI_FFS_FILE_HEADER              *FfsFileHeader,

   IN OUT VOID                         **SectionData

@@ -243,7 +243,7 @@ PeiCoreFfsFindSectionData (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreInstallPeiMemory (

+PeiServicesInstallPeiMemory (

   IN EFI_PHYSICAL_ADDRESS             MemoryBegin,

   IN UINT64                           MemoryLength

   )

@@ -264,7 +264,7 @@ PeiCoreInstallPeiMemory (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreAllocatePages (

+PeiServicesAllocatePages (

   IN EFI_MEMORY_TYPE                  MemoryType,

   IN UINTN                            Pages,

   IN OUT EFI_PHYSICAL_ADDRESS         *Memory

@@ -284,7 +284,7 @@ PeiCoreAllocatePages (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreAllocatePool (

+PeiServicesAllocatePool (

   IN UINTN                            Size,

   OUT VOID                            **Buffer

   )

@@ -298,7 +298,7 @@ PeiCoreAllocatePool (
 **/

 EFI_STATUS

 EFIAPI

-PeiCoreResetSystem (

+PeiServicesResetSystem (

   VOID

   )

 ;

diff --git a/MdePkg/Include/Library/ReportStatusCodeLib.h b/MdePkg/Include/Library/ReportStatusCodeLib.h
index b05bcc6..9a3d4da 100644
--- a/MdePkg/Include/Library/ReportStatusCodeLib.h
+++ b/MdePkg/Include/Library/ReportStatusCodeLib.h
@@ -21,8 +21,6 @@
 #define REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED          0x00000001

 #define REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED             0x00000002

 #define REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED             0x00000004

-#define REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED              0x00000008

-#define REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTION_ENABLED  0x00000010

 

 //

 // Extended Data structure definitions with EFI_STATUS_CODE_DATA headers removed

@@ -455,63 +453,6 @@ ReportStatusCodeEx (
 

 

 /**

-  Sends an 32-bit value to a POST card.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  

-  Some implementations of this library function may perform I/O operations 

-  directly to a POST card device.  Other implementations may send Value to 

-  ReportStatusCode(), and the status code reporting mechanism will eventually 

-  display the 32-bit value on the status reporting device.

-  

-  PostCode() must actively prevent recursion.  If PostCode() is called while 

-  processing another any other Report Status Code Library function, then 

-  PostCode() must return Value immediately.

-

-  @param  Value  The 32-bit value to write to the POST card.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCode (

-  IN UINT32  Value

-  );

-

-

-/**

-  Sends an 32-bit value to a POST and associated ASCII string.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.

-  If Description is not NULL, then the ASCII string specified by Description is 

-  also passed to the handler that displays the POST card value.  Some 

-  implementations of this library function may perform I/O operations directly 

-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), 

-  and the status code reporting mechanism will eventually display the 32-bit 

-  value on the status reporting device.  

-

-  PostCodeWithDescription()must actively prevent recursion.  If 

-  PostCodeWithDescription() is called while processing another any other Report 

-  Status Code Library function, then PostCodeWithDescription() must return Value 

-  immediately.

-

-  @param  Value        The 32-bit value to write to the POST card.

-  @param  Description  Pointer to an ASCII string that is a description of the 

-                       POST code value.  This is an optional parameter that may 

-                       be NULL.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCodeWithDescription (

-  IN UINT32       Value,

-  IN CONST CHAR8  *Description  OPTIONAL

-  );

-

-

-/**

   Returns TRUE if status codes of type EFI_PROGRESS_CODE are enabled

 

   This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED 

@@ -569,45 +510,6 @@ ReportDebugCodeEnabled (
 

 

 /**

-  Returns TRUE if POST Codes are enabled.

-

-  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED 

-  bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeEnabled (

-  VOID

-  );

-

-

-/**

-  Returns TRUE if POST code descriptions are enabled.

-

-  This function returns TRUE if the 

-  REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED bit of 

-  PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeDescriptionEnabled (

-  VOID

-  );

-

-

-/**

   Reports a status code with minimal parameters if the status code type is enabled.

 

   If the status code type specified by Type is enabled in 

@@ -727,37 +629,4 @@ ReportPostCodeDescriptionEnabled (
   ReportStatusCodeEx(Type,Value,Instance,CallerId,ExtendedDataGuid,ExtendedData,ExtendedDataSize)        :  \

   EFI_UNSUPPORTED

 

-/**

-  Sends an 32-bit value to a POST card.

-

-  If POST codes are enabled in PcdReportStatusCodeProperyMask, then call PostCode() 

-  passing in Value.  Value is returned.

-

-  @param  Value  The 32-bit value to write to the POST card.

-

-  @return  Value

-

-**/

-#define POST_CODE(Value)  ReportPostCodeEnabled() ? PostCode(Value) : Value

-

-/**

-  Sends an 32-bit value to a POST and associated ASCII string.

-

-  If POST codes and POST code descriptions are enabled in 

-  PcdReportStatusCodeProperyMask, then call PostCodeWithDescription() passing in 

-  Value and Description.  If only POST codes are enabled, then call PostCode() 

-  passing in Value.  Value is returned.

-

-  @param  Value        The 32-bit value to write to the POST card.

-  @param  Description  Pointer to an ASCII string that is a description of the 

-                       POST code value.

-

-**/

-#define POST_CODE_WITH_DESCRIPTION(Value,Description)  \

-  ReportPostCodeEnabled()                        ?     \

-    (ReportPostCodeDescriptionEnabled()          ?     \

-      PostCodeWithDescription(Value,Description) :     \

-      PostCode(Value))                           :     \

-    Value

-

 #endif

diff --git a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
index 663d416..78c20eb 100644
--- a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
+++ b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
@@ -41,7 +41,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>ReportStatusCodeLib.c</Filename>

-    <Filename>PostCode.c</Filename>

   </SourceFiles>

   <Includes>

     <PackageName>MdePkg</PackageName>

diff --git a/MdePkg/Library/BaseReportStatusCodeLibNull/PostCode.c b/MdePkg/Library/BaseReportStatusCodeLibNull/PostCode.c
deleted file mode 100644
index 3d0ce7c..0000000
--- a/MdePkg/Library/BaseReportStatusCodeLibNull/PostCode.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/** @file

-  Report Status Code Library Post Code functions for DXE Phase.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials                          

-  are licensed and made available under the terms and conditions of the BSD License         

-  which accompanies this distribution.  The full text of the license may be found at        

-  http://opensource.org/licenses/bsd-license.php                                            

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-

-**/

-

-

-/**

-  Sends an 32-bit value to a POST card.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  

-  Some implementations of this library function may perform I/O operations 

-  directly to a POST card device.  Other implementations may send Value to 

-  ReportStatusCode(), and the status code reporting mechanism will eventually 

-  display the 32-bit value on the status reporting device.

-  

-  PostCode() must actively prevent recursion.  If PostCode() is called while 

-  processing another any other Report Status Code Library function, then 

-  PostCode() must return Value immediately.

-

-  @param  Value  The 32-bit value to write to the POST card.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCode (

-  IN UINT32  Value

-  )

-{

-  DEBUG((EFI_D_INFO, "POST %08x\n", Value));

-  IoWrite8 (0x80, (UINT8)(Value));

-  return Value;

-}

-

-

-/**

-  Sends an 32-bit value to a POST and associated ASCII string.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.

-  If Description is not NULL, then the ASCII string specified by Description is 

-  also passed to the handler that displays the POST card value.  Some 

-  implementations of this library function may perform I/O operations directly 

-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), 

-  and the status code reporting mechanism will eventually display the 32-bit 

-  value on the status reporting device.  

-

-  PostCodeWithDescription()must actively prevent recursion.  If 

-  PostCodeWithDescription() is called while processing another any other Report 

-  Status Code Library function, then PostCodeWithDescription() must return Value 

-  immediately.

-

-  @param  Value        The 32-bit value to write to the POST card.

-  @param  Description  Pointer to an ASCII string that is a description of the 

-                       POST code value.  This is an optional parameter that may 

-                       be NULL.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCodeWithDescription (

-  IN UINT32       Value,

-  IN CONST CHAR8  *Description  OPTIONAL

-  )

-{

-  DEBUG((EFI_D_INFO, "POST %08x - %s\n", Value, Description));

-  IoWrite8 (0x80, (UINT8)(Value));

-  return Value;

-}

-

-

-/**

-  Returns TRUE if POST Codes are enabled.

-

-  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED 

-  bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeEnabled (

-  VOID

-  )

-{

-  return ((PcdGet8(PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED) != 0);

-}

-

-

-/**

-  Returns TRUE if POST code descriptions are enabled.

-

-  This function returns TRUE if the 

-  REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED bit of 

-  PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeDescriptionEnabled (

-  VOID

-  )

-{

-  return ((PcdGet8(PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTION_ENABLED) != 0);

-}

diff --git a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
index 214fdf3..2196461 100644
--- a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
+++ b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
@@ -42,7 +42,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>ReportStatusCodeLib.c</Filename>

-    <Filename>PostCode.c</Filename>

   </SourceFiles>

   <Includes>

     <PackageName>MdePkg</PackageName>

diff --git a/MdePkg/Library/DxeReportStatusCodeLib/PostCode.c b/MdePkg/Library/DxeReportStatusCodeLib/PostCode.c
deleted file mode 100644
index 3d0ce7c..0000000
--- a/MdePkg/Library/DxeReportStatusCodeLib/PostCode.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/** @file

-  Report Status Code Library Post Code functions for DXE Phase.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials                          

-  are licensed and made available under the terms and conditions of the BSD License         

-  which accompanies this distribution.  The full text of the license may be found at        

-  http://opensource.org/licenses/bsd-license.php                                            

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-

-**/

-

-

-/**

-  Sends an 32-bit value to a POST card.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  

-  Some implementations of this library function may perform I/O operations 

-  directly to a POST card device.  Other implementations may send Value to 

-  ReportStatusCode(), and the status code reporting mechanism will eventually 

-  display the 32-bit value on the status reporting device.

-  

-  PostCode() must actively prevent recursion.  If PostCode() is called while 

-  processing another any other Report Status Code Library function, then 

-  PostCode() must return Value immediately.

-

-  @param  Value  The 32-bit value to write to the POST card.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCode (

-  IN UINT32  Value

-  )

-{

-  DEBUG((EFI_D_INFO, "POST %08x\n", Value));

-  IoWrite8 (0x80, (UINT8)(Value));

-  return Value;

-}

-

-

-/**

-  Sends an 32-bit value to a POST and associated ASCII string.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.

-  If Description is not NULL, then the ASCII string specified by Description is 

-  also passed to the handler that displays the POST card value.  Some 

-  implementations of this library function may perform I/O operations directly 

-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), 

-  and the status code reporting mechanism will eventually display the 32-bit 

-  value on the status reporting device.  

-

-  PostCodeWithDescription()must actively prevent recursion.  If 

-  PostCodeWithDescription() is called while processing another any other Report 

-  Status Code Library function, then PostCodeWithDescription() must return Value 

-  immediately.

-

-  @param  Value        The 32-bit value to write to the POST card.

-  @param  Description  Pointer to an ASCII string that is a description of the 

-                       POST code value.  This is an optional parameter that may 

-                       be NULL.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCodeWithDescription (

-  IN UINT32       Value,

-  IN CONST CHAR8  *Description  OPTIONAL

-  )

-{

-  DEBUG((EFI_D_INFO, "POST %08x - %s\n", Value, Description));

-  IoWrite8 (0x80, (UINT8)(Value));

-  return Value;

-}

-

-

-/**

-  Returns TRUE if POST Codes are enabled.

-

-  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED 

-  bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeEnabled (

-  VOID

-  )

-{

-  return ((PcdGet8(PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED) != 0);

-}

-

-

-/**

-  Returns TRUE if POST code descriptions are enabled.

-

-  This function returns TRUE if the 

-  REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED bit of 

-  PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeDescriptionEnabled (

-  VOID

-  )

-{

-  return ((PcdGet8(PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTION_ENABLED) != 0);

-}

diff --git a/MdePkg/Library/PeiHobLib/HobLib.c b/MdePkg/Library/PeiHobLib/HobLib.c
index 1f0c66a..ce9f79f 100644
--- a/MdePkg/Library/PeiHobLib/HobLib.c
+++ b/MdePkg/Library/PeiHobLib/HobLib.c
@@ -33,7 +33,7 @@ GetHobList (
   EFI_STATUS            Status;

   VOID                  *HobList;

 

-  Status = PeiCoreGetHobList (&HobList);

+  Status = PeiServicesGetHobList (&HobList);

   ASSERT_EFI_ERROR (Status);

   ASSERT (HobList != NULL);

 

@@ -187,7 +187,7 @@ InternalPeiCreateHob (
   EFI_STATUS        Status;

   VOID              *Hob;

 

-  Status = PeiCoreCreateHob (Type, Length, &Hob);

+  Status = PeiServicesCreateHob (Type, Length, &Hob);

   //

   // Assume the process of HOB building is always successful.

   //

diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.msa b/MdePkg/Library/PeiHobLib/PeiHobLib.msa
index 1d8fb79..a5b71d3 100644
--- a/MdePkg/Library/PeiHobLib/PeiHobLib.msa
+++ b/MdePkg/Library/PeiHobLib/PeiHobLib.msa
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <LibraryClassDefinitions>

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

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

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

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

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

   </LibraryClassDefinitions>

   <SourceFiles>

diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
index c37e423..d2d0f17 100644
--- a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
+++ b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
@@ -42,7 +42,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>ReportStatusCodeLib.c</Filename>

-    <Filename>PostCode.c</Filename>

   </SourceFiles>

   <Includes>

     <PackageName>MdePkg</PackageName>

diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PostCode.c b/MdePkg/Library/PeiReportStatusCodeLib/PostCode.c
deleted file mode 100644
index c5d32e7..0000000
--- a/MdePkg/Library/PeiReportStatusCodeLib/PostCode.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/** @file

-  Report Status Code Library Post Code functions for PEI Phase.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials                          

-  are licensed and made available under the terms and conditions of the BSD License         

-  which accompanies this distribution.  The full text of the license may be found at        

-  http://opensource.org/licenses/bsd-license.php                                            

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-

-**/

-

-

-/**

-  Sends an 32-bit value to a POST card.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.  

-  Some implementations of this library function may perform I/O operations 

-  directly to a POST card device.  Other implementations may send Value to 

-  ReportStatusCode(), and the status code reporting mechanism will eventually 

-  display the 32-bit value on the status reporting device.

-  

-  PostCode() must actively prevent recursion.  If PostCode() is called while 

-  processing another any other Report Status Code Library function, then 

-  PostCode() must return Value immediately.

-

-  @param  Value  The 32-bit value to write to the POST card.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCode (

-  IN UINT32  Value

-  )

-{

-  DEBUG((EFI_D_INFO, "POST %08x\n", Value));

-  IoWrite8 (0x80, (UINT8)(Value));

-  return Value;

-}

-

-

-/**

-  Sends an 32-bit value to a POST and associated ASCII string.

-

-  Sends the 32-bit value specified by Value to a POST card, and returns Value.

-  If Description is not NULL, then the ASCII string specified by Description is 

-  also passed to the handler that displays the POST card value.  Some 

-  implementations of this library function may perform I/O operations directly 

-  to a POST card device.  Other implementations may send Value to ReportStatusCode(), 

-  and the status code reporting mechanism will eventually display the 32-bit 

-  value on the status reporting device.  

-

-  PostCodeWithDescription()must actively prevent recursion.  If 

-  PostCodeWithDescription() is called while processing another any other Report 

-  Status Code Library function, then PostCodeWithDescription() must return Value 

-  immediately.

-

-  @param  Value        The 32-bit value to write to the POST card.

-  @param  Description  Pointer to an ASCII string that is a description of the 

-                       POST code value.  This is an optional parameter that may 

-                       be NULL.

-

-  @return  Value

-

-**/

-UINT32

-EFIAPI

-PostCodeWithDescription (

-  IN UINT32       Value,

-  IN CONST CHAR8  *Description  OPTIONAL

-  )

-{

-  DEBUG((EFI_D_INFO, "POST %08x - %s\n", Value, Description));

-  IoWrite8 (0x80, (UINT8)(Value));

-  return Value;

-}

-

-

-/**

-  Returns TRUE if POST Codes are enabled.

-

-  This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED 

-  bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED bit of 

-                  PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeEnabled (

-  VOID

-  )

-{

-  return ((PcdGet8(PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_POST_CODE_ENABLED) != 0);

-}

-

-

-/**

-  Returns TRUE if POST code descriptions are enabled.

-

-  This function returns TRUE if the 

-  REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED bit of 

-  PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.

-

-  @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is set.

-  @retval  FALSE  The REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTIONS_ENABLED 

-                  bit of PcdReportStatusCodeProperyMask is clear.

-

-**/

-BOOLEAN

-EFIAPI

-ReportPostCodeDescriptionEnabled (

-  VOID

-  )

-{

-  return ((PcdGet8(PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_POST_CODE_DESCRIPTION_ENABLED) != 0);

-}

diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
index 2726c53..9cde383 100644
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
+++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
@@ -43,7 +43,7 @@ PublishSystemMemory (
   ASSERT (MemoryLength > 0);

   ASSERT (MemoryLength <= (MAX_ADDRESS - MemoryBegin + 1));

 

-  Status      = PeiCoreInstallPeiMemory (MemoryBegin, MemoryLength);

+  Status      = PeiServicesInstallPeiMemory (MemoryBegin, MemoryLength);

      

   return (RETURN_STATUS) Status;

 }

diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
index 2e85949..dd54b71 100644
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
+++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
@@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </MsaLibHeader>

   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_PRODUCED">ResourcePublicationLib</LibraryClass>

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

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

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

   </LibraryClassDefinitions>

   <SourceFiles>

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
new file mode 100644
index 0000000..ef16064
--- /dev/null
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
@@ -0,0 +1,376 @@
+/** @file

+  PEI Library.

+

+  Copyright (c) 2006, Intel Corporation<BR>

+  All rights reserved. This program and the accompanying materials                          

+  are licensed and made available under the terms and conditions of the BSD License         

+  which accompanies this distribution.  The full text of the license may be found at        

+  http://opensource.org/licenses/bsd-license.php                                            

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+  Module Name:  PeiServicesLib.c

+

+**/

+

+/**

+  This service enables a given PEIM to register an interface into the PEI Foundation. 

+

+  @param  PpiList A pointer to the list of interfaces that the caller shall install.

+

+  @retval  EFI_SUCCESS The interface was successfully installed.

+  @retval  EFI_INVALID_PARAMETER The PpiList pointer is NULL.

+  @retval  EFI_INVALID_PARAMETER Any of the PEI PPI descriptors in the list do not have

+  the EFI_PEI_PPI_DESCRIPTOR_PPI bit set in the Flags field.

+  @retval  EFI_OUT_OF_RESOURCES There is no additional space in the PPI database.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesInstallPpi (

+  IN EFI_PEI_PPI_DESCRIPTOR           *PpiList

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->InstallPpi (PeiServices, PpiList);

+}

+

+/**

+  This service enables PEIMs to replace an entry in the PPI database with an alternate entry.

+

+  @param  OldPpi Pointer to the old PEI PPI Descriptors.

+  @param  NewPpi Pointer to the new PEI PPI Descriptors.

+

+  @retval  EFI_SUCCESS The interface was successfully installed.

+  @retval  EFI_INVALID_PARAMETER The OldPpi or NewPpi is NULL.

+  @retval  EFI_INVALID_PARAMETER Any of the PEI PPI descriptors in the list do not have

+  the EFI_PEI_PPI_DESCRIPTOR_PPI bit set in the Flags field.

+  @retval  EFI_OUT_OF_RESOURCES There is no additional space in the PPI database.

+  @retval  EFI_NOT_FOUND The PPI for which the reinstallation was requested has not been installed.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesReinstallPpi (

+  IN EFI_PEI_PPI_DESCRIPTOR           *OldPpi,

+  IN EFI_PEI_PPI_DESCRIPTOR           *NewPpi

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->ReInstallPpi (PeiServices, OldPpi, NewPpi);

+}

+

+/**

+  This service enables PEIMs to discover a given instance of an interface.

+

+  @param  Guid A pointer to the GUID whose corresponding interface needs to be found.

+  @param  Instance The N-th instance of the interface that is required.

+  @param  PpiDescriptor A pointer to instance of the EFI_PEI_PPI_DESCRIPTOR.

+  @param  Ppi A pointer to the instance of the interface.

+

+  @retval  EFI_SUCCESS The interface was successfully returned.

+  @retval  EFI_NOT_FOUND The PPI descriptor is not found in the database.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesLocatePpi (

+  IN EFI_GUID                         *Guid,

+  IN UINTN                            Instance,

+  IN OUT EFI_PEI_PPI_DESCRIPTOR       **PpiDescriptor,

+  IN OUT VOID                         **Ppi

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->LocatePpi (PeiServices, Guid, Instance, PpiDescriptor, Ppi);

+}

+

+/**

+  This service enables PEIMs to register a given service to be invoked

+  when another service is installed or reinstalled.

+

+  @param  NotifyList A pointer to the list of notification interfaces that the caller shall install.

+

+  @retval  EFI_SUCCESS The interface was successfully installed.

+  @retval  EFI_INVALID_PARAMETER The NotifyList pointer is NULL.

+  @retval  EFI_INVALID_PARAMETER Any of the PEI notify descriptors in the list do not have

+  the EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES bit set in the Flags field.

+  @retval  EFI_OUT_OF_RESOURCES There is no additional space in the PPI database.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesNotifyPpi (

+  IN EFI_PEI_NOTIFY_DESCRIPTOR        *NotifyList

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->NotifyPpi (PeiServices, NotifyList);

+}

+

+/**

+  This service enables PEIMs to ascertain the present value of the boot mode.  

+

+  @param  BootMode A pointer to contain the value of the boot mode.

+

+  @retval  EFI_SUCCESS The boot mode was returned successfully.

+  @retval  EFI_INVALID_PARAMETER BootMode is NULL.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesGetBootMode (

+  IN OUT EFI_BOOT_MODE                *BootMode

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->GetBootMode (PeiServices, BootMode);

+}

+

+/**

+  This service enables PEIMs to update the boot mode variable.    

+

+  @param  BootMode The value of the boot mode to set.

+

+  @retval  EFI_SUCCESS The value was successfully updated

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesSetBootMode (

+  IN EFI_BOOT_MODE                    BootMode

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->SetBootMode (PeiServices, BootMode);

+}

+

+/**

+  This service enables a PEIM to ascertain the address of the list of HOBs in memory.

+

+  @param  HobList A pointer to the list of HOBs that the PEI Foundation will initialize.

+

+  @retval  EFI_SUCCESS The list was successfully returned.

+  @retval  EFI_NOT_AVAILABLE_YET The HOB list is not yet published.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesGetHobList (

+  IN OUT VOID                         **HobList

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->GetHobList (PeiServices, HobList);

+}

+

+/**

+  This service enables PEIMs to create various types of HOBs.

+

+  @param  Type The type of HOB to be installed.

+  @param  Length The length of the HOB to be added.

+  @param  Hob The address of a pointer that will contain the HOB header.

+

+  @retval  EFI_SUCCESS The HOB was successfully created.

+  @retval  EFI_OUT_OF_RESOURCES There is no additional space for HOB creation.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesCreateHob (

+  IN UINT16                           Type,

+  IN UINT16                           Length,

+  IN OUT VOID                         **Hob

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->CreateHob (PeiServices, Type, Length, Hob);

+}

+

+/**

+  This service enables PEIMs to discover additional firmware volumes.

+

+  @param  Instance This instance of the firmware volume to find.

+  The value 0 is the Boot Firmware Volume (BFV).

+  @param  FwVolHeader Pointer to the firmware volume header of the volume to return.

+

+  @retval  EFI_SUCCESS The volume was found.

+  @retval  EFI_NOT_FOUND The volume was not found.

+  @retval  EFI_INVALID_PARAMETER FwVolHeader is NULL.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesFfsFindNextVolume (

+  IN UINTN                            Instance,

+  IN OUT EFI_FIRMWARE_VOLUME_HEADER   **FwVolHeader

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->FfsFindNextVolume (PeiServices, Instance, FwVolHeader);

+}

+

+/**

+  This service enables PEIMs to discover additional firmware files.

+

+  @param  SearchType A filter to find files only of this type.

+  @param  FwVolHeader Pointer to the firmware volume header of the volume to search.

+  This parameter must point to a valid FFS volume.

+  @param  FileHeader Pointer to the current file from which to begin searching.

+

+  @retval  EFI_SUCCESS The file was found.

+  @retval  EFI_NOT_FOUND The file was not found.

+  @retval  EFI_NOT_FOUND The header checksum was not zero.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesFfsFindNextFile (

+  IN EFI_FV_FILETYPE                  SearchType,

+  IN EFI_FIRMWARE_VOLUME_HEADER       *FwVolHeader,

+  IN OUT EFI_FFS_FILE_HEADER          **FileHeader

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->FfsFindNextFile (PeiServices, SearchType, FwVolHeader, FileHeader);

+}

+

+/**

+  This service enables PEIMs to discover sections of a given type within a valid FFS file.

+

+  @param  SearchType The value of the section type to find.

+  @param  FfsFileHeader A pointer to the file header that contains the set of sections to be searched.

+  @param  SectionData A pointer to the discovered section, if successful.

+

+  @retval  EFI_SUCCESS The section was found.

+  @retval  EFI_NOT_FOUND The section was not found.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesFfsFindSectionData (

+  IN EFI_SECTION_TYPE                 SectionType,

+  IN EFI_FFS_FILE_HEADER              *FfsFileHeader,

+  IN OUT VOID                         **SectionData

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->FfsFindSectionData (PeiServices, SectionType, FfsFileHeader, SectionData);

+}

+

+/**

+  This service enables PEIMs to register the permanent memory configuration

+  that has been initialized with the PEI Foundation.

+

+  @param  MemoryBegin The value of a region of installed memory.

+  @param  MemoryLength The corresponding length of a region of installed memory.

+

+  @retval  EFI_SUCCESS The region was successfully installed in a HOB.

+  @retval  EFI_INVALID_PARAMETER MemoryBegin and MemoryLength are illegal for this system.

+  @retval  EFI_OUT_OF_RESOURCES There is no additional space for HOB creation.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesInstallPeiMemory (

+  IN EFI_PHYSICAL_ADDRESS             MemoryBegin,

+  IN UINT64                           MemoryLength

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->InstallPeiMemory (PeiServices, MemoryBegin, MemoryLength);

+}

+

+/**

+  This service enables PEIMs to allocate memory after the permanent memory has been installed by a PEIM.

+

+  @param  MemoryType Type of memory to allocate.

+  @param  Pages Number of pages to allocate.

+  @param  Memory Pointer of memory allocated.

+

+  @retval  EFI_SUCCESS The memory range was successfully allocated.

+  @retval  EFI_INVALID_PARAMETER Type is not equal to AllocateAnyPages.

+  @retval  EFI_NOT_AVAILABLE_YET Called with permanent memory not available.

+  @retval  EFI_OUT_OF_RESOURCES The pages could not be allocated.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesAllocatePages (

+  IN EFI_MEMORY_TYPE                  MemoryType,

+  IN UINTN                            Pages,

+  IN OUT EFI_PHYSICAL_ADDRESS         *Memory

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->AllocatePages (PeiServices, MemoryType, Pages, Memory);

+}

+

+/**

+  This service allocates memory from the Hand-Off Block (HOB) heap.

+

+  @param  Size The number of bytes to allocate from the pool.

+  @param  Buffer If the call succeeds, a pointer to a pointer to the allocated buffer;

+  undefined otherwise.

+

+  @retval  EFI_SUCCESS The allocation was successful

+  @retval  EFI_OUT_OF_RESOURCES There is not enough heap to allocate the requested size.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesAllocatePool (

+  IN UINTN                            Size,

+  OUT VOID                            **Buffer

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->AllocatePool (PeiServices, Size, Buffer);

+}

+

+/**

+  This service resets the entire platform, including all processors and devices, and reboots the system. 

+

+  @retval  EFI_NOT_AVAILABLE_YET The service has not been installed yet.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiServicesResetSystem (

+  VOID

+  )

+{

+  EFI_PEI_SERVICES  **PeiServices;

+  

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->PeiResetSystem (PeiServices);

+}

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.mbd b/MdePkg/Library/PeiServicesLib/PeiServicesLib.mbd
new file mode 100644
index 0000000..cecec2d
--- /dev/null
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.mbd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+Copyright (c) 2006, Intel Corporation

+All rights reserved. This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+-->

+<LibraryModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">

+  <MbdLibHeader>

+    <BaseName>PeiServicesLib</BaseName>

+    <Guid>a804239b-4155-446f-acc8-f0825d74908c</Guid>

+    <Version>0</Version>

+    <Description>FIX ME!</Description>

+    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>

+    <License>

+      All rights reserved. This program and the accompanying materials

+      are licensed and made available under the terms and conditions of the BSD License

+      which accompanies this distribution.  The full text of the license may be found at

+      http://opensource.org/licenses/bsd-license.php

+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+    </License>

+    <Created>2006-03-09 23:12</Created>

+    <Modified>2006-03-19 15:17</Modified>

+  </MbdLibHeader>

+</LibraryModuleBuildDescription>

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa b/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
new file mode 100644
index 0000000..b889029
--- /dev/null
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+Copyright (c) 2006, Intel Corporation

+All rights reserved. This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+-->

+<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">

+  <MsaLibHeader>

+    <BaseName>PeiServicesLib</BaseName>

+    <ModuleType>PEIM</ModuleType>

+    <ComponentType>LIBRARY</ComponentType>

+    <Guid>a804239b-4155-446f-acc8-f0825d74908c</Guid>

+    <Version>0</Version>

+    <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>

+    <Description>FIX ME!</Description>

+    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>

+    <License>

+      All rights reserved. This program and the accompanying materials

+      are licensed and made available under the terms and conditions of the BSD License

+      which accompanies this distribution.  The full text of the license may be found at

+      http://opensource.org/licenses/bsd-license.php

+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+    </License>

+    <Created>2006-03-09 23:12</Created>

+    <Updated>2006-03-19 15:17</Updated>

+    <Specification>0</Specification>

+  </MsaLibHeader>

+  <LibraryClassDefinitions>

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

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

+  </LibraryClassDefinitions>

+  <SourceFiles>

+    <Filename>PeiServicesLib.c</Filename>

+  </SourceFiles>

+  <Includes>

+    <PackageName>MdePkg</PackageName>

+  </Includes>

+</LibraryModuleSurfaceArea>

diff --git a/MdePkg/Library/PeiServicesLib/build.xml b/MdePkg/Library/PeiServicesLib/build.xml
new file mode 100644
index 0000000..3f5c9f6
--- /dev/null
+++ b/MdePkg/Library/PeiServicesLib/build.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 

+All rights reserved. This program and the accompanying materials 

+are licensed and made available under the terms and conditions of the BSD License 

+which accompanies this distribution.  The full text of the license may be found at  

+http://opensource.org/licenses/bsd-license.php 

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->

+<project basedir="." default="PeiServicesLib"><!--Apply external ANT tasks-->

+   <taskdef resource="GenBuild.tasks"/>

+   <taskdef resource="net/sf/antcontrib/antlib.xml"/>

+   <property environment="env"/>

+   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>

+   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->

+   <property name="MODULE_RELATIVE_PATH" value="Library/PeiServicesLib"/>

+   <property name="MODULE_DIR" value="${PACKAGE_DIR}/${MODULE_RELATIVE_PATH}"/>

+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}/Tools/Conf/Common.xml"/>

+   <target name="PeiServicesLib">

+      <GenBuild baseName="PeiServicesLib" mbdFilename="${MODULE_DIR}/PeiServicesLib.mbd" msaFilename="${MODULE_DIR}/PeiServicesLib.msa"/>

+   </target>

+   <target depends="PeiServicesLib_clean" name="clean"/>

+   <target depends="PeiServicesLib_cleanall" name="cleanall"/>

+   <target name="PeiServicesLib_clean">

+      <OutputDirSetup baseName="PeiServicesLib" mbdFilename="${MODULE_DIR}/PeiServicesLib.mbd" msaFilename="${MODULE_DIR}/PeiServicesLib.msa"/>

+      <if>

+         <available file="${DEST_DIR_OUTPUT}/PeiServicesLib_build.xml"/>

+         <then>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiServicesLib_build.xml" target="clean"/>

+         </then>

+      </if>

+      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>

+   </target>

+   <target name="PeiServicesLib_cleanall">

+      <OutputDirSetup baseName="PeiServicesLib" mbdFilename="${MODULE_DIR}/PeiServicesLib.mbd" msaFilename="${MODULE_DIR}/PeiServicesLib.msa"/>

+      <if>

+         <available file="${DEST_DIR_OUTPUT}/PeiServicesLib_build.xml"/>

+         <then>

+            <ant antfile="${DEST_DIR_OUTPUT}/PeiServicesLib_build.xml" target="cleanall"/>

+         </then>

+      </if>

+      <delete dir="${DEST_DIR_OUTPUT}"/>

+      <delete dir="${DEST_DIR_DEBUG}"/>

+      <delete>

+         <fileset dir="${BIN_DIR}" includes="**PeiServicesLib*"/>

+      </delete>

+   </target>

+</project>
\ No newline at end of file
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index b12e506..636fd0e 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -65,7 +65,7 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiSmbusLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" />

-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" />

+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />

       

@@ -138,7 +138,7 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" />

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiSmbusLib" />

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" />

-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" />

+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" />

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" />

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />

       

@@ -210,7 +210,7 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" />

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiSmbusLib" />

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" />

-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" />

+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" />

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" />

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />

       

@@ -283,7 +283,7 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" />

       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiSmbusLib" />

       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" />

-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" />

+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" />

       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" />

       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />

       

@@ -931,7 +931,7 @@
       </ModuleSA>        

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" >

       </ModuleSA>        

-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" >

+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" >

       </ModuleSA>        

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" >

       </ModuleSA>        

@@ -1520,7 +1520,7 @@
       </ModuleSA>        

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" >

       </ModuleSA>        

-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" >

+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" >

       </ModuleSA>        

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" >

       </ModuleSA>        

@@ -2109,7 +2109,7 @@
       </ModuleSA>        

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" >

       </ModuleSA>        

-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" >

+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" >

       </ModuleSA>        

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" >

       </ModuleSA>        

@@ -2698,7 +2698,7 @@
       </ModuleSA>        

       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" >

       </ModuleSA>        

-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" >

+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" >

       </ModuleSA>        

       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" >

       </ModuleSA>        

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 684662f..d3068a5 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -62,7 +62,7 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiSmbusLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" />

-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" />

+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" />

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />

 

@@ -709,7 +709,7 @@
       </ModuleSA>        

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" >

       </ModuleSA>        

-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" >

+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" >

       </ModuleSA>        

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" >

       </ModuleSA>        

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 6b43238..28e90ee 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -115,8 +115,8 @@
       <IncludeHeader>Include/Library/PeiCoreEntryPoint.h</IncludeHeader>

     </LibraryClassDeclaration>

     <LibraryClassDeclaration>

-      <LibraryClass>PeiCoreLib</LibraryClass>

-      <IncludeHeader>Include/Library/PeiCoreLib.h</IncludeHeader>

+      <LibraryClass>PeiServicesLib</LibraryClass>

+      <IncludeHeader>Include/Library/PeiServicesLib.h</IncludeHeader>

     </LibraryClassDeclaration>

     <LibraryClassDeclaration>

       <LibraryClass>PeimEntryPoint</LibraryClass>

@@ -302,7 +302,7 @@
       <Filename>Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa</Filename>

     </MsaFile>

     <MsaFile>

-      <Filename>Library/PeiCoreLib/PeiCoreLib.msa</Filename>

+      <Filename>Library/PeiServicesLib/PeiServicesLib.msa</Filename>

     </MsaFile>

     <MsaFile>

       <Filename>Library/PeiHobLib/PeiHobLib.msa</Filename>