Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Include / Library / EdkIIGlueUefiDriverModelLib.h

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiDriverModelLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiDriverModelLib.h
index 2038303a2c6048a69fbe45806af65b2d1d807bc3..ef947fa7ebd8c6644e4e99a64527ff3e54b0e122 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiDriverModelLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiDriverModelLib.h
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2004 - 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
@@ -34,15 +34,14 @@ Abstract:
 // Data structure that declares pointers to the Driver Model \r
 // Protocols.\r
 //\r
-typedef struct {\r
-  const EFI_DRIVER_BINDING_PROTOCOL        *DriverBinding;\r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-  const EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName;\r
-#else\r
-  const EFI_COMPONENT_NAME_PROTOCOL        *ComponentName;\r
-#endif\r
-  const EFI_DRIVER_CONFIGURATION_PROTOCOL  *DriverConfiguration;\r
-  const EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics;\r
+typedef struct {  \r
+  const EFI_DRIVER_BINDING_PROTOCOL         *DriverBinding;\r
+  const EFI_COMPONENT_NAME_PROTOCOL         *ComponentName;\r
+  const EFI_DRIVER_CONFIGURATION_PROTOCOL   *DriverConfiguration;\r
+  const EFI_DRIVER_DIAGNOSTICS_PROTOCOL     *DriverDiagnostics;\r
+  const EFI_COMPONENT_NAME2_PROTOCOL        *ComponentName2;\r
+  const EFI_DRIVER_CONFIGURATION2_PROTOCOL  *DriverConfiguration2;\r
+  const EFI_DRIVER_DIAGNOSTICS2_PROTOCOL    *DriverDiagnostics2;\r
 } EFI_DRIVER_MODEL_PROTOCOL_LIST;\r
 \r
 //\r