MdeModulePkg: Rename SmmEndOfS3ResumeProtocolGuid to EndOfS3ResumeGuid

[mirror_edk2.git] / UefiCpuPkg / Universal / Acpi / S3Resume2Pei / S3Resume.c

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index e0c2d366cd0de86918bc0e52d935656a7c39d273..b597ac7dc5ff2a52e5e933e0a76a9a7b4b493970 100644 (file)
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -23,6 +23,7 @@
 #include <Guid/AcpiS3Context.h>\r
 #include <Guid/BootScriptExecutorVariable.h>\r
 #include <Guid/Performance.h>\r
+#include <Guid/EndOfS3Resume.h>\r
 #include <Ppi/ReadOnlyVariable2.h>\r
 #include <Ppi/S3Resume2.h>\r
 #include <Ppi/SmmAccess.h>\r
@@ -30,8 +31,6 @@
 #include <Ppi/EndOfPeiPhase.h>\r
 #include <Ppi/SmmCommunication.h>\r
 \r
-#include <Protocol/SmmEndOfS3Resume.h>\r
-\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/TimerLib.h>\r
@@ -156,7 +155,7 @@ typedef union {
 \r
 //\r
 // Define two type of smm communicate headers.\r
-// One for 32 bits  PEI + 64 bits DXE, the other for 32 bits PEI + 32 bits DXE case.\r
+// One for 32 bits PEI + 64 bits DXE, the other for 32 bits PEI + 32 bits DXE case.\r
 //\r
 typedef struct {\r
   EFI_GUID  HeaderGuid;\r
@@ -471,7 +470,7 @@ SignalEndOfS3Resume (
   // This buffer consumed in DXE phase, so base on DXE mode to prepare communicate buffer.\r
   // Detect whether DXE is 64 bits mode.\r
   // if (sizeof(UINTN) == sizeof(UINT64), PEI already 64 bits, assume DXE also 64 bits.\r
-  // or (FeaturePcdGet (PcdDxeIplSwitchToLongMode)), Dxe will switch to 64 bits.\r
+  // or (FeaturePcdGet (PcdDxeIplSwitchToLongMode)), DXE will switch to 64 bits.\r
   //\r
   if ((sizeof(UINTN) == sizeof(UINT64)) || (FeaturePcdGet (PcdDxeIplSwitchToLongMode))) {\r
     CommBuffer = &Header64;\r
@@ -482,7 +481,7 @@ SignalEndOfS3Resume (
     Header32.MessageLength = 0;\r
     CommSize = OFFSET_OF (SMM_COMMUNICATE_HEADER_32, Data);\r
   }\r
-  CopyGuid (CommBuffer, &gEdkiiSmmEndOfS3ResumeProtocolGuid);\r
+  CopyGuid (CommBuffer, &gEdkiiEndOfS3ResumeGuid);\r
 \r
   Status = PeiServicesLocatePpi (\r
              &gEfiPeiSmmCommunicationPpiGuid,\r