summaryrefslogtreecommitdiff
path: root/MdeModulePkg/Core
diff options
context:
space:
mode:
authorjchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>2010-03-01 07:11:28 +0000
committerjchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>2010-03-01 07:11:28 +0000
commit77215d10c065729798a2cb4734d8707cdedc0872 (patch)
tree336a94f50c84497ac8159ea2012f961fdec32432 /MdeModulePkg/Core
parent42686f29905cc6cec3692a24410505fa32c4d487 (diff)
downloadedk2-platforms-77215d10c065729798a2cb4734d8707cdedc0872.tar.xz
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
Diffstat (limited to 'MdeModulePkg/Core')
-rw-r--r--MdeModulePkg/Core/DxeIplPeim/DxeIpl.h2
-rw-r--r--MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf2
-rw-r--r--MdeModulePkg/Core/DxeIplPeim/DxeLoad.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 8f3538e4d1..9c542ef2e8 100644
--- 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>
#include <Ppi/GuidedSectionExtraction.h>
#include <Ppi/LoadFile.h>
-#include <Ppi/S3Resume.h>
+#include <Ppi/S3Resume2.h>
#include <Ppi/RecoveryModule.h>
#include <Guid/MemoryTypeInformation.h>
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index c3dd5f6719..72bfe453a4 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -80,7 +80,7 @@
gEfiPeiDecompressPpiGuid ## SOMETIMES_PRODUCES
gEfiPeiReadOnlyVariable2PpiGuid ## SOMETIMES_CONSUMES
gEfiPeiLoadFilePpiGuid ## CONSUMES
- gEfiPeiS3ResumePpiGuid ## SOMETIMES_CONSUMES(Consumed on S3 boot path)
+ gEfiPeiS3Resume2PpiGuid ## SOMETIMES_CONSUMES(Consumed on S3 boot path)
gEfiPeiRecoveryModulePpiGuid ## SOMETIMES_CONSUMES(Consumed on recovery boot path)
[Guids]
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 4a0c9ddb67..1c967ab170 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -158,7 +158,7 @@ DxeLoadCore (
UINTN Instance;
UINT32 AuthenticationState;
UINTN DataSize;
- EFI_PEI_S3_RESUME_PPI *S3Resume;
+ EFI_PEI_S3_RESUME2_PPI *S3Resume;
EFI_PEI_RECOVERY_MODULE_PPI *PeiRecovery;
EFI_MEMORY_TYPE_INFORMATION MemoryData[EfiMaxMemoryType + 1];
@@ -169,14 +169,14 @@ DxeLoadCore (
if (BootMode == BOOT_ON_S3_RESUME) {
Status = PeiServicesLocatePpi (
- &gEfiPeiS3ResumePpiGuid,
+ &gEfiPeiS3Resume2PpiGuid,
0,
NULL,
(VOID **) &S3Resume
);
ASSERT_EFI_ERROR (Status);
- Status = S3Resume->S3RestoreConfig (PeiServices);
+ Status = S3Resume->S3RestoreConfig2 (S3Resume);
ASSERT_EFI_ERROR (Status);
} else if (BootMode == BOOT_IN_RECOVERY_MODE) {
Status = PeiServicesLocatePpi (