Rename PI SMM definitions which has same name with those of Framework SMM spec but with different content (Note these renamings are not yet in public PI spec or errata now); Remove common definitions shared between PI and Framework Spec from include files for Framework SMM Spec, and change includes files for Framework SMM Spec to include PI SMM include files. The goal is to allow a module include both PI and Framework SMM definitions without conflict.

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

1 files changed, 4 insertions, 18 deletions

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
index 14d5a55..fd65f77 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
@@ -19,6 +19,10 @@
 #ifndef _EFI_SMM_SX_DISPATCH_H_

 #define _EFI_SMM_SX_DISPATCH_H_

 

+//

+// Share some common definitions with PI SMM

+//

+#include <Protocol/SmmSxDispatch2.h>

 

 //

 // Global ID for the Sx SMI Protocol

@@ -29,24 +33,6 @@
   }

 

 typedef struct _EFI_SMM_SX_DISPATCH_PROTOCOL  EFI_SMM_SX_DISPATCH_PROTOCOL;

-//

-// Related Definitions

-//

-typedef enum {

-  SxS0,

-  SxS1,

-  SxS2,

-  SxS3,

-  SxS4,

-  SxS5,

-  EfiMaximumSleepType

-} EFI_SLEEP_TYPE;

-

-typedef enum {

-  SxEntry,

-  SxExit,

-  EfiMaximumPhase

-} EFI_SLEEP_PHASE;

 

 typedef struct {

   EFI_SLEEP_TYPE  Type;