Remove Micro Channel Architecture support. Of the commonly available

machines, only a few 486 machines that used it, and those haven't had
enough memory to run FreeBSD for quite some time (often limited to
16MB).

Not to be confused with the Machine Check Architecture, which is still
very much alive and used (and untouched by this commit).

No Objection From: arch@

4 files changed, 1 insertions, 52 deletions

diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c
index fc1d2dcdd391..ea8c3e2786a6 100644
--- a/sys/x86/isa/atpic.c
+++ b/sys/x86/isa/atpic.c
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_auto_eoi.h"
 #include "opt_isa.h"
-#include "opt_mca.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,9 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <x86/isa/icu.h>
 #include <isa/isareg.h>
 #include <isa/isavar.h>
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
 
 #ifdef __amd64__
 #define	SDT_ATPIC	SDT_SYSIGT
@@ -356,13 +352,7 @@ i8259_init(struct atpic *pic, int slave)
 
 	/* Reset the PIC and program with next four bytes. */
 	spinlock_enter();
-#ifdef DEV_MCA
-	/* MCA uses level triggered interrupts. */
-	if (MCA_system)
-		outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4 | ICW1_LTIM);
-	else
-#endif
-		outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4);
+	outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4);
 	imr_addr = pic->at_ioaddr + ICU_IMR_OFFSET;
 
 	/* Start vector. */
@@ -419,14 +409,6 @@ atpic_startup(void)
 		    ai->at_irq, ai->at_intr, SDT_ATPIC, SEL_KPL, GSEL_ATPIC);
 	}
 
-#ifdef DEV_MCA
-	/* For MCA systems, all interrupts are level triggered. */
-	if (MCA_system)
-		for (i = 0, ai = atintrs; i < NUM_ISA_IRQS; i++, ai++)
-			ai->at_trigger = INTR_TRIGGER_LEVEL;
-	else
-#endif
-
 	/*
 	 * Look for an ELCR.  If we find one, update the trigger modes.
 	 * If we don't find one, assume that IRQs 0, 1, 2, and 13 are
diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c
index 778481fb73c9..039dda1f1a3d 100644
--- a/sys/x86/isa/clock.c
+++ b/sys/x86/isa/clock.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_clock.h"
 #include "opt_isa.h"
-#include "opt_mca.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,10 +72,6 @@ __FBSDID("$FreeBSD$");
 #include <isa/isavar.h>
 #endif
 
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 int	clkintr_pending;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
@@ -153,11 +148,6 @@ clkintr(void *arg)
 	if (sc->et.et_active && sc->mode != MODE_STOP)
 		sc->et.et_event_cb(&sc->et, sc->et.et_arg);
 
-#ifdef DEV_MCA
-	/* Reset clock interrupt by asserting bit 7 of port 0x61 */
-	if (MCA_system)
-		outb(0x61, inb(0x61) | 0x80);
-#endif
 	return (FILTER_HANDLED);
 }
 
diff --git a/sys/x86/isa/nmi.c b/sys/x86/isa/nmi.c
index db5550c63423..fd6943029a51 100644
--- a/sys/x86/isa/nmi.c
+++ b/sys/x86/isa/nmi.c
@@ -35,18 +35,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_mca.h"
-
 #include <sys/types.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 
 #include <machine/md_var.h>
 
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 #define NMI_PARITY (1 << 7)
 #define NMI_IOCHAN (1 << 6)
 #define ENMI_WATCHDOG (1 << 7)
@@ -65,10 +59,6 @@ isa_nmi(int cd)
 	int eisa_port = inb(0x461);
 
 	log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port);
-#ifdef DEV_MCA
-	if (MCA_system && mca_bus_nmi())
-		return(0);
-#endif
 	
 	if (isa_port & NMI_PARITY) {
 		log(LOG_CRIT, "RAM parity error, likely hardware failure.");
diff --git a/sys/x86/x86/legacy.c b/sys/x86/x86/legacy.c
index e7a101fe06b5..6450fe0d80af 100644
--- a/sys/x86/x86/legacy.c
+++ b/sys/x86/x86/legacy.c
@@ -29,7 +29,6 @@
 
 #ifdef __i386__
 #include "opt_eisa.h"
-#include "opt_mca.h"
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -51,10 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/smp.h>
 
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 #include <machine/clock.h>
 #include <machine/resource.h>
 #include <x86/legacyvar.h>
@@ -144,14 +139,6 @@ legacy_attach(device_t dev)
 		device_probe_and_attach(child);
 	}
 #endif
-#ifdef DEV_MCA
-	if (MCA_system && !devclass_get_device(devclass_find("mca"), 0)) {
-        	child = BUS_ADD_CHILD(dev, 0, "mca", 0);
-        	if (child == 0)
-                	panic("legacy_probe mca");
-		device_probe_and_attach(child);
-	}
-#endif
 	if (!devclass_get_device(devclass_find("isa"), 0)) {
 		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
 		if (child == NULL)