Resolve GCC build error, where #pragma pack(push[, id], <n>) is not supported.

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

diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 52eaea560db89d8e29807959c1e3fd044228155e..29e5e90675e96022478e25ed6ad4dd3b7429e852 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 - 2012, 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
@@ -139,10 +131,10 @@ EFI_STATUS
   @param[in,out] CommBuffer      Points to the optional communication buffer.\r
   @param[in,out] CommBufferSize  Points to the size of the optional communication buffer.\r
 \r
-  @retval EFI_SUCCESS                        Interrupt source was processed successfully but not quiesced.\r
+  @retval EFI_WARN_INTERRUPT_SOURCE_PENDING  Interrupt source was processed successfully but not quiesced.\r
   @retval EFI_INTERRUPT_PENDING              One or more SMI sources could not be quiesced.\r
-  @retval EFI_WARN_INTERRUPT_SOURCE_PENDING  Interrupt source was not handled or quiesced.\r
-  @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED Interrupt source was handled and quiesced.\r
+  @retval EFI_NOT_FOUND                      Interrupt source was not handled or quiesced.\r
+  @retval EFI_SUCCESS                        Interrupt source was handled and quiesced.\r
 **/\r
 typedef\r
 EFI_STATUS\r
@@ -224,7 +216,7 @@ typedef struct _EFI_SMM_ENTRY_CONTEXT {
   ///\r
   UINTN                    CurrentlyExecutingCpu;\r
   ///\r
-  /// The number of current operational processors in the platform.  This is a 1 based \r
+  /// The number of possible processors in the platform.  This is a 1 based \r
   /// counter.  This does not indicate the number of processors that entered SMM.\r
   ///\r
   UINTN                    NumberOfCpus;\r
@@ -280,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
@@ -305,7 +297,7 @@ struct _EFI_SMM_SYSTEM_TABLE2 {
   ///\r
   UINTN                                CurrentlyExecutingCpu;\r
   ///\r
-  /// The number of current operational processors in the platform.  This is a 1 based counter.\r
+  /// The number of possible processors in the platform.  This is a 1 based counter.\r
   ///\r
   UINTN                                NumberOfCpus;\r
   ///\r