Remove the el(4) driver for 3Com 3c501 ISA NICs from HEAD as threatened

earlier as no one has stepped up to test recent changes to the driver.
Oddly, the module was actually turned on on ia64 though I'm fairly certain
that no ia64 machine has ever had or will ever have an ISA slot.

Axe borrowed from:	phk

6 files changed, 0 insertions, 904 deletions

diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index b2dec20..c66937f 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -321,7 +321,6 @@ i386/isa/clock.c		standard
 i386/isa/elcr.c			standard
 i386/isa/elink.c		optional ep
 i386/isa/elink.c		optional ie
-i386/isa/if_el.c		optional el
 i386/isa/isa.c			optional isa
 i386/isa/isa_dma.c		optional isa
 i386/isa/nmi.c			standard
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 028a911..e6781ac 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -491,7 +491,6 @@ hint.mse.0.irq="5"
 # ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 #       HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf)
 #       (requires miibus)
-# el:   3Com 3C501 (slow!)
 # ie:   AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210;
 #       Intel EtherExpress
 # lnc:  Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
@@ -535,10 +534,6 @@ hint.ed.0.at="isa"
 hint.ed.0.port="0x280"
 hint.ed.0.irq="5"
 hint.ed.0.maddr="0xd8000"
-device		el
-hint.el.0.at="isa"
-hint.el.0.port="0x300"
-hint.el.0.irq="9"
 device		ie			# Hints only required for Starlan
 hint.ie.2.at="isa"
 hint.ie.2.port="0x300"
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
deleted file mode 100644
index 0612292..0000000
--- a/sys/i386/isa/if_el.c
+++ /dev/null
@@ -1,808 +0,0 @@
-/*-
- * Copyright (c) 1994, Matthew E. Kimmel.  Permission is hereby granted
- * to use, copy, modify and distribute this software provided that both
- * the copyright notice and this permission notice appear in all copies
- * of the software, derivative works or modified versions, and any
- * portions thereof.
- *
- * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/* Except of course for the portions of code lifted from other FreeBSD
- * drivers (mainly elread, elget and el_ioctl)
- */
-/* 3COM Etherlink 3C501 device driver for FreeBSD */
-/* Yeah, I know these cards suck, but you can also get them for free
- * really easily...
- */
-/* Bugs/possible improvements:
- *	- Does not currently support DMA
- *	- Does not currently support multicasts
- */
-#include "opt_inet.h"
-#include "opt_ipx.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-#include <sys/bus.h>
-
-#include <net/ethernet.h>
-#include <net/if.h>
-#include <net/if_types.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
-#include <net/bpf.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <isa/isavar.h>
-
-#include <i386/isa/if_elreg.h>
-
-/* For debugging convenience */
-#ifdef EL_DEBUG
-#define dprintf(x) printf x
-#else
-#define dprintf(x)
-#endif
-
-/* el_softc: per line info and status */
-struct el_softc {
-	struct ifnet		*el_ifp;
-	u_char			el_enaddr[6];
-	bus_space_handle_t	el_bhandle;
-	bus_space_tag_t		el_btag;
-	void			*el_intrhand;
-	struct resource		*el_irq;
-	struct resource		*el_res;
-	struct mtx		el_mtx;
-	char el_pktbuf[EL_BUFSIZ]; 	/* Frame buffer */
-};
-
-/* Prototypes */
-static int el_attach(device_t);
-static int el_detach(device_t);
-static void el_init(void *);
-static void el_init_locked(struct el_softc *);
-static int el_ioctl(struct ifnet *,u_long,caddr_t);
-static int el_probe(device_t);
-static void el_start(struct ifnet *);
-static void el_start_locked(struct ifnet *);
-static void el_reset(struct el_softc *);
-static void el_watchdog(struct ifnet *);
-static int el_shutdown(device_t);
-
-static void el_stop(struct el_softc *);
-static int el_xmit(struct el_softc *,int);
-static void elintr(void *);
-static __inline void elread(struct el_softc *,caddr_t,int);
-static struct mbuf *elget(caddr_t,int,struct ifnet *);
-static __inline void el_hardreset(struct el_softc *);
-
-static device_method_t el_methods[] = {
-        /* Device interface */
-	DEVMETHOD(device_probe,		el_probe),
-	DEVMETHOD(device_attach,	el_attach),
-	DEVMETHOD(device_detach,	el_detach),
-	DEVMETHOD(device_shutdown,	el_shutdown),
-	{ 0, 0 }
-};
-
-static driver_t el_driver = {
-	"el",
-	el_methods,
-	sizeof(struct el_softc)
-};
-
-static devclass_t el_devclass;
-
-DRIVER_MODULE(if_el, isa, el_driver, el_devclass, 0, 0);
-
-#define CSR_WRITE_1(sc, reg, val)       \
-	bus_space_write_1(sc->el_btag, sc->el_bhandle, reg, val)
-#define CSR_READ_1(sc, reg)		\
-	bus_space_read_1(sc->el_btag, sc->el_bhandle, reg)
-
-#define EL_LOCK(_sc)		mtx_lock(&(_sc)->el_mtx)
-#define EL_UNLOCK(_sc)		mtx_unlock(&(_sc)->el_mtx)
-#define EL_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->el_mtx, MA_OWNED)
-
-/* Probe routine.  See if the card is there and at the right place. */
-static int
-el_probe(device_t dev)
-{
-	struct el_softc *sc;
-	u_short base; /* Just for convenience */
-	int i, rid;
-
-	/* Grab some info for our structure */
-	sc = device_get_softc(dev);
-
-	if (isa_get_logicalid(dev))		/* skip PnP probes */
-		return (ENXIO);
-
-	if ((base = bus_get_resource_start(dev, SYS_RES_IOPORT, 0)) == 0)
-		return (ENXIO);
-
-	/* First check the base */
-	if((base < 0x280) || (base > 0x3f0)) {
-		device_printf(dev,
-		    "ioaddr must be between 0x280 and 0x3f0\n");
-		return(ENXIO);
-	}
-
-	/* Temporarily map the resources. */
-	rid = 0;
-	sc->el_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-	    0, ~0, EL_IOSIZ, RF_ACTIVE);
-
-	if (sc->el_res == NULL)
-		return(ENXIO);
-
-	sc->el_btag = rman_get_bustag(sc->el_res);
-	sc->el_bhandle = rman_get_bushandle(sc->el_res);
-
-	/* Now attempt to grab the station address from the PROM
-	 * and see if it contains the 3com vendor code.
-	 */
-	dprintf(("Probing 3c501 at 0x%x...\n",base));
-
-	/* Reset the board */
-	dprintf(("Resetting board...\n"));
-	CSR_WRITE_1(sc,EL_AC,EL_AC_RESET);
-	DELAY(5);
-	CSR_WRITE_1(sc,EL_AC,0);
-	dprintf(("Reading station address...\n"));
-	/* Now read the address */
-	for(i=0;i<ETHER_ADDR_LEN;i++) {
-		CSR_WRITE_1(sc,EL_GPBL,i);
-		sc->el_enaddr[i] = CSR_READ_1(sc,EL_EAW);
-	}
-
-	/* Now release resources */
-	bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->el_res);
-
-	dprintf(("Address is %6D\n",sc->el_enaddr, ":"));
-
-	/* If the vendor code is ok, return a 1.  We'll assume that
-	 * whoever configured this system is right about the IRQ.
-	 */
-	if((sc->el_enaddr[0] != 0x02) || (sc->el_enaddr[1] != 0x60)
-	   || (sc->el_enaddr[2] != 0x8c)) {
-		dprintf(("Bad vendor code.\n"));
-		return(ENXIO);
-	} else {
-		dprintf(("Vendor code ok.\n"));
-	}
-
-	device_set_desc(dev, "3Com 3c501 Ethernet");
-
-	return(0);
-}
-
-/* Do a hardware reset of the 3c501.  Do not call until after el_probe()! */
-static __inline void
-el_hardreset(sc)
-	struct el_softc *sc;
-{
-	register int j;
-
-	/* First reset the board */
-	EL_LOCK_ASSERT(sc);
-	CSR_WRITE_1(sc,EL_AC,EL_AC_RESET);
-	DELAY(5);
-	CSR_WRITE_1(sc,EL_AC,0);
-
-	/* Then give it back its ethernet address.  Thanks to the mach
-	 * source code for this undocumented goodie...
-	 */
-	for(j=0;j<ETHER_ADDR_LEN;j++)
-		CSR_WRITE_1(sc,j,IFP2ENADDR(sc->el_ifp)[j]);
-}
-
-/* Attach the interface to the kernel data structures.  By the time
- * this is called, we know that the card exists at the given I/O address.
- * We still assume that the IRQ given is correct.
- */
-static int
-el_attach(device_t dev)
-{
-	struct el_softc *sc;
-	struct ifnet *ifp;
-	int rid, error;
-
-	dprintf(("Attaching el%d...\n",device_get_unit(dev)));
-
-	/* Get things pointing to the right places. */
-	sc = device_get_softc(dev);
-	mtx_init(&sc->el_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
-	    MTX_DEF);
-	ifp = sc->el_ifp = if_alloc(IFT_ETHER);
-
-	if (ifp == NULL) {
-		mtx_destroy(&sc->el_mtx);
-		return (ENOSPC);
-	}
-
-	rid = 0;
-	sc->el_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-	    0, ~0, EL_IOSIZ, RF_ACTIVE);
-
-	if (sc->el_res == NULL) {
-		mtx_destroy(&sc->el_mtx);
-		if_free(ifp);
-		return(ENXIO);
-	}
-
-	rid = 0;
-	sc->el_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
-            RF_SHAREABLE | RF_ACTIVE);
-
-        if (sc->el_irq == NULL) {
-		mtx_destroy(&sc->el_mtx);
-		if_free(ifp);
-                bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->el_res);
-		return(ENXIO);
-	}
-
-	/* Initialize ifnet structure */
-	ifp->if_softc = sc;
-	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-	ifp->if_mtu = ETHERMTU;
-	ifp->if_start = el_start;
-	ifp->if_ioctl = el_ioctl;
-	ifp->if_watchdog = el_watchdog;
-	ifp->if_init = el_init;
-	ifp->if_flags = (IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX);
-	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
-
-	/* Now we can attach the interface */
-	dprintf(("Attaching interface...\n"));
-	ether_ifattach(ifp, sc->el_enaddr);
-
-	/* Finally, setup the interrupt handler. */
-	error = bus_setup_intr(dev, sc->el_irq, INTR_TYPE_NET | INTR_MPSAFE,
-		elintr, sc, &sc->el_intrhand);
-
-	if (error) {
-		ether_ifdetach(ifp);
-		if_free(ifp);
-		mtx_destroy(&sc->el_mtx);
-		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->el_irq);
-		bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->el_res);
-		return(ENXIO);
-	}
-
-	/* Now reset the board */
-	dprintf(("Resetting board...\n"));
-	EL_LOCK(sc);
-	el_hardreset(sc);
-	EL_UNLOCK(sc);
-
-	dprintf(("el_attach() finished.\n"));
-	return(0);
-}
-
-static int el_detach(dev)
-	device_t dev;
-{
-	struct el_softc *sc;
-	struct ifnet *ifp;
-
-	sc = device_get_softc(dev);
-	ifp = sc->el_ifp;
-
-	EL_LOCK(sc);
-	el_stop(sc);
-	EL_UNLOCK(sc);
-	ether_ifdetach(ifp);
-	if_free(ifp);
-	bus_teardown_intr(dev, sc->el_irq, sc->el_intrhand);
-	bus_release_resource(dev, SYS_RES_IRQ, 0, sc->el_irq);
-	bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->el_res);
-	mtx_destroy(&sc->el_mtx);
-
-	return(0);
-}
-
-static int
-el_shutdown(dev)
-	device_t dev;
-{
-	struct el_softc *sc;
-
-	sc = device_get_softc(dev);
-	EL_LOCK(sc);
-	el_stop(sc);
-	EL_UNLOCK(sc);
-	return(0);
-}
-
-/* This routine resets the interface. */
-static void 
-el_reset(sc)
-	struct el_softc *sc;
-{
-
-	dprintf(("elreset()\n"));
-	el_stop(sc);
-	el_init_locked(sc);
-}
-
-static void el_stop(sc)
-	struct el_softc *sc;
-{
-
-	EL_LOCK_ASSERT(sc);
-	CSR_WRITE_1(sc,EL_AC,0);
-	el_hardreset(sc);
-}
-
-/* Initialize interface.  */
-static void
-el_init(xsc)
-	void *xsc;
-{
-	struct el_softc *sc = xsc;
-
-	EL_LOCK(sc);
-	el_init_locked(sc);
-	EL_UNLOCK(sc);
-}
-
-static void 
-el_init_locked(sc)
-	struct el_softc *sc;
-{
-	struct ifnet *ifp;
-
-	/* Set up pointers */
-	ifp = sc->el_ifp;
-
-	/* If address not known, do nothing. */
-	if(TAILQ_EMPTY(&ifp->if_addrhead)) /* XXX unlikely */
-		return;
-
-	EL_LOCK_ASSERT(sc);
-
-	/* First, reset the board. */
-	dprintf(("Resetting board...\n"));
-	el_hardreset(sc);
-
-	/* Configure rx */
-	dprintf(("Configuring rx...\n"));
-	if(ifp->if_flags & IFF_PROMISC)
-		CSR_WRITE_1(sc,EL_RXC,
-		    (EL_RXC_PROMISC|EL_RXC_ABROAD|EL_RXC_AMULTI|
-		    EL_RXC_AGF|EL_RXC_DSHORT|EL_RXC_DDRIB|EL_RXC_DOFLOW));
-	else
-		CSR_WRITE_1(sc,EL_RXC,
-		    (EL_RXC_ABROAD|EL_RXC_AMULTI|
-		    EL_RXC_AGF|EL_RXC_DSHORT|EL_RXC_DDRIB|EL_RXC_DOFLOW));
-	CSR_WRITE_1(sc,EL_RBC,0);
-
-	/* Configure TX */
-	dprintf(("Configuring tx...\n"));
-	CSR_WRITE_1(sc,EL_TXC,0);
-
-	/* Start reception */
-	dprintf(("Starting reception...\n"));
-	CSR_WRITE_1(sc,EL_AC,(EL_AC_IRQE|EL_AC_RX));
-
-	/* Set flags appropriately */
-	ifp->if_drv_flags |= IFF_DRV_RUNNING;
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-
-	/* And start output. */
-	el_start_locked(ifp);
-}
-
-/* Start output on interface.  Get datagrams from the queue and output
- * them, giving the receiver a chance between datagrams.  Call only
- * from splimp or interrupt level!
- */
-static void
-el_start(struct ifnet *ifp)
-{
-	struct el_softc *sc;
-
-	sc = ifp->if_softc;
-	EL_LOCK(sc);
-	el_start_locked(ifp);
-	EL_UNLOCK(sc);
-}
-
-static void
-el_start_locked(struct ifnet *ifp)
-{
-	struct el_softc *sc;
-	struct mbuf *m, *m0;
-	int i, len, retries, done;
-
-	/* Get things pointing in the right directions */
-	sc = ifp->if_softc;
-
-	dprintf(("el_start()...\n"));
-	EL_LOCK_ASSERT(sc);
-
-	/* Don't do anything if output is active */
-	if(sc->el_ifp->if_drv_flags & IFF_DRV_OACTIVE)
-		return;
-	sc->el_ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-
-	/* The main loop.  They warned me against endless loops, but
-	 * would I listen?  NOOO....
-	 */
-	while(1) {
-		/* Dequeue the next datagram */
-		IF_DEQUEUE(&sc->el_ifp->if_snd,m0);
-
-		/* If there's nothing to send, return. */
-		if(m0 == NULL) {
-			sc->el_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-			return;
-		}
-
-		/* Disable the receiver */
-		CSR_WRITE_1(sc,EL_AC,EL_AC_HOST);
-		CSR_WRITE_1(sc,EL_RBC,0);
-
-		/* Copy the datagram to the buffer. */
-		len = 0;
-		for(m = m0; m != NULL; m = m->m_next) {
-			if(m->m_len == 0)
-				continue;
-			bcopy(mtod(m,caddr_t),sc->el_pktbuf+len,m->m_len);
-			len += m->m_len;
-		}
-		m_freem(m0);
-
-		len = max(len,ETHER_MIN_LEN);
-
-		/* Give the packet to the bpf, if any */
-		BPF_TAP(sc->el_ifp, sc->el_pktbuf, len);
-
-		/* Transfer datagram to board */
-		dprintf(("el: xfr pkt length=%d...\n",len));
-		i = EL_BUFSIZ - len;
-		CSR_WRITE_1(sc,EL_GPBL,(i & 0xff));
-		CSR_WRITE_1(sc,EL_GPBH,((i>>8)&0xff));
-		bus_space_write_multi_1(sc->el_btag, sc->el_bhandle,
-		    EL_BUF, sc->el_pktbuf, len);
-
-		/* Now transmit the datagram */
-		retries=0;
-		done=0;
-		while(!done) {
-			if(el_xmit(sc,len)) { /* Something went wrong */
-				done = -1;
-				break;
-			}
-			/* Check out status */
-			i = CSR_READ_1(sc,EL_TXS);
-			dprintf(("tx status=0x%x\n",i));
-			if(!(i & EL_TXS_READY)) {
-				dprintf(("el: err txs=%x\n",i));
-				sc->el_ifp->if_oerrors++;
-				if(i & (EL_TXS_COLL|EL_TXS_COLL16)) {
-					if((!(i & EL_TXC_DCOLL16)) && retries < 15) {
-						retries++;
-						CSR_WRITE_1(sc,EL_AC,EL_AC_HOST);
-					}
-				}
-				else
-					done = 1;
-			}
-			else {
-				sc->el_ifp->if_opackets++;
-				done = 1;
-			}
-		}
-		if(done == -1)  /* Packet not transmitted */
-			continue;
-
-		/* Now give the card a chance to receive.
-		 * Gotta love 3c501s...
-		 */
-		(void)CSR_READ_1(sc,EL_AS);
-		CSR_WRITE_1(sc,EL_AC,(EL_AC_IRQE|EL_AC_RX));
-		EL_UNLOCK(sc);
-		/* Interrupt here */
-		EL_LOCK(sc);
-	}
-}
-
-/* This function actually attempts to transmit a datagram downloaded
- * to the board.  Call at splimp or interrupt, after downloading data!
- * Returns 0 on success, non-0 on failure
- */
-static int
-el_xmit(struct el_softc *sc,int len)
-{
-	int gpl;
-	int i;
-
-	gpl = EL_BUFSIZ - len;
-	dprintf(("el: xmit..."));
-	CSR_WRITE_1(sc,EL_GPBL,(gpl & 0xff));
-	CSR_WRITE_1(sc,EL_GPBH,((gpl>>8)&0xff));
-	CSR_WRITE_1(sc,EL_AC,EL_AC_TXFRX);
-	i = 20000;
-	while((CSR_READ_1(sc,EL_AS) & EL_AS_TXBUSY) && (i>0))
-		i--;
-	if(i == 0) {
-		dprintf(("tx not ready\n"));
-		sc->el_ifp->if_oerrors++;
-		return(-1);
-	}
-	dprintf(("%d cycles.\n",(20000-i)));
-	return(0);
-}
-
-/* Pass a packet up to the higher levels. */
-static __inline void
-elread(struct el_softc *sc,caddr_t buf,int len)
-{
-	struct ifnet *ifp = sc->el_ifp;
-	struct mbuf *m;
-
-	/*
-	 * Put packet into an mbuf chain
-	 */
-	EL_LOCK_ASSERT(sc);
-	m = elget(buf,len,ifp);
-	if(m == 0)
-		return;
-
-	EL_UNLOCK(sc);
-	(*ifp->if_input)(ifp,m);
-	EL_LOCK(sc);
-}
-
-/* controller interrupt */
-static void
-elintr(void *xsc)
-{
-	register struct el_softc *sc;
-	int stat, rxstat, len, done;
-
-
-	/* Get things pointing properly */
-	sc = xsc;
-	EL_LOCK(sc);
-	dprintf(("elintr: "));
-
-	/* Check board status */
-	stat = CSR_READ_1(sc,EL_AS);
-	if(stat & EL_AS_RXBUSY) {
-		(void)CSR_READ_1(sc,EL_RXC);
-		CSR_WRITE_1(sc,EL_AC,(EL_AC_IRQE|EL_AC_RX));
-		EL_UNLOCK(sc);
-		return;
-	}
-
-	done = 0;
-	while(!done) {
-		rxstat = CSR_READ_1(sc,EL_RXS);
-		if(rxstat & EL_RXS_STALE) {
-			(void)CSR_READ_1(sc,EL_RXC);
-			CSR_WRITE_1(sc,EL_AC,(EL_AC_IRQE|EL_AC_RX));
-			EL_UNLOCK(sc);
-			return;
-		}
-
-		/* If there's an overflow, reinit the board. */
-		if(!(rxstat & EL_RXS_NOFLOW)) {
-			dprintf(("overflow.\n"));
-			el_hardreset(sc);
-			/* Put board back into receive mode */
-			if(sc->el_ifp->if_flags & IFF_PROMISC)
-				CSR_WRITE_1(sc,EL_RXC,
-				    (EL_RXC_PROMISC|EL_RXC_ABROAD|
-		    		    EL_RXC_AMULTI|EL_RXC_AGF|EL_RXC_DSHORT|
-				    EL_RXC_DDRIB|EL_RXC_DOFLOW));
-			else
-				CSR_WRITE_1(sc,EL_RXC,
-				    (EL_RXC_ABROAD|
-		    		    EL_RXC_AMULTI|EL_RXC_AGF|EL_RXC_DSHORT|
-				    EL_RXC_DDRIB|EL_RXC_DOFLOW));
-			(void)CSR_READ_1(sc,EL_AS);
-			CSR_WRITE_1(sc,EL_RBC,0);
-			(void)CSR_READ_1(sc,EL_RXC);
-			CSR_WRITE_1(sc,EL_AC,(EL_AC_IRQE|EL_AC_RX));
-			EL_UNLOCK(sc);
-			return;
-		}
-
-		/* Incoming packet */
-		len = CSR_READ_1(sc,EL_RBL);
-		len |= CSR_READ_1(sc,EL_RBH) << 8;
-		dprintf(("receive len=%d rxstat=%x ",len,rxstat));
-		CSR_WRITE_1(sc,EL_AC,EL_AC_HOST);
-
-		/* If packet too short or too long, restore rx mode and return
-		 */
-		if((len <= sizeof(struct ether_header)) || (len > ETHER_MAX_LEN)) {
-			if(sc->el_ifp->if_flags & IFF_PROMISC)
-				CSR_WRITE_1(sc,EL_RXC,
-				    (EL_RXC_PROMISC|EL_RXC_ABROAD|
-		    		    EL_RXC_AMULTI|EL_RXC_AGF|EL_RXC_DSHORT|
-				    EL_RXC_DDRIB|EL_RXC_DOFLOW));
-			else
-				CSR_WRITE_1(sc,EL_RXC,
-				    (EL_RXC_ABROAD|
-		    		    EL_RXC_AMULTI|EL_RXC_AGF|EL_RXC_DSHORT|
-				    EL_RXC_DDRIB|EL_RXC_DOFLOW));
-			(void)CSR_READ_1(sc,EL_AS);
-			CSR_WRITE_1(sc,EL_RBC,0);
-			(void)CSR_READ_1(sc,EL_RXC);
-			CSR_WRITE_1(sc,EL_AC,(EL_AC_IRQE|EL_AC_RX));
-			EL_UNLOCK(sc);
-			return;
-		}
-
-		sc->el_ifp->if_ipackets++;
-
-		/* Copy the data into our buffer */
-		CSR_WRITE_1(sc,EL_GPBL,0);
-		CSR_WRITE_1(sc,EL_GPBH,0);
-		bus_space_read_multi_1(sc->el_btag, sc->el_bhandle,
-		    EL_BUF, sc->el_pktbuf, len);
-		CSR_WRITE_1(sc,EL_RBC,0);
-		CSR_WRITE_1(sc,EL_AC,EL_AC_RX);
-		dprintf(("%6D-->",sc->el_pktbuf+6,":"));
-		dprintf(("%6D\n",sc->el_pktbuf,":"));
-
-		/* Pass data up to upper levels */
-		elread(sc,(caddr_t)(sc->el_pktbuf),len);
-
-		/* Is there another packet? */
-		stat = CSR_READ_1(sc,EL_AS);
-
-		/* If so, do it all again (i.e. don't set done to 1) */
-		if(!(stat & EL_AS_RXBUSY))
-			dprintf(("<rescan> "));
-		else
-			done = 1;
-	}
-
-	(void)CSR_READ_1(sc,EL_RXC);
-	CSR_WRITE_1(sc,EL_AC,(EL_AC_IRQE|EL_AC_RX));
-	EL_UNLOCK(sc);
-	return;
-}
-
-/*
- * Pull read data off an interface.
- * Len is length of data, with local net header stripped.
- */
-static struct mbuf *
-elget(buf, totlen, ifp)
-        caddr_t buf;
-        int totlen;
-        struct ifnet *ifp;
-{
-        struct mbuf *top, **mp, *m;
-        int len;
-        register caddr_t cp;
-        char *epkt;
-
-        buf += sizeof(struct ether_header);
-        cp = buf;
-        epkt = cp + totlen;
-
-        MGETHDR(m, M_DONTWAIT, MT_DATA);
-        if (m == 0)
-                return (0);
-        m->m_pkthdr.rcvif = ifp;
-        m->m_pkthdr.len = totlen;
-        m->m_len = MHLEN;
-        top = 0;
-        mp = &top;
-        while (totlen > 0) {
-                if (top) {
-                        MGET(m, M_DONTWAIT, MT_DATA);
-                        if (m == 0) {
-                                m_freem(top);
-                                return (0);
-                        }
-                        m->m_len = MLEN;
-                }
-                len = min(totlen, epkt - cp);
-                if (len >= MINCLSIZE) {
-                        MCLGET(m, M_DONTWAIT);
-                        if (m->m_flags & M_EXT)
-                                m->m_len = len = min(len, MCLBYTES);
-                        else
-                                len = m->m_len;
-                } else {
-                        /*
-                         * Place initial small packet/header at end of mbuf.
-                         */
-                        if (len < m->m_len) {
-                                if (top == 0 && len + max_linkhdr <= m->m_len)
-                                        m->m_data += max_linkhdr;
-                                m->m_len = len;
-                        } else
-                                len = m->m_len;
-                }
-                bcopy(cp, mtod(m, caddr_t), (unsigned)len);
-                cp += len;
-                *mp = m;
-                mp = &m->m_next;
-                totlen -= len;
-                if (cp == epkt)
-                        cp = buf;
-        }
-        return (top);
-}
-
-/*
- * Process an ioctl request. This code needs some work - it looks
- *	pretty ugly.
- */
-static int
-el_ioctl(ifp, command, data)
-	register struct ifnet *ifp;
-	u_long command;
-	caddr_t data;
-{
-	int error = 0;
-	struct el_softc *sc;
-
-	sc = ifp->if_softc;
-
-	switch (command) {
-	case SIOCSIFFLAGS:
-		EL_LOCK(sc);
-		/*
-		 * If interface is marked down and it is running, then stop it
-		 */
-		if (((ifp->if_flags & IFF_UP) == 0) &&
-		    (ifp->if_drv_flags & IFF_DRV_RUNNING)) {
-			el_stop(sc);
-			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
-		} else {
-		/*
-		 * If interface is marked up and it is stopped, then start it
-		 */
-			if ((ifp->if_flags & IFF_UP) &&
-		    	    ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0))
-				el_init_locked(ifp->if_softc);
-		}
-		EL_UNLOCK(sc);
-		break;
-	default:
-		error = ether_ioctl(ifp, command, data);
-		break;
-	}
-	return (error);
-}
-
-/* Device timeout routine */
-static void
-el_watchdog(struct ifnet *ifp)
-{
-	struct el_softc *sc;
-
-	sc = ifp->if_softc;
-	log(LOG_ERR,"%s: device timeout\n", ifp->if_xname);
-	EL_LOCK(sc);
-	ifp->if_oerrors++;
-	el_reset(sc);
-	EL_UNLOCK(sc);
-}
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
deleted file mode 100644
index f7f36d9..0000000
--- a/sys/i386/isa/if_elreg.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1994, Matthew E. Kimmel.  Permission is hereby granted
- * to use, copy, modify and distribute this software provided that both
- * the copyright notice and this permission notice appear in all copies
- * of the software, derivative works or modified versions, and any
- * portions thereof.
- *
- * $FreeBSD$
- */
-/* 3COM Etherlink 3C501 Register Definitions */
-
-/* I/O Ports */
-#define EL_RXS	0x6	/* Receive status register */
-#define EL_RXC	0x6	/* Receive command register */
-#define EL_TXS	0x7	/* Transmit status register */
-#define EL_TXC	0x7	/* Transmit command register */
-#define EL_GPBL	0x8	/* GP buffer ptr low byte */
-#define EL_GPBH	0x9	/* GP buffer ptr high byte */
-#define EL_RBL	0xa	/* Receive buffer ptr low byte */
-#define EL_RBC	0xa	/* Receive buffer clear */
-#define EL_RBH	0xb	/* Receive buffer ptr high byte */
-#define EL_EAW	0xc	/* Ethernet address window */
-#define EL_AS	0xe	/* Auxiliary status register */
-#define EL_AC	0xe	/* Auxiliary command register */
-#define EL_BUF	0xf	/* Data buffer */
-
-/* Receive status register bits */
-#define EL_RXS_OFLOW	0x01	/* Overflow error */
-#define EL_RXS_FCS	0x02	/* FCS error */
-#define EL_RXS_DRIB	0x04	/* Dribble error */
-#define EL_RXS_SHORT	0x08	/* Short frame */
-#define EL_RXS_NOFLOW	0x10	/* No overflow */
-#define	EL_RXS_GOOD	0x20	/* Received good frame */
-#define EL_RXS_STALE	0x80	/* Stale receive status */
-
-/* Receive command register bits */
-#define EL_RXC_DISABLE	0x00	/* Receiver disabled */
-#define EL_RXC_DOFLOW	0x01	/* Detect overflow */
-#define EL_RXC_DFCS	0x02	/* Detect FCS errs */
-#define EL_RXC_DDRIB	0x04	/* Detect dribble errors */
-#define EL_RXC_DSHORT	0x08	/* Detect short frames */
-#define EL_RXC_DNOFLOW	0x10	/* Detect frames w/o overflow ??? */
-#define EL_RXC_AGF	0x20	/* Accept Good Frames */
-#define EL_RXC_PROMISC	0x40	/* Promiscuous mode */
-#define EL_RXC_ABROAD	0x80	/* Accept address, broadcast */
-#define EL_RXC_AMULTI	0xc0	/* Accept address, multicast */
-
-/* Transmit status register bits */
-#define EL_TXS_UFLOW	0x01	/* Underflow */
-#define EL_TXS_COLL	0x02	/* Collision */
-#define EL_TXS_COLL16	0x04	/* Collision 16 */
-#define EL_TXS_READY	0x08	/* Ready for new frame */
-
-/* Transmit command register bits */
-#define EL_TXC_DUFLOW	0x01	/* Detect underflow */
-#define EL_TXC_DCOLL	0x02	/* Detect collisions */
-#define EL_TXC_DCOLL16	0x04	/* Detect collision 16 */
-#define EL_TXC_DSUCCESS	0x08	/* Detect success */
-
-/* Auxiliary status register bits */
-#define EL_AS_RXBUSY	0x01	/* Receive busy */
-#define EL_AS_DMADONE	0x10	/* DMA finished */
-#define EL_AS_TXBUSY	0x80	/* Transmit busy */
-
-/* Auxiliary command register bits */
-#define EL_AC_HOST	0x00	/* System bus can access buffer */
-#define EL_AC_IRQE	0x01	/* IRQ enable */
-#define EL_AC_TXBAD	0x02	/* Transmit frames with bad FCS */
-#define EL_AC_TXFRX	0x04	/* Transmit followed by receive */
-#define EL_AC_RX	0x08	/* Receive */
-#define EL_AC_LB	0x0c	/* Loopback */
-#define EL_AC_DRQ	0x20	/* DMA request */
-#define EL_AC_RIDE	0x40	/* DRQ and IRQ enabled */
-#define EL_AC_RESET	0x80	/* Reset */
-
-/* Packet buffer size */
-#define EL_BUFSIZ	2048
-#define EL_IOSIZ	16
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 42a2a46..6855311 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -69,7 +69,6 @@ SUBDIR=	${_3dfx} \
 	${_drm} \
 	dummynet \
 	${_ed} \
-	${_el} \
 	${_elink} \
 	${_em} \
 	en \
@@ -384,7 +383,6 @@ _cs=		cs
 _ctau=		ctau
 _cx=		cx
 _dpt=		dpt
-_el=		el
 _ex=		ex
 _exca=		exca
 _hptmv=		hptmv
@@ -469,7 +467,6 @@ _ciss=		ciss
 _cm=		cm
 _coff=		coff
 _cpufreq=	cpufreq
-_el=		el
 _em=		em
 _ep=		ep
 _exca=		exca
diff --git a/sys/modules/el/Makefile b/sys/modules/el/Makefile
deleted file mode 100644
index 7839405..0000000
--- a/sys/modules/el/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../i386/isa
-
-KMOD=	if_el
-SRCS=	if_el.c
-SRCS+=	opt_bdg.h opt_inet.h opt_ipx.h device_if.h bus_if.h isa_if.h
-
-.include <bsd.kmod.mk>