diff options
| author | peter <peter@FreeBSD.org> | 2001-01-29 09:38:39 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-01-29 09:38:39 +0000 |
| commit | b7edc4f4e3e8a67e435d794319102a67c59af546 (patch) | |
| tree | 1281145cc84b32bb59314a3b88e848f48901c103 /sys/alpha/pci/pcibus.c | |
| parent | 2c6ef92d83b54b2a2a2203ee3860bc46a6c56341 (diff) | |
| download | FreeBSD-src-b7edc4f4e3e8a67e435d794319102a67c59af546.zip FreeBSD-src-b7edc4f4e3e8a67e435d794319102a67c59af546.tar.gz | |
Send "#if NISA > 0" to the bit-bucket and replace it with an option.
These were compile-time "is the isa code present?" tests and not
'how many isa busses' tests.
Diffstat (limited to 'sys/alpha/pci/pcibus.c')
| -rw-r--r-- | sys/alpha/pci/pcibus.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c index aea4a88..71a3eb1 100644 --- a/sys/alpha/pci/pcibus.c +++ b/sys/alpha/pci/pcibus.c @@ -27,6 +27,8 @@ * */ +#include "opt_isa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -47,7 +49,6 @@ #include <alpha/isa/isavar.h> #include "alphapci_if.h" -#include "isa.h" #define ISA_IRQ_OFFSET 0xe0 #define ISA_IRQ_LEN 0x10 @@ -90,7 +91,7 @@ alpha_pci_route_interrupt(device_t bus, device_t dev, int pin) return(255); } -#if NISA > 0 +#ifdef DEV_ISA struct resource * alpha_platform_alloc_ide_intr(int chan) { @@ -153,7 +154,7 @@ alpha_platform_pci_setup_intr(device_t dev, device_t child, driver_intr_t *intr, void *arg, void **cookiep) { -#if NISA > 0 +#ifdef DEV_ISA /* * XXX - If we aren't the resource manager for this IRQ, assume that * it is actually handled by the ISA PIC. @@ -171,7 +172,7 @@ int alpha_platform_pci_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie) { -#if NISA > 0 +#ifdef DEV_ISA /* * XXX - If we aren't the resource manager for this IRQ, assume that * it is actually handled by the ISA PIC. @@ -225,7 +226,7 @@ pci_alloc_resource(device_t bus, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: -#if NISA > 0 +#ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { return isa_alloc_intrs(bus, child, |
