diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
| commit | e1150713a203c7b933939d575ea80f12c6877665 (patch) | |
| tree | e90efa2f0b6a55e4114028b09fc286948d8516ea /sys/ia64/acpica | |
| parent | 5577165db58ddb7157c690a8eabdb3df64d3ca38 (diff) | |
| download | FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.zip FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.tar.gz | |
Resolve conflicts arising from the ACPI CA 20020404 import.
Diffstat (limited to 'sys/ia64/acpica')
| -rw-r--r-- | sys/ia64/acpica/OsdEnvironment.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c index 897fc26..724968e 100644 --- a/sys/ia64/acpica/OsdEnvironment.c +++ b/sys/ia64/acpica/OsdEnvironment.c @@ -51,13 +51,18 @@ AcpiOsTerminate(void) } ACPI_STATUS -AcpiOsGetRootPointer(UINT32 Flags, ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress) +AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpAddress) { - if (ia64_efi_acpi20_table) - *RsdpPhysicalAddress = ia64_efi_acpi20_table; - else if (ia64_efi_acpi_table) - *RsdpPhysicalAddress = ia64_efi_acpi_table; + if (ia64_efi_acpi20_table) { + RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER; + RsdpAddress->Pointer.Physical = ia64_efi_acpi20_table; + + } + else if (ia64_efi_acpi_table) { + RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER; + RsdpAddress->Pointer.Physical = ia64_efi_acpi_table; + } else return(AE_NOT_FOUND); |
