diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-03-26 22:38:40 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-03-26 22:38:40 +0000 |
| commit | 971bb4bc1ce2f7f91c9871b0f50a68e39326fd1c (patch) | |
| tree | 349aff69b835169acc1c72f4e2c4ad13c674fcbd /sys/arch/i386/conf | |
| parent | 4a8a2378aeebf4afb7f090031193a8fc582384e2 (diff) | |
from netbsd: pci interrupt routing code.
also, change a few pcidevs names to match netbsd (and more descriptive).
tested on a bunch of laptops, helps resolving 'pin X unmapped'
problems for (usually) usb and cardbus cntrollers.
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 1d47e9180bb..b838ef7be8c 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.162 2000/03/26 18:49:43 aaron Exp $ +# $OpenBSD: GENERIC,v 1.163 2000/03/26 22:38:31 mickey Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -48,6 +48,8 @@ option EISAVERBOSE #option PCMCIAVERBOSE #option USBVERBOSE +option BIOS32,PCIBIOS,PCIBIOS_INTR_FIXUP + pchb* at pci? dev ? function ? # PCI-Host bridges ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 8c17435b5cd..809930770b0 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.62 2000/02/21 17:09:08 mickey Exp $ +# $OpenBSD: files.i386,v 1.63 2000/03/26 22:38:32 mickey Exp $ # $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $ # # new style config file for i386 architecture @@ -84,8 +84,17 @@ file arch/i386/i386/mainbus.c mainbus include "../../../dev/pci/files.pci" file arch/i386/pci/pci_machdep.c pci -file arch/i386/pci/pciide_machdep.c pciide file arch/i386/pci/pci_compat.c pci # XXX compatibility +file arch/i386/pci/pcibios.c pcibios +file arch/i386/pci/pci_intr_fixup.c pcibios & pcibios_intr_fixup +file arch/i386/pci/piix.c pcibios & pcibios_intr_fixup +file arch/i386/pci/opti82c558.c pcibios & pcibios_intr_fixup +file arch/i386/pci/opti82c700.c pcibios & pcibios_intr_fixup +file arch/i386/pci/sis85c503.c pcibios & pcibios_intr_fixup +file arch/i386/pci/via82c586.c pcibios & pcibios_intr_fixup +file arch/i386/pci/pci_bus_fixup.c pcibios & pcibios_bus_fixup +file arch/i386/pci/pciide_machdep.c pciide +file arch/i386/pci/pcic_pci_machdep.c pcic_pci # PCI-Host bridge chipsets device pchb: pcibus @@ -244,6 +253,8 @@ attach apm at bios file arch/i386/i386/apm.c apm needs-count file arch/i386/i386/apmcall.S apm +file arch/i386/i386/bios32.c bios32 + # XXXX pcic here because it needs to be late. The catch: pcic needs # to be late, so devices which attach to it are attached late. But it # needs to be before its isa and pci attachments. This answer is |