Merge the PI enabling works from the branch
First round of PI enabling work: 1) PiPeiCis changes (CONST, EFI_PEI_FILE_HANDLE.. etc) 2) Make use of FirmwareVolume 2 protocol. 3) Verified for Nt32Pkg and real platform for S3. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3773 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -20,6 +20,7 @@ Abstract:
|
||||
--*/
|
||||
|
||||
#include <BaseMemoryTest.h>
|
||||
#include <Library/PeiServicesLib.h>
|
||||
|
||||
static PEI_BASE_MEMORY_TEST_PPI mPeiBaseMemoryTestPpi = { BaseMemoryTest };
|
||||
|
||||
@@ -51,11 +52,9 @@ Returns:
|
||||
|
||||
--*/
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
|
||||
Status = (**PeiServices).InstallPpi (PeiServices, &PpiListPeiBaseMemoryTest);
|
||||
|
||||
return Status;
|
||||
return PeiServicesInstallPpi (&PpiListPeiBaseMemoryTest);
|
||||
|
||||
}
|
||||
|
||||
EFI_STATUS
|
||||
|
@@ -39,6 +39,7 @@
|
||||
ReportStatusCodeLib
|
||||
PeimEntryPoint
|
||||
DebugLib
|
||||
PeiServicesLib
|
||||
|
||||
[Ppis]
|
||||
gPeiBaseMemoryTestPpiGuid # PPI ALWAYS_PRODUCED
|
||||
|
@@ -364,7 +364,7 @@ PeimInitializePciCfg (
|
||||
ASSERT ((**PeiServices).Hdr.Revision >= PEI_SERVICES_REVISION);
|
||||
|
||||
(**PeiServices).PciCfg = &gPciCfg2Ppi;
|
||||
Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);
|
||||
Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);
|
||||
|
||||
return Status;
|
||||
}
|
||||
|
@@ -64,7 +64,7 @@ Returns:
|
||||
//
|
||||
// Publish the variable capability to other modules
|
||||
//
|
||||
return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable);
|
||||
return (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &mPpiListVariable);
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user