rm rtfps driver. disabled and man page doesn't inspire much confidence.

ok deraadt

5 files changed, 4 insertions, 326 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 9eb7238d062..7bfc0d18bf6 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.752 2020/01/21 16:18:27 mpi Exp $
+#	$OpenBSD: Makefile,v 1.753 2020/01/22 05:06:18 tedu Exp $
 
 MAN=	aac.4 abcrtc.4 ac97.4 acphy.4 acrtc.4 \
 	acpi.4 acpiac.4 acpials.4 acpiasus.4 acpibat.4 \
@@ -64,7 +64,7 @@ MAN=	aac.4 abcrtc.4 ac97.4 acphy.4 acrtc.4 \
 	rge.4 ricohrtc.4 rkclock.4 rkdwusb.4 rkemmcphy.4 rkgpio.4 rkgrf.4 \
 	rkiic.4 rkpcie.4 rkpinctrl.4 rkpmic.4 rkpwm.4 rktemp.4 \
 	rl.4 rlphy.4 route.4 rsu.4 rtsx.4 rum.4 run.4 \
-	rtfps.4 rtw.4 rtwn.4 safe.4 safte.4 sbus.4 schsio.4 \
+	rtw.4 rtwn.4 safe.4 safte.4 sbus.4 schsio.4 \
 	scsi.4 sd.4 \
 	sdmmc.4 sdhc.4 se.4 ses.4 \
 	sf.4 sili.4 simplefb.4 siop.4 sis.4 sk.4 \
diff --git a/share/man/man4/rtfps.4 b/share/man/man4/rtfps.4
deleted file mode 100644
index 54d3e15c7d0..00000000000
--- a/share/man/man4/rtfps.4
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"	$OpenBSD: rtfps.4,v 1.13 2014/02/20 17:56:35 schwarze Exp $
-.\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Systems Programming Group of the University of Utah Computer
-.\" Science Department.
-.\" 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. 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: @(#)dca.4	5.2 (Berkeley) 3/27/91
-.\"	from: Id: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\"
-.Dd $Mdocdate: February 20 2014 $
-.Dt RTFPS 4
-.Os
-.Sh NAME
-.Nm rtfps
-.Nd multiplexing serial communications interface
-.Sh SYNOPSIS
-.Cd "rtfps0 at isa? port 0x1230 irq 10"
-.Cd "com* at rtfps?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for IBM RT PC boards that multiplex together up to four
-.Tn EIA
-.Tn RS-232C
-.Pq Tn CCITT V.28
-or
-.Tn RS-422A
-communications interfaces.
-.Pp
-Each
-.Nm
-device is the master device for up to four
-.Nm com
-devices.
-The kernel configuration specifies these
-.Nm com
-devices as slave devices of the
-.Nm
-device, as shown in
-.Sx SYNOPSIS .
-The
-.Cd port
-specification for the
-.Nm
-device is used to compute the base addresses for the
-.Nm com
-subdevices.
-.Sh FILES
-.Bl -tag -width Pa
-.It Pa /dev/tty0?
-.El
-.Sh SEE ALSO
-.Xr com 4 ,
-.Xr intro 4 ,
-.Xr isa 4
-.Sh HISTORY
-The
-.Nm
-driver was written by
-.An Charles Hannum ,
-based on the
-.Nm ast
-driver.
-.Sh BUGS
-The
-.Nm
-driver is unlikely to work on non-EISA and non-PCI machines.
-The ISA bus only asserts 10 I/O address lines, and this is not enough.
-.Pp
-Even on EISA and PCI machines, some address conflicts have been observed.
-On one machine, the second port always conflicted with something (though
-it's not clear what) and caused strange results.
-Disabling the second port in the kernel config allowed the other three
-ports to function correctly.
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a2dee192f81..ad83d7d34a6 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.849 2020/01/20 23:21:01 tedu Exp $
+#	$OpenBSD: GENERIC,v 1.850 2020/01/22 05:06:19 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -408,8 +408,6 @@ com*	at ast?
 #com*	at boca?
 #addcom0	at isa? port 0x108 irq 5	# Addonics FlexPort
 #com*	at addcom?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps?
 #hsq0	at isa? port 0x140 irq 10	# Hostess 4-port serial card
 #com*	at hsq?
 com*	at pcmcia?			# PCMCIA modems/serial ports
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 65877402ccf..2a670c39d27 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.124 2018/02/14 23:51:49 jsg Exp $
+#	$OpenBSD: files.isa,v 1.125 2020/01/22 05:06:19 tedu Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -54,11 +54,6 @@ device	addcom: commulti
 attach	addcom at isa with addcom_isa
 file	dev/isa/addcom_isa.c		addcom
 
-# IBM RT PC 4-port board
-device	rtfps: commulti
-attach	rtfps at isa
-file	dev/isa/rtfps.c			rtfps
-
 # Hostess 4-port board
 device	hsq: commulti
 attach	hsq at isa
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
deleted file mode 100644
index d45c6e57442..00000000000
--- a/sys/dev/isa/rtfps.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*	$OpenBSD: rtfps.c,v 1.19 2002/03/14 01:26:56 millert Exp $       */
-/*	$NetBSD: rtfps.c,v 1.27 1996/10/21 22:41:18 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
- * Copyright (c) 1995 Charles Hannum.  All rights reserved.
- *
- * This code is derived from public-domain software written by
- * Roland McGrath.
- *
- * 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 Charles Hannum.
- * 4. 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.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/termios.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/ic/comreg.h>
-#include <dev/ic/comvar.h>
-
-#define	NSLAVES	4
-
-struct rtfps_softc {
-	struct device sc_dev;
-	void *sc_ih;
-
-	bus_space_tag_t sc_iot;
-	int sc_iobase;
-	int sc_irqport;
-	bus_space_handle_t sc_irqioh;
-
-	int sc_alive;			/* mask of slave units attached */
-	void *sc_slaves[NSLAVES];	/* com device unit numbers */
-	bus_space_handle_t sc_slaveioh[NSLAVES];
-};
-
-int rtfpsprobe(struct device *, void *, void *);
-void rtfpsattach(struct device *, struct device *, void *);
-int rtfpsintr(void *);
-int rtfpsprint(void *, const char *);
-
-struct cfattach rtfps_ca = {
-	sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach
-};
-
-struct cfdriver rtfps_cd = {
-	NULL, "rtfps", DV_TTY
-};
-
-int
-rtfpsprobe(parent, self, aux)
-	struct device *parent;
-	void *self;
-	void *aux;
-{
-	struct isa_attach_args *ia = aux;
-	int iobase = ia->ia_iobase;
-	bus_space_tag_t iot = ia->ia_iot;
-	bus_space_handle_t ioh;
-	int i, rv = 1;
-
-	/*
-	 * Do the normal com probe for the first UART and assume
-	 * its presence, and the ability to map the other UARTS,
-	 * means there is a multiport board there.
-	 * XXX Needs more robustness.
-	 */
-
-	/* if the first port is in use as console, then it. */
-	if (iobase == comconsaddr && !comconsattached)
-		goto checkmappings;
-
-	if (bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh)) {
-		rv = 0;
-		goto out;
-	}
-	rv = comprobe1(iot, ioh);
-	bus_space_unmap(iot, ioh, COM_NPORTS);
-	if (rv == 0)
-		goto out;
-
-checkmappings:
-	for (i = 1; i < NSLAVES; i++) {
-		iobase += COM_NPORTS;
-
-		if (iobase == comconsaddr && !comconsattached)
-			continue;
-
-		if (bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh)) {
-			rv = 0;
-			goto out;
-		}
-		bus_space_unmap(iot, ioh, COM_NPORTS);
-	}
-
-out:
-	if (rv)
-		ia->ia_iosize = NSLAVES * COM_NPORTS;
-	return (rv);
-}
-
-int
-rtfpsprint(aux, pnp)
-	void *aux;
-	const char *pnp;
-{
-	struct commulti_attach_args *ca = aux;
-
-	if (pnp)
-		printf("com at %s", pnp);
-	printf(" slave %d", ca->ca_slave);
-	return (UNCONF);
-}
-
-void
-rtfpsattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
-{
-	struct rtfps_softc *sc = (void *)self;
-	struct isa_attach_args *ia = aux;
-	struct commulti_attach_args ca;
-	static int irqport[] = {
-		IOBASEUNK, IOBASEUNK, IOBASEUNK, IOBASEUNK,
-		IOBASEUNK, IOBASEUNK, IOBASEUNK, IOBASEUNK,
-		IOBASEUNK,     0x2f2,     0x6f2,     0x6f3,
-		IOBASEUNK, IOBASEUNK, IOBASEUNK, IOBASEUNK
-	};
-	bus_space_tag_t iot = ia->ia_iot;
-	int i;
-
-	sc->sc_iot = ia->ia_iot;
-	sc->sc_iobase = ia->ia_iobase;
-
-	if (ia->ia_irq >= 16 || irqport[ia->ia_irq] == IOBASEUNK)
-		panic("rtfpsattach: invalid irq");
-	sc->sc_irqport = irqport[ia->ia_irq];
-
-	for (i = 0; i < NSLAVES; i++)
-		if (bus_space_map(iot, sc->sc_iobase + i * COM_NPORTS,
-		    COM_NPORTS, 0, &sc->sc_slaveioh[i]))
-			panic("rtfpsattach: couldn't map slave %d", i);
-	if (bus_space_map(iot, sc->sc_irqport, 1, 0, &sc->sc_irqioh))
-		panic("rtfpsattach: couldn't map irq port at 0x%x",
-		    sc->sc_irqport);
-
-	bus_space_write_1(iot, sc->sc_irqioh, 0, 0);
-
-	printf("\n");
-
-	for (i = 0; i < NSLAVES; i++) {
-		ca.ca_slave = i;
-		ca.ca_iot = sc->sc_iot;
-		ca.ca_ioh = sc->sc_slaveioh[i];
-		ca.ca_iobase = sc->sc_iobase + i * COM_NPORTS;
-		ca.ca_noien = 0;
-
-		sc->sc_slaves[i] = config_found(self, &ca, rtfpsprint);
-		if (sc->sc_slaves[i] != NULL)
-			sc->sc_alive |= 1 << i;
-	}
-
-	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
-	    IPL_TTY, rtfpsintr, sc, sc->sc_dev.dv_xname);
-}
-
-int
-rtfpsintr(arg)
-	void *arg;
-{
-	struct rtfps_softc *sc = arg;
-	bus_space_tag_t iot = sc->sc_iot;
-	int alive = sc->sc_alive;
-
-	bus_space_write_1(iot, sc->sc_irqioh, 0, 0);
-
-#define	TRY(n) \
-	if (alive & (1 << (n))) \
-		comintr(sc->sc_slaves[n]);
-	TRY(0);
-	TRY(1);
-	TRY(2);
-	TRY(3);
-#undef TRY
-
-	return (1);
-}