Fix entry point prototype error.

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

diff --git a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c
index 2c2b3025b0e7e377c70ad8458ffbf5d2dc9de58e..9591c39fcfb6843b46dca8a31064d13ab1e8fd27 100644 (file)
--- a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c
+++ b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c
@@ -35,12 +35,13 @@ Revision History
 #include <Library/DebugLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
 #include <Library/HobLib.h>\r
+#include <Library/PeiServicesLib.h>\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 PeimInitializeWinNtAutoScan (\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE       FileHandle,\r
+  IN CONST EFI_PEI_SERVICES          **PeiServices\r
   )\r
 /*++\r
 \r
@@ -72,25 +73,23 @@ Returns:
   //\r
   // Get the PEI NT Autoscan PPI\r
   //\r
-  Status = (**PeiServices).LocatePpi (\r
-                            (const EFI_PEI_SERVICES **)PeiServices,\r
-                            &gPeiNtAutoScanPpiGuid, // GUID\r
-                            0,                      // INSTANCE\r
-                            &PpiDescriptor,         // EFI_PEI_PPI_DESCRIPTOR\r
-                            (VOID**)&PeiNtService           // PPI\r
-                            );\r
+  Status = PeiServicesLocatePpi (\r
+             &gPeiNtAutoScanPpiGuid, // GUID\r
+             0,                      // INSTANCE\r
+             &PpiDescriptor,         // EFI_PEI_PPI_DESCRIPTOR\r
+             (VOID**)&PeiNtService           // PPI\r
+             );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   // Get the Memory Test PPI\r
   //\r
-  Status = (**PeiServices).LocatePpi (\r
-                            (const EFI_PEI_SERVICES **)PeiServices,\r
-                            &gPeiBaseMemoryTestPpiGuid,\r
-                            0,\r
-                            NULL,\r
-                            (VOID**)&MemoryTestPpi\r
-                            );\r
+  Status = PeiServicesLocatePpi (\r
+             &gPeiBaseMemoryTestPpiGuid,\r
+             0,\r
+             NULL,\r
+            (VOID**)&MemoryTestPpi\r
+            );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Index = 0;\r
@@ -112,7 +111,7 @@ Returns:
         // For the first area register it as PEI tested memory\r
         //\r
         Status = MemoryTestPpi->BaseMemoryTest (\r
-                                  PeiServices,\r
+                                  (EFI_PEI_SERVICES **) PeiServices,\r
                                   MemoryTestPpi,\r
                                   MemoryBase,\r
                                   MemorySize,\r
@@ -124,7 +123,7 @@ Returns:
         //\r
         // Register the "tested" memory with the PEI Core\r
         //\r
-        Status = (**PeiServices).InstallPeiMemory ((const EFI_PEI_SERVICES **)PeiServices, MemoryBase, MemorySize);\r
+        Status = PeiServicesInstallPeiMemory (MemoryBase, MemorySize);\r
         ASSERT_EFI_ERROR (Status);\r
 \r
         Attributes |= EFI_RESOURCE_ATTRIBUTE_TESTED;\r

diff --git a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
index 078293142db103b18c69eeb4158c44b21efe2173..c04d062f72c2415eb4fe96a2ebfbdb8f1c9b983b 100644 (file)
--- a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
+++ b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
@@ -44,7 +44,7 @@
   HobLib\r
   PeimEntryPoint\r
   DebugLib\r
-\r
+  PeiServicesLib\r
 \r
 [Ppis]\r
   gPeiBaseMemoryTestPpiGuid                     # PPI ALWAYS_CONSUMED\r