diff options
author | nyan <nyan@FreeBSD.org> | 2003-11-04 13:01:41 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2003-11-04 13:01:41 +0000 |
commit | 52ef645f2cbf701ab2e6d2a204e7ad345ac8f21d (patch) | |
tree | 2e93286dd00b6d8922f94a7854084cf4cf610610 | |
parent | c5907a254d4484ce6f04e717e1dd66ba6d49ccc0 (diff) | |
download | FreeBSD-src-52ef645f2cbf701ab2e6d2a204e7ad345ac8f21d.zip FreeBSD-src-52ef645f2cbf701ab2e6d2a204e7ad345ac8f21d.tar.gz |
Split pc98 support into pc98/pc98/nmi.c.
-rw-r--r-- | sys/amd64/isa/nmi.c | 23 | ||||
-rw-r--r-- | sys/i386/isa/nmi.c | 23 | ||||
-rw-r--r-- | sys/pc98/cbus/nmi.c | 78 | ||||
-rw-r--r-- | sys/pc98/pc98/nmi.c | 78 |
4 files changed, 158 insertions, 44 deletions
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 5274145..4815587 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -51,16 +51,11 @@ __FBSDID("$FreeBSD$"); #include <i386/bios/mca_machdep.h> #endif -#ifdef PC98 -#define NMI_PARITY 0x04 -#define NMI_EPARITY 0x02 -#else #define NMI_PARITY (1 << 7) #define NMI_IOCHAN (1 << 6) #define ENMI_WATCHDOG (1 << 7) #define ENMI_BUSTIMER (1 << 6) #define ENMI_IOSTATUS (1 << 5) -#endif /* * Handle a NMI, possibly a machine check. @@ -70,22 +65,6 @@ int isa_nmi(int cd) { int retval = 0; -#ifdef PC98 - int port = inb(0x33); - - log(LOG_CRIT, "NMI PC98 port = %x\n", port); - if (epson_machine_id == 0x20) - epson_outb(0xc16, epson_inb(0xc16) | 0x1); - if (port & NMI_PARITY) { - log(LOG_CRIT, "BASE RAM parity error, likely hardware failure."); - retval = 1; - } else if (port & NMI_EPARITY) { - log(LOG_CRIT, "EXTENDED RAM parity error, likely hardware failure."); - retval = 1; - } else { - log(LOG_CRIT, "\nNMI Resume ??\n"); - } -#else /* IBM-PC */ int isa_port = inb(0x61); int eisa_port = inb(0x461); @@ -127,6 +106,6 @@ isa_nmi(int cd) log(LOG_CRIT, "EISA I/O port status error."); retval = 1; } -#endif + return(retval); } diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index 5274145..4815587 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -51,16 +51,11 @@ __FBSDID("$FreeBSD$"); #include <i386/bios/mca_machdep.h> #endif -#ifdef PC98 -#define NMI_PARITY 0x04 -#define NMI_EPARITY 0x02 -#else #define NMI_PARITY (1 << 7) #define NMI_IOCHAN (1 << 6) #define ENMI_WATCHDOG (1 << 7) #define ENMI_BUSTIMER (1 << 6) #define ENMI_IOSTATUS (1 << 5) -#endif /* * Handle a NMI, possibly a machine check. @@ -70,22 +65,6 @@ int isa_nmi(int cd) { int retval = 0; -#ifdef PC98 - int port = inb(0x33); - - log(LOG_CRIT, "NMI PC98 port = %x\n", port); - if (epson_machine_id == 0x20) - epson_outb(0xc16, epson_inb(0xc16) | 0x1); - if (port & NMI_PARITY) { - log(LOG_CRIT, "BASE RAM parity error, likely hardware failure."); - retval = 1; - } else if (port & NMI_EPARITY) { - log(LOG_CRIT, "EXTENDED RAM parity error, likely hardware failure."); - retval = 1; - } else { - log(LOG_CRIT, "\nNMI Resume ??\n"); - } -#else /* IBM-PC */ int isa_port = inb(0x61); int eisa_port = inb(0x461); @@ -127,6 +106,6 @@ isa_nmi(int cd) log(LOG_CRIT, "EISA I/O port status error."); retval = 1; } -#endif + return(retval); } diff --git a/sys/pc98/cbus/nmi.c b/sys/pc98/cbus/nmi.c new file mode 100644 index 0000000..2ebd868 --- /dev/null +++ b/sys/pc98/cbus/nmi.c @@ -0,0 +1,78 @@ +/*- + * Copyright (c) 1991 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/syslog.h> +#include <sys/systm.h> + +#include <machine/md_var.h> + +#include <pc98/pc98/epsonio.h> +#include <pc98/pc98/pc98_machdep.h> + +#define NMI_PARITY 0x04 +#define NMI_EPARITY 0x02 + +/* + * Handle a NMI, possibly a machine check. + * return true to panic system, false to ignore. + */ +int +isa_nmi(int cd) +{ + int retval = 0; + int port = inb(0x33); + + log(LOG_CRIT, "NMI PC98 port = %x\n", port); + if (epson_machine_id == 0x20) + epson_outb(0xc16, epson_inb(0xc16) | 0x1); + if (port & NMI_PARITY) { + log(LOG_CRIT, "BASE RAM parity error, likely hardware failure."); + retval = 1; + } else if (port & NMI_EPARITY) { + log(LOG_CRIT, "EXTENDED RAM parity error, likely hardware failure."); + retval = 1; + } else { + log(LOG_CRIT, "\nNMI Resume ??\n"); + } + + return(retval); +} diff --git a/sys/pc98/pc98/nmi.c b/sys/pc98/pc98/nmi.c new file mode 100644 index 0000000..2ebd868 --- /dev/null +++ b/sys/pc98/pc98/nmi.c @@ -0,0 +1,78 @@ +/*- + * Copyright (c) 1991 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/syslog.h> +#include <sys/systm.h> + +#include <machine/md_var.h> + +#include <pc98/pc98/epsonio.h> +#include <pc98/pc98/pc98_machdep.h> + +#define NMI_PARITY 0x04 +#define NMI_EPARITY 0x02 + +/* + * Handle a NMI, possibly a machine check. + * return true to panic system, false to ignore. + */ +int +isa_nmi(int cd) +{ + int retval = 0; + int port = inb(0x33); + + log(LOG_CRIT, "NMI PC98 port = %x\n", port); + if (epson_machine_id == 0x20) + epson_outb(0xc16, epson_inb(0xc16) | 0x1); + if (port & NMI_PARITY) { + log(LOG_CRIT, "BASE RAM parity error, likely hardware failure."); + retval = 1; + } else if (port & NMI_EPARITY) { + log(LOG_CRIT, "EXTENDED RAM parity error, likely hardware failure."); + retval = 1; + } else { + log(LOG_CRIT, "\nNMI Resume ??\n"); + } + + return(retval); +} |