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

diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h
index 8b019e12c2e2ab4e591a801c731df375f9d7f1fb..91f90fea2024e3b1eb31dbe83f8cb2446bc34395 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain.h
+++ b/EdkModulePkg/Core/Pei/PeiMain.h
@@ -119,38 +119,6 @@ typedef union {
   VOID                         *Raw;\r
 } PEI_CORE_TEMP_POINTERS;\r
 \r
   VOID                         *Raw;\r
 } PEI_CORE_TEMP_POINTERS;\r
 \r

-\r
-//\r
-// Main PEI entry\r
-//\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-PeiCore (\r
-  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r
-  IN PEI_CORE_INSTANCE           *OldCoreData\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Main entry point to Pei Core. After switching stack in the PEI core,\r
-  it will restart with the old core data.\r
-\r
-Arguments:\r
-\r
-  PeiStartupDescriptor - Information and services provided by SEC phase.\r
-  OldCoreData          - Pointer to old core data that is used to initialize the\r
-                         core's data areas.\r
-\r
-Returns:\r
-\r
-  This function never returns\r
-\r
---*/\r
-;\r
-\r
-\r

 //\r
 // Dispatcher support functions\r
 //\r
 //\r
 // Dispatcher support functions\r
 //\r

diff --git a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
index f8579600f61c4d213c2aaca536a94d4ce3339d7e..5d439f74ac950bd3c1b63933dac3fe857ba9e3ba 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -76,7 +76,7 @@ EFI_STATUS
 EFIAPI\r
 PeiCore (\r
   IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r
 EFIAPI\r
 PeiCore (\r
   IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r

-  IN PEI_CORE_INSTANCE           *OldCoreData\r
+  IN VOID                        *Data\r

   )\r
 /*++\r
 \r
   )\r
 /*++\r
 \r


@@ -104,8 +104,10 @@ Returns:
   PEI_CORE_TEMP_POINTERS                                TempPtr;\r
   PEI_CORE_DISPATCH_DATA                                *DispatchData;\r
   UINT64                                                mTick;\r
   PEI_CORE_TEMP_POINTERS                                TempPtr;\r
   PEI_CORE_DISPATCH_DATA                                *DispatchData;\r
   UINT64                                                mTick;\r

+  PEI_CORE_INSTANCE                                     *OldCoreData;\r

 \r
   mTick = 0;\r
 \r
   mTick = 0;\r

+  OldCoreData = (PEI_CORE_INSTANCE *) Data;\r

 \r
   if (PerformanceMeasurementEnabled()) {\r
     if (OldCoreData == NULL) {\r
 \r
   if (PerformanceMeasurementEnabled()) {\r
     if (OldCoreData == NULL) {\r

diff --git a/EdkModulePkg/Include/EdkPeiCore.h b/EdkModulePkg/Include/EdkPeiCore.h
index 4e07efb01b2cb9e1ba765c45badc388d26b9cd9e..6cd6f664e806e58d85a6160b6e188e7b951b5fef 100644 (file)
--- a/EdkModulePkg/Include/EdkPeiCore.h
+++ b/EdkModulePkg/Include/EdkPeiCore.h
@@ -39,4 +39,12 @@ Abstract:
 //\r
 #include <Guid/PeiPerformanceHob.h>\r
 \r
 //\r
 #include <Guid/PeiPerformanceHob.h>\r
 \r

+EFI_STATUS\r
+EFIAPI\r
+PeiCore (\r
+  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r
+  IN VOID                        *Data\r
+  )\r
+;\r
+\r

 #endif\r
 #endif\r