MdePkg: Add UEFI2.5 EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL definitions

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

diff --git a/MdePkg/Include/Protocol/SmmControl2.h b/MdePkg/Include/Protocol/SmmControl2.h
index 59eccdf6c3348ddc3b43053b4e484227edcc8d8c..58df62aa6ecd0b77427adce6055e45e89ede2527 100644 (file)
--- a/MdePkg/Include/Protocol/SmmControl2.h
+++ b/MdePkg/Include/Protocol/SmmControl2.h
@@ -11,8 +11,8 @@
   accessed, will generate the SMI.  Also, the hardware optionally supports the periodic generation of \r
   these signals.\r
 \r
-  Copyright (c) 2009, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
+  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
   http://opensource.org/licenses/bsd-license.php                                            \r
@@ -50,11 +50,12 @@ typedef UINTN  EFI_SMM_PERIOD;
   @retval EFI_SUCCESS            The SMI/PMI has been engendered.\r
   @retval EFI_DEVICE_ERROR       The timing is unsupported.\r
   @retval EFI_INVALID_PARAMETER  The activation period is unsupported.\r
+  @retval EFI_INVALID_PARAMETER  The last periodic activation has not been cleared. \r
   @retval EFI_NOT_STARTED        The SMM base service has not been initialized.\r
 **/\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 +77,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 +89,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