tedu FDDI support and the 3 flavors the driver for DEC devices, even

miod@ cannot find two boards using the same media.

With precious punctuation review from guenther@, thanks!

ok deraadt@, henning@

2 files changed, 1 insertions, 132 deletions

diff --git a/sys/dev/tc/files.tc b/sys/dev/tc/files.tc
index 4487b0db9f8..7abbfb13941 100644
--- a/sys/dev/tc/files.tc
+++ b/sys/dev/tc/files.tc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.tc,v 1.10 2013/09/24 20:11:05 miod Exp $
+#	$OpenBSD: files.tc,v 1.11 2013/10/28 12:33:32 mpi Exp $
 #	$NetBSD: files.tc,v 1.26 2001/11/28 10:21:24 lukem Exp $
 #
 # Config file and device description for machine-independent
@@ -28,11 +28,6 @@ device	bba: audio, am7930, mulaw
 attach	bba at ioasic
 file	dev/tc/bba.c			bba
 
-# DEFTA FDDI controller
-device	fta: pdq, fddi, ifnet
-attach	fta at tc
-file	dev/tc/if_fta.c			fta
-
 # TCDS dual channel SCSI
 device	tcds {[chip = -1]}
 attach	tcds at tc
diff --git a/sys/dev/tc/if_fta.c b/sys/dev/tc/if_fta.c
deleted file mode 100644
index d0720800c2b..00000000000
--- a/sys/dev/tc/if_fta.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$OpenBSD: if_fta.c,v 1.17 2010/09/20 07:40:42 deraadt Exp $	*/
-/*	$NetBSD: if_fta.c,v 1.7 1996/10/22 21:37:26 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1996 Matt Thomas <matt@3am-software.com>
- * 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.
- * 2. 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.
- *
- * Id: if_fta.c,v 1.3 1996/05/17 01:15:18 thomas Exp
- *
- */
-
-/*
- * DEC TurboChannel FDDI Controller; code for BSD derived operating systems
- *
- * Written by Matt Thomas
- *
- *   This module supports the DEC DEFTA TurboChannel FDDI Controller
- */
-
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/device.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-#include <net/if_fddi.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <dev/tc/tcvar.h>
-#include <dev/ic/pdqvar.h>
-#include <dev/ic/pdqreg.h>
-
-int	pdq_tc_match(struct device *, void *, void *);
-void	pdq_tc_attach(struct device *, struct device *, void *);
-
-int
-pdq_tc_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	struct tc_attach_args *ta = (struct tc_attach_args *) aux;
-
-	if (strncmp("PMAF-F", ta->ta_modname, 6) == 0)
-		return (1);
-	return (0);
-}
-
-void
-pdq_tc_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
-{
-	pdq_softc_t * const sc = (pdq_softc_t *) self;
-	struct tc_attach_args * const ta = (struct tc_attach_args *) aux;
-
-	/*
-	 * NOTE: sc_bc is an alias for sc_csrtag and sc_membase is an
-	 * alias for sc_csrhandle.  sc_iobase is not used in this front-end.
-	 */
-	sc->sc_csrtag = ta->ta_memt;
-	bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ);
-	sc->sc_if.if_flags = 0;
-	sc->sc_if.if_softc = sc;
-
-	if (bus_space_map(sc->sc_csrtag, ta->ta_addr + PDQ_TC_CSR_OFFSET,
-		    PDQ_TC_CSR_SPACE, 0, &sc->sc_csrhandle)) {
-		printf("\n%s: can't map card memory!\n", sc->sc_dev.dv_xname);
-		return;
-	}
-
-	printf("\n");
-	sc->sc_pdq = pdq_initialize(sc->sc_csrtag, sc->sc_csrhandle,
-	    sc->sc_if.if_xname, 0, (void *) sc, PDQ_DEFTA);
-	if (sc->sc_pdq == NULL) {
-		printf("%s: initialization failed\n", sc->sc_dev.dv_xname);
-		return;
-	}
-	bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes,
-	    sc->sc_arpcom.ac_enaddr, 6);
-	pdq_ifattach(sc, NULL);
-
-	tc_intr_establish(parent, ta->ta_cookie, IPL_NET,
-	    (int (*)(void *)) pdq_interrupt, sc->sc_pdq, self->dv_xname);
-}
-
-struct cfattach fta_ca = {
-	sizeof(pdq_softc_t), pdq_tc_match, pdq_tc_attach
-};
-
-struct cfdriver fta_cd = {
-	NULL, "fta", DV_IFNET
-};