1) Add library classes of S3Lib and RecoveryLib in MdeModulePkg

[mirror_edk2.git] / MdeModulePkg / Core / DxeIplPeim / DxeLoad.c

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 089e3bff66be44538ec8b53f1ee443ac03f0dcb7..2042efae6dd697ee91c0585e0d0dc4f6fdd372b4 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -185,8 +185,6 @@ DxeLoadCore (
   EFI_PHYSICAL_ADDRESS                      DxeCoreEntryPoint;\r
   EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader;\r
   EFI_BOOT_MODE                             BootMode;\r
-  EFI_PEI_RECOVERY_MODULE_PPI               *PeiRecovery;\r
-  EFI_PEI_S3_RESUME_PPI                     *S3Resume;\r
   EFI_PEI_FV_HANDLE                         VolumeHandle;\r
   EFI_PEI_FILE_HANDLE                       FileHandle;\r
   UINTN                                     Instance;\r
@@ -198,27 +196,10 @@ DxeLoadCore (
   ASSERT_EFI_ERROR(Status);\r
 \r
   if (BootMode == BOOT_ON_S3_RESUME) {\r
-    Status = PeiServicesLocatePpi (\r
-               &gEfiPeiS3ResumePpiGuid,\r
-               0,\r
-               NULL,\r
-               (VOID **)&S3Resume\r
-               );\r
-    ASSERT_EFI_ERROR (Status);\r
-\r
-    Status = S3Resume->S3RestoreConfig (PeiServices);\r
+    Status = S3RestoreConfig();\r
     ASSERT_EFI_ERROR (Status);\r
   } else if (BootMode == BOOT_IN_RECOVERY_MODE) {\r
-\r
-    Status = PeiServicesLocatePpi (\r
-               &gEfiPeiRecoveryModulePpiGuid,\r
-               0,\r
-               NULL,\r
-               (VOID **)&PeiRecovery\r
-               );\r
-    ASSERT_EFI_ERROR (Status);\r
-\r
-    Status = PeiRecovery->LoadRecoveryCapsule (PeiServices, PeiRecovery);\r
+    Status = Recovery ();\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status));\r
       CpuDeadLoop ();\r