From a40d5ee7726e4fd0241713083a83bc7e7467499f Mon Sep 17 00:00:00 2001 From: nyan Date: Wed, 14 Sep 2005 12:39:06 +0000 Subject: [PATCH] Remove EPSON PC-386 note A/W/AE/WR support. --- sys/boot/pc98/boot2/io.c | 15 ++--------- sys/pc98/cbus/fdc.c | 8 ------ sys/pc98/cbus/gdc.c | 26 +++++-------------- sys/pc98/cbus/nmi.c | 5 ---- sys/pc98/cbus/sio.c | 12 +++------ sys/pc98/pc98/epsonio.h | 54 ---------------------------------------- 6 files changed, 12 insertions(+), 108 deletions(-) delete mode 100644 sys/pc98/pc98/epsonio.h diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c index 4d0324684e2c..240b76375011 100644 --- a/sys/boot/pc98/boot2/io.c +++ b/sys/boot/pc98/boot2/io.c @@ -354,7 +354,6 @@ void machine_check(void) int ret; int i; int data = 0; - u_char epson_machine_id = *(unsigned char *)V(0xA1624); /* PC98_SYSTEM_PARAMETER(0x501) */ ret = ((*(unsigned char*)V(0xA1501)) & 0x08) >> 3; @@ -390,18 +389,8 @@ void machine_check(void) } else { ret |= M_NOT_H98; } - } else { + } else ret |= M_NOT_H98; - switch (epson_machine_id) { - case 0x20: /* note A */ - case 0x22: /* note W */ - case 0x27: /* note AE */ - case 0x2a: /* note WR */ - ret |= M_NOTE; - break; - default: - break; - } - } + (*(unsigned long *)V(0xA1620)) = ret; } diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 4ba20ec37bed..2650fe7e5fa7 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -644,14 +644,6 @@ static void pc98_fd_check_type(struct fd_data *fd) } fd->type = FDT_12M; - - switch (epson_machine_id) { - case 0x20: - case 0x27: - if ((PC98_SYSTEM_PARAMETER(0x488) >> fd->fdu) & 0x01) - fd->type = FDT_NONE; - break; - } } #endif /* PC98 */ diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index f9c2f586f630..c7dd61eb7aef 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -1313,29 +1313,15 @@ gdc_blank_display(video_adapter_t *adp, int mode) /* FALLTHROUGH */ case V_DISPLAY_BLANK: - if (epson_machine_id == 0x20) { - outb(0x43f, 0x42); - outb(0xc17, inb(0xc17) & ~0x08); /* turn off side light */ - outb(0xc16, inb(0xc16) & ~0x02); /* turn off back light */ - outb(0x43f, 0x40); - } else { - while (!(inb(TEXT_GDC) & 0x20)) /* V-SYNC wait */ - ; - outb(TEXT_GDC + 8, 0x0e); /* DISP off */ - } + while (!(inb(TEXT_GDC) & 0x20)) /* V-SYNC wait */ + ; + outb(TEXT_GDC + 8, 0x0e); /* DISP off */ break; case V_DISPLAY_ON: - if (epson_machine_id == 0x20) { - outb(0x43f, 0x42); - outb(0xc17, inb(0xc17) | 0x08); - outb(0xc16, inb(0xc16) | 0x02); - outb(0x43f, 0x40); - } else { - while (!(inb(TEXT_GDC) & 0x20)) /* V-SYNC wait */ - ; - outb(TEXT_GDC + 8, 0x0f); /* DISP on */ - } + while (!(inb(TEXT_GDC) & 0x20)) /* V-SYNC wait */ + ; + outb(TEXT_GDC + 8, 0x0f); /* DISP on */ if (standby) { outb(0x09a2, 0x00); /* V/H-SYNC unmask */ standby = 0; diff --git a/sys/pc98/cbus/nmi.c b/sys/pc98/cbus/nmi.c index 431dd060cc19..16612aa25b44 100644 --- a/sys/pc98/cbus/nmi.c +++ b/sys/pc98/cbus/nmi.c @@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$"); #include -#include -#include - #define NMI_PARITY 0x04 #define NMI_EPARITY 0x02 @@ -58,8 +55,6 @@ isa_nmi(int cd) 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; diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 007e1b2e8c96..b1accbf6e753 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -945,9 +945,6 @@ sioprobe(dev, xrid, rclk, noprobe) */ result = 0; } - if (epson_machine_id==0x20) { /* XXX */ - result = 0; - } bus_release_resource(dev, SYS_RES_IOPORT, rid, port); if (result) { device_set_softc(dev, NULL); @@ -4129,6 +4126,7 @@ com_cflag_and_speed_set( struct com_s *com, int cflag, int speed) { int cfcr=0; int previnterrupt; + int tmp; u_int count; if (pc98_ttspeedtab(com, speed, &count) != 0) @@ -4165,11 +4163,9 @@ com_cflag_and_speed_set( struct com_s *com, int cflag, int speed) else cfcr |= MOD8251_CLKX16; - if (epson_machine_id != 0x20) { /* XXX */ - int tmp; - while (!((tmp = inb(com->sts_port)) & STS8251_TxEMP)) - ; - } + while (!((tmp = inb(com->sts_port)) & STS8251_TxEMP)) + ; + /* set baud rate from ospeed */ pc98_set_baud_rate( com, count ); diff --git a/sys/pc98/pc98/epsonio.h b/sys/pc98/pc98/epsonio.h deleted file mode 100644 index ebbff0a7011d..000000000000 --- a/sys/pc98/pc98/epsonio.h +++ /dev/null @@ -1,54 +0,0 @@ -/*- - * Copyright (c) KATO Takenori, 1996. All rights reserved. - * - * 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 as - * the first lines of this file unmodified. - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - * - * $FreeBSD$ - */ - -#ifndef __PC98_PC98_EPSONIO_H__ -#define __PC98_PC98_EPSONIO_H__ - -#include - -static __inline u_char -epson_inb(u_int port) -{ - u_char data; - - outb(0x43f, 0x42); - data = inb(port); - outb(0x43f, 0x40); - return (data); -} - -static __inline void -epson_outb(u_int port, u_char data) -{ - outb(0x43f, 0x42); - outb(port,data); - outb(0x43f, 0x40); -} - -#endif