From f0ba8fda369980905c1577c5e8492815050af802 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Thu, 27 Nov 2008 05:18:34 +0000 Subject: [PATCH] Update PEIM entry point to follow PEIM entry point. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6754 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/BootModePei/BootModePei.c | 14 +++++++------- .../Library/PeiNt32PeCoffLib/PeiNt32PeCoffLib.c | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Nt32Pkg/BootModePei/BootModePei.c b/Nt32Pkg/BootModePei/BootModePei.c index d68f1d94d8..97cc27c6b7 100644 --- a/Nt32Pkg/BootModePei/BootModePei.c +++ b/Nt32Pkg/BootModePei/BootModePei.c @@ -55,8 +55,8 @@ EFI_PEI_PPI_DESCRIPTOR mPpiListRecoveryBootMode = { EFI_STATUS EFIAPI InitializeBootMode ( - IN EFI_FFS_FILE_HEADER *FfsHeader, - IN EFI_PEI_SERVICES **PeiServices + IN EFI_PEI_FILE_HANDLE FileHandle, + IN CONST EFI_PEI_SERVICES **PeiServices ) /*++ @@ -66,14 +66,14 @@ Routine Description: Arguments: - PeiServices - General purpose services available to every PEIM. + FileHandle - Handle of the file being invoked. + PeiServices - Describes the list of possible PEI Services. Returns: Status - EFI_SUCCESS if the boot mode could be set --*/ -// TODO: FfsHeader - add argument and description to function comment { EFI_STATUS Status; UINTN BootMode; @@ -86,14 +86,14 @@ Returns: // BootMode = BOOT_WITH_FULL_CONFIGURATION; - Status = (**PeiServices).SetBootMode ((const EFI_PEI_SERVICES **)PeiServices, (UINT8) BootMode); + Status = (**PeiServices).SetBootMode (PeiServices, (UINT8) BootMode); ASSERT_EFI_ERROR (Status); - Status = (**PeiServices).InstallPpi ((const EFI_PEI_SERVICES **)PeiServices, &mPpiListBootMode); + Status = (**PeiServices).InstallPpi (PeiServices, &mPpiListBootMode); ASSERT_EFI_ERROR (Status); if (BootMode == BOOT_IN_RECOVERY_MODE) { - Status = (**PeiServices).InstallPpi ((const EFI_PEI_SERVICES **)PeiServices, &mPpiListRecoveryBootMode); + Status = (**PeiServices).InstallPpi (PeiServices, &mPpiListRecoveryBootMode); ASSERT_EFI_ERROR (Status); } diff --git a/Nt32Pkg/Library/PeiNt32PeCoffLib/PeiNt32PeCoffLib.c b/Nt32Pkg/Library/PeiNt32PeCoffLib/PeiNt32PeCoffLib.c index 80796020f2..997585cd46 100644 --- a/Nt32Pkg/Library/PeiNt32PeCoffLib/PeiNt32PeCoffLib.c +++ b/Nt32Pkg/Library/PeiNt32PeCoffLib/PeiNt32PeCoffLib.c @@ -36,8 +36,8 @@ EFI_PEI_PE_COFF_LOADER_PROTOCOL *mPeiEfiPeiPeCoffLoader; The constructor must be called after PeCofferLoader guid structure is installed. It will ASSERT() if PeCofferLoader guid structure is not installed. - @param FfsHeader Pointer to FFS header the loaded driver. - @param PeiServices Pointer to the PEI services. + @param FileHandle Handle of the file being invoked. + @param PeiServices Describes the list of possible PEI Services. @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS. @@ -45,8 +45,8 @@ EFI_PEI_PE_COFF_LOADER_PROTOCOL *mPeiEfiPeiPeCoffLoader; EFI_STATUS EFIAPI PeiNt32PeCoffLibConstructor ( - IN EFI_FFS_FILE_HEADER *FfsHeader, - IN EFI_PEI_SERVICES **PeiServices + IN EFI_PEI_FILE_HANDLE FileHandle, + IN CONST EFI_PEI_SERVICES **PeiServices ) { EFI_STATUS Status; @@ -64,7 +64,7 @@ PeiNt32PeCoffLibConstructor ( // GuidHob is not ready, try to locate PeCoffLoader guid structure. // Status = (*PeiServices)->LocatePpi ( - (CONST EFI_PEI_SERVICES **)PeiServices, + PeiServices, &gEfiPeiPeCoffLoaderGuid, 0, NULL,