Rename PI SMM definitions which has same name with those of Framework SMM spec but...

[mirror_edk2.git] / MdePkg / Include / Protocol / SmmControl2.h

diff --git a/MdePkg/Include/Protocol/SmmControl2.h b/MdePkg/Include/Protocol/SmmControl2.h
index 59eccdf6c3348ddc3b43053b4e484227edcc8d8c..8d29b1f7eb8a7c2ad534022f0879b88c96f9464e 100644 (file)
--- a/MdePkg/Include/Protocol/SmmControl2.h
+++ b/MdePkg/Include/Protocol/SmmControl2.h
@@ -27,6 +27,15 @@
 \r
 #include <PiDxe.h>\r
 \r
+///\r
+/// Note:\r
+///   To avoid name conflict between PI and Framework SMM spec, the following names defined\r
+///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.\r
+///\r
+///   EFI_SMM_ACTIVATE   -> EFI_SMM_ACTIVATE2\r
+///   EFI_SMM_DEACTIVATE -> EFI_SMM_DEACTIVATE2\r
+///\r
+\r
 #define EFI_SMM_CONTROL2_PROTOCOL_GUID \\r
   { \\r
     0x843dc720, 0xab1e, 0x42cb, {0x93, 0x57, 0x8a, 0x0, 0x78, 0xf3, 0x56, 0x1b}  \\r
@@ -54,7 +63,7 @@ typedef UINTN  EFI_SMM_PERIOD;
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_ACTIVATE)(\r
+(EFIAPI *EFI_SMM_ACTIVATE2)(\r
   IN CONST EFI_SMM_CONTROL2_PROTOCOL  *This,\r
   IN OUT UINT8                        *CommandPort       OPTIONAL,\r
   IN OUT UINT8                        *DataPort          OPTIONAL,\r
@@ -76,7 +85,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_DEACTIVATE)(\r
+(EFIAPI *EFI_SMM_DEACTIVATE2)(\r
   IN CONST EFI_SMM_CONTROL2_PROTOCOL  *This,\r
   IN BOOLEAN                          Periodic OPTIONAL\r
   );\r
@@ -88,8 +97,8 @@ EFI_STATUS
 /// these signals.\r
 ///\r
 struct _EFI_SMM_CONTROL2_PROTOCOL {\r
-  EFI_SMM_ACTIVATE    Trigger;\r
-  EFI_SMM_DEACTIVATE  Clear;\r
+  EFI_SMM_ACTIVATE2    Trigger;\r
+  EFI_SMM_DEACTIVATE2  Clear;\r
   ///\r
   /// Minimum interval at which the platform can set the period.  A maximum is not \r
   /// specified in that the SMM infrastructure code can emulate a maximum interval that is \r