From 0308e20dc67c63e48211b140558ae3bd13a1cbf5 Mon Sep 17 00:00:00 2001 From: eric_tian Date: Tue, 28 Oct 2008 09:07:50 +0000 Subject: 1. build.py's changes : include XXXEntryPointLib.h into the corresponding autogen.c files of various modules to avoid the inconsistence between the interface definition of library class and the implementation of autogen.c 2. code base changes : modify some interface definitions to follow the lastest Mde Library Spec. 3. PeiCore changes : remove the return value of PeiCore() which is meaningless as PeiCore will never reach the end of procedure.replace it with VOID. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6271 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/Pei/PeiMain.h | 2 +- MdeModulePkg/Core/Pei/PeiMain/PeiMain.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'MdeModulePkg/Core') diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h index e4ef1a0b7c..c3102950c5 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.h +++ b/MdeModulePkg/Core/Pei/PeiMain.h @@ -230,7 +230,7 @@ typedef struct { @retval EFI_NOT_FOUND Never reach **/ -EFI_STATUS +VOID EFIAPI PeiCore ( IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData, diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c index 8055659129..32f875b688 100644 --- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c +++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c @@ -86,7 +86,7 @@ STATIC EFI_PEI_SERVICES gPs = { @retval EFI_NOT_FOUND Never reach **/ -EFI_STATUS +VOID EFIAPI PeiCore ( IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData, @@ -156,7 +156,7 @@ PeiCore ( // // Initialize libraries that the PeiCore is linked against // - ProcessLibraryConstructorList (NULL, &PrivateData.PS); + ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.PS); InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData); @@ -247,10 +247,11 @@ PeiCore ( &PrivateData.PS, PrivateData.HobList ); - + // + // Should never reach here. + // ASSERT_EFI_ERROR (Status); - - return EFI_NOT_FOUND; + CpuDeadLoop(); } -- cgit v1.2.3