tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 22:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

update DxeIpl to use EFI_S3_RESUME2_PPI instead of EFI_S3_RESUME_PPI

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10138 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jchen20 2010-03-01 07:11:28 +00:00
parent 42686f2990
commit 77215d10c0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
View File

@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Ppi/FirmwareVolumeInfo.h> #include <Ppi/FirmwareVolumeInfo.h>
#include <Ppi/GuidedSectionExtraction.h> #include <Ppi/GuidedSectionExtraction.h>
#include <Ppi/LoadFile.h> #include <Ppi/LoadFile.h>
#include <Ppi/S3Resume.h> #include <Ppi/S3Resume2.h>
#include <Ppi/RecoveryModule.h> #include <Ppi/RecoveryModule.h>
#include <Guid/MemoryTypeInformation.h> #include <Guid/MemoryTypeInformation.h>

2
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
View File

@ -80,7 +80,7 @@
gEfiPeiDecompressPpiGuid ## SOMETIMES_PRODUCES gEfiPeiDecompressPpiGuid ## SOMETIMES_PRODUCES
gEfiPeiReadOnlyVariable2PpiGuid ## SOMETIMES_CONSUMES gEfiPeiReadOnlyVariable2PpiGuid ## SOMETIMES_CONSUMES
gEfiPeiLoadFilePpiGuid ## 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) gEfiPeiRecoveryModulePpiGuid ## SOMETIMES_CONSUMES(Consumed on recovery boot path)
[Guids] [Guids]

6
MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
View File

@ -158,7 +158,7 @@ DxeLoadCore (
UINTN Instance; UINTN Instance;
UINT32 AuthenticationState; UINT32 AuthenticationState;
UINTN DataSize; UINTN DataSize;
EFI_PEI_S3_RESUME_PPI *S3Resume; EFI_PEI_S3_RESUME2_PPI *S3Resume;
EFI_PEI_RECOVERY_MODULE_PPI *PeiRecovery; EFI_PEI_RECOVERY_MODULE_PPI *PeiRecovery;
EFI_MEMORY_TYPE_INFORMATION MemoryData[EfiMaxMemoryType + 1]; EFI_MEMORY_TYPE_INFORMATION MemoryData[EfiMaxMemoryType + 1];
@ -169,14 +169,14 @@ DxeLoadCore (
if (BootMode == BOOT_ON_S3_RESUME) { if (BootMode == BOOT_ON_S3_RESUME) {
Status = PeiServicesLocatePpi ( Status = PeiServicesLocatePpi (
&gEfiPeiS3ResumePpiGuid, &gEfiPeiS3Resume2PpiGuid,
0, 0,
NULL, NULL,
(VOID **) &S3Resume (VOID **) &S3Resume
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
Status = S3Resume->S3RestoreConfig (PeiServices); Status = S3Resume->S3RestoreConfig2 (S3Resume);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
} else if (BootMode == BOOT_IN_RECOVERY_MODE) { } else if (BootMode == BOOT_IN_RECOVERY_MODE) {
Status = PeiServicesLocatePpi ( Status = PeiServicesLocatePpi (