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
This commit is contained in:
qhuang8
2006-06-08 03:36:57 +00:00
parent 54d37f3a61
commit 84a99d48f4
64 changed files with 620 additions and 632 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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

View File

@@ -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

View File

@@ -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;
}

View File

@@ -72,7 +72,7 @@ Returns:
//
// Check if the PPI is installed.
//
Status = PeiCoreLocatePpi(
Status = PeiServicesLocatePpi(
&PpiGuid, // GUID
0, // INSTANCE
NULL, // EFI_PEI_PPI_DESCRIPTOR

View File

@@ -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

View File

@@ -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,

View File

@@ -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,

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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,

View File

@@ -50,7 +50,7 @@ Returns:
EFI_STATUS Status;
EFI_PEI_RESET_PPI *ResetPpi;
Status = PeiCoreLocatePpi (
Status = PeiServicesLocatePpi (
&gEfiPeiResetPpiGuid,
0,
NULL,

View File

@@ -58,7 +58,7 @@ Returns:
--*/
{
if (OldCoreData == NULL) {
PeiCoreNotifyPpi (&mNotifyList);
PeiServicesNotifyPpi (&mNotifyList);
}
return;
}

View File

@@ -67,7 +67,7 @@ Returns:
//
//Locate StatusCode Ppi.
//
Status = PeiCoreLocatePpi (
Status = PeiServicesLocatePpi (
&gEfiPeiStatusCodePpiGuid,
0,
NULL,