Date: Sun, 22 Sep 2002 21:08:29 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17950 for review Message-ID: <200209230408.g8N48Tbt003163@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17950 Change 17950 by peter@peter_overcee on 2002/09/22 21:08:27 EISA? what's that? Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#5 edit .. //depot/projects/hammer/sys/x86_64/isa/isa.h#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#5 (text+ko) ==== @@ -181,9 +181,8 @@ { int retval = 0; int isa_port = inb(0x61); - int eisa_port = inb(0x461); - log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port); + log(LOG_CRIT, "NMI ISA STATUS 0x%02x", isa_port); if (isa_port & NMI_PARITY) { log(LOG_CRIT, "RAM parity error, likely hardware failure."); @@ -195,29 +194,7 @@ retval = 1; } - /* - * On a real EISA machine, this will never happen. However it can - * happen on ISA machines which implement XT style floating point - * error handling (very rare). Save them from a meaningless panic. - */ - if (eisa_port == 0xff) - return(retval); - - if (eisa_port & ENMI_WATCHDOG) { - log(LOG_CRIT, "EISA watchdog timer expired, likely hardware failure."); - retval = 1; - } - - if (eisa_port & ENMI_BUSTIMER) { - log(LOG_CRIT, "EISA bus timeout, likely hardware failure."); - retval = 1; - } - - if (eisa_port & ENMI_IOSTATUS) { - log(LOG_CRIT, "EISA I/O port status error."); - retval = 1; - } - return(retval); + return (retval); } /* ==== //depot/projects/hammer/sys/x86_64/isa/isa.h#4 (text+ko) ==== @@ -147,7 +147,6 @@ #define IO_COMSIZE 8 /* 8250, 16x50 com controllers */ #define IO_DMASIZE 16 /* 8237 DMA controllers */ #define IO_DPGSIZE 32 /* 74LS612 DMA page registers */ -#define IO_EISASIZE 256 /* EISA controllers */ #define IO_FDCSIZE 8 /* Nec765 floppy controllers */ #define IO_GAMSIZE 16 /* AT compatible game controllers */ #define IO_GSCSIZE 8 /* GeniScan GS-4500G hand scanner */ ==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#5 (text+ko) ==== @@ -223,15 +223,9 @@ */ bus_generic_attach(dev); /* - * And if we didn't see EISA or ISA on a pci bridge, create some + * And if we didn't see an ISA on a pci bridge, create some * connection points now so they show up "on motherboard". */ - if (!devclass_get_device(devclass_find("eisa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "eisa", 0); - if (child == NULL) - panic("nexus_attach eisa"); - device_probe_and_attach(child); - } if (!devclass_get_device(devclass_find("isa"), 0)) { child = BUS_ADD_CHILD(dev, 0, "isa", 0); if (child == NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209230408.g8N48Tbt003163>