Update input of disasmembler to support IfThen construct. Add prototype dos script...

[mirror_edk2.git] / UnixPkg / UnixAutoScanPei / UnixAutoScan.c

diff --git a/UnixPkg/UnixAutoScanPei/UnixAutoScan.c b/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
index 34f50986ad09b307f0fe0174e267939b5147db07..56fa31edc8992bf5dfeb3bd75beec654c0ac9ec4 100644 (file)
--- a/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
+++ b/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
@@ -21,7 +21,6 @@ Revision History
 \r
 #include "PiPei.h"\r
 #include <Ppi/UnixAutoScan.h>\r
-#include <Ppi/BaseMemoryTest.h>\r
 #include <Ppi/MemoryDiscovered.h>\r
 \r
 #include <Library/DebugLib.h>\r
@@ -35,8 +34,8 @@ Revision History
 EFI_STATUS\r
 EFIAPI\r
 PeimInitializeUnixAutoScan (\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
@@ -57,8 +56,6 @@ Returns:
   PEI_UNIX_AUTOSCAN_PPI      *PeiUnixService;\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
@@ -68,25 +65,12 @@ Returns:
   //\r
   // Get the PEI UNIX Autoscan PPI\r
   //\r
-  Status = (**PeiServices).LocatePpi (\r
-                            PeiServices,\r
-                            &gPeiUnixAutoScanPpiGuid, // GUID\r
-                            0,                      // INSTANCE\r
-                            &PpiDescriptor,         // EFI_PEI_PPI_DESCRIPTOR\r
-                            (VOID **)&PeiUnixService           // 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
-                            (VOID **)&MemoryTestPpi\r
-                            );\r
+  Status = PeiServicesLocatePpi (\r
+             &gPeiUnixAutoScanPpiGuid, // GUID\r
+             0,                      // INSTANCE\r
+             &PpiDescriptor,         // EFI_PEI_PPI_DESCRIPTOR\r
+             (VOID **)&PeiUnixService           // PPI\r
+             );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Index = 0;\r
@@ -105,22 +89,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