27c27
< * $FreeBSD: head/sys/ia64/acpica/OsdEnvironment.c 99149 2002-06-30 17:53:12Z iwasaki $
---
> * $FreeBSD: head/sys/ia64/acpica/OsdEnvironment.c 108026 2002-12-18 08:47:07Z marcel $
32a33,35
> #include <sys/types.h>
> #include <sys/linker_set.h>
> #include <sys/sysctl.h>
38a42,46
> u_long ia64_acpi_root;
>
> SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &ia64_acpi_root, 0,
> "The physical address of the RSDP");
>
57,60c65,77
< if (ia64_efi_acpi20_table) {
< RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER;
< RsdpAddress->Pointer.Physical = ia64_efi_acpi20_table;
<
---
> if (ia64_acpi_root == 0) {
> if (ia64_efi_acpi20_table) {
> /* XXX put under bootverbose. */
> printf("Using ACPI2.0 table at 0x%lx\n",
> ia64_efi_acpi20_table);
> ia64_acpi_root = ia64_efi_acpi20_table;
> } else if (ia64_efi_acpi_table) {
> /* XXX put under bootverbose. */
> printf("Using ACPI1.x table at 0x%lx\n",
> ia64_efi_acpi_table);
> ia64_acpi_root = ia64_efi_acpi_table;
> } else
> return(AE_NOT_FOUND);
62,67d78
< else if (ia64_efi_acpi_table) {
< RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER;
< RsdpAddress->Pointer.Physical = ia64_efi_acpi_table;
< }
< else
< return(AE_NOT_FOUND);
68a80,81
> RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER;
> RsdpAddress->Pointer.Physical = ia64_acpi_root;