EFI_PEI_PE_COFF_LOADER_PROTOCOL *PeiEfiPeiPeCoffLoader;\r
EFI_BOOT_MODE BootMode;\r
\r
- Status = PeiCoreGetBootMode (&BootMode);\r
+ Status = PeiServicesGetBootMode (&BootMode);\r
\r
ASSERT_EFI_ERROR (Status);\r
\r
- Status = PeiCoreLocatePpi (\r
+ Status = PeiServicesLocatePpi (\r
&gPeiInMemoryGuid,\r
0,\r
NULL,\r
//\r
// Install LoadFile PPI\r
//\r
- Status = PeiCoreInstallPpi (&mPpiLoadFile);\r
+ Status = PeiServicesInstallPpi (&mPpiLoadFile);\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
//\r
// Install DxeIpl PPI\r
//\r
- PeiCoreInstallPpi (&mPpiList);\r
+ PeiServicesInstallPpi (&mPpiList);\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
//\r
// if in S3 Resume, restore configure\r
//\r
- Status = PeiCoreGetBootMode (&BootMode);\r
+ Status = PeiServicesGetBootMode (&BootMode);\r
\r
if (!EFI_ERROR (Status) && (BootMode == BOOT_ON_S3_RESUME)) {\r
- Status = PeiCoreLocatePpi (\r
+ Status = PeiServicesLocatePpi (\r
&gEfiPeiS3ResumePpiGuid,\r
0,\r
NULL,\r
//\r
// See if we are in crisis recovery\r
//\r
- Status = PeiCoreGetBootMode (&BootMode);\r
+ Status = PeiServicesGetBootMode (&BootMode);\r
\r
if (!EFI_ERROR (Status) && (BootMode == BOOT_IN_RECOVERY_MODE)) {\r
\r
- Status = PeiCoreLocatePpi (\r
+ Status = PeiServicesLocatePpi (\r
&gEfiPeiRecoveryModulePpiGuid,\r
0,\r
NULL,\r
//\r
// PERF_END (PeiServices, L"DxeIpl", NULL, 0);\r
\r
- Status = PeiCoreInstallPpi (&mPpiSignal);\r
+ Status = PeiServicesInstallPpi (&mPpiSignal);\r
\r
ASSERT_EFI_ERROR (Status);\r
\r
Hob.Raw = GetHobList ();\r
while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_FV, Hob.Raw)) != NULL) {\r
FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) (Hob.FirmwareVolume->BaseAddress);\r
- Status = PeiCoreFfsFindNextFile (\r
+ Status = PeiServicesFfsFindNextFile (\r
Type,\r
FwVolHeader,\r
&FfsFileHeader\r
);\r
if (!EFI_ERROR (Status)) {\r
- CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));\r
Status = PeiProcessFile (\r
SectionType,\r
- FfsFileHeader,\r
+ &FfsFileHeader,\r
Pe32Data\r
);\r
+ CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));\r
return Status;\r
}\r
Hob.Raw = GET_NEXT_HOB (Hob);\r
//\r
// Install PeiInMemory to indicate the Dxeipl is shadowed\r
//\r
- Status = PeiCoreInstallPpi (&mPpiPeiInMemory);\r
+ Status = PeiServicesInstallPpi (&mPpiPeiInMemory);\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
//\r
Status = PeiProcessFile (\r
EFI_SECTION_PE32,\r
- FfsHeader,\r
+ &FfsHeader,\r
&Pe32Data\r
);\r
\r
\r
EFI_STATUS\r
PeiProcessFile (\r
- IN UINT16 SectionType,\r
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
- OUT VOID **Pe32Data\r
+ IN UINT16 SectionType,\r
+ IN OUT EFI_FFS_FILE_HEADER **RealFfsFileHeader,\r
+ OUT VOID **Pe32Data\r
)\r
/*++\r
\r
EFI_GUID TempGuid;\r
EFI_FIRMWARE_VOLUME_HEADER *FvHeader;\r
EFI_COMPRESSION_SECTION *CompressionSection;\r
+ EFI_FFS_FILE_HEADER *FfsFileHeader;\r
+ \r
+ FfsFileHeader = *RealFfsFileHeader;\r
\r
- Status = PeiCoreFfsFindSectionData (\r
+ Status = PeiServicesFfsFindSectionData (\r
EFI_SECTION_COMPRESSION,\r
FfsFileHeader,\r
&SectionData\r
//\r
AuthenticationStatus = 0;\r
\r
- Status = PeiCoreLocatePpi (\r
+ Status = PeiServicesLocatePpi (\r
&gEfiPeiSectionExtractionPpiGuid,\r
0,\r
NULL,\r
// If not ask the Security PPI, if exists, for disposition\r
//\r
//\r
- Status = PeiCoreLocatePpi (\r
+ Status = PeiServicesLocatePpi (\r
&gEfiPeiSecurityPpiGuid,\r
0,\r
NULL,\r
if (FvHeader->Signature == EFI_FVH_SIGNATURE) {\r
FfsFileHeader = NULL;\r
BuildFvHob ((EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader, FvHeader->FvLength);\r
- Status = PeiCoreFfsFindNextFile (\r
+ Status = PeiServicesFfsFindNextFile (\r
EFI_FV_FILETYPE_DXE_CORE,\r
FvHeader,\r
&FfsFileHeader\r
return EFI_NOT_FOUND;\r
}\r
\r
- return PeiProcessFile (SectionType, FfsFileHeader, Pe32Data);\r
+ //\r
+ // Reture the FfsHeader that contain Pe32Data.\r
+ //\r
+ *RealFfsFileHeader = FfsFileHeader;\r
+ return PeiProcessFile (SectionType, RealFfsFileHeader, Pe32Data);\r
}\r
}\r
//\r
//\r
} else {\r
\r
- Status = PeiCoreFfsFindSectionData (\r
+ Status = PeiServicesFfsFindSectionData (\r
EFI_SECTION_PE32,\r
FfsFileHeader,\r
&SectionData\r
);\r
\r
if (EFI_ERROR (Status)) {\r
- Status = PeiCoreFfsFindSectionData (\r
+ Status = PeiServicesFfsFindSectionData (\r
EFI_SECTION_TE,\r
FfsFileHeader,\r
&SectionData\r