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, 13 insertions, 4 deletions

diff --git a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
index b3cdb47653..eca6d80291 100644
--- a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
@@ -23,6 +23,15 @@
 

 #include <Pi/PiSmmCis.h>

 

+///

+/// Note:

+///   To avoid name conflict between PI and Framework SMM spec, the following names defined

+///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

+///

+///   EFI_SMM_POWER_BUTTON_REGISTER   -> EFI_SMM_POWER_BUTTON_REGISTER2

+///   EFI_SMM_POWER_BUTTON_UNREGISTER -> EFI_SMM_POWER_BUTTON_UNREGISTER2

+///

+

 #define EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL_GUID \

   { \

     0x1b1183fa, 0x1823, 0x46a7, {0x88, 0x72, 0x9c, 0x57, 0x87, 0x55, 0x40, 0x9d } \

@@ -75,7 +84,7 @@ typedef struct _EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL EFI_SMM_POWER_BUTTON_DIS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_SMM_POWER_BUTTON_REGISTER)(

+(EFIAPI *EFI_SMM_POWER_BUTTON_REGISTER2)(

   IN CONST EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL  *This,

   IN       EFI_SMM_HANDLER_ENTRY_POINT2             DispatchFunction,

   IN       EFI_SMM_POWER_BUTTON_REGISTER_CONTEXT    *RegisterContext,

@@ -96,7 +105,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_SMM_POWER_BUTTON_UNREGISTER)(

+(EFIAPI *EFI_SMM_POWER_BUTTON_UNREGISTER2)(

   IN CONST EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL  *This,

   IN       EFI_HANDLE                               DispatchHandle

   );

@@ -107,8 +116,8 @@ EFI_STATUS
 /// This protocol provides the parent dispatch service for the power button SMI source generator.

 ///

 struct _EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL {

-  EFI_SMM_POWER_BUTTON_REGISTER    Register;

-  EFI_SMM_POWER_BUTTON_UNREGISTER  UnRegister;

+  EFI_SMM_POWER_BUTTON_REGISTER2    Register;

+  EFI_SMM_POWER_BUTTON_UNREGISTER2  UnRegister;

 };

 

 extern EFI_GUID gEfiSmmPowerButtonDispatch2ProtocolGuid;