diff options
author | nyan <nyan@FreeBSD.org> | 2005-09-14 12:39:06 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2005-09-14 12:39:06 +0000 |
commit | a40d5ee7726e4fd0241713083a83bc7e7467499f (patch) | |
tree | 3a8e44e951520ce285d67f255e34271a6e582f67 /sys/pc98/cbus | |
parent | d050e6481b2b36982b29527ae13c7c55b1737d2e (diff) | |
download | FreeBSD-src-a40d5ee7726e4fd0241713083a83bc7e7467499f.zip FreeBSD-src-a40d5ee7726e4fd0241713083a83bc7e7467499f.tar.gz |
Remove EPSON PC-386 note A/W/AE/WR support.
Diffstat (limited to 'sys/pc98/cbus')
-rw-r--r-- | sys/pc98/cbus/fdc.c | 8 | ||||
-rw-r--r-- | sys/pc98/cbus/gdc.c | 26 | ||||
-rw-r--r-- | sys/pc98/cbus/nmi.c | 5 | ||||
-rw-r--r-- | sys/pc98/cbus/sio.c | 12 |
4 files changed, 10 insertions, 41 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 4ba20ec..2650fe7 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 f9c2f58..c7dd61e 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 431dd06..16612aa 100644 --- a/sys/pc98/cbus/nmi.c +++ b/sys/pc98/cbus/nmi.c @@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> -#include <pc98/pc98/epsonio.h> -#include <pc98/pc98/pc98_machdep.h> - #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 007e1b2..b1accbf 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 ); |