diff options
| author | peter <peter@FreeBSD.org> | 2001-01-29 11:57:27 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-01-29 11:57:27 +0000 |
| commit | ab46631b96686af7d466445686f52b41f6b32c01 (patch) | |
| tree | 25766643a9c13085c3fe6d6da0e5d27d6a092e7f /sys/i386/isa/nmi.c | |
| parent | 2509160a79caccba59e4647f797d606a2c9d96dc (diff) | |
| download | FreeBSD-src-ab46631b96686af7d466445686f52b41f6b32c01.zip FreeBSD-src-ab46631b96686af7d466445686f52b41f6b32c01.tar.gz | |
Convert mca (microchannel bus support) from something that we count
(bogus) to something that we test for the presence of.
Diffstat (limited to 'sys/i386/isa/nmi.c')
| -rw-r--r-- | sys/i386/isa/nmi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index 7a10912..d44a672 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -39,6 +39,7 @@ #include "opt_auto_eoi.h" #include "opt_isa.h" +#include "opt_mca.h" #include <sys/param.h> #include <sys/bus.h> @@ -84,8 +85,7 @@ #include <machine/clock.h> #endif -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include <i386/isa/mca_machdep.h> #endif @@ -237,7 +237,7 @@ isa_nmi(cd) int eisa_port = inb(0x461); log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port); -#if NMCA > 0 +#ifdef DEV_MCA if (MCA_system && mca_bus_nmi()) return(0); #endif @@ -293,7 +293,7 @@ isa_defaultirq() icu_unset(i, (driver_intr_t *)NULL); /* initialize 8259's */ -#if NMCA > 0 +#ifdef DEV_MCA if (MCA_system) outb(IO_ICU1, 0x19); /* reset; program device, four bytes */ else @@ -321,7 +321,7 @@ isa_defaultirq() outb(IO_ICU1, 0xc0 | (3 - 1)); /* pri order 3-7, 0-2 (com2 first) */ #endif /* !PC98 */ -#if NMCA > 0 +#ifdef DEV_MCA if (MCA_system) outb(IO_ICU2, 0x19); /* reset; program device, four bytes */ else |
