From: Sascha Wildner Date: Sat, 1 Dec 2012 22:46:53 +0000 (+0100) Subject: cy(4): Remove ISA support. X-Git-Tag: v3.4.0rc~758 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/558b0a0bdfb7d23b00a70f506da24cbb04eb672b cy(4): Remove ISA support. --- diff --git a/UPDATING b/UPDATING index 1584199971..e61ee9b379 100644 --- a/UPDATING +++ b/UPDATING @@ -29,16 +29,16 @@ kernel config, you need to change it to IFPOLL_ENABLE. Also, the KTR_POLLING kernel option has been removed, so it must be removed from kernel configs that have it. -BUSLOGIC AND STALLION ISA SUPPORT REMOVED ------------------------------------------ +BUSLOGIC, CYCLADES AND STALLION ISA SUPPORT REMOVED +--------------------------------------------------- The bt(4) driver for Buslogic SCSI adapters has been made PCI only. ISA cards will no longer be detected. The same has been done for Stallion multiport serial controllers. stli(4) has been completely removed (along with the stlload(8) and stlstty(8) -utilities) and stl(4) was changed to support only PCI cards. Both drivers -are i386 only. +utilities) and stl(4) was changed to support only PCI cards. Similarly, +ISA support was removed from cy(4) too. All these drivers are i386 only. +-----------------------------------------------------------------------+ + UPGRADING DRAGONFLY FROM 3.0 to later versions + diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4 index bbd8c1e895..5089dec4c6 100644 --- a/share/man/man4/isa.4 +++ b/share/man/man4/isa.4 @@ -72,8 +72,6 @@ Generic ATA/ATAPI disk controller driver .El .Ss Serial and parallel interfaces .Bl -tag -width 12n -offset indent -compact -.It Xr cy 4 -Cyclades Cyclom-Y serial driver .It Xr digi 4 DigiBoard intelligent serial cards driver .It Xr lpt 4 diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4 index d28dd6b4c7..5387225682 100644 --- a/share/man/man4/man4.i386/cy.4 +++ b/share/man/man4/man4.i386/cy.4 @@ -36,7 +36,6 @@ .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp .\" from: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $ .\" $FreeBSD: src/share/man/man4/man4.i386/cy.4,v 1.13.2.2 2001/08/17 13:08:45 ru Exp $ -.\" $DragonFly: src/share/man/man4/man4.i386/cy.4,v 1.4 2008/05/02 02:05:06 swildner Exp $ .\" .Dd June 14, 1999 .Dt CY 4 i386 @@ -45,8 +44,7 @@ .Nm cy .Nd Cyclades Cyclom-Y serial driver .Sh SYNOPSIS -.Cd "device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000" -.Cd "device cy1 at isa? irq 11 iomem 0xd6000 iosiz 0x2000" +.Cd "device cy" .Pp Minor numbering: .Bd -literal diff --git a/sys/bus/isa/i386/isa_compat.h b/sys/bus/isa/i386/isa_compat.h index 94098009f2..3cb619a60f 100644 --- a/sys/bus/isa/i386/isa_compat.h +++ b/sys/bus/isa/i386/isa_compat.h @@ -26,8 +26,6 @@ * $FreeBSD: src/sys/i386/isa/isa_compat.h,v 1.27.2.11 2002/10/05 18:31:48 scottl Exp $ */ -#include "use_cy.h" - struct old_isa_driver { int type; struct isa_driver *driver; @@ -47,10 +45,6 @@ static struct old_isa_driver old_drivers[] = { /* TTY */ -#if NCY > 0 - { 0, &cydriver }, -#endif - /* BIO */ /* NET */ diff --git a/sys/config/LINT b/sys/config/LINT index 9563496b87..5af22768fd 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -1555,7 +1555,7 @@ device "snd_uaudio" device apm0 device ecc device joy0 at isa? port IO_GAME -device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000 +device cy device nrp device si0 at isa? iomem 0xd0000 irq 12 device spic0 at isa? irq 0 port 0x10a0 diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c index 3151430fff..c2e435d8ed 100644 --- a/sys/dev/serial/cy/cy.c +++ b/sys/dev/serial/cy/cy.c @@ -85,7 +85,6 @@ #include #include -#include #include "cyreg.h" #include @@ -330,7 +329,6 @@ int cyattach_common (cy_addr cy_iobase, int cy_align); void siointr(void *); static int cy_units (cy_addr cy_iobase, int cy_align); -static int sioattach (struct isa_device *dev); static void cd1400_channel_cmd (struct com_s *com, int cmd); static void cd1400_channel_cmd_wait (struct com_s *com); static void cd_etc (struct com_s *com, int etc); @@ -345,7 +343,6 @@ static void siointr1 (struct com_s *com); static int commctl (struct com_s *com, int bits, int how); static int comparam (struct tty *tp, struct termios *t); static inthand2_t siopoll; -static int sioprobe (struct isa_device *dev); static void siosettimeout (void); static int siosetwater (struct com_s *com, speed_t speed); static int comspeed (speed_t speed, u_long cy_clock, @@ -366,10 +363,6 @@ static char driver_name[] = "cy"; static struct com_s *p_com_addr[NSIO]; #define com_addr(unit) (p_com_addr[unit]) -struct isa_driver siodriver = { - sioprobe, sioattach, driver_name -}; - static d_open_t sioopen; static d_close_t sioclose; static d_write_t siowrite; @@ -417,24 +410,6 @@ static int cy_total_devices; #undef RxFifoThreshold static int volatile RxFifoThreshold = (CD1400_RX_FIFO_SIZE / 2); -static int -sioprobe(struct isa_device *dev) -{ - cy_addr iobase; - - iobase = (cy_addr)dev->id_maddr; - - /* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */ - cy_inb(iobase, CY16_RESET, 0); /* XXX? */ - DELAY(500); /* wait for the board to get its act together */ - - /* this is needed to get the board out of reset */ - cy_outb(iobase, CY_CLEAR_INTR, 0, 0); - DELAY(500); - - return (cy_units(iobase, 0) == 0 ? 0 : -1); -} - static int cy_units(cy_addr cy_iobase, int cy_align) { @@ -482,33 +457,6 @@ cy_units(cy_addr cy_iobase, int cy_align) return (cyu); } -static int -sioattach(struct isa_device *isdp) -{ - int adapter; - - lwkt_gettoken(&tty_token); - adapter = cyattach_common((cy_addr) isdp->id_maddr, 0); - if (adapter < 0) { - lwkt_reltoken(&tty_token); - return (0); - } - - /* - * XXX - * This kludge is to allow ISA/PCI device specifications in the - * kernel config file to be in any order. - */ - if (isdp->id_unit != adapter) { - kprintf("cy%d: attached as cy%d\n", isdp->id_unit, adapter); - isdp->id_unit = adapter; /* XXX */ - } - isdp->id_intr = (inthand2_t *)siointr; - /* isdp->id_ri_flags |= RI_FAST; XXX unimplemented - use newbus! */ - lwkt_reltoken(&tty_token); - return (1); -} - /* * NOTE: Must be called with tty_token held */ diff --git a/sys/platform/pc32/i386/userconfig.c b/sys/platform/pc32/i386/userconfig.c index 82fee6967d..f5c674cd2c 100644 --- a/sys/platform/pc32/i386/userconfig.c +++ b/sys/platform/pc32/i386/userconfig.c @@ -353,7 +353,6 @@ static DEV_INFO device_info[] = { {"sio", "8250/16450/16550 Serial port", 0, CLS_COMMS}, {"cx", "Cronyx/Sigma multiport sync/async adapter",0, CLS_COMMS}, -{"cy", "Cyclades multiport async adapter", 0, CLS_COMMS}, {"si", "Specialix SI/XIO/SX async adapter", 0, CLS_COMMS}, {"ppc", "Parallel Port chipset", 0, CLS_COMMS},