mirror of https://github.com/acidanthera/audk.git
Correct the conflict EFI_ACPI_GET_ACPI_TABLE to EFI_ACPI_GET_ACPI_TABLE2
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9771 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
311004b238
commit
89b11f0557
|
@ -81,7 +81,7 @@ EFI_STATUS
|
||||||
**/
|
**/
|
||||||
typedef
|
typedef
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
(EFIAPI *EFI_ACPI_GET_ACPI_TABLE)(
|
(EFIAPI *EFI_ACPI_GET_ACPI_TABLE2)(
|
||||||
IN UINTN Index,
|
IN UINTN Index,
|
||||||
OUT EFI_ACPI_SDT_HEADER **Table,
|
OUT EFI_ACPI_SDT_HEADER **Table,
|
||||||
OUT EFI_ACPI_TABLE_VERSION *Version,
|
OUT EFI_ACPI_TABLE_VERSION *Version,
|
||||||
|
@ -246,7 +246,10 @@ typedef struct _EFI_ACPI_SDT_PROTOCOL {
|
||||||
/// Specifies the ACPI version supported by this protocol.
|
/// Specifies the ACPI version supported by this protocol.
|
||||||
///
|
///
|
||||||
EFI_ACPI_TABLE_VERSION AcpiVersion;
|
EFI_ACPI_TABLE_VERSION AcpiVersion;
|
||||||
EFI_ACPI_GET_ACPI_TABLE GetAcpiTable;
|
//
|
||||||
|
// EFI_ACPI_GET_ACPI_TABLE2 not in public UEFI specification.
|
||||||
|
//
|
||||||
|
EFI_ACPI_GET_ACPI_TABLE2 GetAcpiTable;
|
||||||
EFI_ACPI_REGISTER_NOTIFY RegisterNotify;
|
EFI_ACPI_REGISTER_NOTIFY RegisterNotify;
|
||||||
EFI_ACPI_OPEN Open;
|
EFI_ACPI_OPEN Open;
|
||||||
EFI_ACPI_OPEN_SDT OpenSdt;
|
EFI_ACPI_OPEN_SDT OpenSdt;
|
||||||
|
|
Loading…
Reference in New Issue