mirror of https://github.com/acidanthera/audk.git
Update DriverConfiguration2.h to avoid the name conflict with DriverConfiguration.h
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2766 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
66f0059f35
commit
e30e5a72f9
|
@ -14,8 +14,8 @@
|
||||||
|
|
||||||
**/
|
**/
|
||||||
|
|
||||||
#ifndef __EFI_DRIVER_CONFIGURATION_H__
|
#ifndef __EFI_DRIVER_CONFIGURATION2_H__
|
||||||
#define __EFI_DRIVER_CONFIGURATION_H__
|
#define __EFI_DRIVER_CONFIGURATION2_H__
|
||||||
|
|
||||||
//
|
//
|
||||||
// Global ID for the Driver Configuration Protocol defined in UEFI 2.0
|
// Global ID for the Driver Configuration Protocol defined in UEFI 2.0
|
||||||
|
@ -150,8 +150,8 @@ EFI_STATUS
|
||||||
**/
|
**/
|
||||||
typedef
|
typedef
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
(EFIAPI *EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS) (
|
(EFIAPI *EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS) (
|
||||||
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,
|
IN EFI_DRIVER_CONFIGURATION2_PROTOCOL *This,
|
||||||
IN EFI_HANDLE ControllerHandle,
|
IN EFI_HANDLE ControllerHandle,
|
||||||
IN EFI_HANDLE ChildHandle OPTIONAL,
|
IN EFI_HANDLE ChildHandle OPTIONAL,
|
||||||
IN UINT32 DefaultType,
|
IN UINT32 DefaultType,
|
||||||
|
@ -162,10 +162,10 @@ EFI_STATUS
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {
|
struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {
|
||||||
EFI_DRIVER_CONFIGURATION2_SET_OPTIONS SetOptions;
|
EFI_DRIVER_CONFIGURATION2_SET_OPTIONS SetOptions;
|
||||||
EFI_DRIVER_CONFIGURATION_OPTIONS_VALID OptionsValid;
|
EFI_DRIVER_CONFIGURATION2_OPTIONS_VALID OptionsValid;
|
||||||
EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;
|
EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS ForceDefaults;
|
||||||
CHAR8 *SupportedLanguages;
|
CHAR8 *SupportedLanguages;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue