From: qhuang8 Date: Thu, 8 Jun 2006 03:36:57 +0000 (+0000) Subject: 1. Rename PeiCoreLib to PeiServicesLib and rename all the interfaces from PeiCoreXXX... X-Git-Tag: edk2-stable201903~25300 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=84a99d48f4d59e0cf59b6d55328c35225c00246d 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 --- 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. PeimEntryPoint PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib BaseCacheMaintenanceLib 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. BaseLib HobLib PerformanceLib - PeiCoreLib + PeiServicesLib ReportStatusCodeLib CacheMaintenanceLib EdkPeCoffLoaderLib 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. PeimEntryPoint PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib BaseCacheMaintenanceLib 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. BaseLib HobLib PerformanceLib - PeiCoreLib + PeiServicesLib ReportStatusCodeLib CacheMaintenanceLib EdkPeCoffLoaderLib 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. BaseLib BaseMemoryLib PeiServicesTablePointerLib - PeiCoreLib + PeiServicesLib PeiHobLib PeiReportStatusCodeLib BaseDebugLibReportStatusCode 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. BaseLib HobLib PerformanceLib - PeiCoreLib + PeiServicesLib ReportStatusCodeLib PeCoffGetEntryPointLib BaseMemoryLib 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. DebugLib HobLib BaseLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib BaseMemoryLib 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. BaseDebugLibReportStatusCode PeiServicesTablePointerLib PeiMemoryLib - PeiCoreLib + PeiServicesLib BaseLib 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. DebugLib PeimEntryPoint - PeiCoreLib + PeiServicesLib BaseMemoryTest.c 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. PeimEntryPoint BaseLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib BaseDebugLibReportStatusCode 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. PeimEntryPoint BaseLib HobLib - PeiCoreLib + PeiServicesLib PcdLib PeiServicesTablePointerLib MemoryAllocationLib 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. PeimEntryPoint BaseLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib BaseDebugLibReportStatusCode PeiMemoryLib 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. BaseDebugLibReportStatusCode BaseLib PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib PeimEntryPoint 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. DebugLib PeimEntryPoint - PeiCoreLib + PeiServicesLib HobLib diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa index 70d94bfd0e..c98b001d16 100644 --- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa +++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa @@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeCoffGetEntryPointLib - PeiCoreLib + PeiServicesLib PeCoffGetEntryPoint.c diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c index ed64158df7..e2cfd352b2 100644 --- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c +++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c @@ -54,7 +54,7 @@ Returns: UINT64 ImageSize; EFI_PHYSICAL_ADDRESS ImageEntryPoint; - Status = PeiCoreLocatePpi ( + Status = PeiServicesLocatePpi ( &gNtPeiLoadFilePpiGuid, 0, &PpiDescriptor, diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd index c6a123ddf9..49bc8eb9b8 100644 --- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd +++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.mbd @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeimEntryPoint PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib PeiReportStatusCodeLib diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa index 887eaf6fc5..05781af256 100644 --- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa +++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa @@ -37,7 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. BaseLib BaseMemoryLib HobLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.mbd b/EdkNt32Pkg/Pei/BootMode/BootMode.mbd index 5dd1a6fe20..12d95b1147 100644 --- a/EdkNt32Pkg/Pei/BootMode/BootMode.mbd +++ b/EdkNt32Pkg/Pei/BootMode/BootMode.mbd @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeimEntryPoint PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiReportStatusCodeLib BaseDebugLibReportStatusCode diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.msa b/EdkNt32Pkg/Pei/BootMode/BootMode.msa index bbc56e6ed8..4c94945bdd 100644 --- a/EdkNt32Pkg/Pei/BootMode/BootMode.msa +++ b/EdkNt32Pkg/Pei/BootMode/BootMode.msa @@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. DebugLib PeimEntryPoint BaseLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd index 3c61664ecc..8a65521b48 100644 --- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd +++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.mbd @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeimEntryPoint PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib PeiReportStatusCodeLib diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa index e70d4dd7db..b6cff5ec31 100644 --- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa +++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa @@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. DebugLib PeimEntryPoint HobLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.c b/EdkNt32Pkg/Pei/FlashMap/FlashMap.c index a8f7ba06ad..b459257285 100644 --- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.c +++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.c @@ -136,14 +136,14 @@ Returns: // // Install FlashMap PPI // - Status = PeiCoreInstallPpi (&mPpiListFlashMap); + Status = PeiServicesInstallPpi (&mPpiListFlashMap); ASSERT_EFI_ERROR (Status); // // Get the Fwh Information PPI // - Status = PeiCoreLocatePpi ( + Status = PeiServicesLocatePpi ( &gNtFwhPpiGuid, // GUID 0, // INSTANCE &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR @@ -249,7 +249,7 @@ GetAreaInfo ( EFI_PEI_HOB_POINTERS Hob; EFI_HOB_FLASH_MAP_ENTRY_TYPE *FlashMapEntry; - Status = PeiCoreGetHobList (&Hob.Raw); + Status = PeiServicesGetHobList (&Hob.Raw); while (!END_OF_HOB_LIST (Hob)) { if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION && CompareGuid (&Hob.Guid->Name, &gEfiFlashMapHobGuid)) { FlashMapEntry = (EFI_HOB_FLASH_MAP_ENTRY_TYPE *) Hob.Raw; diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd b/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd index 8c38ee9f59..351e86dffd 100644 --- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd +++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeimEntryPoint PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib PeiReportStatusCodeLib diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa index f347ca45db..672199920a 100644 --- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa +++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa @@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. DebugLib PeimEntryPoint HobLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib BaseMemoryLib diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd b/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd index f48b4c7f0e..950b450647 100644 --- a/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd +++ b/EdkNt32Pkg/Pei/MonoStatusCode/Nt32/MonoStatusCode.mbd @@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeiHobLib PeimEntryPoint EdkMemoryStatusCodeLib - PeiCoreLib + PeiServicesLib _ModuleEntryPoint diff --git a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c index 69261b952b..76399048fd 100644 --- a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c +++ b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.c @@ -621,7 +621,7 @@ PeimPcdEmulatorEntry ( // // Install PCD service PPI // - Status = PeiCoreInstallPpi (&mPpiPCD); + Status = PeiServicesInstallPpi (&mPpiPCD); ASSERT_EFI_ERROR (Status); return Status; diff --git a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd index 816cf6f869..1b3e35ad6d 100644 --- a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd +++ b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.mbd @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeimEntryPoint BaseLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib BaseDebugLibReportStatusCode diff --git a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa index ad11084476..feb0c07011 100644 --- a/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa +++ b/EdkNt32Pkg/Pei/PcdEmulator/PcdEmulator.msa @@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeimEntryPoint BaseLib HobLib - PeiCoreLib + PeiServicesLib PcdLib PeiServicesTablePointerLib MemoryAllocationLib diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd index ab862efcae..e931679d39 100644 --- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd +++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.mbd @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. PeimEntryPoint PeiMemoryLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib PeiHobLib PeiReportStatusCodeLib diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa index 2890c9d5a2..a227dd0133 100644 --- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa +++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa @@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. DebugLib PeimEntryPoint HobLib - PeiCoreLib + PeiServicesLib PeiServicesTablePointerLib diff --git a/MdePkg/Include/Library/PeiCoreLib.h b/MdePkg/Include/Library/PeiCoreLib.h deleted file mode 100644 index dfbe51c5da..0000000000 --- a/MdePkg/Include/Library/PeiCoreLib.h +++ /dev/null @@ -1,306 +0,0 @@ -/** @file - PEI Core Library implementation - - 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. - - Module Name: PeiCoreLib.h - -**/ - -#ifndef __PEI_CORE_LIB_H__ -#define __PEI_CORE_LIB_H__ - -/** - 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 -PeiCoreInstallPpi ( - IN EFI_PEI_PPI_DESCRIPTOR *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 -PeiCoreReinstallPpi ( - IN EFI_PEI_PPI_DESCRIPTOR *OldPpi, - IN EFI_PEI_PPI_DESCRIPTOR *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 -PeiCoreLocatePpi ( - IN EFI_GUID *Guid, - IN UINTN Instance, - IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor, - IN OUT VOID **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 -PeiCoreNotifyPpi ( - IN EFI_PEI_NOTIFY_DESCRIPTOR *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 -PeiCoreGetBootMode ( - IN OUT EFI_BOOT_MODE *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 -PeiCoreSetBootMode ( - IN EFI_BOOT_MODE 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 -PeiCoreGetHobList ( - IN OUT VOID **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 -PeiCoreCreateHob ( - IN UINT16 Type, - IN UINT16 Length, - IN OUT VOID **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 -PeiCoreFfsFindNextVolume ( - IN UINTN Instance, - IN OUT EFI_FIRMWARE_VOLUME_HEADER **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 -PeiCoreFfsFindNextFile ( - IN EFI_FV_FILETYPE SearchType, - IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader, - IN OUT EFI_FFS_FILE_HEADER **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 -PeiCoreFfsFindSectionData ( - IN EFI_SECTION_TYPE SectionType, - IN EFI_FFS_FILE_HEADER *FfsFileHeader, - IN OUT VOID **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 -PeiCoreInstallPeiMemory ( - IN EFI_PHYSICAL_ADDRESS MemoryBegin, - IN UINT64 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 -PeiCoreAllocatePages ( - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN Pages, - IN OUT EFI_PHYSICAL_ADDRESS *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 -PeiCoreAllocatePool ( - IN UINTN Size, - OUT VOID **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 -PeiCoreResetSystem ( - VOID - ) -; - -#endif diff --git a/MdePkg/Include/Library/PeiServicesLib.h b/MdePkg/Include/Library/PeiServicesLib.h new file mode 100644 index 0000000000..64bd253a72 --- /dev/null +++ b/MdePkg/Include/Library/PeiServicesLib.h @@ -0,0 +1,306 @@ +/** @file + PEI Core Library implementation + + 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. + + Module Name: PeiServicesLib.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. + + @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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +/** + 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 + ) +; + +#endif diff --git a/MdePkg/Include/Library/ReportStatusCodeLib.h b/MdePkg/Include/Library/ReportStatusCodeLib.h index b05bcc6593..9a3d4daabd 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 @@ -454,63 +452,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 @@ -568,45 +509,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. @@ -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 663d41627e..78c20ebe2b 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. ReportStatusCodeLib.c - PostCode.c MdePkg diff --git a/MdePkg/Library/BaseReportStatusCodeLibNull/PostCode.c b/MdePkg/Library/BaseReportStatusCodeLibNull/PostCode.c deleted file mode 100644 index 3d0ce7cb8f..0000000000 --- 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
- 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 214fdf3e28..219646133c 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. ReportStatusCodeLib.c - PostCode.c MdePkg diff --git a/MdePkg/Library/DxeReportStatusCodeLib/PostCode.c b/MdePkg/Library/DxeReportStatusCodeLib/PostCode.c deleted file mode 100644 index 3d0ce7cb8f..0000000000 --- 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
- 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 1f0c66acd0..ce9f79f82c 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 1d8fb79d24..a5b71d3f03 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. HobLib DebugLib - PeiCoreLib + PeiServicesLib BaseMemoryLib diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa index c37e4234df..d2d0f17967 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. ReportStatusCodeLib.c - PostCode.c MdePkg diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PostCode.c b/MdePkg/Library/PeiReportStatusCodeLib/PostCode.c deleted file mode 100644 index c5d32e77fb..0000000000 --- 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
- 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 2726c53fc5..9cde383a9b 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 2e85949b12..dd54b7197b 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. ResourcePublicationLib - PeiCoreLib + PeiServicesLib DebugLib diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c new file mode 100644 index 0000000000..ef1606403e --- /dev/null +++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c @@ -0,0 +1,376 @@ +/** @file + PEI Library. + + 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. + + 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 0000000000..cecec2d63a --- /dev/null +++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.mbd @@ -0,0 +1,30 @@ + + + + + PeiServicesLib + a804239b-4155-446f-acc8-f0825d74908c + 0 + FIX ME! + Copyright (c) 2004-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. + + 2006-03-09 23:12 + 2006-03-19 15:17 + + diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa b/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa new file mode 100644 index 0000000000..b889029e35 --- /dev/null +++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa @@ -0,0 +1,44 @@ + + + + + PeiServicesLib + PEIM + LIBRARY + a804239b-4155-446f-acc8-f0825d74908c + 0 + Component description file for the entry point to a EFIDXE Drivers + FIX ME! + Copyright (c) 2004-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. + + 2006-03-09 23:12 + 2006-03-19 15:17 + 0 + + + PeiServicesLib + PeiServicesTablePointerLib + + + PeiServicesLib.c + + + MdePkg + + diff --git a/MdePkg/Library/PeiServicesLib/build.xml b/MdePkg/Library/PeiServicesLib/build.xml new file mode 100644 index 0000000000..3f5c9f6a35 --- /dev/null +++ b/MdePkg/Library/PeiServicesLib/build.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd index b12e506c8d..636fd0e429 100644 --- a/MdePkg/MdePkg-All-Archs.fpd +++ b/MdePkg/MdePkg-All-Archs.fpd @@ -65,7 +65,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -931,7 +931,7 @@ - + @@ -1520,7 +1520,7 @@ - + @@ -2109,7 +2109,7 @@ - + @@ -2698,7 +2698,7 @@ - + diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd index 684662f72a..d3068a5817 100644 --- a/MdePkg/MdePkg.fpd +++ b/MdePkg/MdePkg.fpd @@ -62,7 +62,7 @@ - + @@ -709,7 +709,7 @@ - + diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd index 6b432384a1..28e90eebb0 100644 --- a/MdePkg/MdePkg.spd +++ b/MdePkg/MdePkg.spd @@ -115,8 +115,8 @@ Include/Library/PeiCoreEntryPoint.h - PeiCoreLib - Include/Library/PeiCoreLib.h + PeiServicesLib + Include/Library/PeiServicesLib.h PeimEntryPoint @@ -302,7 +302,7 @@ Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa - Library/PeiCoreLib/PeiCoreLib.msa + Library/PeiServicesLib/PeiServicesLib.msa Library/PeiHobLib/PeiHobLib.msa