diff options
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/clock.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/intr_machdep.c | 10 | ||||
| -rw-r--r-- | sys/i386/isa/nmi.c | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 14bcd93..d7a1ff0 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -50,6 +50,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include <sys/param.h> #include <sys/systm.h> @@ -90,8 +91,7 @@ #include <i386/isa/intr_machdep.h> -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include <i386/isa/mca_machdep.h> #endif @@ -263,7 +263,7 @@ clkintr(struct clockframe frame) } break; } -#if NMCA > 0 +#ifdef DEV_MCA /* Reset clock interrupt by asserting bit 7 of port 0x61 */ if (MCA_system) outb(0x61, inb(0x61) | 0x80); diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c index 7a10912..d44a672 100644 --- a/sys/i386/isa/intr_machdep.c +++ b/sys/i386/isa/intr_machdep.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 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 |
