Remove comments about in-consistency between code and UEFI/PI spec because UEFI 2.3 Errata B and PI 1.2 Errata A spec were published.

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

12 files changed, 8 insertions, 114 deletions

diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 597eeb9..3e9edff 100644
--- a/MdePkg/Include/Pi/PiSmmCis.h
+++ b/MdePkg/Include/Pi/PiSmmCis.h
@@ -19,16 +19,6 @@
 #include <Pi/PiMultiPhase.h>

 #include <Protocol/SmmCpuIo2.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_SYSTEM_TABLE                -> EFI_SMM_SYSTEM_TABLE2

-///   EFI_SMM_SYSTEM_TABLE_REVISION       -> EFI_SMM_SYSTEM_TABLE2_REVISION

-///   EFI_SMM_INSTALL_CONFIGURATION_TABLE -> EFI_SMM_INSTALL_CONFIGURATION_TABLE2

-///

-

 typedef struct _EFI_SMM_SYSTEM_TABLE2  EFI_SMM_SYSTEM_TABLE2;

 

 ///

diff --git a/MdePkg/Include/Protocol/HiiDatabase.h b/MdePkg/Include/Protocol/HiiDatabase.h
index c31f971..000a465 100644
--- 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

   corresponding call to

   EFI_HII_DATABASE_PROTOCOL.RemovePackageList().

-

-  Note: inconsistency with UEFI 2.3 spec that the parameter DriverHandle

-  is optional.

   

   @param This           A pointer to the EFI_HII_DATABASE_PROTOCOL instance.

 

diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h
index a8c6c2e..79319bc 100644
--- a/MdePkg/Include/Protocol/SmmAccess2.h
+++ b/MdePkg/Include/Protocol/SmmAccess2.h
@@ -25,17 +25,6 @@
 #ifndef _SMM_ACCESS2_H_

 #define _SMM_ACCESS2_H_

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_OPEN         -> EFI_SMM_OPEN2

-///   EFI_SMM_CLOSE        -> EFI_SMM_CLOSE2

-///   EFI_SMM_LOCK         -> EFI_SMM_LOCK2

-///   EFI_SMM_CAPABILITIES -> EFI_SMM_CAPABILITIES2

-///

-

 #define EFI_SMM_ACCESS2_PROTOCOL_GUID \

   { \

      0xc2702b74, 0x800c, 0x4131, {0x87, 0x46, 0x8f, 0xb5, 0xb8, 0x9c, 0xe4, 0xac } \

diff --git a/MdePkg/Include/Protocol/SmmControl2.h b/MdePkg/Include/Protocol/SmmControl2.h
index 8d29b1f..c6f0271 100644
--- 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 

   these signals.

 

-  Copyright (c) 2009, Intel Corporation                                                         

+  Copyright (c) 2009 - 2010, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -27,15 +27,6 @@
 

 #include <PiDxe.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_ACTIVATE   -> EFI_SMM_ACTIVATE2

-///   EFI_SMM_DEACTIVATE -> EFI_SMM_DEACTIVATE2

-///

-

 #define EFI_SMM_CONTROL2_PROTOCOL_GUID \

   { \

     0x843dc720, 0xab1e, 0x42cb, {0x93, 0x57, 0x8a, 0x0, 0x78, 0xf3, 0x56, 0x1b}  \

diff --git a/MdePkg/Include/Protocol/SmmCpuIo2.h b/MdePkg/Include/Protocol/SmmCpuIo2.h
index 580a8b6..a9d2efd 100644
--- a/MdePkg/Include/Protocol/SmmCpuIo2.h
+++ b/MdePkg/Include/Protocol/SmmCpuIo2.h
@@ -17,15 +17,6 @@
 #ifndef _SMM_CPU_IO2_H_

 #define _SMM_CPU_IO2_H_

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed.

-///

-///   *EFI_SMM_CPU_IO*    -> *EFI_SMM_CPU_IO2*

-///   *EFI_SMM_IO_ACCESS* -> *EFI_SMM_IO_ACCESS2*

-///

-

 #define EFI_SMM_CPU_IO2_PROTOCOL_GUID \

   { \

     0x3242A9D8, 0xCE70, 0x4AA0, { 0x95, 0x5D, 0x5E, 0x7B, 0x14, 0x0D, 0xE4, 0xD2 } \

diff --git a/MdePkg/Include/Protocol/SmmGpiDispatch2.h b/MdePkg/Include/Protocol/SmmGpiDispatch2.h
index 2bc457e..f8690b8 100644
--- 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 

   SMI in response to any of these inputs having a true value provided.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -28,15 +28,6 @@
 

 #include <Pi/PiSmmCis.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_GPI_REGISTER   -> EFI_SMM_GPI_REGISTER2

-///   EFI_SMM_GPI_UNREGISTER -> EFI_SMM_GPI_UNREGISTER2

-///

-

 #define EFI_SMM_GPI_DISPATCH2_PROTOCOL_GUID \

   { \

     0x25566b03, 0xb577, 0x4cbf, {0x95, 0x8c, 0xed, 0x66, 0x3e, 0xa2, 0x43, 0x80 } \

diff --git a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
index 252729f..0ef803f 100644
--- a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h
@@ -4,7 +4,7 @@
 

   This protocol provides the parent dispatch service for the periodical timer SMI source generator.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -23,16 +23,6 @@
 

 #include <Pi/PiSmmCis.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_PERIODIC_TIMER_REGISTER   -> EFI_SMM_PERIODIC_TIMER_REGISTER2

-///   EFI_SMM_PERIODIC_TIMER_UNREGISTER -> EFI_SMM_PERIODIC_TIMER_UNREGISTER2

-///   EFI_SMM_PERIODIC_TIMER_INTERVAL   -> EFI_SMM_PERIODIC_TIMER_INTERVAL2

-///

-

 #define EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL_GUID \

   { \

     0x4cec368e, 0x8e8e, 0x4d71, {0x8b, 0xe1, 0x95, 0x8c, 0x45, 0xfc, 0x8a, 0x53 } \

diff --git a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
index eca6d80..d9cbc0a 100644
--- a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h
@@ -4,7 +4,7 @@
 

   This protocol provides the parent dispatch service for the power button SMI source generator.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -23,15 +23,6 @@
 

 #include <Pi/PiSmmCis.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_POWER_BUTTON_REGISTER   -> EFI_SMM_POWER_BUTTON_REGISTER2

-///   EFI_SMM_POWER_BUTTON_UNREGISTER -> EFI_SMM_POWER_BUTTON_UNREGISTER2

-///

-

 #define EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL_GUID \

   { \

     0x1b1183fa, 0x1823, 0x46a7, {0x88, 0x72, 0x9c, 0x57, 0x87, 0x55, 0x40, 0x9d } \

diff --git a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
index ddfa230..57aa218 100644
--- a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h
@@ -4,7 +4,7 @@
 

   This protocol provides the parent dispatch service for the standby button SMI source generator.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -23,15 +23,6 @@
 

 #include <Pi/PiSmmCis.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_STANDBY_BUTTON_REGISTER   -> EFI_SMM_STANDBY_BUTTON_REGISTER2

-///   EFI_SMM_STANDBY_BUTTON_UNREGISTER -> EFI_SMM_STANDBY_BUTTON_UNREGISTER2

-///

-

 #define EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL_GUID \

   { \

     0x7300c4a1, 0x43f2, 0x4017, {0xa5, 0x1b, 0xc8, 0x1a, 0x7f, 0x40, 0x58, 0x5b } \

diff --git a/MdePkg/Include/Protocol/SmmSwDispatch2.h b/MdePkg/Include/Protocol/SmmSwDispatch2.h
index c99a5b9..81ff748 100644
--- a/MdePkg/Include/Protocol/SmmSwDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmSwDispatch2.h
@@ -4,7 +4,7 @@
 

   This protocol provides the parent dispatch service for a given SMI source generator.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -20,15 +20,6 @@
 

 #include <Pi/PiSmmCis.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_SW_REGISTER   -> EFI_SMM_SW_REGISTER2

-///   EFI_SMM_SW_UNREGISTER -> EFI_SMM_SW_UNREGISTER2

-///

-

 #define EFI_SMM_SW_DISPATCH2_PROTOCOL_GUID \

   { \

     0x18a3c6dc, 0x5eea, 0x48c8, {0xa1, 0xc1, 0xb5, 0x33, 0x89, 0xf9, 0x89, 0x99 } \

diff --git a/MdePkg/Include/Protocol/SmmSxDispatch2.h b/MdePkg/Include/Protocol/SmmSxDispatch2.h
index fe0baa1..9380516 100644
--- a/MdePkg/Include/Protocol/SmmSxDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmSxDispatch2.h
@@ -4,7 +4,7 @@
 

   Provides the parent dispatch service for a given Sx-state source generator.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -20,15 +20,6 @@
 

 #include <Pi/PiSmmCis.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_SX_REGISTER   -> EFI_SMM_SX_REGISTER2

-///   EFI_SMM_SX_UNREGISTER -> EFI_SMM_SX_UNREGISTER2

-///

-

 #define EFI_SMM_SX_DISPATCH2_PROTOCOL_GUID \

   { \

     0x456d2859, 0xa84b, 0x4e47, {0xa2, 0xee, 0x32, 0x76, 0xd8, 0x86, 0x99, 0x7d } \

diff --git a/MdePkg/Include/Protocol/SmmUsbDispatch2.h b/MdePkg/Include/Protocol/SmmUsbDispatch2.h
index 27b4674..a2bc4df 100644
--- a/MdePkg/Include/Protocol/SmmUsbDispatch2.h
+++ b/MdePkg/Include/Protocol/SmmUsbDispatch2.h
@@ -4,7 +4,7 @@
 

   Provides the parent dispatch service for the USB SMI source generator.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -23,15 +23,6 @@
 

 #include <Pi/PiSmmCis.h>

 

-///

-/// Note:

-///   To avoid name conflict between PI and Framework SMM spec, the following names defined

-///   in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.

-///

-///   EFI_SMM_USB_REGISTER   -> EFI_SMM_USB_REGISTER2

-///   EFI_SMM_USB_UNREGISTER -> EFI_SMM_USB_UNREGISTER2

-///

-

 #define EFI_SMM_USB_DISPATCH2_PROTOCOL_GUID \

   { \

     0xee9b8d90, 0xc5a6, 0x40a2, {0xbd, 0xe2, 0x52, 0x55, 0x8d, 0x33, 0xcc, 0xa1 } \