MdePkg:

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

diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 52eaea560db89d8e29807959c1e3fd044228155e..2fa83afc6ec962e787ac5f6bc120c337efaca23c 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 - 2010, 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
@@ -280,7 +270,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