From cc08c549443efef7fe4b573cabbc8cd8f3ed923b Mon Sep 17 00:00:00 2001 From: xli24 Date: Fri, 26 Jan 2007 01:49:18 +0000 Subject: [PATCH] Remove private data structure in PEI core entry point. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2318 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/Core/Pei/PeiMain.h | 32 ------------------------- EdkModulePkg/Core/Pei/PeiMain/PeiMain.c | 4 +++- EdkModulePkg/Include/EdkPeiCore.h | 8 +++++++ 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h index 8b019e12c2..91f90fea20 100644 --- a/EdkModulePkg/Core/Pei/PeiMain.h +++ b/EdkModulePkg/Core/Pei/PeiMain.h @@ -119,38 +119,6 @@ typedef union { VOID *Raw; } PEI_CORE_TEMP_POINTERS; - -// -// Main PEI entry -// - -EFI_STATUS -EFIAPI -PeiCore ( - IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor, - IN PEI_CORE_INSTANCE *OldCoreData - ) -/*++ - -Routine Description: - - Main entry point to Pei Core. After switching stack in the PEI core, - it will restart with the old core data. - -Arguments: - - PeiStartupDescriptor - Information and services provided by SEC phase. - OldCoreData - Pointer to old core data that is used to initialize the - core's data areas. - -Returns: - - This function never returns - ---*/ -; - - // // Dispatcher support functions // diff --git a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c index f8579600f6..5d439f74ac 100644 --- a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c +++ b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c @@ -76,7 +76,7 @@ EFI_STATUS EFIAPI PeiCore ( IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor, - IN PEI_CORE_INSTANCE *OldCoreData + IN VOID *Data ) /*++ @@ -104,8 +104,10 @@ Returns: PEI_CORE_TEMP_POINTERS TempPtr; PEI_CORE_DISPATCH_DATA *DispatchData; UINT64 mTick; + PEI_CORE_INSTANCE *OldCoreData; mTick = 0; + OldCoreData = (PEI_CORE_INSTANCE *) Data; if (PerformanceMeasurementEnabled()) { if (OldCoreData == NULL) { diff --git a/EdkModulePkg/Include/EdkPeiCore.h b/EdkModulePkg/Include/EdkPeiCore.h index 4e07efb01b..6cd6f664e8 100644 --- a/EdkModulePkg/Include/EdkPeiCore.h +++ b/EdkModulePkg/Include/EdkPeiCore.h @@ -39,4 +39,12 @@ Abstract: // #include +EFI_STATUS +EFIAPI +PeiCore ( + IN EFI_PEI_STARTUP_DESCRIPTOR *PeiStartupDescriptor, + IN VOID *Data + ) +; + #endif