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

2 files changed, 18 insertions, 149 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