Update PI Service Table Versions per PI 1.2 Errata C.

[mirror_edk2.git] / MdePkg / Include / Pi / PiSmmCis.h

diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 77556be0fe347c9eec88ddc5cde8adfbdff5a3e3..21246d5ba65a2b02c283112c22c28b049fe4c23e 100644 (file)
--- a/MdePkg/Include/Pi/PiSmmCis.h
+++ b/MdePkg/Include/Pi/PiSmmCis.h
@@ -2,8 +2,8 @@
   Common definitions in the Platform Initialization Specification version 1.2\r
   VOLUME 4 System Management Mode Core Interface version.\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
@@ -17,17 +17,7 @@
 #define _PI_SMMCIS_H_\r
 \r
 #include <Pi/PiMultiPhase.h>\r
-#include <Protocol/SmmCpuIo.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_SYSTEM_TABLE                -> EFI_SMM_SYSTEM_TABLE2\r
-///   EFI_SMM_SYSTEM_TABLE_REVISION       -> EFI_SMM_SYSTEM_TABLE2_REVISION\r
-///   EFI_SMM_INSTALL_CONFIGURATION_TABLE -> EFI_SMM_INSTALL_CONFIGURATION_TABLE2\r
-///\r
+#include <Protocol/SmmCpuIo2.h>\r
 \r
 typedef struct _EFI_SMM_SYSTEM_TABLE2  EFI_SMM_SYSTEM_TABLE2;\r
 \r
@@ -36,9 +26,11 @@ typedef struct _EFI_SMM_SYSTEM_TABLE2  EFI_SMM_SYSTEM_TABLE2;
 ///\r
 #define SMM_SMST_SIGNATURE            SIGNATURE_32 ('S', 'M', 'S', 'T')\r
 ///\r
-/// The System Management System Table (SMST) revision is 1.0\r
+/// The System Management System Table (SMST) revision is 1.2\r
 ///\r
-#define EFI_SMM_SYSTEM_TABLE2_REVISION ((1 << 16) | (0x00))\r
+#define SMM_SPECIFICATION_MAJOR_REVISION  1\r
+#define SMM_SPECIFICATION_MINOR_REVISION  20\r
+#define EFI_SMM_SYSTEM_TABLE2_REVISION    ((SMM_SPECIFICATION_MAJOR_REVISION<<16) | (SMM_SPECIFICATION_MINOR_REVISION))\r
 \r
 /**\r
   Adds, updates, or removes a configuration table entry from the System Management System Table.\r
@@ -67,17 +59,6 @@ EFI_STATUS
   IN UINTN                        TableSize\r
   );\r
 \r
-/**\r
-  Function prototype for invoking a function on an Application Processor.\r
-\r
-  @param[in,out] Buffer  Pointer to private data buffer.\r
-**/\r
-typedef\r
-VOID\r
-(EFIAPI *EFI_AP_PROCEDURE)(\r
-  IN OUT VOID  *Buffer\r
-  );\r
-\r
 /**\r
   The SmmStartupThisAp() lets the caller to get one distinct application processor\r
   (AP) in the enabled processor pool to execute a caller-provided code stream\r
@@ -291,7 +272,7 @@ struct _EFI_SMM_SYSTEM_TABLE2 {
   ///\r
   /// I/O Service\r
   ///\r
-  EFI_SMM_CPU_IO_PROTOCOL              SmmIo;\r
+  EFI_SMM_CPU_IO2_PROTOCOL             SmmIo;\r
 \r
   ///\r
   /// Runtime memory services\r