Convert mca (microchannel bus support) from something that we count

(bogus) to something that we test for the presence of.
This commit is contained in:
Peter Wemm 2001-01-29 11:57:27 +00:00
parent 435ff15c3b
commit f444a0efe9
15 changed files with 47 additions and 46 deletions

@ -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);

@ -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);

@ -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

@ -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

@ -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

@ -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

@ -492,3 +492,4 @@ NDEVFSOVERFLOW opt_devfs.h
# various 'device presence' options.
DEV_SNP opt_snp.h
DEV_MCA opt_mca.h

@ -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);

@ -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);

@ -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

@ -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

@ -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);

@ -54,6 +54,7 @@
#include "opt_clock.h"
#include "opt_apm.h"
#include "opt_mca.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -100,8 +101,7 @@
#include <i386/isa/intr_machdep.h>
#include "mca.h"
#if NMCA > 0
#ifdef DEV_MCA
#include <i386/isa/mca_machdep.h>
#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);

@ -54,6 +54,7 @@
#include "opt_clock.h"
#include "opt_apm.h"
#include "opt_mca.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -100,8 +101,7 @@
#include <i386/isa/intr_machdep.h>
#include "mca.h"
#if NMCA > 0
#ifdef DEV_MCA
#include <i386/isa/mca_machdep.h>
#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);

@ -54,6 +54,7 @@
#include "opt_clock.h"
#include "opt_apm.h"
#include "opt_mca.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -100,8 +101,7 @@
#include <i386/isa/intr_machdep.h>
#include "mca.h"
#if NMCA > 0
#ifdef DEV_MCA
#include <i386/isa/mca_machdep.h>
#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);