Code scrub for PeiCore module.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5558 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Pei/Dependency/Dependency.c b/MdeModulePkg/Core/Pei/Dependency/Dependency.c
index 9ce8b4a34d76be5cd9f01d60b95a1164e6247a0e..cbdbe35b1e5f562c3b5530ac1e9c2b2da211f09c 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dependency/Dependency.c
+++ b/MdeModulePkg/Core/Pei/Dependency/Dependency.c
@@ -229,7 +229,6 @@ PeimDispatchReadiness (
         // The grammar should never arrive here\r
         //\r
         return FALSE;\r
-        break;\r
     }\r
   }\r
 }\r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index f18e954f2ade2e9a5c69cc305442eb2ecfee2979..53bbecd5bc6d65428e452f6890153888f432098f 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -481,11 +481,19 @@ PeiDispatcher (
               // CAUTION: The new base is computed accounding to gap of new stack.\r
               //\r
               NewPermenentMemoryBase = Private->PhysicalMemoryBegin + StackGap;\r
+              \r
+              //\r
+              // Caculate stack offset and heap offset between CAR and new permement \r
+              // memory seperately.\r
+              //\r
               StackOffset            = (UINTN) NewPermenentMemoryBase - (UINTN) SecCoreData->StackBase;\r
               HeapOffset             = (INTN) ((UINTN) Private->PhysicalMemoryBegin + Private->StackSize - \\r
                                                (UINTN) SecCoreData->PeiTemporaryRamBase);\r
               DEBUG ((EFI_D_INFO, "Heap Offset = 0x%X Stack Offset = 0x%X\n", HeapOffset, StackOffset));\r
               \r
+              //\r
+              // Caculate new HandOffTable and PrivateData address in permenet memory's stack\r
+              //\r
               NewHandOffTable        = (EFI_HOB_HANDOFF_INFO_TABLE *)((UINTN)OldHandOffTable + HeapOffset);\r
               PrivateInMem           = (PEI_CORE_INSTANCE *)((UINTN) (VOID*) Private + StackOffset);\r
 \r
@@ -502,6 +510,12 @@ PeiDispatcher (
 \r
 \r
               if (!EFI_ERROR (Status)) {\r
+                //\r
+                // Temporary Ram support Ppi is provided by platform, it will copy \r
+                // temporary memory to permenent memory and do stack switching.\r
+                // After invoken temporary Ram support, following code's stack is in \r
+                // memory but not in CAR.\r
+                //\r
                 TemporaryRamSupportPpi->TemporaryRamMigration (\r
                                           (CONST EFI_PEI_SERVICES **) PeiServices,\r
                                           (EFI_PHYSICAL_ADDRESS)(UINTN) SecCoreData->TemporaryRamBase,\r
@@ -549,7 +563,7 @@ PeiDispatcher (
               //\r
               // We need convert the PPI desciptor's pointer\r
               //\r
-              ConvertPpiPointers ((CONST EFI_PEI_SERVICES **)PeiServices, \r
+              ConvertPpiPointers (PrivateInMem, \r
                                   OldCheckingBottom, \r
                                   OldCheckingTop, \r
                                   HeapOffset\r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index d5af3a0b1d0ca84ffe77df9c0ac906389064c901..689e0953bd342cb4a28a5a91f67e46c987cb408a 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -10,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-Module Name:\r
-\r
-  FwVol.c\r
-\r
-Abstract:\r
-\r
-  \r
-\r
 **/\r
 \r
 #include <PeiMain.h>\r
@@ -35,7 +27,6 @@ STATIC EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnFvInfoList = {
 /**\r
   Returns the highest bit set of the State field\r
 \r
-\r
   @param ErasePolarity   Erase Polarity  as defined by EFI_FVB2_ERASE_POLARITY\r
                          in the Attributes field.\r
   @param FfsHeader       Pointer to FFS File Header.\r
@@ -222,8 +213,8 @@ PeiFindFileEx (
     switch (FileState) {\r
 \r
     case EFI_FILE_HEADER_INVALID:\r
-      FileOffset += sizeof(EFI_FFS_FILE_HEADER);\r
-      FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + sizeof(EFI_FFS_FILE_HEADER));\r
+      FileOffset    += sizeof(EFI_FFS_FILE_HEADER);\r
+      FfsFileHeader =  (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + sizeof(EFI_FFS_FILE_HEADER));\r
       break;\r
         \r
     case EFI_FILE_DATA_VALID:\r
@@ -234,7 +225,7 @@ PeiFindFileEx (
         return EFI_NOT_FOUND;\r
       }\r
 \r
-      FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
+      FileLength       = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
       FileOccupiedSize = GET_OCCUPIED_SIZE(FileLength, 8);\r
 \r
       if (FileName != NULL) {\r
@@ -262,15 +253,15 @@ PeiFindFileEx (
         return EFI_SUCCESS;\r
       }\r
 \r
-      FileOffset += FileOccupiedSize; \r
-      FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
+      FileOffset    += FileOccupiedSize; \r
+      FfsFileHeader =  (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
       break;\r
     \r
     case EFI_FILE_DELETED:\r
-      FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
-      FileOccupiedSize = GET_OCCUPIED_SIZE(FileLength, 8);\r
-      FileOffset += FileOccupiedSize;\r
-      FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
+      FileLength       =  *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
+      FileOccupiedSize =  GET_OCCUPIED_SIZE(FileLength, 8);\r
+      FileOffset       += FileOccupiedSize;\r
+      FfsFileHeader    =  (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
       break;\r
 \r
     default:\r
@@ -284,15 +275,10 @@ PeiFindFileEx (
 }\r
 \r
 /**\r
-\r
   Initialize PeiCore Fv List.\r
 \r
-\r
   @param PrivateData     - Pointer to PEI_CORE_INSTANCE.\r
   @param SecCoreData     - Pointer to EFI_SEC_PEI_HAND_OFF.\r
-\r
-  @return NONE\r
-\r
 **/\r
 VOID \r
 PeiInitializeFv (\r

diff --git a/MdeModulePkg/Core/Pei/Hob/Hob.c b/MdeModulePkg/Core/Pei/Hob/Hob.c
index aa38228bec647c9312cb3433fda6d79b66f57e07..4eb4b9a8921a116f7e3b12ea8466a9ca70be1927 100644 (file)
--- a/MdeModulePkg/Core/Pei/Hob/Hob.c
+++ b/MdeModulePkg/Core/Pei/Hob/Hob.c
@@ -18,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   Gets the pointer to the HOB List.\r
 \r
-\r
   @param PeiServices                   The PEI core services table.\r
   @param HobList                       Pointer to the HOB List.\r
 \r
@@ -35,7 +34,6 @@ PeiGetHobList (
   )\r
 {\r
   PEI_CORE_INSTANCE *PrivateData;\r
-\r
   \r
   //\r
   // Only check this parameter in debug mode\r
@@ -51,7 +49,6 @@ PeiGetHobList (
 \r
   *HobList    = PrivateData->HobList.Raw;\r
 \r
-\r
   return EFI_SUCCESS;   \r
 }\r
 \r
@@ -59,10 +56,10 @@ PeiGetHobList (
 /**\r
   Add a new HOB to the HOB List.\r
 \r
-  @param PeiServices     - The PEI core services table.\r
-  @param Type            - Type of the new HOB.\r
-  @param Length          - Length of the new HOB to allocate.\r
-  @param Hob             - Pointer to the new HOB.\r
+  @param PeiServices      The PEI core services table.\r
+  @param Type             Type of the new HOB.\r
+  @param Length           Length of the new HOB to allocate.\r
+  @param Hob              Pointer to the new HOB.\r
 \r
   @return  EFI_SUCCESS           Success to create hob.\r
   @retval  EFI_INVALID_PARAMETER if Hob is NULL\r
@@ -118,11 +115,9 @@ PeiCreateHob (
   HobEnd++;\r
   HandOffHob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;\r
 \r
-\r
   return EFI_SUCCESS;   \r
 }\r
 \r
-\r
 /**\r
 \r
   Builds a Handoff Information Table HOB\r
@@ -144,15 +139,15 @@ PeiCoreBuildHobHandoffInfoTable (
   EFI_HOB_HANDOFF_INFO_TABLE   *Hob;\r
   EFI_HOB_GENERIC_HEADER       *HobEnd;\r
 \r
-  Hob    = (VOID *)(UINTN)MemoryBegin;\r
-  HobEnd = (EFI_HOB_GENERIC_HEADER*) (Hob+1);\r
-  Hob->Header.HobType   = EFI_HOB_TYPE_HANDOFF;\r
-  Hob->Header.HobLength = sizeof(EFI_HOB_HANDOFF_INFO_TABLE);\r
-  Hob->Header.Reserved  = 0;\r
+  Hob                      = (VOID *)(UINTN)MemoryBegin;\r
+  HobEnd                   = (EFI_HOB_GENERIC_HEADER*) (Hob+1);\r
+  Hob->Header.HobType      = EFI_HOB_TYPE_HANDOFF;\r
+  Hob->Header.HobLength    = sizeof(EFI_HOB_HANDOFF_INFO_TABLE);\r
+  Hob->Header.Reserved     = 0;\r
   \r
-  HobEnd->HobType     = EFI_HOB_TYPE_END_OF_HOB_LIST;\r
-  HobEnd->HobLength   = sizeof(EFI_HOB_GENERIC_HEADER);\r
-  HobEnd->Reserved    = 0;\r
+  HobEnd->HobType          = EFI_HOB_TYPE_END_OF_HOB_LIST;\r
+  HobEnd->HobLength        = sizeof(EFI_HOB_GENERIC_HEADER);\r
+  HobEnd->Reserved         = 0;\r
 \r
   Hob->Version             = EFI_HOB_HANDOFF_TABLE_VERSION;\r
   Hob->BootMode            = BootMode;\r
@@ -160,7 +155,7 @@ PeiCoreBuildHobHandoffInfoTable (
   Hob->EfiMemoryTop        = MemoryBegin + MemoryLength;\r
   Hob->EfiMemoryBottom     = MemoryBegin;\r
   Hob->EfiFreeMemoryTop    = MemoryBegin + MemoryLength;\r
-  Hob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) (HobEnd+1);\r
+  Hob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) (HobEnd + 1);\r
   Hob->EfiEndOfHobList     = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;\r
 \r
   return EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 58c5d81517ea30884c442c590b5c987781ee3161..de32b69bd2ce868a80a1797ad12dfb1796c3d89c 100644 (file)
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -37,6 +37,10 @@ InitializeMemoryServices (
   \r
   PrivateData->SwitchStackSignal      = FALSE;\r
 \r
+  //\r
+  // First entering PeiCore, following code will initialized some field\r
+  // in PeiCore's private data according to hand off data from sec core.\r
+  //\r
   if (OldCoreData == NULL) {\r
 \r
     PrivateData->PeiMemoryInstalled = FALSE;\r
@@ -159,8 +163,6 @@ PeiAllocatePages (
     FreeMemoryBottom  = &(Hob.HandoffInformationTable->EfiFreeMemoryBottom);\r
   }\r
 \r
-  \r
-\r
   //\r
   // Check to see if on 4k boundary\r
   //\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 7f7ac196d60b3caf0c159905586240e1219b8158..3cd642ea4f9635c30506caad28f41a39404d79e4 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -58,6 +58,9 @@ typedef union {
   VOID                        *Raw;\r
 } PEI_PPI_LIST_POINTERS;\r
 \r
+///\r
+/// PPI database structure\r
+///\r
 typedef struct {\r
   INTN                    PpiListEnd;\r
   INTN                    NotifyListEnd;\r
@@ -94,12 +97,12 @@ typedef struct {
   UINTN                               SectionIndex;\r
 } CACHE_SECTION_DATA;\r
 \r
-//\r
-// Pei Core private data structure instance\r
-//\r
 \r
 #define PEI_CORE_HANDLE_SIGNATURE  EFI_SIGNATURE_32('P','e','i','C')\r
 \r
+///\r
+/// Pei Core private data structure instance\r
+///\r
 typedef struct{\r
   UINTN                              Signature;\r
   EFI_PEI_SERVICES                   *PS;     // Point to ServiceTableShadow\r
@@ -134,10 +137,9 @@ typedef struct{
   CACHE_SECTION_DATA                 CacheSection;\r
 } PEI_CORE_INSTANCE;\r
 \r
-//\r
-// Pei Core Instance Data Macros\r
-//\r
-\r
+///\r
+/// Pei Core Instance Data Macros\r
+///\r
 #define PEI_CORE_INSTANCE_FROM_PS_THIS(a) \\r
   CR(a, PEI_CORE_INSTANCE, PS, PEI_CORE_HANDLE_SIGNATURE)\r
 \r
@@ -266,8 +268,6 @@ PeiDispatcher (
                          environment, such as the size and location of temporary RAM, the stack location and\r
                          the BFV location.\r
 \r
-  @return None.\r
-\r
 **/\r
 VOID\r
 InitializeDispatcherData (\r
@@ -305,7 +305,6 @@ DepexSatisfied (
 \r
   Initialize PPI services.\r
 \r
-\r
   @param PrivateData     Pointer to the PEI Core data.\r
   @param OldCoreData     Pointer to old PEI Core data. \r
                          NULL if being run in non-permament memory mode.\r
@@ -331,10 +330,10 @@ InitializePpiServices (
 **/\r
 VOID\r
 ConvertPpiPointers (\r
-  IN CONST EFI_PEI_SERVICES        **PeiServices,\r
-  IN UINTN                         OldCheckingBottom,\r
-  IN UINTN                         OldCheckingTop,\r
-  IN UINTN                         Fixup\r
+  IN PEI_CORE_INSTANCE       *PrivateData,\r
+  IN UINTN                   OldCheckingBottom,\r
+  IN UINTN                   OldCheckingTop,\r
+  IN INTN                    Fixup\r
   )\r
 ;\r
 \r
@@ -512,9 +511,8 @@ PeiSetBootMode (
 \r
   Initialize the security services.\r
 \r
-\r
-  @param PeiServices     - The PEI core services table.\r
-  @param OldCoreData     - Pointer to the old core data.\r
+  @param PeiServices     The PEI core services table.\r
+  @param OldCoreData     Pointer to the old core data.\r
                          NULL if being run in non-permament memory mode.\r
 \r
 **/\r
@@ -528,10 +526,10 @@ InitializeSecurityServices (
 /**\r
   Verify a Firmware volume\r
 \r
-  @param CurrentFvAddress - Pointer to the current Firmware Volume under consideration\r
+  @param CurrentFvAddress           Pointer to the current Firmware Volume under consideration\r
 \r
-  @retval EFI_SUCCESS             - Firmware Volume is legal\r
-  @retval EFI_SECURITY_VIOLATION  - Firmware Volume fails integrity test\r
+  @retval EFI_SUCCESS               Firmware Volume is legal\r
+  @retval EFI_SECURITY_VIOLATION    Firmware Volume fails integrity test\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 09e380d628340080ed5f6f0c63b6d8355e63e68f..af8e2acdacd7e11cdd0f1774e9b8526412472946 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -75,12 +75,12 @@
   gEfiPeiStatusCodePpiGuid                      # PPI SOMETIMES_CONSUMED\r
   gEfiPeiResetPpiGuid                           # PPI SOMETIMES_CONSUMED\r
   gEfiDxeIplPpiGuid                             # PPI ALWAYS_CONSUMED\r
-  gEfiPeiMemoryDiscoveredPpiGuid                # PPI ALWAYS_PRODUCED\r
-  gEfiPeiDecompressPpiGuid\r
-  gEfiPeiFirmwareVolumeInfoPpiGuid\r
-  gEfiPeiLoadFilePpiGuid\r
-  gEfiPeiSecurity2PpiGuid\r
-  gEfiTemporaryRamSupportPpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid                # PPI ALWAYS_CONSUMED\r
+  gEfiPeiDecompressPpiGuid                      # PPI ALWAYS_CONSUMED\r
+  gEfiPeiFirmwareVolumeInfoPpiGuid              # PPI ALWAYS_CONSUMED\r
+  gEfiPeiLoadFilePpiGuid                        # PPI ALWAYS_CONSUMED\r
+  gEfiPeiSecurity2PpiGuid                       # PPI ALWAYS_CONSUMED\r
+  gEfiTemporaryRamSupportPpiGuid                # PPI ALWAYS_CONSUMED\r
 \r
 [FixedPcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported\r
@@ -90,7 +90,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize\r
 \r
-\r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst\r
 \r

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 056165e689931cbc1469ba281d767615ba787c46..1524abf81c597ddad9337c3886c52db1fee57e21 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -20,10 +20,10 @@ STATIC EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {
   NULL\r
 };\r
 \r
-//\r
-// Pei Core Module Variables\r
-//\r
-//\r
+///\r
+/// Pei Core Module Variables\r
+///\r
+///\r
 STATIC EFI_PEI_SERVICES  gPs = {\r
   {\r
     PEI_SERVICES_SIGNATURE,\r
@@ -107,12 +107,20 @@ PeiCore (
   mTick = 0;\r
   OldCoreData = (PEI_CORE_INSTANCE *) Data;\r
 \r
+  //\r
+  // Record the system tick for first entering PeiCore.\r
+  // This tick is duration of executing platform seccore module.\r
+  // \r
   if (PerformanceMeasurementEnabled()) {\r
     if (OldCoreData == NULL) {\r
       mTick = GetPerformanceCounter ();\r
     }\r
   }\r
 \r
+  //\r
+  // PeiCore has been shadowed to memory for first entering, so\r
+  // just jump to PeiCore in memory here.\r
+  //\r
   if (OldCoreData != NULL) {\r
     ShadowedPeiCore = (PEI_CORE_ENTRY_POINT) (UINTN) OldCoreData->ShadowedPeiCore;\r
     if (ShadowedPeiCore != NULL) {\r
@@ -143,7 +151,6 @@ PeiCore (
 \r
   //\r
   // Initialize libraries that the PeiCore is linked against\r
-  // BUGBUG: The FileHandle is passed in as NULL.  Do we look it up or remove it from the lib init?\r
   //\r
   ProcessLibraryConstructorList (NULL, &PrivateData.PS);\r
 \r
@@ -213,6 +220,10 @@ PeiCore (
   //\r
   ASSERT(PrivateData.PeiMemoryInstalled == TRUE);\r
 \r
+  //\r
+  // Till now, PEI phase will be finished, get performace count\r
+  // for computing duration of PEI phase\r
+  //\r
   PERF_END (NULL, "PostMem", NULL, 0);\r
 \r
   Status = PeiServicesLocatePpi (\r
@@ -223,6 +234,9 @@ PeiCore (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  //\r
+  // Enter DxeIpl to load Dxe core.\r
+  //\r
   DEBUG ((EFI_D_INFO, "DXE IPL Entry\n"));\r
   Status = TempPtr.DxeIpl->Entry (\r
                              TempPtr.DxeIpl,\r

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index b7a9b1232148db8a40bfbfdf693ac239839bd057..28ddd99e3ce2db8824dc6231cf460e8387cb5d3c 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -18,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   Initialize PPI services.\r
 \r
-\r
   @param PrivateData     Pointer to the PEI Core data.\r
   @param OldCoreData     Pointer to old PEI Core data. \r
                          NULL if being run in non-permament memory mode.\r
@@ -50,18 +49,15 @@ InitializePpiServices (
 **/\r
 VOID\r
 ConvertPpiPointers (\r
-  IN CONST EFI_PEI_SERVICES        **PeiServices,\r
-  IN UINTN                         OldCheckingBottom,\r
-  IN UINTN                         OldCheckingTop,\r
-  IN UINTN                         Fixup\r
+  IN PEI_CORE_INSTANCE       *PrivateData,\r
+  IN UINTN                   OldCheckingBottom,\r
+  IN UINTN                   OldCheckingTop,\r
+  IN INTN                    Fixup\r
   )\r
 {\r
-  PEI_CORE_INSTANCE     *PrivateData;\r
   UINT8                 Index;\r
   PEI_PPI_LIST_POINTERS *PpiPointer;\r
 \r
-  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
-\r
   for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxPpiSupported); Index++) {\r
     if (Index < PrivateData->PpiData.PpiListEnd ||\r
         Index > PrivateData->PpiData.NotifyListEnd) {\r
@@ -342,7 +338,6 @@ PeiLocatePpi (
 \r
   Install a notification for a given PPI.\r
 \r
-\r
   @param PeiServices     - Pointer to the PEI Service Table\r
   @param NotifyList      - Pointer to list of Descriptors to notify upon.\r
 \r
@@ -451,7 +446,6 @@ PeiNotifyPpi (
     PrivateData->PpiData.NotifyListEnd\r
     );\r
 \r
-\r
   return  EFI_SUCCESS;\r
 }\r
 \r
@@ -578,7 +572,5 @@ DispatchNotify (
       }\r
     }\r
   }\r
-\r
-  return;\r
 }\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Security/Security.c b/MdeModulePkg/Core/Pei/Security/Security.c
index cf3344760208164c6420a5379e22556058d2e6be..b7cc10058ef642ea4306730809cd70cbe27deb92 100644 (file)
--- a/MdeModulePkg/Core/Pei/Security/Security.c
+++ b/MdeModulePkg/Core/Pei/Security/Security.c
@@ -40,12 +40,10 @@ STATIC EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {
 };\r
 \r
 /**\r
-\r
   Initialize the security services.\r
 \r
-\r
-  @param PeiServices     - The PEI core services table.\r
-  @param OldCoreData     - Pointer to the old core data.\r
+  @param PeiServices     The PEI core services table.\r
+  @param OldCoreData     Pointer to the old core data.\r
                          NULL if being run in non-permament memory mode.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
index 8e271d5e633848e736d879f23a81ecd3449e01af..d39311c7a43eb01151206d4b11d5cd2aae46ede1 100644 (file)
--- a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
+++ b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
@@ -43,10 +43,9 @@ PeiReportStatusCode (
 {\r
   EFI_STATUS                Status;\r
   EFI_PEI_PROGRESS_CODE_PPI *StatusCodePpi;\r
-  \r
 \r
   //\r
-  //Locate StatusCode Ppi.\r
+  // Locate StatusCode Ppi.\r
   //\r
   Status = PeiServicesLocatePpi (\r
              &gEfiPeiStatusCodePpiGuid,         \r