Remove comments about in-consistency between code and UEFI/PI spec because UEFI 2...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10143 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 597eeb90869c2a1bdf65431178aaeddfb4d36f90..3e9edffd9acbed2c449120a4a06bada6f1019544 100644 (file)
--- a/MdePkg/Include/Pi/PiSmmCis.h
+++ b/MdePkg/Include/Pi/PiSmmCis.h
@@ -19,16 +19,6 @@
 #include <Pi/PiMultiPhase.h>\r
 #include <Protocol/SmmCpuIo2.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
-\r
 typedef struct _EFI_SMM_SYSTEM_TABLE2  EFI_SMM_SYSTEM_TABLE2;\r
 \r
 ///\r

diff --git a/MdePkg/Include/Protocol/HiiDatabase.h b/MdePkg/Include/Protocol/HiiDatabase.h
index c31f971758194f1bba8504a4dcbf1dff7fd307b9..000a465e74539056779eb978b250a46304dd0d38 100644 (file)
--- a/MdePkg/Include/Protocol/HiiDatabase.h
+++ b/MdePkg/Include/Protocol/HiiDatabase.h
@@ -80,9 +80,6 @@ EFI_STATUS
   be called. For each call to NewPackageList(), there should be a\r
   corresponding call to\r
   EFI_HII_DATABASE_PROTOCOL.RemovePackageList().\r
-\r
-  Note: inconsistency with UEFI 2.3 spec that the parameter DriverHandle\r
-  is optional.\r
   \r
   @param This           A pointer to the EFI_HII_DATABASE_PROTOCOL instance.\r
 \r

diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h
index a8c6c2ebe0fe778e56b258f507d8a9dbc4fd1a8b..79319bcbd6a921d706565aaef794ee469585462b 100644 (file)
--- a/MdePkg/Include/Protocol/SmmAccess2.h
+++ b/MdePkg/Include/Protocol/SmmAccess2.h
@@ -25,17 +25,6 @@
 #ifndef _SMM_ACCESS2_H_\r
 #define _SMM_ACCESS2_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_OPEN         -> EFI_SMM_OPEN2\r
-///   EFI_SMM_CLOSE        -> EFI_SMM_CLOSE2\r
-///   EFI_SMM_LOCK         -> EFI_SMM_LOCK2\r
-///   EFI_SMM_CAPABILITIES -> EFI_SMM_CAPABILITIES2\r
-///\r
-\r
 #define EFI_SMM_ACCESS2_PROTOCOL_GUID \\r
   { \\r
      0xc2702b74, 0x800c, 0x4131, {0x87, 0x46, 0x8f, 0xb5, 0xb8, 0x9c, 0xe4, 0xac } \\r

diff --git a/MdePkg/Include/Protocol/SmmControl2.h b/MdePkg/Include/Protocol/SmmControl2.h
index 8d29b1f7eb8a7c2ad534022f0879b88c96f9464e..c6f027106fa0ee1593b970dba9ccfe0e190c0cf6 100644 (file)
--- a/MdePkg/Include/Protocol/SmmControl2.h
+++ b/MdePkg/Include/Protocol/SmmControl2.h
@@ -11,7 +11,7 @@
   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
+  Copyright (c) 2009 - 2010, Intel Corporation                                                         \r
   All rights reserved. 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
@@ -27,15 +27,6 @@
 \r
 #include <PiDxe.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_ACTIVATE   -> EFI_SMM_ACTIVATE2\r
-///   EFI_SMM_DEACTIVATE -> EFI_SMM_DEACTIVATE2\r
-///\r
-\r
 #define EFI_SMM_CONTROL2_PROTOCOL_GUID \\r
   { \\r
     0x843dc720, 0xab1e, 0x42cb, {0x93, 0x57, 0x8a, 0x0, 0x78, 0xf3, 0x56, 0x1b}  \\r

diff --git a/MdePkg/Include/Protocol/SmmCpuIo2.h b/MdePkg/Include/Protocol/SmmCpuIo2.h
index 580a8b6eac2ebc727db83f2015e3ebdff3aab25a..a9d2efd153b4ae6377ec84f3ea3558b84e1f6f0a 100644 (file)
--- a/MdePkg/Include/Protocol/SmmCpuIo2.h
+++ b/MdePkg/Include/Protocol/SmmCpuIo2.h
@@ -17,15 +17,6 @@
 #ifndef _SMM_CPU_IO2_H_\r
 #define _SMM_CPU_IO2_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.\r
-///\r
-///   *EFI_SMM_CPU_IO*    -> *EFI_SMM_CPU_IO2*\r
-///   *EFI_SMM_IO_ACCESS* -> *EFI_SMM_IO_ACCESS2*\r
-///\r
-\r
 #define EFI_SMM_CPU_IO2_PROTOCOL_GUID \\r
   { \\r
     0x3242A9D8, 0xCE70, 0x4AA0, { 0x95, 0x5D, 0x5E, 0x7B, 0x14, 0x0D, 0xE4, 0xD2 } \\r

diff --git a/MdePkg/Include/Protocol/SmmGpiDispatch2.h b/MdePkg/Include/Protocol/SmmGpiDispatch2.h
index 2bc457e6ffcf47ed74ed305aaf298f4913a457b8..f8690b8b5a9b96bd468c7faf3a2f8bbbab3f279a 100644 (file)
--- a/MdePkg/Include/Protocol/SmmGpiDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmGpiDispatch2.h
@@ -9,7 +9,7 @@
   given event types.  Several inputs can be enabled.  This purpose of this interface is to generate an \r
   SMI in response to any of these inputs having a true value provided.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, Intel Corporation\r
   All rights reserved. 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
@@ -28,15 +28,6 @@
 \r
 #include <Pi/PiSmmCis.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_GPI_REGISTER   -> EFI_SMM_GPI_REGISTER2\r
-///   EFI_SMM_GPI_UNREGISTER -> EFI_SMM_GPI_UNREGISTER2\r
-///\r
-\r
 #define EFI_SMM_GPI_DISPATCH2_PROTOCOL_GUID \\r
   { \\r
     0x25566b03, 0xb577, 0x4cbf, {0x95, 0x8c, 0xed, 0x66, 0x3e, 0xa2, 0x43, 0x80 } \\r

diff --git a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
index 252729fd5c976fe22bc08c24f9c1812d8911cbe7..0ef803f3d9453c0be28c7778e4bbd8f6e5a909c5 100644 (file)
--- a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
@@ -4,7 +4,7 @@
 \r
   This protocol provides the parent dispatch service for the periodical timer SMI source generator.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, Intel Corporation\r
   All rights reserved. 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
@@ -23,16 +23,6 @@
 \r
 #include <Pi/PiSmmCis.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_PERIODIC_TIMER_REGISTER   -> EFI_SMM_PERIODIC_TIMER_REGISTER2\r
-///   EFI_SMM_PERIODIC_TIMER_UNREGISTER -> EFI_SMM_PERIODIC_TIMER_UNREGISTER2\r
-///   EFI_SMM_PERIODIC_TIMER_INTERVAL   -> EFI_SMM_PERIODIC_TIMER_INTERVAL2\r
-///\r
-\r
 #define EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL_GUID \\r
   { \\r
     0x4cec368e, 0x8e8e, 0x4d71, {0x8b, 0xe1, 0x95, 0x8c, 0x45, 0xfc, 0x8a, 0x53 } \\r

diff --git a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
index eca6d802913495d558b9e5d4782057e1e6104195..d9cbc0a6a32210e8ac2d96496efa82094b913ef8 100644 (file)
--- a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
@@ -4,7 +4,7 @@
 \r
   This protocol provides the parent dispatch service for the power button SMI source generator.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, Intel Corporation\r
   All rights reserved. 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
@@ -23,15 +23,6 @@
 \r
 #include <Pi/PiSmmCis.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_POWER_BUTTON_REGISTER   -> EFI_SMM_POWER_BUTTON_REGISTER2\r
-///   EFI_SMM_POWER_BUTTON_UNREGISTER -> EFI_SMM_POWER_BUTTON_UNREGISTER2\r
-///\r
-\r
 #define EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL_GUID \\r
   { \\r
     0x1b1183fa, 0x1823, 0x46a7, {0x88, 0x72, 0x9c, 0x57, 0x87, 0x55, 0x40, 0x9d } \\r

diff --git a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
index ddfa230d070b269b4c4d15f312d112548e564edd..57aa218a0a5048281c2d83b6d720a4cb04b5acfb 100644 (file)
--- a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
@@ -4,7 +4,7 @@
 \r
   This protocol provides the parent dispatch service for the standby button SMI source generator.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, Intel Corporation\r
   All rights reserved. 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
@@ -23,15 +23,6 @@
 \r
 #include <Pi/PiSmmCis.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_STANDBY_BUTTON_REGISTER   -> EFI_SMM_STANDBY_BUTTON_REGISTER2\r
-///   EFI_SMM_STANDBY_BUTTON_UNREGISTER -> EFI_SMM_STANDBY_BUTTON_UNREGISTER2\r
-///\r
-\r
 #define EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL_GUID \\r
   { \\r
     0x7300c4a1, 0x43f2, 0x4017, {0xa5, 0x1b, 0xc8, 0x1a, 0x7f, 0x40, 0x58, 0x5b } \\r

diff --git a/MdePkg/Include/Protocol/SmmSwDispatch2.h b/MdePkg/Include/Protocol/SmmSwDispatch2.h
index c99a5b95d637788c46641fc30a3ac7c28f9d77dd..81ff7488d545182f1116355d219591f97a2269a6 100644 (file)
--- a/MdePkg/Include/Protocol/SmmSwDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmSwDispatch2.h
@@ -4,7 +4,7 @@
 \r
   This protocol provides the parent dispatch service for a given SMI source generator.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, Intel Corporation\r
   All rights reserved. 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
@@ -20,15 +20,6 @@
 \r
 #include <Pi/PiSmmCis.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_SW_REGISTER   -> EFI_SMM_SW_REGISTER2\r
-///   EFI_SMM_SW_UNREGISTER -> EFI_SMM_SW_UNREGISTER2\r
-///\r
-\r
 #define EFI_SMM_SW_DISPATCH2_PROTOCOL_GUID \\r
   { \\r
     0x18a3c6dc, 0x5eea, 0x48c8, {0xa1, 0xc1, 0xb5, 0x33, 0x89, 0xf9, 0x89, 0x99 } \\r

diff --git a/MdePkg/Include/Protocol/SmmSxDispatch2.h b/MdePkg/Include/Protocol/SmmSxDispatch2.h
index fe0baa19608f82f1c871737c125a51b6a169a557..9380516e87db57bf5c6d3c17acc0d794878da89f 100644 (file)
--- a/MdePkg/Include/Protocol/SmmSxDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmSxDispatch2.h
@@ -4,7 +4,7 @@
 \r
   Provides the parent dispatch service for a given Sx-state source generator.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, Intel Corporation\r
   All rights reserved. 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
@@ -20,15 +20,6 @@
 \r
 #include <Pi/PiSmmCis.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_SX_REGISTER   -> EFI_SMM_SX_REGISTER2\r
-///   EFI_SMM_SX_UNREGISTER -> EFI_SMM_SX_UNREGISTER2\r
-///\r
-\r
 #define EFI_SMM_SX_DISPATCH2_PROTOCOL_GUID \\r
   { \\r
     0x456d2859, 0xa84b, 0x4e47, {0xa2, 0xee, 0x32, 0x76, 0xd8, 0x86, 0x99, 0x7d } \\r

diff --git a/MdePkg/Include/Protocol/SmmUsbDispatch2.h b/MdePkg/Include/Protocol/SmmUsbDispatch2.h
index 27b4674bfe7788e3d6cc3a0b5c5c2d2a33814f7e..a2bc4df42bcd1d10ea393b445203e504b7077f3d 100644 (file)
--- a/MdePkg/Include/Protocol/SmmUsbDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmUsbDispatch2.h
@@ -4,7 +4,7 @@
 \r
   Provides the parent dispatch service for the USB SMI source generator.\r
 \r
-  Copyright (c) 2009, Intel Corporation\r
+  Copyright (c) 2009 - 2010, Intel Corporation\r
   All rights reserved. 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
@@ -23,15 +23,6 @@
 \r
 #include <Pi/PiSmmCis.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_USB_REGISTER   -> EFI_SMM_USB_REGISTER2\r
-///   EFI_SMM_USB_UNREGISTER -> EFI_SMM_USB_UNREGISTER2\r
-///\r
-\r
 #define EFI_SMM_USB_DISPATCH2_PROTOCOL_GUID \\r
   { \\r
     0xee9b8d90, 0xc5a6, 0x40a2, {0xbd, 0xe2, 0x52, 0x55, 0x8d, 0x33, 0xcc, 0xa1 } \\r