diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 14bcd9336412..d7a1ff09ca22 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -50,6 +50,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include #include @@ -90,8 +91,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 14bcd9336412..d7a1ff09ca22 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -50,6 +50,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include #include @@ -90,8 +91,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 7a109124d262..d44a672aecb1 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -39,6 +39,7 @@ #include "opt_auto_eoi.h" #include "opt_isa.h" +#include "opt_mca.h" #include #include @@ -84,8 +85,7 @@ #include #endif -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 7a109124d262..d44a672aecb1 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -39,6 +39,7 @@ #include "opt_auto_eoi.h" #include "opt_isa.h" +#include "opt_mca.h" #include #include @@ -84,8 +85,7 @@ #include #endif -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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/conf/files.i386 b/sys/conf/files.i386 index 9ce3c2a58908..cc1acb414373 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -234,7 +234,7 @@ i386/isa/istallion.c optional stli i386/isa/labpc.c count labpc i386/isa/loran.c optional loran i386/isa/matcd/matcd.c count matcd -i386/isa/mca_machdep.c count mca +i386/isa/mca_machdep.c optional mca i386/isa/mcd.c count mcd i386/isa/mse.c optional mse i386/isa/npx.c mandatory npx diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index fd6a74465f54..e458bd2753e5 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -225,7 +225,7 @@ i386/isa/istallion.c optional stli i386/isa/labpc.c count labpc i386/isa/loran.c optional loran i386/isa/matcd/matcd.c count matcd -i386/isa/mca_machdep.c count mca +i386/isa/mca_machdep.c optional mca i386/isa/mcd.c count mcd i386/isa/pcf.c optional pcf i386/isa/pcvt/pcvt_drv.c optional vt diff --git a/sys/conf/options b/sys/conf/options index 35d1ee71f501..1d682e731232 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -492,3 +492,4 @@ NDEVFSOVERFLOW opt_devfs.h # various 'device presence' options. DEV_SNP opt_snp.h +DEV_MCA opt_mca.h diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 14bcd9336412..d7a1ff09ca22 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -50,6 +50,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include #include @@ -90,8 +91,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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/clock.c b/sys/i386/isa/clock.c index 14bcd9336412..d7a1ff09ca22 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 #include @@ -90,8 +91,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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 7a109124d262..d44a672aecb1 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 #include @@ -84,8 +85,7 @@ #include #endif -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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 7a109124d262..d44a672aecb1 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 #include @@ -84,8 +85,7 @@ #include #endif -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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/isa/atrtc.c b/sys/isa/atrtc.c index 14bcd9336412..d7a1ff09ca22 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -50,6 +50,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include #include @@ -90,8 +91,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #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/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 7de923d1c5a2..08af87151784 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -54,6 +54,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include #include @@ -100,8 +101,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #endif @@ -288,7 +288,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/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 7de923d1c5a2..08af87151784 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -54,6 +54,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include #include @@ -100,8 +101,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #endif @@ -288,7 +288,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/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c index 7de923d1c5a2..08af87151784 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -54,6 +54,7 @@ #include "opt_clock.h" #include "opt_apm.h" +#include "opt_mca.h" #include #include @@ -100,8 +101,7 @@ #include -#include "mca.h" -#if NMCA > 0 +#ifdef DEV_MCA #include #endif @@ -288,7 +288,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);