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

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

diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h
index 533c11d05ef191e6b507c81735d1cc0175ab691f..d33578d275502182a98a8e21aa8c1fbe3474ba79 100644 (file)
--- a/MdePkg/Include/Protocol/SmmAccess2.h
+++ b/MdePkg/Include/Protocol/SmmAccess2.h
@@ -27,6 +27,17 @@
 \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_OPEN         -> EFI_SMM_OPEN2\r
+///   EFI_SMM_CLOSE        -> EFI_SMM_CLOSE2\r
+///   EFI_SMM_LOCK         -> EFI_SMM_LOCK2\r
+///   EFI_SMM_CAPABILITIES -> EFI_SMM_CAPABILITIES2\r
+///\r
+\r
 #define EFI_SMM_ACCESS2_PROTOCOL_GUID \\r
   { \\r
      0xc2702b74, 0x800c, 0x4131, {0x87, 0x46, 0x8f, 0xb5, 0xb8, 0x9c, 0xe4, 0xac } \\r
@@ -88,7 +99,7 @@ typedef struct _EFI_SMM_ACCESS2_PROTOCOL  EFI_SMM_ACCESS2_PROTOCOL;
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_OPEN)(\r
+(EFIAPI *EFI_SMM_OPEN2)(\r
   IN EFI_SMM_ACCESS2_PROTOCOL  *This\r
   );\r
 \r
@@ -106,7 +117,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_CLOSE)(\r
+(EFIAPI *EFI_SMM_CLOSE2)(\r
   IN EFI_SMM_ACCESS2_PROTOCOL  *This\r
   );\r
 \r
@@ -123,7 +134,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_LOCK)(\r
+(EFIAPI *EFI_SMM_LOCK2)(\r
   IN EFI_SMM_ACCESS2_PROTOCOL  *This\r
   );\r
 \r
@@ -140,7 +151,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_CAPABILITIES)(\r
+(EFIAPI *EFI_SMM_CAPABILITIES2)(\r
   IN CONST EFI_SMM_ACCESS2_PROTOCOL  *This,\r
   IN OUT UINTN                       *SmramMapSize,\r
   IN OUT EFI_SMRAM_DESCRIPTOR        *SmramMap\r
@@ -152,10 +163,10 @@ EFI_STATUS
 ///  that the north bridge or memory controller would publish this protocol.\r
 /// \r
 struct _EFI_SMM_ACCESS2_PROTOCOL {\r
-  EFI_SMM_OPEN          Open;\r
-  EFI_SMM_CLOSE         Close;\r
-  EFI_SMM_LOCK          Lock;\r
-  EFI_SMM_CAPABILITIES  GetCapabilities;\r
+  EFI_SMM_OPEN2          Open;\r
+  EFI_SMM_CLOSE2         Close;\r
+  EFI_SMM_LOCK2          Lock;\r
+  EFI_SMM_CAPABILITIES2  GetCapabilities;\r
   ///\r
   /// Indicates the current state of the SMRAM. Set to TRUE if SMRAM is locked.\r
   ///\r