X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FInclude%2FProtocol%2FDriverConfiguration.h;h=ce94de7f8b902ff108fdac87d5a403aa72e14522;hb=99e8ed219f48b82694424e46c9512d4929d9d54e;hp=34f1a641dd627e0b19069571086902b5cd73fc49;hpb=842f5579c7e2a313f56c576e4c5150f7f4793079;p=mirror_edk2.git

diff --git a/MdePkg/Include/Protocol/DriverConfiguration.h b/MdePkg/Include/Protocol/DriverConfiguration.h
index 34f1a641dd..ce94de7f8b 100644
--- a/MdePkg/Include/Protocol/DriverConfiguration.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration.h
@@ -1,7 +1,7 @@
 /** @file
   EFI Driver Configuration Protocol
 
-  Copyright (c) 2006, Intel Corporation                                                         
+  Copyright (c) 2006 - 2008, 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        
@@ -15,11 +15,12 @@
 #ifndef __EFI_DRIVER_CONFIGURATION_H__
 #define __EFI_DRIVER_CONFIGURATION_H__
 
+#include <PiDxe.h>
 #include <Protocol/DriverConfiguration2.h>
 
-//
-// Global ID for the Driver Configuration Protocol defined in EFI 1.10
-//
+///
+/// Global ID for the Driver Configuration Protocol defined in UEFI 2.0
+///
 #define EFI_DRIVER_CONFIGURATION_PROTOCOL_GUID \
   { \
     0x107a772b, 0xd5e1, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
@@ -32,7 +33,7 @@ typedef struct _EFI_DRIVER_CONFIGURATION_PROTOCOL  EFI_DRIVER_CONFIGURATION_PROT
   Allows the user to set controller specific options for a controller that a 
   driver is currently managing.
 
-  @param  This             A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance.
+  @param  This             A pointer to the EFI_DRIVER_CONFIGURATION_PROTOCOL instance.
   @param  ControllerHandle The handle of the controller to set options on.
   @param  ChildHandle      The handle of the child controller to set options on.  This
                            is an optional parameter that may be NULL.  It will be NULL
@@ -72,7 +73,7 @@ typedef struct _EFI_DRIVER_CONFIGURATION_PROTOCOL  EFI_DRIVER_CONFIGURATION_PROT
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_DRIVER_CONFIGURATION_SET_OPTIONS) (
+(EFIAPI *EFI_DRIVER_CONFIGURATION_SET_OPTIONS)(
   IN EFI_DRIVER_CONFIGURATION_PROTOCOL                        *This,
   IN  EFI_HANDLE                                              ControllerHandle,
   IN  EFI_HANDLE                                              ChildHandle  OPTIONAL,
@@ -111,7 +112,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_DRIVER_CONFIGURATION_OPTIONS_VALID) (
+(EFIAPI *EFI_DRIVER_CONFIGURATION_OPTIONS_VALID)(
   IN EFI_DRIVER_CONFIGURATION_PROTOCOL                        *This,
   IN  EFI_HANDLE                                              ControllerHandle,
   IN  EFI_HANDLE                                              ChildHandle  OPTIONAL
@@ -120,7 +121,7 @@ EFI_STATUS
 /**
   Forces a driver to set the default configuration options for a controller.
 
-  @param  This             A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance.
+  @param  This             A pointer to the EFI_DRIVER_CONFIGURATION_PROTOCOL instance.
   @param  ControllerHandle The handle of the controller to force default configuration options on.
   @param  ChildHandle      The handle of the child controller to force default configuration options on  This is an optional parameter that may be NULL.  It will be NULL for device drivers.  It will also be NULL for a bus drivers that wish to force default configuration options for the bus controller.  It will not be NULL for a bus driver that wishes to force default configuration options for one of its child controllers.
   @param  DefaultType      The type of default configuration options to force on the controller specified by ControllerHandle and ChildHandle.  See Table 9-1 for legal values.  A DefaultType of 0x00000000 must be supported by this protocol.
@@ -138,7 +139,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS) (
+(EFIAPI *EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS)(
   IN EFI_DRIVER_CONFIGURATION_PROTOCOL                        *This,
   IN  EFI_HANDLE                                              ControllerHandle,
   IN  EFI_HANDLE                                              ChildHandle  OPTIONAL,
@@ -147,15 +148,6 @@ EFI_STATUS
   );
 
 
-//
-//
-struct _EFI_DRIVER_CONFIGURATION_PROTOCOL {
-  EFI_DRIVER_CONFIGURATION_SET_OPTIONS    SetOptions;
-  EFI_DRIVER_CONFIGURATION_OPTIONS_VALID  OptionsValid;
-  EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;
-  CHAR8                                   *SupportedLanguages;
-};
-
 /**
   Interface structure for the Driver Configuration Protocol.
 
@@ -176,6 +168,13 @@ struct _EFI_DRIVER_CONFIGURATION_PROTOCOL {
                              codes that this protocol supports.
 
 **/
+struct _EFI_DRIVER_CONFIGURATION_PROTOCOL {
+  EFI_DRIVER_CONFIGURATION_SET_OPTIONS    SetOptions;
+  EFI_DRIVER_CONFIGURATION_OPTIONS_VALID  OptionsValid;
+  EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;
+  CHAR8                                   *SupportedLanguages;
+};
+
 
 extern EFI_GUID gEfiDriverConfigurationProtocolGuid;