//\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
#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
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
//\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
\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