Someone lost a new line at the end of file, it causes GCC build error.

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

diff --git a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
index 014c571c05eaf208a228463f6ccc95e1868b28d2..c94331c010f6474da094c7e1b3329d0a23ab8619 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -113,7 +113,6 @@ Returns:
   }\r
 #endif\r
 \r
   }\r
 #endif\r
 \r

-\r

   //\r
   // For IPF in CAR mode the real memory access is uncached,in InstallPeiMemory()\r
   //  the 63-bit of address is set to 1.\r
   //\r
   // For IPF in CAR mode the real memory access is uncached,in InstallPeiMemory()\r
   //  the 63-bit of address is set to 1.\r


@@ -151,10 +150,10 @@ Returns:
     //\r
     // The following code dumps out interesting cache as RAM usage information\r
     // so we can keep tabs on how the cache as RAM is being utilized.  The\r
     //\r
     // The following code dumps out interesting cache as RAM usage information\r
     // so we can keep tabs on how the cache as RAM is being utilized.  The\r

-    // DEBUG_CODE macro is used to prevent this code from being compiled\r
+    // DEBUG_CODE_BEGIN macro is used to prevent this code from being compiled\r

     // on a debug build.\r
     //\r
     // on a debug build.\r
     //\r

-    DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r

       UINTN  *StackPointer;\r
       UINTN  StackValue;\r
 \r
       UINTN  *StackPointer;\r
       UINTN  StackValue;\r
 \r


@@ -174,13 +173,13 @@ Returns:
         ((UINTN) OldCoreData->HobList.HandoffInformationTable->EfiFreeMemoryBottom -\r
         (UINTN) OldCoreData->HobList.Raw)\r
         ));\r
         ((UINTN) OldCoreData->HobList.HandoffInformationTable->EfiFreeMemoryBottom -\r
         (UINTN) OldCoreData->HobList.Raw)\r
         ));\r

-    );\r
+    DEBUG_CODE_END ();\r

 \r
     //\r
     // Alert any listeners that there is permanent memory available\r
     //\r
     PERF_START (NULL,"DisMem", NULL, 0);\r
 \r
     //\r
     // Alert any listeners that there is permanent memory available\r
     //\r
     PERF_START (NULL,"DisMem", NULL, 0);\r

-    Status = PeiCoreInstallPpi (&mMemoryDiscoveredPpi);\r
+    Status = PeiServicesInstallPpi (&mMemoryDiscoveredPpi);\r

     PERF_END (NULL,"DisMem", NULL, 0);\r
 \r
   } else {\r
     PERF_END (NULL,"DisMem", NULL, 0);\r
 \r
   } else {\r


@@ -202,7 +201,7 @@ Returns:
     // If SEC provided any PPI services to PEI, install them.\r
     //\r
     if (PeiStartupDescriptor->DispatchTable != NULL) {\r
     // If SEC provided any PPI services to PEI, install them.\r
     //\r
     if (PeiStartupDescriptor->DispatchTable != NULL) {\r

-      Status = PeiCoreInstallPpi (PeiStartupDescriptor->DispatchTable);\r
+      Status = PeiServicesInstallPpi (PeiStartupDescriptor->DispatchTable);\r

       ASSERT_EFI_ERROR (Status);\r
     }\r
   }\r
       ASSERT_EFI_ERROR (Status);\r
     }\r
   }\r


@@ -221,7 +220,7 @@ Returns:
 \r
   PERF_END (NULL, "PostMem", NULL, 0);\r
 \r
 \r
   PERF_END (NULL, "PostMem", NULL, 0);\r
 \r

-  Status = PeiCoreLocatePpi (\r
+  Status = PeiServicesLocatePpi (\r

              &gEfiDxeIplPpiGuid,\r
              0,\r
              NULL,\r
              &gEfiDxeIplPpiGuid,\r
              0,\r
              NULL,\r