diff options
| author | Star Zeng <star.zeng@intel.com> | 2017-12-08 17:36:09 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2017-12-12 18:30:05 +0800 |
| commit | a85e7127bf40e24401f841814e0aac850038e4d2 (patch) | |
| tree | ca8a5a0be8dcc598c54a4c752a6cc6981567fde7 /UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | |
| parent | 8c721557687f7fd650920591bbeb598e9b6ff5ce (diff) | |
| download | edk2-a85e7127bf40e24401f841814e0aac850038e4d2.tar.gz edk2-a85e7127bf40e24401f841814e0aac850038e4d2.tar.bz2 edk2-a85e7127bf40e24401f841814e0aac850038e4d2.zip | |
MdeModulePkg: Rename SmmEndOfS3ResumeProtocolGuid to EndOfS3ResumeGuid
Rename SmmEndOfS3ResumeProtocolGuid to EndOfS3ResumeGuid as the GUID
may be used to install PPI in future to notify PEI phase code.
The references in UefiCpuPkg are also being updated.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c')
| -rw-r--r-- | UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c index e0c2d366cd..b597ac7dc5 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c @@ -23,6 +23,7 @@ #include <Guid/AcpiS3Context.h>
#include <Guid/BootScriptExecutorVariable.h>
#include <Guid/Performance.h>
+#include <Guid/EndOfS3Resume.h>
#include <Ppi/ReadOnlyVariable2.h>
#include <Ppi/S3Resume2.h>
#include <Ppi/SmmAccess.h>
@@ -30,8 +31,6 @@ #include <Ppi/EndOfPeiPhase.h>
#include <Ppi/SmmCommunication.h>
-#include <Protocol/SmmEndOfS3Resume.h>
-
#include <Library/DebugLib.h>
#include <Library/BaseLib.h>
#include <Library/TimerLib.h>
@@ -156,7 +155,7 @@ typedef union { //
// Define two type of smm communicate headers.
-// One for 32 bits PEI + 64 bits DXE, the other for 32 bits PEI + 32 bits DXE case.
+// One for 32 bits PEI + 64 bits DXE, the other for 32 bits PEI + 32 bits DXE case.
//
typedef struct {
EFI_GUID HeaderGuid;
@@ -471,7 +470,7 @@ SignalEndOfS3Resume ( // This buffer consumed in DXE phase, so base on DXE mode to prepare communicate buffer.
// Detect whether DXE is 64 bits mode.
// if (sizeof(UINTN) == sizeof(UINT64), PEI already 64 bits, assume DXE also 64 bits.
- // or (FeaturePcdGet (PcdDxeIplSwitchToLongMode)), Dxe will switch to 64 bits.
+ // or (FeaturePcdGet (PcdDxeIplSwitchToLongMode)), DXE will switch to 64 bits.
//
if ((sizeof(UINTN) == sizeof(UINT64)) || (FeaturePcdGet (PcdDxeIplSwitchToLongMode))) {
CommBuffer = &Header64;
@@ -482,7 +481,7 @@ SignalEndOfS3Resume ( Header32.MessageLength = 0;
CommSize = OFFSET_OF (SMM_COMMUNICATE_HEADER_32, Data);
}
- CopyGuid (CommBuffer, &gEdkiiSmmEndOfS3ResumeProtocolGuid);
+ CopyGuid (CommBuffer, &gEdkiiEndOfS3ResumeGuid);
Status = PeiServicesLocatePpi (
&gEfiPeiSmmCommunicationPpiGuid,
|