1 files changed, 13 insertions, 4 deletions
diff --git a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
index 82c944a191..ddfa230d07 100644
--- a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.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_STANDBY_BUTTON_REGISTER   -> EFI_SMM_STANDBY_BUTTON_REGISTER2
+///   EFI_SMM_STANDBY_BUTTON_UNREGISTER -> EFI_SMM_STANDBY_BUTTON_UNREGISTER2
+///
+
 #define EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL_GUID \
   { \
     0x7300c4a1, 0x43f2, 0x4017, {0xa5, 0x1b, 0xc8, 0x1a, 0x7f, 0x40, 0x58, 0x5b } \
@@ -76,7 +85,7 @@ typedef struct _EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL EFI_SMM_STANDBY_BUTTON
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_SMM_STANDBY_BUTTON_REGISTER)(
+(EFIAPI *EFI_SMM_STANDBY_BUTTON_REGISTER2)(
   IN CONST EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL  *This,
   IN       EFI_SMM_HANDLER_ENTRY_POINT2               DispatchFunction,
   IN       EFI_SMM_STANDBY_BUTTON_REGISTER_CONTEXT    *RegisterContext,
@@ -97,7 +106,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_SMM_STANDBY_BUTTON_UNREGISTER)(
+(EFIAPI *EFI_SMM_STANDBY_BUTTON_UNREGISTER2)(
   IN CONST EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL  *This,
   IN       EFI_HANDLE                                 DispatchHandle
   );
@@ -109,8 +118,8 @@ EFI_STATUS
 /// button SMI source generator.
 ///
 struct _EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL {
-  EFI_SMM_STANDBY_BUTTON_REGISTER    Register;
-  EFI_SMM_STANDBY_BUTTON_UNREGISTER  UnRegister;
+  EFI_SMM_STANDBY_BUTTON_REGISTER2    Register;
+  EFI_SMM_STANDBY_BUTTON_UNREGISTER2  UnRegister;
 };
 
 extern EFI_GUID gEfiSmmStandbyButtonDispatch2ProtocolGuid;