diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-12-05 19:17:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-12-05 19:17:15 +0000 |
| commit | 889140cc7443199609393b489e13d395e9e062a1 (patch) | |
| tree | 9e57175bdada4e31c27b49ac718d0d24dd92e2d2 /sys/arch/i386/include | |
| parent | 52e7566f48bd54f2a0a319139b4ca8625857a49c (diff) | |
Hang acpi(4) below bios(4) instead of mainbus(4). This lets us move acpi(4)
before pcibios(4), and then.... if acpi(4) attaches, skip pcibios(4) since
it messes the machines up. Fixes claudio's HP dl320 G5, and almost assuredly
others.
ok kettenis
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/biosvar.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h index 119e09a5b86..75882686370 100644 --- a/sys/arch/i386/include/biosvar.h +++ b/sys/arch/i386/include/biosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosvar.h,v 1.48 2006/05/20 22:36:33 deraadt Exp $ */ +/* $OpenBSD: biosvar.h,v 1.49 2007/12/05 19:17:13 deraadt Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -225,17 +225,19 @@ extern volatile struct BIOS_regs { #include <machine/bus.h> struct bios_attach_args { - char *bios_dev; - u_int bios_func; - bus_space_tag_t bios_iot; - bus_space_tag_t bios_memt; + char *ba_name; + u_int ba_func; + bus_space_tag_t ba_iot; + bus_space_tag_t ba_memt; union { - void *_p; - bios_apminfo_t *_bios_apmp; + void *_p; + bios_apminfo_t *_ba_apmp; + paddr_t _ba_acpipbase; } _; }; -#define bios_apmp _._bios_apmp +#define ba_apmp _._ba_apmp +#define ba_acpipbase _._ba_acpipbase struct consdev; struct proc; |