Update DSC&FDF files according to update of status code PEIM.

[mirror_edk2.git] / Nt32Pkg / WinNtAutoScanPei / WinNtAutoScan.c

diff --git a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c
index 99b12b2f1787775cc2201e77af79c68cae714071..e55bc6f29bec2c07785c376c3ddb9343724edbfb 100644 (file)
--- a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c
+++ b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.c
@@ -1,4 +1,4 @@
-/*++\r
+/**@file\r
 \r
 Copyright (c) 2006, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
@@ -17,7 +17,7 @@ Abstract:
 \r
 Revision History\r
 \r
---*/\r
+**/\r
 \r
 //\r
 // The package level header files this module uses\r
@@ -27,7 +27,6 @@ Revision History
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r
-#include <Ppi/BaseMemoryTest.h>\r
 #include <Ppi/NtAutoscan.h>\r
 //\r
 // The Library classes this module consumes\r
@@ -35,12 +34,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
@@ -61,8 +61,6 @@ Returns:
   PEI_NT_AUTOSCAN_PPI         *PeiNtService;\r
   UINT64                      MemorySize;\r
   EFI_PHYSICAL_ADDRESS        MemoryBase;\r
-  PEI_BASE_MEMORY_TEST_PPI    *MemoryTestPpi;\r
-  EFI_PHYSICAL_ADDRESS        ErrorAddress;\r
   UINTN                       Index;\r
   EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;\r
 \r
@@ -72,25 +70,12 @@ Returns:
   //\r
   // Get the PEI NT Autoscan PPI\r
   //\r
-  Status = (**PeiServices).LocatePpi (\r
-                            PeiServices,\r
-                            &gPeiNtAutoScanPpiGuid, // GUID\r
-                            0,                      // INSTANCE\r
-                            &PpiDescriptor,         // EFI_PEI_PPI_DESCRIPTOR\r
-                            &PeiNtService           // PPI\r
-                            );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // Get the Memory Test PPI\r
-  //\r
-  Status = (**PeiServices).LocatePpi (\r
-                            PeiServices,\r
-                            &gPeiBaseMemoryTestPpiGuid,\r
-                            0,\r
-                            NULL,\r
-                            &MemoryTestPpi\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
   Index = 0;\r
@@ -109,22 +94,9 @@ Returns:
 \r
       if (Index == 0) {\r
         //\r
-        // For the first area register it as PEI tested memory\r
-        //\r
-        Status = MemoryTestPpi->BaseMemoryTest (\r
-                                  PeiServices,\r
-                                  MemoryTestPpi,\r
-                                  MemoryBase,\r
-                                  MemorySize,\r
-                                  Quick,\r
-                                  &ErrorAddress\r
-                                  );\r
-        ASSERT_EFI_ERROR (Status);\r
-\r
-        //\r
-        // Register the "tested" memory with the PEI Core\r
+        // Register the memory with the PEI Core\r
         //\r
-        Status = (**PeiServices).InstallPeiMemory (PeiServices, MemoryBase, MemorySize);\r
+        Status = PeiServicesInstallPeiMemory (MemoryBase, MemorySize);\r
         ASSERT_EFI_ERROR (Status);\r
 \r
         Attributes |= EFI_RESOURCE_ATTRIBUTE_TESTED;\r