update DxeIpl to use EFI_S3_RESUME2_PPI instead of EFI_S3_RESUME_PPI

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

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 8f3538e4d11ebb91f42d6ed5db8d4f6cfe25b043..9c542ef2e8600c384b5f21ddad71eb1620ea837e 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Ppi/FirmwareVolumeInfo.h>\r
 #include <Ppi/GuidedSectionExtraction.h>\r
 #include <Ppi/LoadFile.h>\r
-#include <Ppi/S3Resume.h>\r
+#include <Ppi/S3Resume2.h>\r
 #include <Ppi/RecoveryModule.h>\r
 \r
 #include <Guid/MemoryTypeInformation.h>\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index c3dd5f6719d7d995c19e54d37529d634b93b5938..72bfe453a43ff72507db80f64087a6a97b11d621 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -80,7 +80,7 @@
   gEfiPeiDecompressPpiGuid          ## SOMETIMES_PRODUCES\r
   gEfiPeiReadOnlyVariable2PpiGuid   ## SOMETIMES_CONSUMES\r
   gEfiPeiLoadFilePpiGuid            ## CONSUMES\r
-  gEfiPeiS3ResumePpiGuid            ## SOMETIMES_CONSUMES(Consumed on S3 boot path)\r
+  gEfiPeiS3Resume2PpiGuid           ## SOMETIMES_CONSUMES(Consumed on S3 boot path)\r
   gEfiPeiRecoveryModulePpiGuid      ## SOMETIMES_CONSUMES(Consumed on recovery boot path)\r
 \r
 [Guids]\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 4a0c9ddb67cb1332375bd427b3fc61eee187c3c0..1c967ab17084c94c57a6a0f79bedfbfcad6ca2e7 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -158,7 +158,7 @@ DxeLoadCore (
   UINTN                                     Instance;\r
   UINT32                                    AuthenticationState;\r
   UINTN                                     DataSize;\r
-  EFI_PEI_S3_RESUME_PPI                     *S3Resume;\r
+  EFI_PEI_S3_RESUME2_PPI                    *S3Resume;\r
   EFI_PEI_RECOVERY_MODULE_PPI               *PeiRecovery;\r
   EFI_MEMORY_TYPE_INFORMATION               MemoryData[EfiMaxMemoryType + 1];\r
 \r
@@ -169,14 +169,14 @@ DxeLoadCore (
 \r
   if (BootMode == BOOT_ON_S3_RESUME) {\r
     Status = PeiServicesLocatePpi (\r
-               &gEfiPeiS3ResumePpiGuid,\r
+               &gEfiPeiS3Resume2PpiGuid,\r
                0,\r
                NULL,\r
                (VOID **) &S3Resume\r
                );\r
     ASSERT_EFI_ERROR (Status);\r
     \r
-    Status = S3Resume->S3RestoreConfig (PeiServices);\r
+    Status = S3Resume->S3RestoreConfig2 (S3Resume);\r
     ASSERT_EFI_ERROR (Status);\r
   } else if (BootMode == BOOT_IN_RECOVERY_MODE) {\r
     Status = PeiServicesLocatePpi (\r