Correct description for return status code of PEI service AllocatePages(), according...

[mirror_edk2.git] / MdeModulePkg / Core / Pei / PeiMain / PeiMain.c

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 9a9c3cf377b2ddc2ea82508d5c91b016b0e41324..c5fe851abeac7302fcdd32cd50d2ecef1c90712b 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -1,7 +1,7 @@
 /** @file\r
   Pei Core Main Entry Point\r
   \r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2010, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <PeiMain.h>\r
+#include "PeiMain.h"\r
 \r
-STATIC EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {\r
+EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiPeiMemoryDiscoveredPpiGuid,\r
   NULL\r
@@ -23,7 +23,7 @@ STATIC EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {
 ///\r
 /// Pei service instance\r
 ///\r
-STATIC EFI_PEI_SERVICES  gPs = {\r
+EFI_PEI_SERVICES  gPs = {\r
   {\r
     PEI_SERVICES_SIGNATURE,\r
     PEI_SERVICES_REVISION,\r
@@ -42,7 +42,7 @@ STATIC EFI_PEI_SERVICES  gPs = {
   PeiGetHobList,\r
   PeiCreateHob,\r
 \r
-  PeiFvFindNextVolume,\r
+  PeiFfsFindNextVolume,\r
   PeiFfsFindNextFile,\r
   PeiFfsFindSectionData,\r
 \r
@@ -55,8 +55,8 @@ STATIC EFI_PEI_SERVICES  gPs = {
   PeiReportStatusCode,\r
   PeiResetSystem,\r
 \r
-  NULL,\r
-  NULL,\r
+  &gPeiDefaultCpuIoPpi,\r
+  &gPeiDefaultPciCfg2Ppi,\r
 \r
   PeiFfsFindFileByName,\r
   PeiFfsGetFileInfo,\r
@@ -65,7 +65,6 @@ STATIC EFI_PEI_SERVICES  gPs = {
 };\r
 \r
 /**\r
-\r
   This routine is invoked by main entry of PeiMain module during transition\r
   from SEC to PEI. After switching stack in the PEI core, it will restart\r
   with the old core data.\r
@@ -83,8 +82,6 @@ STATIC EFI_PEI_SERVICES  gPs = {
                          core's data areas.\r
                          If NULL, it is first PeiCore entering.\r
 \r
-  @retval EFI_NOT_FOUND  Never reach\r
-\r
 **/\r
 VOID\r
 EFIAPI\r
@@ -151,12 +148,12 @@ PeiCore (
     CopyMem (&PrivateData.ServiceTableShadow, &gPs, sizeof (gPs));\r
   }\r
 \r
-  PrivateData.PS = &PrivateData.ServiceTableShadow;\r
+  PrivateData.Ps = &PrivateData.ServiceTableShadow;\r
 \r
   //\r
   // Initialize libraries that the PeiCore is linked against\r
   //\r
-  ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.PS);\r
+  ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.Ps);\r
 \r
   InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);\r
 \r
@@ -165,7 +162,7 @@ PeiCore (
   //\r
   // Save PeiServicePointer so that it can be retrieved anywhere.\r
   //\r
-  SetPeiServicesTablePointer((CONST EFI_PEI_SERVICES **) &PrivateData.PS);\r
+  SetPeiServicesTablePointer((CONST EFI_PEI_SERVICES **) &PrivateData.Ps);\r
   \r
   if (OldCoreData != NULL) {\r
 \r
@@ -187,7 +184,7 @@ PeiCore (
     //\r
     REPORT_STATUS_CODE (\r
       EFI_PROGRESS_CODE,\r
-      FixedPcdGet32 (PcdStatusCodeValuePeiCoreEntry)\r
+      (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT)\r
       );\r
       \r
     PERF_START (NULL, "SEC", NULL, 1);\r
@@ -208,7 +205,7 @@ PeiCore (
     }\r
   }\r
 \r
-  InitializeSecurityServices (&PrivateData.PS, OldCoreData);\r
+  InitializeSecurityServices (&PrivateData.Ps, OldCoreData);\r
 \r
   InitializeDispatcherData (&PrivateData, OldCoreData, SecCoreData);\r
 \r
@@ -247,7 +244,7 @@ PeiCore (
   DEBUG ((EFI_D_INFO, "DXE IPL Entry\n"));\r
   Status = TempPtr.DxeIpl->Entry (\r
                              TempPtr.DxeIpl,\r
-                             &PrivateData.PS,\r
+                             &PrivateData.Ps,\r
                              PrivateData.HobList\r
                              );\r
   //\r