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, 5 insertions, 10 deletions

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
index 7c0ff89329..dd3ced55b7 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
@@ -24,6 +24,11 @@
 #define _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_

 

 //

+// Share some common definitions with PI SMM

+//

+#include <Protocol/SmmStandbyButtonDispatch2.h>

+

+//

 // Global ID for the Standby Button SMI Protocol

 //

 #define EFI_SMM_STANDBY_BUTTON_DISPATCH_PROTOCOL_GUID \

@@ -37,16 +42,6 @@ typedef struct _EFI_SMM_STANDBY_BUTTON_DISPATCH_PROTOCOL  EFI_SMM_STANDBY_BUTTON
 // Related Definitions

 //

 

-///

-/// Standby Button. Example, Use for changing LEDs before ACPI OS is on.

-///    - DXE/BDS Phase

-///    - OS Install Phase

-///

-typedef enum {

-  EfiStandbyButtonEntry,

-  EfiStandbyButtonExit

-} EFI_STANDBY_BUTTON_PHASE;

-

 typedef struct {

   ///  Describes whether the child handler should be invoked upon the entry to the button

   ///  activation or upon exit (i.e., upon receipt of the button press event or upon release of