Garbage collect unbuildable and unusable non-MPSAFE network device

drivers that depended on the historic IFF_NEEDSGIANT compatibility
mechanism:

  ar(4)
  ray(4)
  sr(4)

Discussed on:	arch@

21 files changed, 0 insertions, 12963 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
deleted file mode 100644
index 55411d8..0000000
--- a/sys/dev/ar/if_ar.c
+++ /dev/null
@@ -1,2341 +0,0 @@
-/*-
- * Copyright (c) 1995 - 2001 John Hay.  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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY John Hay ``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 John Hay 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/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * Programming assumptions and other issues.
- *
- * The descriptors of a DMA channel will fit in a 16K memory window.
- *
- * The buffers of a transmit DMA channel will fit in a 16K memory window.
- *
- * Only the ISA bus cards with X.21 and V.35 is tested.
- *
- * When interface is going up, handshaking is set and it is only cleared
- * when the interface is down'ed.
- *
- * There should be a way to set/reset Raw HDLC/PPP, Loopback, DCE/DTE,
- * internal/external clock, etc.....
- */
-
-#include "opt_netgraph.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <net/if.h>
-#ifdef NETGRAPH
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <sys/syslog.h>
-#include <dev/ar/if_ar.h>
-#else /* NETGRAPH */
-#include <net/if_sppp.h>
-#include <net/if_types.h>
-#include <net/bpf.h>
-#endif /* NETGRAPH */
-
-#include <machine/md_var.h>
-
-#include <dev/ic/hd64570.h>
-#include <dev/ar/if_arregs.h>
-
-#ifdef TRACE
-#define TRC(x)               x
-#else
-#define TRC(x)
-#endif
-
-#define TRCL(x)              x
-
-#define PPP_HEADER_LEN       4
-
-devclass_t ar_devclass;
-
-struct ar_softc {
-#ifndef	NETGRAPH
-	struct ifnet *ifp;
-#endif /* NETGRAPH */
-	int unit;            /* With regards to all ar devices */
-	int subunit;         /* With regards to this card */
-	struct ar_hardc *hc;
-
-	struct buf_block {
-		u_int txdesc;        /* On card address */
-		u_int txstart;       /* On card address */
-		u_int txend;         /* On card address */
-		u_int txtail;        /* Index of first unused buffer */
-		u_int txmax;         /* number of usable buffers/descriptors */
-		u_int txeda;         /* Error descriptor addresses */
-	}block[AR_TX_BLOCKS];
-
-	char  xmit_busy;     /* Transmitter is busy */
-	char  txb_inuse;     /* Number of tx blocks currently in use */
-	u_char txb_new;      /* Index to where new buffer will be added */
-	u_char txb_next_tx;  /* Index to next block ready to tx */
-
-	u_int rxdesc;        /* On card address */
-	u_int rxstart;       /* On card address */
-	u_int rxend;         /* On card address */
-	u_int rxhind;        /* Index to the head of the rx buffers. */
-	u_int rxmax;         /* number of usable buffers/descriptors */
-
-	int scano;
-	int scachan;
-	sca_regs *sca;
-#ifdef NETGRAPH
-	int	running;	/* something is attached so we are running */
-	int	dcd;		/* do we have dcd? */
-	/* ---netgraph bits --- */
-	char		nodename[NG_NODESIZ]; /* store our node name */
-	int		datahooks;	/* number of data hooks attached */
-	node_p		node;		/* netgraph node */
-	hook_p		hook;		/* data hook */
-	hook_p		debug_hook;
-	struct ifqueue	xmitq_hipri;	/* hi-priority transmit queue */
-	struct ifqueue	xmitq;		/* transmit queue */
-	int		flags;		/* state */
-#define	SCF_RUNNING	0x01		/* board is active */
-#define	SCF_OACTIVE	0x02		/* output is active */
-	int		out_dog;	/* watchdog cycles output count-down */
-	struct callout_handle handle;	/* timeout(9) handle */
-	u_long		inbytes, outbytes;	/* stats */
-	u_long		lastinbytes, lastoutbytes; /* a second ago */
-	u_long		inrate, outrate;	/* highest rate seen */
-	u_long		inlast;		/* last input N secs ago */
-	u_long		out_deficit;	/* output since last input */
-	u_long		oerrors, ierrors[6];
-	u_long		opackets, ipackets;
-#endif /* NETGRAPH */
-};
-#define SC2IFP(sc)	(sc)->ifp
-
-static int	next_ar_unit = 0;
-
-#ifdef NETGRAPH
-#define DOG_HOLDOFF	6	/* dog holds off for 6 secs */
-#define QUITE_A_WHILE	300	/* 5 MINUTES */
-#define LOTS_OF_PACKETS	100
-#endif /* NETGRAPH */
-
-/*
- * This translate from irq numbers to
- * the value that the arnet card needs
- * in the lower part of the AR_INT_SEL
- * register.
- */
-static int irqtable[16] = {
-	0,	/*  0 */
-	0,	/*  1 */
-	0,	/*  2 */
-	1,	/*  3 */
-	0,	/*  4 */
-	2,	/*  5 */
-	0,	/*  6 */
-	3,	/*  7 */
-	0,	/*  8 */
-	0,	/*  9 */
-	4,	/* 10 */
-	5,	/* 11 */
-	6,	/* 12 */
-	0,	/* 13 */
-	0,	/* 14 */
-	7	/* 15 */
-};
-
-#ifndef NETGRAPH
-MODULE_DEPEND(if_ar, sppp, 1, 1, 1);
-#endif
-
-static void arintr(void *arg);
-static void ar_xmit(struct ar_softc *sc);
-#ifndef NETGRAPH
-static void arstart(struct ifnet *ifp);
-static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
-static void arwatchdog(struct ifnet *ifp);
-#else	/* NETGRAPH */
-static void arstart(struct ar_softc *sc);
-static void arwatchdog(struct ar_softc *sc);
-#endif	/* NETGRAPH */
-static int ar_packet_avail(struct ar_softc *sc, int *len, u_char *rxstat);
-static void ar_copy_rxbuf(struct mbuf *m, struct ar_softc *sc, int len);
-static void ar_eat_packet(struct ar_softc *sc, int single);
-static void ar_get_packets(struct ar_softc *sc);
-
-static int ar_read_pim_iface(volatile struct ar_hardc *hc, int channel);
-static void ar_up(struct ar_softc *sc);
-static void ar_down(struct ar_softc *sc);
-static void arc_init(struct ar_hardc *hc);
-static void ar_init_sca(struct ar_hardc *hc, int scano);
-static void ar_init_msci(struct ar_softc *sc);
-static void ar_init_rx_dmac(struct ar_softc *sc);
-static void ar_init_tx_dmac(struct ar_softc *sc);
-static void ar_dmac_intr(struct ar_hardc *hc, int scano, u_char isr);
-static void ar_msci_intr(struct ar_hardc *hc, int scano, u_char isr);
-static void ar_timer_intr(struct ar_hardc *hc, int scano, u_char isr);
-
-#ifdef	NETGRAPH
-static	void	ngar_watchdog_frame(void * arg);
-
-static ng_constructor_t	ngar_constructor;
-static ng_rcvmsg_t	ngar_rcvmsg;
-static ng_shutdown_t	ngar_shutdown;
-static ng_newhook_t	ngar_newhook;
-/*static ng_findhook_t	ngar_findhook; */
-static ng_connect_t	ngar_connect;
-static ng_rcvdata_t	ngar_rcvdata;
-static ng_disconnect_t	ngar_disconnect;
-	
-static struct ng_type typestruct = {
-	.version =	NG_ABI_VERSION,
-	.name =		NG_AR_NODE_TYPE,
-	.constructor =	ngar_constructor,
-	.rcvmsg =	ngar_rcvmsg,
-	.shutdown =	ngar_shutdown,
-	.newhook =	ngar_newhook,
-	.connect =	ngar_connect,
-	.rcvdata =	ngar_rcvdata,
-	.disconnect =	ngar_disconnect,
-};
-NETGRAPH_INIT_ORDERED(sync_ar, &typestruct, SI_SUB_DRIVERS, SI_ORDER_FIRST);
-#endif /* NETGRAPH */
-
-int
-ar_attach(device_t device)
-{
-	struct ar_hardc *hc;
-	struct ar_softc *sc;
-#ifndef	NETGRAPH
-	struct ifnet *ifp;
-	char *iface;
-#endif	/* NETGRAPH */
-	int unit;
-
-	hc = (struct ar_hardc *)device_get_softc(device);
-
-	printf("arc%d: %uK RAM, %u ports, rev %u.\n",
-		hc->cunit,
-		hc->memsize/1024,
-		hc->numports,
-		hc->revision);
-	
-	arc_init(hc);
-
-	if(bus_setup_intr(device, hc->res_irq,
-	    INTR_TYPE_NET, NULL, arintr, hc, &hc->intr_cookie) != 0)
-		return (1);
-
-	sc = hc->sc;
-
-	for(unit=0;unit<hc->numports;unit+=NCHAN)
-		ar_init_sca(hc, unit / NCHAN);
-
-	/*
-	 * Now configure each port on the card.
-	 */
-	for(unit=0;unit<hc->numports;sc++,unit++) {
-		sc->hc = hc;
-		sc->subunit = unit;
-		sc->unit = next_ar_unit;
-		next_ar_unit++;
-		sc->scano = unit / NCHAN;
-		sc->scachan = unit%NCHAN;
-
-		ar_init_rx_dmac(sc);
-		ar_init_tx_dmac(sc);
-		ar_init_msci(sc);
-
-#ifndef	NETGRAPH
-		ifp = SC2IFP(sc) = if_alloc(IFT_PPP);
-		if (ifp == NULL) {
-			if (bus_teardown_intr(device,
-			    hc->res_irq, hc->intr_cookie) != 0) {
-				printf("intr teardown failed.. continuing\n");
-			}
-			return (1);
-		}
-
-		ifp->if_softc = sc;
-		if_initname(ifp, device_get_name(device),
-		    device_get_unit(device));
-		ifp->if_mtu = PP_MTU;
-		ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST |
-		    IFF_NEEDSGIANT;
-		ifp->if_ioctl = arioctl;
-		ifp->if_start = arstart;
-		ifp->if_watchdog = arwatchdog;
-
-		IFP2SP(sc->ifp)->pp_flags = PP_KEEPALIVE;
-
-		switch(hc->interface[unit]) {
-		default: iface = "UNKNOWN"; break;
-		case AR_IFACE_EIA_232: iface = "EIA-232"; break;
-		case AR_IFACE_V_35: iface = "EIA-232 or V.35"; break;
-		case AR_IFACE_EIA_530: iface = "EIA-530"; break;
-		case AR_IFACE_X_21: iface = "X.21"; break;
-		case AR_IFACE_COMBO: iface = "COMBO X.21 / EIA-530"; break;
-		}
-
-		printf("ar%d: Adapter %d, port %d, interface %s.\n",
-			sc->unit,
-			hc->cunit,
-			sc->subunit,
-			iface);
-
-		sppp_attach(SC2IFP(sc));
-		if_attach(ifp);
-
-		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
-#else	/* NETGRAPH */
-		if (ng_make_node_common(&typestruct, &sc->node) != 0)
-			return (1);
-		sprintf(sc->nodename, "%s%d", NG_AR_NODE_TYPE, sc->unit);
-		if (ng_name_node(sc->node, sc->nodename)) {
-			NG_NODE_UNREF(sc->node); /* drop it again */
-			return (1);
-		}
-		NG_NODE_SET_PRIVATE(sc->node, sc);
-		callout_handle_init(&sc->handle);
-		sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
-		sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
-		mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", NULL, MTX_DEF);
-		mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", NULL,
-		    MTX_DEF);
-		sc->running = 0;
-#endif	/* NETGRAPH */
-	}
-
-	if(hc->bustype == AR_BUS_ISA)
-		ARC_SET_OFF(hc);
-
-	return (0);
-}
-
-int
-ar_detach(device_t device)
-{
-	struct ar_hardc *hc = device_get_softc(device);
-
-	if (hc->intr_cookie != NULL) {
-		if (bus_teardown_intr(device,
-			hc->res_irq, hc->intr_cookie) != 0) {
-				printf("intr teardown failed.. continuing\n");
-		}
-		hc->intr_cookie = NULL;
-	}
-
-	/*
-	 * deallocate any system resources we may have
-	 * allocated on behalf of this driver.
-	 */
-	free(hc->sc, M_DEVBUF);
-	hc->sc = NULL;
-	hc->mem_start = NULL;
-	return (ar_deallocate_resources(device));
-}
-
-int
-ar_allocate_ioport(device_t device, int rid, u_long size)
-{
-	struct ar_hardc *hc = device_get_softc(device);
-
-	hc->rid_ioport = rid;
-	hc->res_ioport = bus_alloc_resource(device, SYS_RES_IOPORT,
-			&hc->rid_ioport, 0ul, ~0ul, size, RF_ACTIVE);
-	if (hc->res_ioport == NULL) {
-		goto errexit;
-	}
-	hc->bt = rman_get_bustag(hc->res_ioport);
-	hc->bh = rman_get_bushandle(hc->res_ioport);
-
-	return (0);
-
-errexit:
-	ar_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-ar_allocate_irq(device_t device, int rid, u_long size)
-{
-	struct ar_hardc *hc = device_get_softc(device);
-
-	hc->rid_irq = rid;
-	hc->res_irq = bus_alloc_resource_any(device, SYS_RES_IRQ,
-			&hc->rid_irq, RF_SHAREABLE|RF_ACTIVE);
-	if (hc->res_irq == NULL) {
-		goto errexit;
-	}
-	return (0);
-
-errexit:
-	ar_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-ar_allocate_memory(device_t device, int rid, u_long size)
-{
-	struct ar_hardc *hc = device_get_softc(device);
-
-	hc->rid_memory = rid;
-	hc->res_memory = bus_alloc_resource(device, SYS_RES_MEMORY,
-			&hc->rid_memory, 0ul, ~0ul, size, RF_ACTIVE);
-	if (hc->res_memory == NULL) {
-		goto errexit;
-	}
-	return (0);
-
-errexit:
-	ar_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-ar_allocate_plx_memory(device_t device, int rid, u_long size)
-{
-	struct ar_hardc *hc = device_get_softc(device);
-
-	hc->rid_plx_memory = rid;
-	hc->res_plx_memory = bus_alloc_resource(device, SYS_RES_MEMORY,
-			&hc->rid_plx_memory, 0ul, ~0ul, size, RF_ACTIVE);
-	if (hc->res_plx_memory == NULL) {
-		goto errexit;
-	}
-	return (0);
-
-errexit:
-	ar_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-ar_deallocate_resources(device_t device)
-{
-	struct ar_hardc *hc = device_get_softc(device);
-
-	if (hc->res_irq != 0) {
-		bus_release_resource(device, SYS_RES_IRQ,
-			hc->rid_irq, hc->res_irq);
-		hc->res_irq = 0;
-	}
-	if (hc->res_ioport != 0) {
-		bus_release_resource(device, SYS_RES_IOPORT,
-			hc->rid_ioport, hc->res_ioport);
-		hc->res_ioport = 0;
-	}
-	if (hc->res_memory != 0) {
-		bus_release_resource(device, SYS_RES_MEMORY,
-			hc->rid_memory, hc->res_memory);
-		hc->res_memory = 0;
-	}
-	if (hc->res_plx_memory != 0) {
-		bus_release_resource(device, SYS_RES_MEMORY,
-			hc->rid_plx_memory, hc->res_plx_memory);
-		hc->res_plx_memory = 0;
-	}
-	return (0);
-}
-
-/*
- * First figure out which SCA gave the interrupt.
- * Process it.
- * See if there is other interrupts pending.
- * Repeat until there is no more interrupts.
- */
-static void
-arintr(void *arg)
-{
-	struct ar_hardc *hc = (struct ar_hardc *)arg;
-	sca_regs *sca;
-	u_char isr0, isr1, isr2, arisr;
-	int scano;
-
-	/* XXX Use the PCI interrupt score board register later */
-	if(hc->bustype == AR_BUS_PCI)
-		arisr = hc->orbase[AR_ISTAT * 4];
-	else
-		arisr = ar_inb(hc, AR_ISTAT);
-
-	while(arisr & AR_BD_INT) {
-		TRC(printf("arisr = %x\n", arisr));
-		if(arisr & AR_INT_0)
-			scano = 0;
-		else if(arisr & AR_INT_1)
-			scano = 1;
-		else {
-			/* XXX Oops this shouldn't happen. */
-			printf("arc%d: Interrupted with no interrupt.\n",
-				hc->cunit);
-			return;
-		}
-		sca = hc->sca[scano];
-
-		if(hc->bustype == AR_BUS_ISA)
-			ARC_SET_SCA(hc, scano);
-
-		isr0 = sca->isr0;
-		isr1 = sca->isr1;
-		isr2 = sca->isr2;
-
-		TRC(printf("arc%d: ARINTR isr0 %x, isr1 %x, isr2 %x\n",
-			hc->cunit,
-			isr0,
-			isr1,
-			isr2));
-		if(isr0)
-			ar_msci_intr(hc, scano, isr0);
-
-		if(isr1)
-			ar_dmac_intr(hc, scano, isr1);
-
-		if(isr2)
-			ar_timer_intr(hc, scano, isr2);
-
-		/*
-		 * Proccess the second sca's interrupt if available.
-		 * Else see if there are any new interrupts.
-		 */
-		if((arisr & AR_INT_0) && (arisr & AR_INT_1))
-			arisr &= ~AR_INT_0;
-		else {
-			if(hc->bustype == AR_BUS_PCI)
-				arisr = hc->orbase[AR_ISTAT * 4];
-			else
-				arisr = ar_inb(hc, AR_ISTAT);
-		}
-	}
-
-	if(hc->bustype == AR_BUS_ISA)
-		ARC_SET_OFF(hc);
-}
-
-
-/*
- * This will only start the transmitter. It is assumed that the data
- * is already there. It is normally called from arstart() or ar_dmac_intr().
- *
- */
-static void
-ar_xmit(struct ar_softc *sc)
-{
-#ifndef NETGRAPH
-	struct ifnet *ifp;
-#endif /* NETGRAPH */
-	dmac_channel *dmac;
-
-#ifndef NETGRAPH
-	ifp = SC2IFP(sc);
-#endif /* NETGRAPH */
-	dmac = &sc->sca->dmac[DMAC_TXCH(sc->scachan)];
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-	dmac->cda = (u_short)(sc->block[sc->txb_next_tx].txdesc & 0xffff);
-
-	dmac->eda = (u_short)(sc->block[sc->txb_next_tx].txeda & 0xffff);
-	dmac->dsr = SCA_DSR_DE;
-
-	sc->xmit_busy = 1;
-
-	sc->txb_next_tx++;
-	if(sc->txb_next_tx == AR_TX_BLOCKS)
-		sc->txb_next_tx = 0;
-
-#ifndef NETGRAPH
-	ifp->if_timer = 2; /* Value in seconds. */
-#else	/* NETGRAPH */
-	sc->out_dog = DOG_HOLDOFF;	/* give ourself some breathing space*/
-#endif	/* NETGRAPH */
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_OFF(sc->hc);
-}
-
-/*
- * This function will be called from the upper level when a user add a
- * packet to be send, and from the interrupt handler after a finished
- * transmit.
- *
- * NOTE: it should run at spl_imp().
- *
- * This function only place the data in the oncard buffers. It does not
- * start the transmition. ar_xmit() does that.
- *
- * Transmitter idle state is indicated by the IFF_DRV_OACTIVE flag. The
- * function that clears that should ensure that the transmitter and its
- * DMA is in a "good" idle state.
- */
-#ifndef NETGRAPH
-static void
-arstart(struct ifnet *ifp)
-{
-	struct ar_softc *sc = ifp->if_softc;
-#else	/* NETGRAPH */
-static void
-arstart(struct ar_softc *sc)
-{
-#endif	/* NETGRAPH */
-	int i, len, tlen;
-	struct mbuf *mtx;
-	u_char *txdata;
-	sca_descriptor *txdesc;
-	struct buf_block *blkp;
-
-#ifndef NETGRAPH
-	if(!(ifp->if_drv_flags & IFF_DRV_RUNNING))
-		return;
-#else	/* NETGRAPH */
-/* XXX */
-#endif	/* NETGRAPH */
-  
-top_arstart:
-
-	/*
-	 * See if we have space for more packets.
-	 */
-	if(sc->txb_inuse == AR_TX_BLOCKS) {
-#ifndef NETGRAPH
-		ifp->if_drv_flags |= IFF_DRV_OACTIVE;	/* yes, mark active */
-#else	/* NETGRAPH */
-/*XXX*/		/*ifp->if_drv_flags |= IFF_DRV_OACTIVE;*/	/* yes, mark active */
-#endif /* NETGRAPH */
-		return;
-	}
-
-#ifndef NETGRAPH
-	mtx = sppp_dequeue(ifp);
-#else	/* NETGRAPH */
-	IF_DEQUEUE(&sc->xmitq_hipri, mtx);
-	if (mtx == NULL) {
-		IF_DEQUEUE(&sc->xmitq, mtx);
-	}
-#endif /* NETGRAPH */
-	if(!mtx)
-		return;
-
-	/*
-	 * It is OK to set the memory window outside the loop because
-	 * all tx buffers and descriptors are assumed to be in the same
-	 * 16K window.
-	 */
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_MEM(sc->hc, sc->block[0].txdesc);
-
-	/*
-	 * We stay in this loop until there is nothing in the
-	 * TX queue left or the tx buffer is full.
-	 */
-	i = 0;
-	blkp = &sc->block[sc->txb_new];
-	txdesc = (sca_descriptor *)
-		(sc->hc->mem_start + (blkp->txdesc & sc->hc->winmsk));
-	txdata = (u_char *)(sc->hc->mem_start + (blkp->txstart & sc->hc->winmsk));
-	for(;;) {
-		len = mtx->m_pkthdr.len;
-
-		TRC(printf("ar%d: ARstart len %u\n", sc->unit, len));
-
-		/*
-		 * We can do this because the tx buffers don't wrap.
-		 */
-		m_copydata(mtx, 0, len, txdata);
-		tlen = len;
-		while(tlen > AR_BUF_SIZ) {
-			txdesc->stat = 0;
-			txdesc->len = AR_BUF_SIZ;
-			tlen -= AR_BUF_SIZ;
-			txdesc++;
-			txdata += AR_BUF_SIZ;
-			i++;
-		}
-		/* XXX Move into the loop? */
-		txdesc->stat = SCA_DESC_EOM;
-		txdesc->len = tlen;
-		txdesc++;
-		txdata += AR_BUF_SIZ;
-		i++;
-
-#ifndef NETGRAPH
-		BPF_MTAP(ifp, mtx);
-		m_freem(mtx);
-		++SC2IFP(sc)->if_opackets;
-#else	/* NETGRAPH */
-		m_freem(mtx);
-		sc->outbytes += len;
-		++sc->opackets;
-#endif	/* NETGRAPH */
-
-		/*
-		 * Check if we have space for another mbuf.
-		 * XXX This is hardcoded. A packet won't be larger
-		 * than 3 buffers (3 x 512).
-		 */
-		if((i + 3) >= blkp->txmax)
-			break;
-
-#ifndef NETGRAPH
-		mtx = sppp_dequeue(ifp);
-#else	/* NETGRAPH */
-		IF_DEQUEUE(&sc->xmitq_hipri, mtx);
-		if (mtx == NULL) {
-			IF_DEQUEUE(&sc->xmitq, mtx);
-		}
-#endif /* NETGRAPH */
-		if(!mtx)
-			break;
-	}
-
-	blkp->txtail = i;
-
-	/*
-	 * Mark the last descriptor, so that the SCA know where
-	 * to stop.
-	 */
-	txdesc--;
-	txdesc->stat |= SCA_DESC_EOT;
-
-	txdesc = (sca_descriptor *)blkp->txdesc;
-	blkp->txeda = (u_short)((u_int)&txdesc[i]);
-
-#if 0
-	printf("ARstart: %p desc->cp %x\n", &txdesc->cp, txdesc->cp);
-	printf("ARstart: %p desc->bp %x\n", &txdesc->bp, txdesc->bp);
-	printf("ARstart: %p desc->bpb %x\n", &txdesc->bpb, txdesc->bpb);
-	printf("ARstart: %p desc->len %x\n", &txdesc->len, txdesc->len);
-	printf("ARstart: %p desc->stat %x\n", &txdesc->stat, txdesc->stat);
-#endif
-
-	sc->txb_inuse++;
-	sc->txb_new++;
-	if(sc->txb_new == AR_TX_BLOCKS)
-		sc->txb_new = 0;
-
-	if(sc->xmit_busy == 0)
-		ar_xmit(sc);
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_OFF(sc->hc);
-
-	goto top_arstart;
-}
-
-#ifndef	NETGRAPH
-static int
-arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
-{
-	int s, error;
-	int was_up, should_be_up;
-	struct ar_softc *sc = ifp->if_softc;
-
-	TRC(if_printf(ifp, "arioctl.\n");)
-
-	was_up = ifp->if_drv_flags & IFF_DRV_RUNNING;
-
-	error = sppp_ioctl(ifp, cmd, data);
-	TRC(if_printf(ifp, "ioctl: ifsppp.pp_flags = %x, if_flags %x.\n", 
-		((struct sppp *)ifp)->pp_flags, ifp->if_flags);)
-	if(error)
-		return (error);
-
-	if((cmd != SIOCSIFFLAGS) && cmd != (SIOCSIFADDR))
-		return (0);
-
-	TRC(if_printf(ifp, "arioctl %s.\n",
-		(cmd == SIOCSIFFLAGS) ? "SIOCSIFFLAGS" : "SIOCSIFADDR");)
-
-	s = splimp();
-	should_be_up = ifp->if_drv_flags & IFF_DRV_RUNNING;
-
-	if(!was_up && should_be_up) {
-		/* Interface should be up -- start it. */
-		ar_up(sc);
-		arstart(ifp);
-		/* XXX Maybe clear the IFF_UP flag so that the link
-		 * will only go up after sppp lcp and ipcp negotiation.
-		 */
-	} else if(was_up && !should_be_up) {
-		/* Interface should be down -- stop it. */
-		ar_down(sc);
-		sppp_flush(ifp);
-	}
-	splx(s);
-	return (0);
-}
-#endif	/* NETGRAPH */
-
-/*
- * This is to catch lost tx interrupts.
- */
-static void
-#ifndef	NETGRAPH
-arwatchdog(struct ifnet *ifp)
-{
-	struct ar_softc *sc = ifp->if_softc;
-#else	/* NETGRAPH */
-arwatchdog(struct ar_softc *sc)
-{
-#endif	/* NETGRAPH */
-	msci_channel *msci = &sc->sca->msci[sc->scachan];
-
-#ifndef	NETGRAPH
-	if(!(ifp->if_drv_flags & IFF_DRV_RUNNING))
-		return;
-#endif	/* NETGRAPH */
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-
-	/* XXX if(SC2IFP(sc)->if_flags & IFF_DEBUG) */
-		printf("ar%d: transmit failed, "
-			"ST0 %x, ST1 %x, ST3 %x, DSR %x.\n",
-			sc->unit,
-			msci->st0,
-			msci->st1,
-			msci->st3,
-			sc->sca->dmac[DMAC_TXCH(sc->scachan)].dsr);
-
-	if(msci->st1 & SCA_ST1_UDRN) {
-		msci->cmd = SCA_CMD_TXABORT;
-		msci->cmd = SCA_CMD_TXENABLE;
-		msci->st1 = SCA_ST1_UDRN;
-	}
-
-	sc->xmit_busy = 0;
-#ifndef	NETGRAPH
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-#else	/* NETGRAPH */
-	/* XXX ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; */
-#endif	/* NETGRAPH */
-
-	if(sc->txb_inuse && --sc->txb_inuse)
-		ar_xmit(sc);
-
-#ifndef	NETGRAPH
-	arstart(ifp);
-#else	/* NETGRAPH */
-	arstart(sc);
-#endif	/* NETGRAPH */
-}
-
-static void
-ar_up(struct ar_softc *sc)
-{
-	sca_regs *sca;
-	msci_channel *msci;
-
-	sca = sc->sca;
-	msci = &sca->msci[sc->scachan];
-
-	TRC(printf("ar%d: sca %p, msci %p, ch %d\n",
-		sc->unit, sca, msci, sc->scachan));
-
-	/*
-	 * Enable transmitter and receiver.
-	 * Raise DTR and RTS.
-	 * Enable interrupts.
-	 */
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-
-	/* XXX
-	 * What about using AUTO mode in msci->md0 ???
-	 * And what about CTS/DCD etc... ?
-	 */
-	if(sc->hc->handshake & AR_SHSK_RTS)
-		msci->ctl &= ~SCA_CTL_RTS;
-	if(sc->hc->handshake & AR_SHSK_DTR) {
-		sc->hc->txc_dtr[sc->scano] &= sc->scachan ? 
-			~AR_TXC_DTR_DTR1 : ~AR_TXC_DTR_DTR0;
-		if(sc->hc->bustype == AR_BUS_PCI)
-			sc->hc->orbase[sc->hc->txc_dtr_off[sc->scano]] =
-				sc->hc->txc_dtr[sc->scano];
-		else
-			ar_outb(sc->hc, sc->hc->txc_dtr_off[sc->scano],
-				sc->hc->txc_dtr[sc->scano]);
-	}
-
-	if(sc->scachan == 0) {
-		sca->ier0 |= 0x0F;
-		sca->ier1 |= 0x0F;
-	} else {
-		sca->ier0 |= 0xF0;
-		sca->ier1 |= 0xF0;
-	}
-
-	msci->cmd = SCA_CMD_RXENABLE;
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ar_inb(sc->hc, AR_ID_5); /* XXX slow it down a bit. */
-	msci->cmd = SCA_CMD_TXENABLE;
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_OFF(sc->hc);
-#ifdef	NETGRAPH
-	untimeout(ngar_watchdog_frame, sc, sc->handle);
-	sc->handle = timeout(ngar_watchdog_frame, sc, hz);
-	sc->running = 1;
-#endif	/* NETGRAPH */
-}
-
-static void
-ar_down(struct ar_softc *sc)
-{
-	sca_regs *sca;
-	msci_channel *msci;
-
-	sca = sc->sca;
-	msci = &sca->msci[sc->scachan];
-
-#ifdef	NETGRAPH
-	untimeout(ngar_watchdog_frame, sc, sc->handle);
-	sc->running = 0;
-#endif	/* NETGRAPH */
-	/*
-	 * Disable transmitter and receiver.
-	 * Lower DTR and RTS.
-	 * Disable interrupts.
-	 */
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-	msci->cmd = SCA_CMD_RXDISABLE;
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ar_inb(sc->hc, AR_ID_5); /* XXX slow it down a bit. */
-	msci->cmd = SCA_CMD_TXDISABLE;
-
-	if(sc->hc->handshake & AR_SHSK_RTS)
-		msci->ctl |= SCA_CTL_RTS;
-	if(sc->hc->handshake & AR_SHSK_DTR) {
-		sc->hc->txc_dtr[sc->scano] |= sc->scachan ? 
-			AR_TXC_DTR_DTR1 : AR_TXC_DTR_DTR0;
-		if(sc->hc->bustype == AR_BUS_PCI)
-			sc->hc->orbase[sc->hc->txc_dtr_off[sc->scano]] =
-				sc->hc->txc_dtr[sc->scano];
-		else
-			ar_outb(sc->hc, sc->hc->txc_dtr_off[sc->scano],
-				sc->hc->txc_dtr[sc->scano]);
-	}
-
-	if(sc->scachan == 0) {
-		sca->ier0 &= ~0x0F;
-		sca->ier1 &= ~0x0F;
-	} else {
-		sca->ier0 &= ~0xF0;
-		sca->ier1 &= ~0xF0;
-	}
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_OFF(sc->hc);
-}
-
-static int
-ar_read_pim_iface(volatile struct ar_hardc *hc, int channel)
-{
-	int ctype, i, val, x;
-	volatile u_char *pimctrl;
-
-	ctype = 0;
-	val = 0;
-
-	pimctrl = hc->orbase + AR_PIMCTRL;
-
-	/* Reset the PIM */
-	*pimctrl = 0x00;
-	*pimctrl = AR_PIM_STROBE;
-
-	/* Check if there is a PIM */
-	*pimctrl = 0x00;
-	*pimctrl = AR_PIM_READ;
-	x = *pimctrl;
-	TRC(printf("x = %x", x));
-	if(x & AR_PIM_DATA) {
-		printf("No PIM installed\n");
-		return (AR_IFACE_UNKNOWN);
-	}
-
-	x = (x >> 1) & 0x01;
-	val |= x << 0;
-
-	/* Now read the next 15 bits */
-	for(i = 1; i < 16; i++) {
-		*pimctrl = AR_PIM_READ;
-		*pimctrl = AR_PIM_READ | AR_PIM_STROBE;
-		x = *pimctrl;
-		TRC(printf(" %x ", x));
-		x = (x >> 1) & 0x01;
-		val |= x << i;
-		if(i == 8 && (val & 0x000f) == 0x0004) {
-			int ii;
-			
-			/* Start bit */
-			*pimctrl = AR_PIM_A2D_DOUT | AR_PIM_A2D_STROBE;
-			*pimctrl = AR_PIM_A2D_DOUT;
-
-			/* Mode bit */
-			*pimctrl = AR_PIM_A2D_DOUT | AR_PIM_A2D_STROBE;
-			*pimctrl = AR_PIM_A2D_DOUT;
-
-			/* Sign bit */
-			*pimctrl = AR_PIM_A2D_DOUT | AR_PIM_A2D_STROBE;
-			*pimctrl = AR_PIM_A2D_DOUT;
-
-			/* Select channel */
-			*pimctrl = AR_PIM_A2D_STROBE | ((channel & 2) << 2);
-			*pimctrl = ((channel & 2) << 2);
-			*pimctrl = AR_PIM_A2D_STROBE | ((channel & 1) << 3);
-			*pimctrl = ((channel & 1) << 3);
-
-			*pimctrl = AR_PIM_A2D_STROBE;
-
-			x = *pimctrl;
-			if(x & AR_PIM_DATA)
-				printf("\nOops A2D start bit not zero (%X)\n", x);
-
-			for(ii = 7; ii >= 0; ii--) {
-				*pimctrl = 0x00;
-				*pimctrl = AR_PIM_A2D_STROBE;
-				x = *pimctrl;
-				if(x & AR_PIM_DATA)
-					ctype |= 1 << ii;
-			}
-		}
-	}
-	TRC(printf("\nPIM val %x, ctype %x, %d\n", val, ctype, ctype));
-	*pimctrl = AR_PIM_MODEG;
-	*pimctrl = AR_PIM_MODEG | AR_PIM_AUTO_LED;
-	if(ctype > 255)
-		return (AR_IFACE_UNKNOWN);
-	if(ctype > 239)
-		return (AR_IFACE_V_35);
-	if(ctype > 207)
-		return (AR_IFACE_EIA_232);
-	if(ctype > 178)
-		return (AR_IFACE_X_21);
-	if(ctype > 150)
-		return (AR_IFACE_EIA_530);
-	if(ctype > 25)
-		return (AR_IFACE_UNKNOWN);
-	if(ctype > 7)
-		return (AR_IFACE_LOOPBACK);
-	return (AR_IFACE_UNKNOWN);
-}
-
-/*
- * Initialize the card, allocate memory for the ar_softc structures
- * and fill in the pointers.
- */
-static void
-arc_init(struct ar_hardc *hc)
-{
-	struct ar_softc *sc;
-	int x;
-	u_int chanmem;
-	u_int bufmem;
-	u_int next;
-	u_int descneeded;
-	u_char isr, mar;
-	u_long memst;
-
-	sc = malloc(hc->numports * sizeof(struct ar_softc),
-		M_DEVBUF, M_WAITOK | M_ZERO);
-	if (sc == NULL)
-		return;
-	hc->sc = sc;
-
-	hc->txc_dtr[0] = AR_TXC_DTR_NOTRESET |
-			 AR_TXC_DTR_DTR0 | AR_TXC_DTR_DTR1;
-	hc->txc_dtr[1] = AR_TXC_DTR_DTR0 | AR_TXC_DTR_DTR1;
-	hc->txc_dtr_off[0] = AR_TXC_DTR0;
-	hc->txc_dtr_off[1] = AR_TXC_DTR2;
-	if(hc->bustype == AR_BUS_PCI) {
-		hc->txc_dtr_off[0] *= 4;
-		hc->txc_dtr_off[1] *= 4;
-	}
-
-	/*
-	 * reset the card and wait at least 1uS.
-	 */
-	if(hc->bustype == AR_BUS_PCI)
-		hc->orbase[AR_TXC_DTR0 * 4] = ~AR_TXC_DTR_NOTRESET &
-			hc->txc_dtr[0];
-	else
-		ar_outb(hc, AR_TXC_DTR0, ~AR_TXC_DTR_NOTRESET &
-			hc->txc_dtr[0]);
-	DELAY(2);
-	if(hc->bustype == AR_BUS_PCI)
-		hc->orbase[AR_TXC_DTR0 * 4] = hc->txc_dtr[0];
-	else
-		ar_outb(hc, AR_TXC_DTR0, hc->txc_dtr[0]);
-
-	if(hc->bustype == AR_BUS_ISA) {
-		/*
-		 * Configure the card.
-		 * Mem address, irq, 
-		 */
-		memst = rman_get_start(hc->res_memory);
-		mar = memst >> 16;
-		isr = irqtable[hc->isa_irq] << 1;
-		if(isr == 0)
-			printf("ar%d: Warning illegal interrupt %d\n",
-				hc->cunit, hc->isa_irq);
-		isr = isr | ((memst & 0xc000) >> 10);
-
-		hc->sca[0] = (sca_regs *)hc->mem_start;
-		hc->sca[1] = (sca_regs *)hc->mem_start;
-
-		ar_outb(hc, AR_MEM_SEL, mar);
-		ar_outb(hc, AR_INT_SEL, isr | AR_INTS_CEN);
-	}
-
-	if(hc->bustype == AR_BUS_PCI && hc->interface[0] == AR_IFACE_PIM)
-		for(x = 0; x < hc->numports; x++)
-			hc->interface[x] = ar_read_pim_iface(hc, x);
-
-	/*
-	 * Set the TX clock direction and enable TX.
-	 */
-	for(x=0;x<hc->numports;x++) {
-		switch(hc->interface[x]) {
-		case AR_IFACE_V_35:
-			hc->txc_dtr[x / NCHAN] |= (x % NCHAN == 0) ?
-			    AR_TXC_DTR_TX0 : AR_TXC_DTR_TX1;
-			hc->txc_dtr[x / NCHAN] |= (x % NCHAN == 0) ?
-			    AR_TXC_DTR_TXCS0 : AR_TXC_DTR_TXCS1;
-			break;
-		case AR_IFACE_EIA_530:
-		case AR_IFACE_COMBO:
-		case AR_IFACE_X_21:
-			hc->txc_dtr[x / NCHAN] |= (x % NCHAN == 0) ?
-			    AR_TXC_DTR_TX0 : AR_TXC_DTR_TX1;
-			break;
-		}
-	}
-
-	if(hc->bustype == AR_BUS_PCI)
-		hc->orbase[AR_TXC_DTR0 * 4] = hc->txc_dtr[0];
-	else
-		ar_outb(hc, AR_TXC_DTR0, hc->txc_dtr[0]);
-	if(hc->numports > NCHAN) {
-		if(hc->bustype == AR_BUS_PCI)
-			hc->orbase[AR_TXC_DTR2 * 4] = hc->txc_dtr[1];
-		else
-			ar_outb(hc, AR_TXC_DTR2, hc->txc_dtr[1]);
-	}
-
-	chanmem = hc->memsize / hc->numports;
-	next = 0;
-
-	for(x=0;x<hc->numports;x++, sc++) {
-		int blk;
-
-		sc->sca = hc->sca[x / NCHAN];
-
-		for(blk = 0; blk < AR_TX_BLOCKS; blk++) {
-			sc->block[blk].txdesc = next;
-			bufmem = (16 * 1024) / AR_TX_BLOCKS;
-			descneeded = bufmem / AR_BUF_SIZ;
-			sc->block[blk].txstart = sc->block[blk].txdesc +
-				((((descneeded * sizeof(sca_descriptor)) /
-					AR_BUF_SIZ) + 1) * AR_BUF_SIZ);
-			sc->block[blk].txend = next + bufmem;
-			sc->block[blk].txmax =
-				(sc->block[blk].txend - sc->block[blk].txstart)
-				/ AR_BUF_SIZ;
-			next += bufmem;
-
-			TRC(printf("ar%d: blk %d: txdesc %x, txstart %x, "
-				   "txend %x, txmax %d\n",
-				   x,
-				   blk,
-				   sc->block[blk].txdesc,
-				   sc->block[blk].txstart,
-				   sc->block[blk].txend,
-				   sc->block[blk].txmax));
-		}
-
-		sc->rxdesc = next;
-		bufmem = chanmem - (bufmem * AR_TX_BLOCKS);
-		descneeded = bufmem / AR_BUF_SIZ;
-		sc->rxstart = sc->rxdesc +
-				((((descneeded * sizeof(sca_descriptor)) /
-					AR_BUF_SIZ) + 1) * AR_BUF_SIZ);
-		sc->rxend = next + bufmem;
-		sc->rxmax = (sc->rxend - sc->rxstart) / AR_BUF_SIZ;
-		next += bufmem;
-		TRC(printf("ar%d: rxdesc %x, rxstart %x, "
-			   "rxend %x, rxmax %d\n",
-			   x, sc->rxdesc, sc->rxstart, sc->rxend, sc->rxmax));
-	}
-
-	if(hc->bustype == AR_BUS_PCI)
-		hc->orbase[AR_PIMCTRL] = AR_PIM_MODEG | AR_PIM_AUTO_LED;
-}
-
-
-/*
- * The things done here are channel independent.
- *
- *   Configure the sca waitstates.
- *   Configure the global interrupt registers.
- *   Enable master dma enable.
- */
-static void
-ar_init_sca(struct ar_hardc *hc, int scano)
-{
-	sca_regs *sca;
-
-	sca = hc->sca[scano];
-	if(hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(hc, scano);
-
-	/*
-	 * Do the wait registers.
-	 * Set everything to 0 wait states.
-	 */
-	sca->pabr0 = 0;
-	sca->pabr1 = 0;
-	sca->wcrl  = 0;
-	sca->wcrm  = 0;
-	sca->wcrh  = 0;
-
-	/*
-	 * Configure the interrupt registers.
-	 * Most are cleared until the interface is configured.
-	 */
-	sca->ier0 = 0x00; /* MSCI interrupts... Not used with dma. */
-	sca->ier1 = 0x00; /* DMAC interrupts */
-	sca->ier2 = 0x00; /* TIMER interrupts... Not used yet. */
-	sca->itcr = 0x00; /* Use ivr and no intr ack */
-	sca->ivr  = 0x40; /* Fill in the interrupt vector. */
-	sca->imvr = 0x40;
-
-	/*
-	 * Configure the timers.
-	 * XXX Later
-	 */
-
-
-	/*
-	 * Set the DMA channel priority to rotate between
-	 * all four channels.
-	 *
-	 * Enable all dma channels.
-	 */
-	if(hc->bustype == AR_BUS_PCI) {
-		u_char *t;
-
-		/*
-		 * Stupid problem with the PCI interface chip that break
-		 * things.
-		 * XXX
-		 */
-		t = (u_char *)sca;
-		t[AR_PCI_SCA_PCR] = SCA_PCR_PR2;
-		t[AR_PCI_SCA_DMER] = SCA_DMER_EN;
-	} else {
-		sca->pcr = SCA_PCR_PR2;
-		sca->dmer = SCA_DMER_EN;
-	}
-}
-
-
-/*
- * Configure the msci
- *
- * NOTE: The serial port configuration is hardcoded at the moment.
- */
-static void
-ar_init_msci(struct ar_softc *sc)
-{
-	msci_channel *msci;
-
-	msci = &sc->sca->msci[sc->scachan];
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-
-	msci->cmd = SCA_CMD_RESET;
-
-	msci->md0 = SCA_MD0_CRC_1 |
-		    SCA_MD0_CRC_CCITT |
-		    SCA_MD0_CRC_ENABLE |
-		    SCA_MD0_MODE_HDLC;
-	msci->md1 = SCA_MD1_NOADDRCHK;
-	msci->md2 = SCA_MD2_DUPLEX | SCA_MD2_NRZ;
-
-	/*
-	 * Acording to the manual I should give a reset after changing the
-	 * mode registers.
-	 */
-	msci->cmd = SCA_CMD_RXRESET;
-	msci->ctl = SCA_CTL_IDLPAT | SCA_CTL_UDRNC | SCA_CTL_RTS;
-
-	/*
-	 * For now all interfaces are programmed to use the RX clock for
-	 * the TX clock.
-	 */
-	switch(sc->hc->interface[sc->subunit]) {
-	case AR_IFACE_V_35:
-		msci->rxs = SCA_RXS_CLK_RXC0 | SCA_RXS_DIV1;
-		msci->txs = SCA_TXS_CLK_TXC | SCA_TXS_DIV1;
-		break;
-	case AR_IFACE_X_21:
-	case AR_IFACE_EIA_530:
-	case AR_IFACE_COMBO:
-		msci->rxs = SCA_RXS_CLK_RXC0 | SCA_RXS_DIV1;
-		msci->txs = SCA_TXS_CLK_RX | SCA_TXS_DIV1;
-	}
-
-	msci->tmc = 153;   /* This give 64k for loopback */
-
-	/* XXX
-	 * Disable all interrupts for now. I think if you are using
-	 * the dmac you don't use these interrupts.
-	 */
-	msci->ie0 = 0;
-	msci->ie1 = 0x0C; /* XXX CTS and DCD (DSR on 570I) level change. */
-	msci->ie2 = 0;
-	msci->fie = 0;
-
-	msci->sa0 = 0;
-	msci->sa1 = 0;
-
-	msci->idl = 0x7E; /* XXX This is what cisco does. */
-
-	/*
-	 * This is what the ARNET diags use.
-	 */
-	msci->rrc  = 0x0E;
-	msci->trc0 = 0x12;
-	msci->trc1 = 0x1F;
-}
-
-/*
- * Configure the rx dma controller.
- */
-static void
-ar_init_rx_dmac(struct ar_softc *sc)
-{
-	dmac_channel *dmac;
-	sca_descriptor *rxd;
-	u_int rxbuf;
-	u_int rxda;
-	u_int rxda_d;
-	int x = 0;
-
-	dmac = &sc->sca->dmac[DMAC_RXCH(sc->scachan)];
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_MEM(sc->hc, sc->rxdesc);
-
-	rxd = (sca_descriptor *)(sc->hc->mem_start + (sc->rxdesc&sc->hc->winmsk));
-	rxda_d = (u_int)sc->hc->mem_start - (sc->rxdesc & ~sc->hc->winmsk);
-
-	for(rxbuf=sc->rxstart;rxbuf<sc->rxend;rxbuf += AR_BUF_SIZ, rxd++) {
-		rxda = (u_int)&rxd[1] - rxda_d;
-		rxd->cp = (u_short)(rxda & 0xfffful);
-
-		x++;
-		if(x < 6)
-		TRC(printf("Descrp %p, data pt %x, data %x, ",
-			rxd, rxda, rxbuf));
-
-		rxd->bp = (u_short)(rxbuf & 0xfffful);
-		rxd->bpb = (u_char)((rxbuf >> 16) & 0xff);
-		rxd->len = 0;
-		rxd->stat = 0xff; /* The sca write here when it is finished. */
-
-		if(x < 6)
-		TRC(printf("bpb %x, bp %x.\n", rxd->bpb, rxd->bp));
-	}
-	rxd--;
-	rxd->cp = (u_short)(sc->rxdesc & 0xfffful);
-
-	sc->rxhind = 0;
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-
-	dmac->dsr = 0;    /* Disable DMA transfer */
-	dmac->dcr = SCA_DCR_ABRT;
-
-	/* XXX maybe also SCA_DMR_CNTE */
-	dmac->dmr = SCA_DMR_TMOD | SCA_DMR_NF;
-	dmac->bfl = AR_BUF_SIZ;
-
-	dmac->cda = (u_short)(sc->rxdesc & 0xffff);
-	dmac->sarb = (u_char)((sc->rxdesc >> 16) & 0xff);
-
-	rxd = (sca_descriptor *)sc->rxstart;
-	dmac->eda = (u_short)((u_int)&rxd[sc->rxmax - 1] & 0xffff);
-
-	dmac->dir = 0xF0;
-
-	dmac->dsr = SCA_DSR_DE;
-}
-
-/*
- * Configure the TX DMA descriptors.
- * Initialize the needed values and chain the descriptors.
- */
-static void
-ar_init_tx_dmac(struct ar_softc *sc)
-{
-	dmac_channel *dmac;
-	struct buf_block *blkp;
-	int blk;
-	sca_descriptor *txd;
-	u_int txbuf;
-	u_int txda;
-	u_int txda_d;
-
-	dmac = &sc->sca->dmac[DMAC_TXCH(sc->scachan)];
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_MEM(sc->hc, sc->block[0].txdesc);
-
-	for(blk = 0; blk < AR_TX_BLOCKS; blk++) {
-		blkp = &sc->block[blk];
-		txd = (sca_descriptor *)(sc->hc->mem_start +
-					(blkp->txdesc&sc->hc->winmsk));
-		txda_d = (u_int)sc->hc->mem_start -
-				(blkp->txdesc & ~sc->hc->winmsk);
-
-		txbuf=blkp->txstart;
-		for(;txbuf<blkp->txend;txbuf += AR_BUF_SIZ, txd++) {
-			txda = (u_int)&txd[1] - txda_d;
-			txd->cp = (u_short)(txda & 0xfffful);
-
-			txd->bp = (u_short)(txbuf & 0xfffful);
-			txd->bpb = (u_char)((txbuf >> 16) & 0xff);
-			TRC(printf("ar%d: txbuf %x, bpb %x, bp %x\n",
-				sc->unit, txbuf, txd->bpb, txd->bp));
-			txd->len = 0;
-			txd->stat = 0;
-		}
-		txd--;
-		txd->cp = (u_short)(blkp->txdesc & 0xfffful);
-
-		blkp->txtail = (u_int)txd - (u_int)sc->hc->mem_start;
-		TRC(printf("TX Descriptors start %x, end %x.\n",
-			blkp->txdesc,
-			blkp->txtail));
-	}
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-
-	dmac->dsr = 0; /* Disable DMA */
-	dmac->dcr = SCA_DCR_ABRT;
-	dmac->dmr = SCA_DMR_TMOD | SCA_DMR_NF;
-	dmac->dir = SCA_DIR_EOT | SCA_DIR_BOF | SCA_DIR_COF;
-
-	dmac->sarb = (u_char)((sc->block[0].txdesc >> 16) & 0xff);
-}
-
-
-/*
- * Look through the descriptors to see if there is a complete packet
- * available. Stop if we get to where the sca is busy.
- *
- * Return the length and status of the packet.
- * Return nonzero if there is a packet available.
- *
- * NOTE:
- * It seems that we get the interrupt a bit early. The updateing of
- * descriptor values is not always completed when this is called.
- */
-static int
-ar_packet_avail(struct ar_softc *sc,
-		    int *len,
-		    u_char *rxstat)
-{
-	dmac_channel *dmac;
-	sca_descriptor *rxdesc;
-	sca_descriptor *endp;
-	sca_descriptor *cda;
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-	dmac = &sc->sca->dmac[DMAC_RXCH(sc->scachan)];
-	cda = (sca_descriptor *)(sc->hc->mem_start +
-	      ((((u_int)dmac->sarb << 16) + dmac->cda) & sc->hc->winmsk));
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_MEM(sc->hc, sc->rxdesc);
-	rxdesc = (sca_descriptor *)
-			(sc->hc->mem_start + (sc->rxdesc & sc->hc->winmsk));
-	endp = rxdesc;
-	rxdesc = &rxdesc[sc->rxhind];
-	endp = &endp[sc->rxmax];
-
-	*len = 0;
-
-	while(rxdesc != cda) {
-		*len += rxdesc->len;
-
-		if(rxdesc->stat & SCA_DESC_EOM) {
-			*rxstat = rxdesc->stat;
-			TRC(printf("ar%d: PKT AVAIL len %d, %x.\n",
-				sc->unit, *len, *rxstat));
-			return (1);
-		}
-
-		rxdesc++;
-		if(rxdesc == endp)
-			rxdesc = (sca_descriptor *)
-			       (sc->hc->mem_start + (sc->rxdesc & sc->hc->winmsk));
-	}
-
-	*len = 0;
-	*rxstat = 0;
-	return (0);
-}
-
-
-/*
- * Copy a packet from the on card memory into a provided mbuf.
- * Take into account that buffers wrap and that a packet may
- * be larger than a buffer.
- */
-static void 
-ar_copy_rxbuf(struct mbuf *m,
-		   struct ar_softc *sc,
-		   int len)
-{
-	sca_descriptor *rxdesc;
-	u_int rxdata;
-	u_int rxmax;
-	u_int off = 0;
-	u_int tlen;
-
-	rxdata = sc->rxstart + (sc->rxhind * AR_BUF_SIZ);
-	rxmax = sc->rxstart + (sc->rxmax * AR_BUF_SIZ);
-
-	rxdesc = (sca_descriptor *)
-			(sc->hc->mem_start + (sc->rxdesc & sc->hc->winmsk));
-	rxdesc = &rxdesc[sc->rxhind];
-
-	while(len) {
-		tlen = (len < AR_BUF_SIZ) ? len : AR_BUF_SIZ;
-		if(sc->hc->bustype == AR_BUS_ISA)
-			ARC_SET_MEM(sc->hc, rxdata);
-		bcopy(sc->hc->mem_start + (rxdata & sc->hc->winmsk), 
-			mtod(m, caddr_t) + off,
-			tlen);
-
-		off += tlen;
-		len -= tlen;
-
-		if(sc->hc->bustype == AR_BUS_ISA)
-			ARC_SET_MEM(sc->hc, sc->rxdesc);
-		rxdesc->len = 0;
-		rxdesc->stat = 0xff;
-
-		rxdata += AR_BUF_SIZ;
-		rxdesc++;
-		if(rxdata == rxmax) {
-			rxdata = sc->rxstart;
-			rxdesc = (sca_descriptor *)
-				(sc->hc->mem_start + (sc->rxdesc & sc->hc->winmsk));
-		}
-	}
-}
-
-/*
- * If single is set, just eat a packet. Otherwise eat everything up to
- * where cda points. Update pointers to point to the next packet.
- */
-static void
-ar_eat_packet(struct ar_softc *sc, int single)
-{
-	dmac_channel *dmac;
-	sca_descriptor *rxdesc;
-	sca_descriptor *endp;
-	sca_descriptor *cda;
-	int loopcnt = 0;
-	u_char stat;
-
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-	dmac = &sc->sca->dmac[DMAC_RXCH(sc->scachan)];
-	cda = (sca_descriptor *)(sc->hc->mem_start +
-	      ((((u_int)dmac->sarb << 16) + dmac->cda) & sc->hc->winmsk));
-
-	/*
-	 * Loop until desc->stat == (0xff || EOM)
-	 * Clear the status and length in the descriptor.
-	 * Increment the descriptor.
-	 */
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_MEM(sc->hc, sc->rxdesc);
-	rxdesc = (sca_descriptor *)
-		(sc->hc->mem_start + (sc->rxdesc & sc->hc->winmsk));
-	endp = rxdesc;
-	rxdesc = &rxdesc[sc->rxhind];
-	endp = &endp[sc->rxmax];
-
-	while(rxdesc != cda) {
-		loopcnt++;
-		if(loopcnt > sc->rxmax) {
-			printf("ar%d: eat pkt %d loop, cda %p, "
-			       "rxdesc %p, stat %x.\n",
-			       sc->unit,
-			       loopcnt,
-			       (void *)cda,
-			       (void *)rxdesc,
-			       rxdesc->stat);
-			break;
-		}
-
-		stat = rxdesc->stat;
-
-		rxdesc->len = 0;
-		rxdesc->stat = 0xff;
-
-		rxdesc++;
-		sc->rxhind++;
-		if(rxdesc == endp) {
-			rxdesc = (sca_descriptor *)
-			       (sc->hc->mem_start + (sc->rxdesc & sc->hc->winmsk));
-			sc->rxhind = 0;
-		}
-
-		if(single && (stat == SCA_DESC_EOM))
-			break;
-	}
-
-	/*
-	 * Update the eda to the previous descriptor.
-	 */
-	if(sc->hc->bustype == AR_BUS_ISA)
-		ARC_SET_SCA(sc->hc, sc->scano);
-
-	rxdesc = (sca_descriptor *)sc->rxdesc;
-	rxdesc = &rxdesc[(sc->rxhind + sc->rxmax - 2 ) % sc->rxmax];
-
-	sc->sca->dmac[DMAC_RXCH(sc->scachan)].eda = 
-			(u_short)((u_int)rxdesc & 0xffff);
-}
-
-
-/*
- * While there is packets available in the rx buffer, read them out
- * into mbufs and ship them off.
- */
-static void
-ar_get_packets(struct ar_softc *sc)
-{
-	sca_descriptor *rxdesc;
-	struct mbuf *m = NULL;
-	int i;
-	int len;
-	u_char rxstat;
-#ifdef NETGRAPH
-	int error;
-#endif
-
-	while(ar_packet_avail(sc, &len, &rxstat)) {
-		TRC(printf("apa: len %d, rxstat %x\n", len, rxstat));
-		if(((rxstat & SCA_DESC_ERRORS) == 0) && (len < MCLBYTES)) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
-			if(m == NULL) {
-				/* eat packet if get mbuf fail!! */
-				ar_eat_packet(sc, 1);
-				continue;
-			}
-#ifndef NETGRAPH
-			m->m_pkthdr.rcvif = SC2IFP(sc);
-#else	/* NETGRAPH */
-			m->m_pkthdr.rcvif = NULL;
-			sc->inbytes += len;
-			sc->inlast = 0;
-#endif	/* NETGRAPH */
-			m->m_pkthdr.len = m->m_len = len;
-			if(len > MHLEN) {
-				MCLGET(m, M_DONTWAIT);
-				if((m->m_flags & M_EXT) == 0) {
-					m_freem(m);
-					ar_eat_packet(sc, 1);
-					continue;
-				}
-			}
-			ar_copy_rxbuf(m, sc, len);
-#ifndef NETGRAPH
-			BPF_MTAP(SC2IFP(sc), m);
-			sppp_input(SC2IFP(sc), m);
-			SC2IFP(sc)->if_ipackets++;
-#else	/* NETGRAPH */
-			NG_SEND_DATA_ONLY(error, sc->hook, m);
-			sc->ipackets++;
-#endif	/* NETGRAPH */
-
-			/*
-			 * Update the eda to the previous descriptor.
-			 */
-			i = (len + AR_BUF_SIZ - 1) / AR_BUF_SIZ;
-			sc->rxhind = (sc->rxhind + i) % sc->rxmax;
-
-			if(sc->hc->bustype == AR_BUS_ISA)
-				ARC_SET_SCA(sc->hc, sc->scano);
-
-			rxdesc = (sca_descriptor *)sc->rxdesc;
-			rxdesc =
-			     &rxdesc[(sc->rxhind + sc->rxmax - 2 ) % sc->rxmax];
-
-			sc->sca->dmac[DMAC_RXCH(sc->scachan)].eda = 
-				(u_short)((u_int)rxdesc & 0xffff);
-		} else {
-			int tries = 5;
-
-			while((rxstat == 0xff) && --tries)
-				ar_packet_avail(sc, &len, &rxstat);
-
-			/*
-			 * It look like we get an interrupt early
-			 * sometimes and then the status is not
-			 * filled in yet.
-			 */
-			if(tries && (tries != 5))
-				continue;
-
-			ar_eat_packet(sc, 1);
-
-#ifndef	NETGRAPH
-			SC2IFP(sc)->if_ierrors++;
-#else	/* NETGRAPH */
-			sc->ierrors[0]++;
-#endif	/* NETGRAPH */
-
-			if(sc->hc->bustype == AR_BUS_ISA)
-				ARC_SET_SCA(sc->hc, sc->scano);
-
-			TRCL(printf("ar%d: Receive error chan %d, "
-					"stat %x, msci st3 %x,"
-					"rxhind %d, cda %x, eda %x.\n",
-					sc->unit,
-					sc->scachan, 
-					rxstat,
-					sc->sca->msci[sc->scachan].st3,
-					sc->rxhind,
-					sc->sca->dmac[
-						DMAC_RXCH(sc->scachan)].cda,
-					sc->sca->dmac[
-						DMAC_RXCH(sc->scachan)].eda));
-		}
-	}
-}
-
-
-/*
- * All DMA interrupts come here.
- *
- * Each channel has two interrupts.
- * Interrupt A for errors and Interrupt B for normal stuff like end
- * of transmit or receive dmas.
- */
-static void
-ar_dmac_intr(struct ar_hardc *hc, int scano, u_char isr1)
-{
-	u_char dsr;
-	u_char dotxstart = isr1;
-	int mch;
-	struct ar_softc *sc;
-	sca_regs *sca;
-	dmac_channel *dmac;
-
-	sca = hc->sca[scano];
-	mch = 0;
-	/*
-	 * Shortcut if there is no interrupts for dma channel 0 or 1
-	 */
-	if((isr1 & 0x0F) == 0) {
-		mch = 1;
-		isr1 >>= 4;
-	}
-
-	do {
-		sc = &hc->sc[mch + (NCHAN * scano)];
-
-		/*
-		 * Transmit channel
-		 */
-		if(isr1 & 0x0C) {
-			dmac = &sca->dmac[DMAC_TXCH(mch)];
-
-			if(hc->bustype == AR_BUS_ISA)
-				ARC_SET_SCA(hc, scano);
-
-			dsr = dmac->dsr;
-			dmac->dsr = dsr;
-
-			/* Counter overflow */
-			if(dsr & SCA_DSR_COF) {
-				printf("ar%d: TX DMA Counter overflow, "
-					"txpacket no %lu.\n",
-					sc->unit,
-#ifndef	NETGRAPH
-					SC2IFP(sc)->if_opackets);
-				SC2IFP(sc)->if_oerrors++;
-#else	/* NETGRAPH */
-					sc->opackets);
-				sc->oerrors++;
-#endif	/* NETGRAPH */
-			}
-
-			/* Buffer overflow */
-			if(dsr & SCA_DSR_BOF) {
-				printf("ar%d: TX DMA Buffer overflow, "
-					"txpacket no %lu, dsr %02x, "
-					"cda %04x, eda %04x.\n",
-					sc->unit,
-#ifndef	NETGRAPH
-					SC2IFP(sc)->if_opackets,
-#else	/* NETGRAPH */
-					sc->opackets,
-#endif	/* NETGRAPH */
-					dsr,
-					dmac->cda,
-					dmac->eda);
-#ifndef	NETGRAPH
-				SC2IFP(sc)->if_oerrors++;
-#else	/* NETGRAPH */
-				sc->oerrors++;
-#endif	/* NETGRAPH */
-			}
-
-			/* End of Transfer */
-			if(dsr & SCA_DSR_EOT) {
-				/*
-				 * This should be the most common case.
-				 *
-				 * Clear the IFF_DRV_OACTIVE flag.
-				 *
-				 * Call arstart to start a new transmit if
-				 * there is data to transmit.
-				 */
-				sc->xmit_busy = 0;
-#ifndef	NETGRAPH
-				SC2IFP(sc)->if_drv_flags &= ~IFF_DRV_OACTIVE;
-				SC2IFP(sc)->if_timer = 0;
-#else	/* NETGRAPH */
-			/* XXX 	SC2IFP(sc)->if_drv_flags &= ~IFF_DRV_OACTIVE; */
-				sc->out_dog = 0; /* XXX */
-#endif	/* NETGRAPH */
-
-				if(sc->txb_inuse && --sc->txb_inuse)
-					ar_xmit(sc);
-			}
-		}
-
-		/*
-		 * Receive channel
-		 */
-		if(isr1 & 0x03) {
-			dmac = &sca->dmac[DMAC_RXCH(mch)];
-
-			if(hc->bustype == AR_BUS_ISA)
-				ARC_SET_SCA(hc, scano);
-
-			dsr = dmac->dsr;
-			dmac->dsr = dsr;
-
-			TRC(printf("AR: RX DSR %x\n", dsr));
-
-			/* End of frame */
-			if(dsr & SCA_DSR_EOM) {
-				TRC(int tt = SC2IFP(sc)->if_ipackets;)
-				TRC(int ind = sc->rxhind;)
-
-				ar_get_packets(sc);
-#ifndef	NETGRAPH
-#define	IPACKETS SC2IFP(sc)->if_ipackets
-#else	/* NETGRAPH */
-#define	IPACKETS sc->ipackets
-#endif	/* NETGRAPH */
-				TRC(if(tt == IPACKETS) {
-					sca_descriptor *rxdesc;
-					int i;
-
-					if(hc->bustype == AR_BUS_ISA)
-						ARC_SET_SCA(hc, scano);
-					printf("AR: RXINTR isr1 %x, dsr %x, "
-					       "no data %d pkts, orxhind %d.\n",
-					       dotxstart,
-					       dsr,
-					       tt,
-					       ind);
-					printf("AR: rxdesc %x, rxstart %x, "
-					       "rxend %x, rxhind %d, "
-					       "rxmax %d.\n",
-					       sc->rxdesc,
-					       sc->rxstart,
-					       sc->rxend,
-					       sc->rxhind,
-					       sc->rxmax);
-					printf("AR: cda %x, eda %x.\n",
-					       dmac->cda,
-					       dmac->eda);
-
-					if(sc->hc->bustype == AR_BUS_ISA)
-						ARC_SET_MEM(sc->hc,
-						    sc->rxdesc);
-					rxdesc = (sca_descriptor *)
-						 (sc->hc->mem_start +
-						  (sc->rxdesc & sc->hc->winmsk));
-					rxdesc = &rxdesc[sc->rxhind];
-					for(i=0;i<3;i++,rxdesc++)
-						printf("AR: rxdesc->stat %x, "
-							"len %d.\n",
-							rxdesc->stat,
-							rxdesc->len);
-				})
-			}
-
-			/* Counter overflow */
-			if(dsr & SCA_DSR_COF) {
-				printf("ar%d: RX DMA Counter overflow, "
-					"rxpkts %lu.\n",
-					sc->unit,
-#ifndef	NETGRAPH
-					SC2IFP(sc)->if_ipackets);
-				SC2IFP(sc)->if_ierrors++;
-#else	/* NETGRAPH */
-					sc->ipackets);
-				sc->ierrors[1]++;
-#endif	/* NETGRAPH */
-			}
-
-			/* Buffer overflow */
-			if(dsr & SCA_DSR_BOF) {
-				if(hc->bustype == AR_BUS_ISA)
-					ARC_SET_SCA(hc, scano);
-				printf("ar%d: RX DMA Buffer overflow, "
-					"rxpkts %lu, rxind %d, "
-					"cda %x, eda %x, dsr %x.\n",
-					sc->unit,
-#ifndef	NETGRAPH
-					SC2IFP(sc)->if_ipackets,
-#else	/* NETGRAPH */
-					sc->ipackets,
-#endif	/* NETGRAPH */
-					sc->rxhind,
-					dmac->cda,
-					dmac->eda,
-					dsr);
-				/*
-				 * Make sure we eat as many as possible.
-				 * Then get the system running again.
-				 */
-				ar_eat_packet(sc, 0);
-#ifndef	NETGRAPH
-				SC2IFP(sc)->if_ierrors++;
-#else	/* NETGRAPH */
-				sc->ierrors[2]++;
-#endif	/* NETGRAPH */
-				if(hc->bustype == AR_BUS_ISA)
-					ARC_SET_SCA(hc, scano);
-				sca->msci[mch].cmd = SCA_CMD_RXMSGREJ;
-				dmac->dsr = SCA_DSR_DE;
-
-				TRC(printf("ar%d: RX DMA Buffer overflow, "
-					"rxpkts %lu, rxind %d, "
-					"cda %x, eda %x, dsr %x. After\n",
-					sc->unit,
-					SC2IFP(sc)->if_ipackets,
-					sc->rxhind,
-					dmac->cda,
-					dmac->eda,
-					dmac->dsr);)
-			}
-
-			/* End of Transfer */
-			if(dsr & SCA_DSR_EOT) {
-				/*
-				 * If this happen, it means that we are
-				 * receiving faster than what the processor
-				 * can handle.
-				 *
-				 * XXX We should enable the dma again.
-				 */
-				printf("ar%d: RX End of transfer, rxpkts %lu.\n",
-					sc->unit,
-#ifndef	NETGRAPH
-					SC2IFP(sc)->if_ipackets);
-				SC2IFP(sc)->if_ierrors++;
-#else	/* NETGRAPH */
-					sc->ipackets);
-				sc->ierrors[3]++;
-#endif	/* NETGRAPH */
-			}
-		}
-
-		isr1 >>= 4;
-
-		mch++;
-	}while((mch<NCHAN) && isr1);
-
-	/*
-	 * Now that we have done all the urgent things, see if we
-	 * can fill the transmit buffers.
-	 */
-	for(mch = 0; mch < NCHAN; mch++) {
-		if(dotxstart & 0x0C) {
-			sc = &hc->sc[mch + (NCHAN * scano)];
-#ifndef	NETGRAPH
-			arstart(SC2IFP(sc));
-#else	/* NETGRAPH */
-			arstart(sc);
-#endif	/* NETGRAPH */
-		}
-		dotxstart >>= 4;
-	}
-}
-
-static void
-ar_msci_intr(struct ar_hardc *hc, int scano, u_char isr0)
-{
-	printf("arc%d: ARINTR: MSCI\n", hc->cunit);
-}
-
-static void
-ar_timer_intr(struct ar_hardc *hc, int scano, u_char isr2)
-{
-	printf("arc%d: ARINTR: TIMER\n", hc->cunit);
-}
-
-
-#ifdef	NETGRAPH
-/*****************************************
- * Device timeout/watchdog routine.
- * called once per second.
- * checks to see that if activity was expected, that it hapenned.
- * At present we only look to see if expected output was completed.
- */
-static void
-ngar_watchdog_frame(void * arg)
-{
-	struct ar_softc * sc = arg;
-	int s;
-	int	speed;
-
-	if(sc->running == 0)
-		return; /* if we are not running let timeouts die */
-	/*
-	 * calculate the apparent throughputs 
-	 *  XXX a real hack
-	 */
-	s = splimp();
-	speed = sc->inbytes - sc->lastinbytes;
-	sc->lastinbytes = sc->inbytes;
-	if ( sc->inrate < speed )
-		sc->inrate = speed;
-	speed = sc->outbytes - sc->lastoutbytes;
-	sc->lastoutbytes = sc->outbytes;
-	if ( sc->outrate < speed )
-		sc->outrate = speed;
-	sc->inlast++;
-	splx(s);
-
-	if ((sc->inlast > QUITE_A_WHILE)
-	&& (sc->out_deficit > LOTS_OF_PACKETS)) {
-		log(LOG_ERR, "ar%d: No response from remote end\n", sc->unit);
-		s = splimp();
-		ar_down(sc);
-		ar_up(sc);
-		sc->inlast = sc->out_deficit = 0;
-		splx(s);
-	} else if ( sc->xmit_busy ) { /* no TX -> no TX timeouts */
-		if (sc->out_dog == 0) { 
-			log(LOG_ERR, "ar%d: Transmit failure.. no clock?\n",
-					sc->unit);
-			s = splimp();
-			arwatchdog(sc);
-#if 0
-			ar_down(sc);
-			ar_up(sc);
-#endif
-			splx(s);
-			sc->inlast = sc->out_deficit = 0;
-		} else {
-			sc->out_dog--;
-		}
-	}
-	sc->handle = timeout(ngar_watchdog_frame, sc, hz);
-}
-
-/***********************************************************************
- * This section contains the methods for the Netgraph interface
- ***********************************************************************/
-/*
- * It is not possible or allowable to create a node of this type.
- * If the hardware exists, it will already have created it.
- */
-static	int
-ngar_constructor(node_p node)
-{
-	return (EINVAL);
-}
-
-/*
- * give our ok for a hook to be added...
- * If we are not running this should kick the device into life.
- * The hook's private info points to our stash of info about that
- * channel.
- */
-static int
-ngar_newhook(node_p node, hook_p hook, const char *name)
-{
-	struct ar_softc *	sc = NG_NODE_PRIVATE(node);
-
-	/*
-	 * check if it's our friend the debug hook
-	 */
-	if (strcmp(name, NG_AR_HOOK_DEBUG) == 0) {
-		NG_HOOK_SET_PRIVATE(hook, NULL); /* paranoid */
-		sc->debug_hook = hook;
-		return (0);
-	}
-
-	/*
-	 * Check for raw mode hook.
-	 */
-	if (strcmp(name, NG_AR_HOOK_RAW) != 0) {
-		return (EINVAL);
-	}
-	NG_HOOK_SET_PRIVATE(hook, sc);
-	sc->hook = hook;
-	sc->datahooks++;
-	ar_up(sc);
-	return (0);
-}
-
-/*
- * incoming messages.
- * Just respond to the generic TEXT_STATUS message
- */
-static	int
-ngar_rcvmsg(node_p node, item_p item, hook_p lasthook)
-{
-	struct ar_softc *	sc;
-	struct ng_mesg *resp = NULL;
-	int error = 0;
-	struct ng_mesg *msg;
-
-	NGI_GET_MSG(item, msg);
-	sc = NG_NODE_PRIVATE(node);
-	switch (msg->header.typecookie) {
-	case	NG_AR_COOKIE: 
-		error = EINVAL;
-		break;
-	case	NGM_GENERIC_COOKIE: 
-		switch(msg->header.cmd) {
-		case NGM_TEXT_STATUS: {
-			char        *arg;
-			int pos = 0;
-
-			int resplen = sizeof(struct ng_mesg) + 512;
-			NG_MKRESPONSE(resp, msg, resplen, M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			arg = (resp)->data;
-			pos = sprintf(arg, "%ld bytes in, %ld bytes out\n"
-			    "highest rate seen: %ld B/S in, %ld B/S out\n",
-			sc->inbytes, sc->outbytes,
-			sc->inrate, sc->outrate);
-			pos += sprintf(arg + pos,
-				"%ld output errors\n",
-			    	sc->oerrors);
-			pos += sprintf(arg + pos,
-				"ierrors = %ld, %ld, %ld, %ld\n",
-			    	sc->ierrors[0],
-			    	sc->ierrors[1],
-			    	sc->ierrors[2],
-			    	sc->ierrors[3]);
-
-			resp->header.arglen = pos + 1;
-			break;
-		      }
-		default:
-		 	error = EINVAL;
-		 	break;
-		    }
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	/* Take care of synchronous response, if any */
-	NG_RESPOND_MSG(error, node, item, resp);
-	NG_FREE_MSG(msg);
-	return (error);
-}
-
-/*
- * get data from another node and transmit it to the correct channel
- */
-static int
-ngar_rcvdata(hook_p hook, item_p item)
-{
-	int s;
-	int error = 0;
-	struct ar_softc * sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-	struct ifqueue	*xmitq_p;
-	struct mbuf *m;
-	struct ng_tag_prio *ptag;
-	
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-	/*
-	 * data doesn't come in from just anywhere (e.g control hook)
-	 */
-	if ( NG_HOOK_PRIVATE(hook) == NULL) {
-		error = ENETDOWN;
-		goto bad;
-	}
-
-	/* 
-	 * Now queue the data for when it can be sent
-	 */
-	if ((ptag = (struct ng_tag_prio *)m_tag_locate(m, NGM_GENERIC_COOKIE,
-	    NG_TAG_PRIO, NULL)) != NULL && (ptag->priority > NG_PRIO_CUTOFF) )
-		xmitq_p = (&sc->xmitq_hipri);
-	else
-		xmitq_p = (&sc->xmitq);
-
-	s = splimp();
-	IF_LOCK(xmitq_p);
-	if (_IF_QFULL(xmitq_p)) {
-		_IF_DROP(xmitq_p);
-		IF_UNLOCK(xmitq_p);
-		splx(s);
-		error = ENOBUFS;
-		goto bad;
-	}
-	_IF_ENQUEUE(xmitq_p, m);
-	IF_UNLOCK(xmitq_p);
-	arstart(sc);
-	splx(s);
-	return (0);
-
-bad:
-	/* 
-	 * It was an error case.
-	 * check if we need to free the mbuf, and then return the error
-	 */
-	NG_FREE_M(m);
-	return (error);
-}
-
-/*
- * do local shutdown processing..
- * this node will refuse to go away, unless the hardware says to..
- * don't unref the node, or remove our name. just clear our links up.
- */
-static	int
-ngar_shutdown(node_p node)
-{
-	struct ar_softc * sc = NG_NODE_PRIVATE(node);
-
-	ar_down(sc);
-	NG_NODE_UNREF(node);
-	/* XXX need to drain the output queues! */
-
-	/* The node is dead, long live the node! */
-	/* stolen from the attach routine */
-	if (ng_make_node_common(&typestruct, &sc->node) != 0)
-		return (0);
-	sprintf(sc->nodename, "%s%d", NG_AR_NODE_TYPE, sc->unit);
-	if (ng_name_node(sc->node, sc->nodename)) {
-		sc->node = NULL;
-		printf("node naming failed\n");
-		NG_NODE_UNREF(sc->node); /* node dissappears */
-		return (0);
-	}
-	NG_NODE_SET_PRIVATE(sc->node, sc);
-	sc->running = 0;
-	return (0);
-}
-
-/* already linked */
-static	int
-ngar_connect(hook_p hook)
-{
-	/* probably not at splnet, force outward queueing */
-	NG_HOOK_FORCE_QUEUE(NG_HOOK_PEER(hook));
-	/* be really amiable and just say "YUP that's OK by me! " */
-	return (0);
-}
-
-/*
- * notify on hook disconnection (destruction)
- *
- * Invalidate the private data associated with this dlci.
- * For this type, removal of the last link resets tries to destroy the node.
- * As the device still exists, the shutdown method will not actually
- * destroy the node, but reset the device and leave it 'fresh' :)
- *
- * The node removal code will remove all references except that owned by the
- * driver. 
- */
-static	int
-ngar_disconnect(hook_p hook)
-{
-	struct ar_softc * sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-	int	s;
-	/*
-	 * If it's the data hook, then free resources etc.
-	 */
-	if (NG_HOOK_PRIVATE(hook)) {
-		s = splimp();
-		sc->datahooks--;
-		if (sc->datahooks == 0)
-			ar_down(sc);
-		splx(s);
-	} else {
-		sc->debug_hook = NULL;
-	}
-	return (0);
-}
-#endif /* NETGRAPH */
-
-/*
- ********************************* END ************************************
- */
diff --git a/sys/dev/ar/if_ar.h b/sys/dev/ar/if_ar.h
deleted file mode 100644
index a6fc8cf..0000000
--- a/sys/dev/ar/if_ar.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * if_ar.h
- *
- * Copyright (C) 1997-1999 Whistle Communications Inc.
- * All rights reserved.
- *
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _I386_ISA_IF_AR_H_
-#define _I386_ISA_IF_AR_H_
-
-/* Node type name and type cookie */
-#define NG_AR_NODE_TYPE		"sync_ar"
-#define NG_AR_COOKIE		860552149
-
-/* Netgraph hooks */
-#define NG_AR_HOOK_DEBUG	"debug"
-#define NG_AR_HOOK_RAW		"rawdata"
-
-#endif /* _I386_ISA_IF_AR_H_ */
-
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
deleted file mode 100644
index afe3615..0000000
--- a/sys/dev/ar/if_ar_isa.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*-
- * Copyright (c) 1995 - 2001 John Hay.  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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY John Hay ``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 John Hay 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/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * Programming assumptions and other issues.
- *
- * The descriptors of a DMA channel will fit in a 16K memory window.
- *
- * The buffers of a transmit DMA channel will fit in a 16K memory window.
- *
- * Only the ISA bus cards with X.21 and V.35 is tested.
- *
- * When interface is going up, handshaking is set and it is only cleared
- * when the interface is down'ed.
- *
- * There should be a way to set/reset Raw HDLC/PPP, Loopback, DCE/DTE,
- * internal/external clock, etc.....
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <isa/isavar.h>
-#include "isa_if.h"
-
-#include <dev/ic/hd64570.h>
-#include <dev/ar/if_arregs.h>
-
-#ifdef TRACE
-#define TRC(x)               x
-#else
-#define TRC(x)
-#endif
-
-#define TRCL(x)              x
-
-static int ar_isa_probe (device_t);
-static int ar_isa_attach (device_t);
-
-static struct isa_pnp_id ar_ids[] = {
-	{0,		NULL}
-};
-
-static device_method_t ar_methods[] = {
-	DEVMETHOD(device_probe,		ar_isa_probe),
-	DEVMETHOD(device_attach,	ar_isa_attach),
-	DEVMETHOD(device_detach,	ar_detach),
-	{ 0, 0 }
-};
-
-static driver_t ar_isa_driver = {
-	"ar",
-	ar_methods,
-	sizeof (struct ar_hardc)
-};
-
-DRIVER_MODULE(ar, isa, ar_isa_driver, ar_devclass, 0, 0);
-MODULE_DEPEND(ar, isa, 1, 1, 1);
-
-/*
- * Probe to see if it is there.
- * Get its information and fill it in.
- */
-static int
-ar_isa_probe(device_t device)
-{
-	int error;
-	u_long membase, memsize;
-	struct ar_hardc *hc;
-
-	error = ISA_PNP_PROBE(device_get_parent(device), device, ar_ids);
-	if(error == ENXIO || error == 0)
-		return (error);
-
-	hc = (struct ar_hardc *)device_get_softc(device);
-
-	if((error = ar_allocate_ioport(device, 0, ARC_IO_SIZ))) {
-		return (ENXIO);
-	}
-
-	/*
-	 * Now see if the card is realy there.
-	 *
-	 * XXX For now I just check the undocumented ports
-	 * for "570". We will probably have to do more checking.
-	 */
-	if((ar_inb(hc, AR_ID_5) != '5') ||
-	   (ar_inb(hc, AR_ID_7) != '7') ||
-	   (ar_inb(hc, AR_ID_0) != '0')) {
-		ar_deallocate_resources(device);
-		return (ENXIO);
-	}
-	membase = bus_get_resource_start(device, SYS_RES_MEMORY, 0);
-	memsize = ar_inb(hc, AR_REV);
-	memsize = 1 << ((memsize & AR_WSIZ_MSK) >> AR_WSIZ_SHFT);
-	memsize *= ARC_WIN_SIZ;
-	error = bus_set_resource(device, SYS_RES_MEMORY, 0, membase, memsize);
-	ar_deallocate_resources(device);
-
-	return (error);
-}
-
-/*
- * Malloc memory for the softc structures.
- * Reset the card to put it in a known state.
- * Register the ports on the adapter.
- * Fill in the info for each port.
- * Attach each port to sppp and bpf.
- */
-static int
-ar_isa_attach(device_t device)
-{
-	u_int tmp;
-	u_long irq, junk;
-	struct ar_hardc *hc;
-
-	hc = (struct ar_hardc *)device_get_softc(device);
-	if(ar_allocate_ioport(device, 0, ARC_IO_SIZ))
-		return (ENXIO);
-
-	tmp = ar_inb(hc, AR_BMI);
-	hc->bustype = tmp & AR_BUS_MSK;
-	hc->memsize = (tmp & AR_MEM_MSK) >> AR_MEM_SHFT;
-	hc->memsize = 1 << hc->memsize;
-	hc->memsize <<= 16;
-	hc->interface[0] = (tmp & AR_IFACE_MSK);
-	hc->interface[1] = hc->interface[0];
-	hc->interface[2] = hc->interface[0];
-	hc->interface[3] = hc->interface[0];
-	tmp = ar_inb(hc, AR_REV);
-	hc->revision = tmp & AR_REV_MSK;
-	hc->winsize = 1 << ((tmp & AR_WSIZ_MSK) >> AR_WSIZ_SHFT);
-	hc->winsize *= ARC_WIN_SIZ;
-	hc->winmsk = hc->winsize - 1;
-	hc->numports = ar_inb(hc, AR_PNUM);
-	hc->handshake = ar_inb(hc, AR_HNDSH);
-
-	if(ar_allocate_memory(device, 0, hc->winsize))
-		return (ENXIO);
-
-	hc->mem_start = rman_get_virtual(hc->res_memory);
-	hc->mem_end = hc->mem_start + hc->winsize;
-	hc->cunit = device_get_unit(device);
-
-	switch(hc->interface[0]) {
-	case AR_IFACE_EIA_232:
-		printf("ar%d: The EIA 232 interface is not supported.\n",
-			hc->cunit);
-		ar_deallocate_resources(device);
-		return (ENXIO);
-	case AR_IFACE_V_35:
-		break;
-	case AR_IFACE_EIA_530:
-		printf("ar%d: WARNING: The EIA 530 interface is untested.\n",
-			hc->cunit);
-		break;
-	case AR_IFACE_X_21:
-		break;
-	case AR_IFACE_COMBO:
-		printf("ar%d: WARNING: The COMBO interface is untested.\n",
-			hc->cunit);
-		break;
-	}
-
-	/*
-	 * Do a little sanity check.
-	 */
-	if((hc->numports > NPORT) || (hc->memsize > (512*1024))) {
-		ar_deallocate_resources(device);
-		return (ENXIO);
-	}
-
-	if(ar_allocate_irq(device, 0, 1))
-		return (ENXIO);
-
-	if(bus_get_resource(device, SYS_RES_IRQ, 0, &irq, &junk)) {
-		ar_deallocate_resources(device);
-		return (ENXIO);
-	}
-	hc->isa_irq = irq;
-
-	if(ar_attach(device)) {
-		ar_deallocate_resources(device);
-		return (ENXIO);
-	}
-
-	return (0);
-}
-
-/*
- ********************************* END ************************************
- */
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
deleted file mode 100644
index 3715c8b..0000000
--- a/sys/dev/ar/if_ar_pci.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * Copyright (c) 1999 - 2001 John Hay.
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-
-#include <dev/ic/hd64570.h>
-#include <dev/ar/if_arregs.h>
-
-#ifdef TRACE
-#define TRC(x)               x
-#else
-#define TRC(x)
-#endif
-
-#define TRCL(x)              x
-
-static int	ar_pci_probe(device_t);
-static int	ar_pci_attach(device_t);
-
-static device_method_t ar_pci_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		ar_pci_probe),
-	DEVMETHOD(device_attach,	ar_pci_attach),
-	DEVMETHOD(device_detach,	ar_detach),
-	{ 0, 0 }
-};
-
-static driver_t ar_pci_driver = {
-	"ar",
-	ar_pci_methods,
-	sizeof(struct ar_hardc),
-};
-
-DRIVER_MODULE(ar, pci, ar_pci_driver, ar_devclass, 0, 0);
-MODULE_DEPEND(ar, pci, 1, 1, 1);
-
-static int
-ar_pci_probe(device_t device)
-{
-	u_int32_t	type = pci_get_devid(device);
-
-	switch(type) {
-	case 0x5012114f:
-		device_set_desc(device, "Digi SYNC/570i-PCI 2 port");
-		return (BUS_PROBE_DEFAULT);
-		break;
-	case 0x5010114f:
-		printf("Digi SYNC/570i-PCI 2 port (mapped below 1M)\n");
-		printf("Please change the jumper to select linear mode.\n");
-		break;
-	case 0x5013114f:
-		device_set_desc(device, "Digi SYNC/570i-PCI 4 port");
-		return (BUS_PROBE_DEFAULT);
-		break;
-	case 0x5011114f:
-		printf("Digi SYNC/570i-PCI 4 port (mapped below 1M)\n");
-		printf("Please change the jumper to select linear mode.\n");
-		break;
-	default:
-		break;
-	}
-	return (ENXIO);
-}
-
-static int
-ar_pci_attach(device_t device)
-{
-	int error;
-	u_int i, tmp;
-	struct ar_hardc *hc;
-
-	hc = (struct ar_hardc *)device_get_softc(device);
-	bzero(hc, sizeof(struct ar_hardc));
-
-	error = ar_allocate_plx_memory(device, 0x10, 1);
-	if(error)
-		goto errexit;
-
-	error = ar_allocate_memory(device, 0x18, 1);
-	if(error)
-		goto errexit;
-
-	error = ar_allocate_irq(device, 0, 1);
-	if(error)
-		goto errexit;
-
-	hc->mem_start = rman_get_virtual(hc->res_memory);
-
-	hc->cunit = device_get_unit(device);
-	hc->sca[0] = (sca_regs *)(hc->mem_start + AR_PCI_SCA_1_OFFSET);
-	hc->sca[1] = (sca_regs *)(hc->mem_start + AR_PCI_SCA_2_OFFSET);
-	hc->orbase = (u_char *)(hc->mem_start + AR_PCI_ORBASE_OFFSET);
-
-	tmp = hc->orbase[AR_BMI * 4];
-	hc->bustype = tmp & AR_BUS_MSK;
-	hc->memsize = (tmp & AR_MEM_MSK) >> AR_MEM_SHFT;
-	hc->memsize = 1 << hc->memsize;
-	hc->memsize <<= 16;
-	hc->interface[0] = (tmp & AR_IFACE_MSK);
-	tmp = hc->orbase[AR_REV * 4];
-	hc->revision = tmp & AR_REV_MSK;
-	hc->winsize = (1 << ((tmp & AR_WSIZ_MSK) >> AR_WSIZ_SHFT)) * 16 * 1024;
-	hc->mem_end = (caddr_t)(hc->mem_start + hc->winsize);
-	hc->winmsk = hc->winsize - 1;
-	hc->numports = hc->orbase[AR_PNUM * 4];
-	hc->handshake = hc->orbase[AR_HNDSH * 4];
-
-	for(i = 1; i < hc->numports; i++)
-		hc->interface[i] = hc->interface[0];
-
-	TRC(printf("arp%d: bus %x, rev %d, memstart %p, winsize %d, "
-	    "winmsk %x, interface %x\n",
-	    unit, hc->bustype, hc->revision, hc->mem_start, hc->winsize,
-	    hc->winmsk, hc->interface[0]));
-
-	ar_attach(device);
-
-	/* Magic to enable the card to generate interrupts. */
-	bus_space_write_1(rman_get_bustag(hc->res_plx_memory),
-	    rman_get_bushandle(hc->res_plx_memory), 0x69, 0x09);
-
-	return (0);
-
-errexit:
-	ar_deallocate_resources(device);
-	return (ENXIO);
-}
-
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
deleted file mode 100644
index d643caf..0000000
--- a/sys/dev/ar/if_arregs.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * Copyright (c) 1995 - 2001 John Hay.  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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY [your name] 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.
- *
- * $FreeBSD$
- */
-#ifndef _IF_ARREGS_H_
-#define _IF_ARREGS_H_
-
-#define NCHAN			2    /* A HD64570 chip have 2 channels */
-#define NPORT			4    /* An ArNet board can have 4 ports or */
-				     /* channels */
-
-#define AR_BUF_SIZ		512
-#define AR_TX_BLOCKS		2
-#define ARC_IO_SIZ		0x10
-#define ARC_WIN_SIZ		0x00004000
-#define ARC_WIN_MSK		(ARC_WIN_SIZ - 1)
-#define ARC_WIN_SHFT		14
-
-/* Some PCI specific offsets. */
-#define AR_PCI_SCA_1_OFFSET	0x00040000
-#define AR_PCI_SCA_2_OFFSET	0x00040400
-#define AR_PCI_ORBASE_OFFSET	0x00041000
-#define AR_PCI_SCA_PCR		0x0208
-#define AR_PCI_SCA_DMER		0x0309
-/* PCI Legacy (below 1M) offsets. */
-#define AR_PCI_L_SCA_1_OFFSET	0x00004000
-#define AR_PCI_L_SCA_2_OFFSET	0x00004400
-#define AR_PCI_L_ORBASE_OFFSET	0x00005000
-
-#define AR_ID_5			0x00 /* RO, Card probe '5' */
-#define AR_ID_7			0x01 /* RO, Card probe '7' */
-#define AR_ID_0			0x02 /* RO, Card probe '0' */
-#define AR_BMI			0x03 /* RO, Bus, mem and interface type */
-#define AR_REV			0x04 /* RO, Adapter revision */
-#define AR_PNUM			0x05 /* RO, Port number */
-#define AR_HNDSH		0x06 /* RO, Supported handshake */
-#define AR_ISTAT		0x07 /* RO, DCD and Interrupt status */
-#define AR_MSCA_EN		0x08 /* WO, Memory and SCA enable */
-#define AR_TXC_DTR0		0x09 /* WO, Tx Clock and DTR control 0 + 1 */
-#define AR_SEC_PAL		0x0A /* RW, Security PAL */
-#define AR_INT_ACK0		0x0B /* RO, Interrupt Acknowledge 0 + 1 */
-#define AR_INT_SEL		0x0C /* RW, Interrupt Select */
-#define AR_MEM_SEL		0x0D /* RW, Memory Select */
-#define AR_INT_ACK2		0x0E /* RO, Interrupt Acknowledge 2 + 3 */
-#define AR_TXC_DTR2		0x0E /* WO, Tx Clock and DTR control 2 + 3 */
-/* PCI only */
-#define AR_PIMCTRL		0x4C /* RW, PIM and LEDs */
-#define AR_INT_SCB		0x50 /* RO, Interrupt Scoreboard */
-
-#define AR_REV_MSK		0x0F
-#define AR_WSIZ_MSK		0xE0
-#define AR_WSIZ_SHFT		5
-/* Bus memory and interface type */
-#define AR_BUS_MSK		0x03
-#define AR_BUS_ISA		0x00
-#define AR_BUS_MCA		0x01
-#define AR_BUS_EISA		0x02
-#define AR_BUS_PCI		0x03
-
-#define AR_MEM_MSK		0x1C
-#define AR_MEM_SHFT		0x02
-#define AR_MEM_64K		0x00
-#define AR_MEM_128K		0x04
-#define AR_MEM_256K		0x08
-#define AR_MEM_512K		0x0C
-
-/*
- * EIA-232
- * V.35/EIA-232
- * EIA-530
- * X.21
- * EIA-530/X.21 Combo
- */
-#define AR_IFACE_MSK		0xE0
-#define AR_IFACE_SHFT		0x05
-#define AR_IFACE_EIA_232	0x00  /* Only on the 570 card, not 570i */
-#define AR_IFACE_V_35		0x20  /* Selectable between V.35 and EIA-232 */
-#define AR_IFACE_EIA_530	0x40
-#define AR_IFACE_X_21		0x60
-#define AR_IFACE_COMBO		0xC0  /* X.21 / EIA-530 */
-#define AR_IFACE_PIM		0xE0  /* PIM module */
-#define AR_IFACE_LOOPBACK	0xFE
-#define AR_IFACE_UNKNOWN	0xFF
-
-/* Supported Handshake signals */
-#define AR_SHSK_DTR		0x01
-#define AR_SHSK_RTS		0x02
-#define AR_SHSK_CTS		0x10
-#define AR_SHSK_DSR		0x20
-#define AR_SHSK_RI		0x40
-#define AR_SHSK_DCD		0x80
-
-/* DCD and Interrupt status */
-#define AR_BD_INT		0x01
-#define AR_INT_0		0x20
-#define AR_INT_1		0x40
-
-#define AR_DCD_MSK		0x1E
-#define AR_DCD_SHFT		0x01
-#define AR_DCD_0		0x02
-#define AR_DCD_1		0x04
-#define AR_DCD_2		0x08
-#define AR_DCD_3		0x10
-
-/* Memory and SCA enable */
-#define AR_WIN_MSK		0x1F
-
-#define AR_SEL_SCA_0		0x00
-#define AR_SEL_SCA_1		0x20
-#define AR_ENA_SCA		0x40
-#define AR_ENA_MEM		0x80
-
-/* Transmit Clock and DTR and RESET */
-#define AR_TXC_DTR_TX0		0x01
-#define AR_TXC_DTR_TX1		0x02
-#define AR_TXC_DTR_DTR0		0x04
-#define AR_TXC_DTR_DTR1		0x08
-#define AR_TXC_DTR_TXCS0	0x10
-#define AR_TXC_DTR_TXCS1	0x20
-#define AR_TXC_DTR_NOTRESET	0x40
-#define AR_TXC_DTR_RESET	0x00
-
-/* Interrupt select register */
-#define AR_INTS_CEN		0x01
-#define AR_INTS_ISEL0		0x02
-#define AR_INTS_ISEL1		0x04
-#define AR_INTS_ISEL2		0x08
-#define AR_INTS_CMA14		0x10
-#define AR_INTS_CMA15		0x20
-
-/* Advanced PIM Control */
-#define AR_PIM_STROBE		0x01
-#define AR_PIM_DATA		0x02
-#define AR_PIM_MODEG		0x04
-#define AR_PIM_A2D_STROBE	0x04
-#define AR_PIM_MODEY		0x08
-#define AR_PIM_A2D_DOUT		0x08
-#define AR_PIM_AUTO_LED		0x10
-#define AR_PIM_INT		0x20
-
-#define AR_PIM_RESET		0x00 /* MODEG and MODEY 0 */
-#define AR_PIM_READ		AR_PIM_MODEG
-#define AR_PIM_WRITE		AR_PIM_MODEY
-
-#define ARC_GET_WIN(addr)	((addr >> ARC_WIN_SHFT) & AR_WIN_MSK)
-
-#define ARC_SET_MEM(hc,win)	ar_outb(hc, AR_MSCA_EN, AR_ENA_MEM | \
-				ARC_GET_WIN(win))
-#define ARC_SET_SCA(hc,ch)	ar_outb(hc, AR_MSCA_EN, AR_ENA_MEM | \
-				AR_ENA_SCA | (ch ? AR_SEL_SCA_1:AR_SEL_SCA_0))
-#define ARC_SET_OFF(hc)		ar_outb(hc, AR_MSCA_EN, 0)
-
-struct ar_hardc {
-	int cunit;
-	struct ar_softc *sc;
-	int isa_irq;
-	int numports;
-	caddr_t mem_start;
-	caddr_t mem_end;
-	u_char *orbase;
-
-	u_int memsize;		/* in bytes */
-	u_int winsize;		/* in bytes */
-	u_int winmsk;
-	u_char bustype;		/* ISA, MCA, PCI.... */
-	u_char interface[NPORT];/* X21, V.35, EIA-530.... */
-	u_char revision;
-	u_char handshake;	/* handshake lines supported by card. */
-
-	u_char txc_dtr[NPORT/NCHAN]; /* the register is write only */
-	u_int txc_dtr_off[NPORT/NCHAN];
-
-	sca_regs *sca[NPORT/NCHAN];
-
-	bus_space_tag_t bt;
-	bus_space_handle_t bh;
-	int rid_ioport;
-	int rid_memory;
-	int rid_plx_memory;
-	int rid_irq;
-	int rid_drq;
-	struct resource* res_ioport;	/* resource for port range */
-	struct resource* res_memory;	/* resource for mem range */
-	struct resource* res_plx_memory;
-	struct resource* res_irq;	/* resource for irq range */
-	struct resource* res_drq;	/* resource for dma channel */
-	void	*intr_cookie;
-};
-
-extern devclass_t ar_devclass;
-
-int ar_allocate_ioport(device_t device, int rid, u_long size);
-int ar_allocate_irq(device_t device, int rid, u_long size);
-int ar_allocate_memory(device_t device, int rid, u_long size);
-int ar_allocate_plx_memory(device_t device, int rid, u_long size);
-int ar_deallocate_resources(device_t device);
-int ar_attach(device_t device);
-int ar_detach (device_t);
-
-#define ar_inb(hc, port) \
-	bus_space_read_1((hc)->bt, (hc)->bh, (port))
-
-#define ar_outb(hc, port, value) \
-	bus_space_write_1((hc)->bt, (hc)->bh, (port), (value))
-
-#endif /* _IF_ARREGS_H_ */
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
deleted file mode 100644
index 9706f0f..0000000
--- a/sys/dev/ray/if_ray.c
+++ /dev/null
@@ -1,3829 +0,0 @@
-/*	$NetBSD: if_ray.c,v 1.12 2000/02/07 09:36:27 augustss Exp $	*/
-/*-
- * Copyright (C) 2000
- * Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
- *
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DUNCAN BARCLAY 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 DUNCAN BARCLAY 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.
- *
- *
- */
-
-/*-
- * Copyright (c) 2000 Christian E. Hopps
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * Card configuration
- * ==================
- *
- * This card is unusual in that it uses both common and attribute
- * memory whilst working. It should use common memory and an IO port.
- *
- * The bus resource allocations need to work around the brain deadness
- * of pccardd (where it reads the CIS for common memory, sets it all
- * up and then throws it all away assuming the card is an ed
- * driver...). Note that this could be dangerous (because it doesn't
- * interact with pccardd) if you use other memory mapped cards in the
- * same pccard slot as currently old mappings are not cleaned up very well
- * by the bus_release_resource methods or pccardd.
- * XXX Are these workarounds necessary with NEWCARD?
- *
- * Ad-hoc and infra-structure modes
- * ================================
- * 
- * The driver supports ad-hoc mode for V4 firmware and infrastructure
- * mode for V5 firmware. V5 firmware in ad-hoc mode is untested and should
- * work.
- *
- * The Linux driver also seems to have the capability to act as an AP.
- * I wonder what facilities the "AP" can provide within a driver? We can
- * probably use the BRIDGE code to form an ESS but I don't think
- * power saving etc. is easy.
- *
- *
- * Packet framing/encapsulation/translation
- * ========================================
- * 
- * Currently we support the Webgear encapsulation:
- *	802.11	header <net/if_ieee80211.h>struct ieee80211_frame
- *	802.3	header <net/ethernet.h>struct ether_header
- *	IP/ARP	payload
- *
- * and RFC1042 encapsulation of IP datagrams (translation):
- *	802.11	header <net/if_ieee80211.h>struct ieee80211_frame
- *	802.2	LLC header
- *	802.2	SNAP header
- *	802.3	Ethertype
- *	IP/ARP	payload
- *
- * Framing should be selected via if_media stuff or link types but
- * is currently hardcoded to:
- *	V4	encapsulation
- *	V5	translation
- *
- *
- * Authentication
- * ==============
- *
- * 802.11 provides two authentication mechanisms. The first is a very
- * simple host based mechanism (like xhost) called Open System and the
- * second is a more complex challenge/response called Shared Key built
- * ontop of WEP.
- *
- * This driver only supports Open System and does not implement any
- * host based control lists. In otherwords authentication is always
- * granted to hosts wanting to authenticate with this station. This is
- * the only sensible behaviour as the Open System mechanism uses MAC
- * addresses to identify hosts. Send me patches if you need it!
- */
-
-/*
- * ***check all XXX_INFRA code - reassoc not done well at all!
- * ***watchdog to catch screwed up removals?
- * ***error handling of RAY_COM_RUNQ
- * ***error handling of ECF command completions
- * ***can't seem to create a n/w that Win95 wants to see.
- * ***remove panic in ray_com_ecf by re-quing or timeout
- * ***use new ioctl stuff - probably need to change RAY_COM_FCHKRUNNING things?
- * 	consider user doing:
- *		ifconfig ray0 192.168.200.38 -bssid "freed"
- *		ifconfig ray0 192.168.200.38 -bssid "fred"
- * 	here the second one would be missed in this code
- * check that v5 needs timeouts on ecf commands
- * write up driver structure in comments above
- * UPDATE_PARAMS seems to return via an interrupt - maybe the timeout
- *	is needed for wrong values?
- * proper setting of mib_hop_seq_len with country code for v4 firmware
- *	best done with raycontrol?
- * countrycode setting is broken I think
- *	userupdate should trap and do via startjoin etc.
- * fragmentation when rx level drops?
- * v5 might not need download
- *	defaults are as documented apart from hop_seq_length
- *	settings are sane for ad-hoc not infra
- *
- * driver state
- *	most state is implied by the sequence of commands in the runq
- *	but in fact any of the rx and tx path that uses variables
- *	in the sc_c are potentially going to get screwed?
- *
- * infra mode stuff
- * 	proper handling of the basic rate set - see the manual
- *	all ray_sj, ray_assoc sequencues need a "nicer" solution as we
- *		remember association and authentication
- *	need to consider WEP
- *	acting as ap - should be able to get working from the manual
- *	need to finish RAY_ECMD_REJOIN_DONE
- *	finish authenitcation code, it doesn't handle errors/timeouts/
- *	REJOIN etc.
- *
- * ray_nw_param
- *	promisc in here too? - done
- *	should be able to update the parameters before we download to the
- *		device. This means we must attach a desired struct to the
- *		runq entry and maybe have another big case statement to
- *		move these desired into current when not running.
- *		init must then use the current settings (pre-loaded
- *		in attach now!) and pass to download. But we can't access
- *		current nw params outside of the runq - ahhh
- * 	differeniate between parameters set in attach and init
- * 	sc_station_addr in here too (for changing mac address)
- * 	move desired into the command structure?
- *	take downloaded MIB from a complete nw_param?
- *	longer term need to attach a desired nw params to the runq entry
- *
- *
- * RAY_COM_RUNQ errors
- *
- * if sleeping in ccs_alloc with eintr/erestart/enxio/enodev
- *	erestart	try again from the top
- *			XXX do not malloc more comqs
- *			XXX ccs allocation hard
- *	eintr		clean up and return
- *	enxio		clean up and return - done in macro
- *
- * if sleeping in runq_arr itself with eintr/erestart/enxio/enodev
- *	erestart	try again from the top
- *			XXX do not malloc more comqs
- *			XXX ccs allocation hard
- *			XXX reinsert comqs at head of list
- *	eintr		clean up and return
- *	enxio		clean up and return - done in macro
- */
-
-#define XXX		0
-#define XXX_ACTING_AP	0
-#define XXX_INFRA	0
-#define RAY_DEBUG	(				\
-                        /* RAY_DBG_AUTH		| */  	\
- 			/* RAY_DBG_SUBR		| */ 	\
-			/* RAY_DBG_BOOTPARAM	| */ 	\
-			/* RAY_DBG_STARTJOIN	| */ 	\
-			/* RAY_DBG_CCS		| */	\
-                        /* RAY_DBG_IOCTL	| */	\
-                        /* RAY_DBG_MBUF		| */ 	\
-                        /* RAY_DBG_RX		| */	\
-                        /* RAY_DBG_CM		| */	\
-                        /* RAY_DBG_COM		| */  	\
-                        /* RAY_DBG_STOP		| */	\
-                        /* RAY_DBG_CTL		| */	\
-                        /* RAY_DBG_MGT		| */ 	\
-                        /* RAY_DBG_TX		| */  	\
-                        /* RAY_DBG_DCOM		| */  	\
-			0				\
-			)
-
-/*
- * XXX build options - move to LINT
- */
-#define RAY_CM_RID		0	/* pccardd abuses windows 0 and 1 */
-#define RAY_AM_RID		3	/* pccardd abuses windows 0 and 1 */
-#define RAY_COM_TIMEOUT		(hz/2)	/* Timeout for CCS commands */
-#define RAY_TX_TIMEOUT		(hz/2)	/* Timeout for rescheduling TX */
-#define RAY_ECF_SPIN_DELAY	1000	/* Wait 1ms before checking ECF ready */
-#define RAY_ECF_SPIN_TRIES	10	/* Wait this many times for ECF ready */
-/*
- * XXX build options - move to LINT
- */
-
-#ifndef RAY_DEBUG
-#define RAY_DEBUG 		0x0000
-#endif /* RAY_DEBUG */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/limits.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-
-#include <net/bpf.h>
-#include <net/ethernet.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-#include <net80211/ieee80211.h>
-#include <net/if_llc.h>
-#include <net/if_types.h>
-
-#include <dev/pccard/pccardvar.h>
-#include "card_if.h"
-
-#include <dev/ray/if_rayreg.h>
-#include <dev/ray/if_raymib.h>
-#include <dev/ray/if_raydbg.h>
-#include <dev/ray/if_rayvar.h>
-
-typedef uint8_t *ieee80211_mgt_beacon_t;
-typedef uint8_t *ieee80211_mgt_auth_t;
-
-#define	IEEE80211_AUTH_ALGORITHM(auth) \
-	((auth)[0] | ((auth)[1] << 8))
-#define	IEEE80211_AUTH_TRANSACTION(auth) \
-	((auth)[2] | ((auth)[3] << 8))
-#define	IEEE80211_AUTH_STATUS(auth) \
-	((auth)[4] | ((auth)[5] << 8))
-
-static MALLOC_DEFINE(M_RAYCOM, "raycom", "Raylink command queue entry");
-/*
- * Prototyping
- */
-static int	ray_attach		(device_t);
-static int	ray_ccs_alloc		(struct ray_softc *sc, size_t *ccsp, char *wmesg);
-static void	ray_ccs_fill		(struct ray_softc *sc, size_t ccs, u_int cmd);
-static void	ray_ccs_free 		(struct ray_softc *sc, size_t ccs);
-static int	ray_ccs_tx		(struct ray_softc *sc, size_t *ccsp, size_t *bufpp);
-static void	ray_com_ecf		(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_com_ecf_done	(struct ray_softc *sc);
-static void	ray_com_ecf_timo	(void *xsc);
-static struct ray_comq_entry *
-		ray_com_init		(struct ray_comq_entry *com, ray_comqfn_t function, int flags, char *mesg);
-static struct ray_comq_entry *
-		ray_com_malloc		(ray_comqfn_t function, int flags, char *mesg);
-static void	ray_com_runq		(struct ray_softc *sc);
-static int	ray_com_runq_add	(struct ray_softc *sc, struct ray_comq_entry *com[], int ncom, char *wmesg);
-static void	ray_com_runq_done	(struct ray_softc *sc);
-static int	ray_detach		(device_t);
-static void	ray_init		(void *xsc);
-static int	ray_init_user		(struct ray_softc *sc);
-static void	ray_init_assoc		(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_init_assoc_done	(struct ray_softc *sc, u_int8_t status, size_t ccs);
-static void	ray_init_auth		(struct ray_softc *sc, struct ray_comq_entry *com);
-static int	ray_init_auth_send	(struct ray_softc *sc, u_int8_t *dst, int sequence);
-static void	ray_init_auth_done	(struct ray_softc *sc, u_int8_t status);
-static void	ray_init_download	(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_init_download_done	(struct ray_softc *sc, u_int8_t status, size_t ccs);
-static void	ray_init_download_v4	(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_init_download_v5	(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_init_mcast		(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_init_sj		(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_init_sj_done	(struct ray_softc *sc, u_int8_t status, size_t ccs);
-static void	ray_intr		(void *xsc);
-static void	ray_intr_ccs		(struct ray_softc *sc, u_int8_t cmd, u_int8_t status, size_t ccs);
-static void	ray_intr_rcs		(struct ray_softc *sc, u_int8_t cmd, size_t ccs);
-static void	ray_intr_updt_errcntrs	(struct ray_softc *sc);
-static int	ray_ioctl		(struct ifnet *ifp, u_long command, caddr_t data);
-static void	ray_mcast		(struct ray_softc *sc, struct ray_comq_entry *com); 
-static void	ray_mcast_done		(struct ray_softc *sc, u_int8_t status, size_t ccs); 
-static int	ray_mcast_user		(struct ray_softc *sc); 
-static int	ray_probe		(device_t);
-static void	ray_promisc		(struct ray_softc *sc, struct ray_comq_entry *com); 
-static void	ray_repparams		(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_repparams_done	(struct ray_softc *sc, u_int8_t status, size_t ccs);
-static int	ray_repparams_user	(struct ray_softc *sc, struct ray_param_req *pr);
-static int	ray_repstats_user	(struct ray_softc *sc, struct ray_stats_req *sr);
-static int	ray_res_alloc_am	(struct ray_softc *sc);
-static int	ray_res_alloc_cm	(struct ray_softc *sc);
-static int	ray_res_alloc_irq	(struct ray_softc *sc);
-static void	ray_res_release		(struct ray_softc *sc);
-static void	ray_rx			(struct ray_softc *sc, size_t rcs);
-static void	ray_rx_ctl		(struct ray_softc *sc, struct mbuf *m0);
-static void	ray_rx_data		(struct ray_softc *sc, struct mbuf *m0, u_int8_t siglev, u_int8_t antenna);
-static void	ray_rx_mgt		(struct ray_softc *sc, struct mbuf *m0);
-static void	ray_rx_mgt_auth		(struct ray_softc *sc, struct mbuf *m0);
-static void	ray_rx_mgt_beacon	(struct ray_softc *sc, struct mbuf *m0);
-static void	ray_rx_mgt_info		(struct ray_softc *sc, struct mbuf *m0, union ieee80211_information *elements);
-static void	ray_rx_update_cache	(struct ray_softc *sc, u_int8_t *src, u_int8_t siglev, u_int8_t antenna);
-static void	ray_stop		(struct ray_softc *sc, struct ray_comq_entry *com);
-static int	ray_stop_user		(struct ray_softc *sc);
-static void	ray_tx			(struct ifnet *ifp);
-static void	ray_tx_done		(struct ray_softc *sc, u_int8_t status, size_t ccs);
-static void	ray_tx_timo		(void *xsc);
-static int	ray_tx_send		(struct ray_softc *sc, size_t ccs, int pktlen, u_int8_t *dst);
-static size_t	ray_tx_wrhdr		(struct ray_softc *sc, size_t bufp, u_int8_t type, u_int8_t fc1, u_int8_t *addr1, u_int8_t *addr2, u_int8_t *addr3);
-static void	ray_upparams		(struct ray_softc *sc, struct ray_comq_entry *com);
-static void	ray_upparams_done	(struct ray_softc *sc, u_int8_t status, size_t ccs);
-static int	ray_upparams_user	(struct ray_softc *sc, struct ray_param_req *pr);
-static void	ray_watchdog		(struct ifnet *ifp);
-static u_int8_t ray_tx_best_antenna	(struct ray_softc *sc, u_int8_t *dst);
-
-#if RAY_DEBUG & RAY_DBG_COM
-static void	ray_com_ecf_check	(struct ray_softc *sc, size_t ccs, char *mesg);
-#endif /* RAY_DEBUG & RAY_DBG_COM */
-#if RAY_DEBUG & RAY_DBG_MBUF
-static void	ray_dump_mbuf		(struct ray_softc *sc, struct mbuf *m, char *s);
-#endif /* RAY_DEBUG & RAY_DBG_MBUF */
-
-/*
- * PC Card (PCMCIA) driver definition
- */
-static device_method_t ray_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		ray_probe),
-	DEVMETHOD(device_attach,	ray_attach),
-	DEVMETHOD(device_detach,	ray_detach),
-
-	{ 0, 0 }
-};
-
-static driver_t ray_driver = {
-	"ray",
-	ray_methods,
-	sizeof(struct ray_softc)
-};
-
-static devclass_t ray_devclass;
-
-DRIVER_MODULE(ray, pccard, ray_driver, ray_devclass, 0, 0);
-
-/* 
- * Probe for the card by checking its startup results.
- *
- * Fixup any bugs/quirks for different firmware.
- */
-static int
-ray_probe(device_t dev)
-{
-	struct ray_softc *sc = device_get_softc(dev);
-	struct ray_ecf_startup_v5 *ep = &sc->sc_ecf_startup;
-	int error;
-
-	sc->dev = dev;
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	/*
-	 * Read startup results from the card.
-	 */
-	error = ray_res_alloc_cm(sc);
-	if (error)
-		return (error);
-	error = ray_res_alloc_am(sc);
-	if (error) {
-		ray_res_release(sc);
-		return (error);
-	}
-	RAY_MAP_CM(sc);
-	SRAM_READ_REGION(sc, RAY_ECF_TO_HOST_BASE, ep,
-	    sizeof(sc->sc_ecf_startup));
-	ray_res_release(sc);
-
-	/*
-	 * Check the card is okay and work out what version we are using.
-	 */
-	if (ep->e_status != RAY_ECFS_CARD_OK) {
-		RAY_PRINTF(sc, "card failed self test 0x%b",
-		    ep->e_status, RAY_ECFS_PRINTFB);
-		return (ENXIO);
-	}
-	if (sc->sc_version != RAY_ECFS_BUILD_4 &&
-	    sc->sc_version != RAY_ECFS_BUILD_5) {
-		RAY_PRINTF(sc, "unsupported firmware version 0x%0x",
-		    ep->e_fw_build_string);
-		return (ENXIO);
-	}
-	RAY_DPRINTF(sc, RAY_DBG_BOOTPARAM, "found a card");
-	sc->sc_gone = 0;
-
-	/*
-	 * Fixup tib size to be correct - on build 4 it is garbage
-	 */
-	if (sc->sc_version == RAY_ECFS_BUILD_4 && sc->sc_tibsize == 0x55)
-		sc->sc_tibsize = sizeof(struct ray_tx_tib);
-
-	return (0);
-}
-
-/*
- * Attach the card into the kernel
- */
-static int
-ray_attach(device_t dev)
-{
-	struct ray_softc *sc = device_get_softc(dev);
-	struct ray_ecf_startup_v5 *ep = &sc->sc_ecf_startup;
-	struct ifnet *ifp;
-	size_t ccs;
-	int i, error;
-
-	ifp = sc->ifp = if_alloc(IFT_ETHER);
-	if (ifp == NULL)
-		return (ENOSPC);
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	if ((sc == NULL) || (sc->sc_gone)) {
-		if_free(ifp);
-		return (ENXIO);
-	}
-
-	/*
-	 * Grab the resources I need
-	 */
-	error = ray_res_alloc_cm(sc);
-	if (error) {
-		if_free(ifp);
-		return (error);
-	}
-	error = ray_res_alloc_am(sc);
-	if (error) {
-		if_free(ifp);
-		ray_res_release(sc);
-		return (error);
-	}
-	error = ray_res_alloc_irq(sc);
-	if (error) {
-		if_free(ifp);
-		ray_res_release(sc);
-		return (error);
-	}
-
-	/*
-	 * Reset any pending interrupts
-	 */
-	RAY_HCS_CLEAR_INTR(sc);
-
-	/*
-	 * Set the parameters that will survive stop/init and
-	 * reset a few things on the card.
-	 *
-	 * Do not update these in ray_init_download's parameter setup
-	 *
-	 */
-	RAY_MAP_CM(sc);
-	bzero(&sc->sc_d, sizeof(struct ray_nw_param));
-	bzero(&sc->sc_c, sizeof(struct ray_nw_param));
-
-	/* Clear statistics counters */
-	sc->sc_rxoverflow = 0;
-	sc->sc_rxcksum = 0;
-	sc->sc_rxhcksum = 0;
-	sc->sc_rxnoise = 0;
-
-	/* Clear signal and antenna cache */
-	bzero(sc->sc_siglevs, sizeof(sc->sc_siglevs));
-
-	/* Set all ccs to be free */
-	bzero(sc->sc_ccsinuse, sizeof(sc->sc_ccsinuse));
-	ccs = RAY_CCS_ADDRESS(0);
-	for (i = 0; i < RAY_CCS_LAST; ccs += RAY_CCS_SIZE, i++)
-		RAY_CCS_FREE(sc, ccs);
-
-	/*
-	 * Initialise the network interface structure
-	 */
-	ifp->if_softc = sc;
-	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-	ifp->if_timer = 0;
-	ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
-	    IFF_NEEDSGIANT);
-	ifp->if_hdrlen = sizeof(struct ieee80211_frame) + 
-	    sizeof(struct ether_header);
-	ifp->if_baudrate = 1000000; /* Is this baud or bps ;-) */
-	ifp->if_start = ray_tx;
-	ifp->if_ioctl = ray_ioctl;
-	ifp->if_watchdog = ray_watchdog;
-	ifp->if_init = ray_init;
-	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
-
-	ether_ifattach(ifp, ep->e_station_addr);
-
-	/*
-	 * Initialise the timers and driver
-	 */
-	callout_handle_init(&sc->com_timerh);
-	callout_handle_init(&sc->tx_timerh);
-	TAILQ_INIT(&sc->sc_comq);
-
-	/*
-	 * Print out some useful information
-	 */
-	if (bootverbose || (RAY_DEBUG & RAY_DBG_BOOTPARAM)) {
-		RAY_PRINTF(sc, "start up results");
-		if (sc->sc_version == RAY_ECFS_BUILD_4)
-			printf(".  Firmware version 4\n");
-		else
-			printf(".  Firmware version 5\n");
-		printf(".  Status 0x%b\n", ep->e_status, RAY_ECFS_PRINTFB);
-		printf(".  Ether address %6D\n", ep->e_station_addr, ":");
-		if (sc->sc_version == RAY_ECFS_BUILD_4) {
-			printf(".  Program checksum %0x\n", ep->e_resv0);
-			printf(".  CIS checksum %0x\n", ep->e_rates[0]);
-		} else {
-			printf(".  (reserved word) %0x\n", ep->e_resv0);
-			printf(".  Supported rates %8D\n", ep->e_rates, ":");
-		}
-		printf(".  Japan call sign %12D\n", ep->e_japan_callsign, ":");
-		if (sc->sc_version == RAY_ECFS_BUILD_5) {
-			printf(".  Program checksum %0x\n", ep->e_prg_cksum);
-			printf(".  CIS checksum %0x\n", ep->e_cis_cksum);
-			printf(".  Firmware version %0x\n",
-			    ep->e_fw_build_string);
-			printf(".  Firmware revision %0x\n", ep->e_fw_build);
-			printf(".  (reserved word) %0x\n", ep->e_fw_resv);
-			printf(".  ASIC version %0x\n", ep->e_asic_version);
-			printf(".  TIB size %0x\n", ep->e_tibsize);
-		}
-	}
-
-	return (0);
-}
-
-/*
- * Detach the card
- *
- * This is usually called when the card is ejected, but
- * can be caused by a modunload of a controller driver.
- * The idea is to reset the driver's view of the device
- * and ensure that any driver entry points such as
- * read and write do not hang.
- */
-static int
-ray_detach(device_t dev)
-{
-	struct ray_softc *sc = device_get_softc(dev);
-	struct ifnet *ifp = sc->ifp;
-	struct ray_comq_entry *com;
-	int s;
-
-	s = splimp();
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STOP, "");
-
-	if ((sc == NULL) || (sc->sc_gone))
-		return (0);
-
-	/*
-	 * Mark as not running and detach the interface.
-	 *
-	 * N.B. if_detach can trigger ioctls so we do it first and
-	 * then clean the runq.
-	 */
-	sc->sc_gone = 1;
-	sc->sc_c.np_havenet = 0;
-	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
-	ether_ifdetach(ifp);
-
-	/*
-	 * Stop the runq and wake up anyone sleeping for us.
-	 */
-	untimeout(ray_com_ecf_timo, sc, sc->com_timerh);
-	untimeout(ray_tx_timo, sc, sc->tx_timerh);
-	com = TAILQ_FIRST(&sc->sc_comq);
-	TAILQ_FOREACH(com, &sc->sc_comq, c_chain) {
-		com->c_flags |= RAY_COM_FDETACHED;
-		com->c_retval = 0;
-		RAY_DPRINTF(sc, RAY_DBG_STOP, "looking at com %p %b",
-		    com, com->c_flags, RAY_COM_FLAGS_PRINTFB);
-		if (com->c_flags & RAY_COM_FWOK) {
-			RAY_DPRINTF(sc, RAY_DBG_STOP, "waking com %p", com);
-			wakeup(com->c_wakeup);
-		}
-	}
-	
-	/*
-	 * Release resources
-	 */
-	ray_res_release(sc);
-	if_free(ifp);
-	RAY_DPRINTF(sc, RAY_DBG_STOP, "unloading complete");
-
-	splx(s);
-
-	return (0);
-}
-
-/*
- * Network ioctl request.
- */
-static int
-ray_ioctl(register struct ifnet *ifp, u_long command, caddr_t data)
-{
-	struct ray_softc *sc = ifp->if_softc;
-	struct ray_param_req pr;
-	struct ray_stats_req sr;
-	struct ifreq *ifr = (struct ifreq *)data;
-	int s, error, error2;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_IOCTL, "");
-
-	if ((sc == NULL) || (sc->sc_gone))
-		return (ENXIO);
-
-	error = error2 = 0;
-	s = splimp();
-
-	switch (command) {
-	case SIOCSIFFLAGS:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "SIFFLAGS 0x%0x", ifp->if_flags);
-		/*
-		 * If the interface is marked up we call ray_init_user.
-		 * This will deal with mcast and promisc flags as well as
-		 * initialising the hardware if it needs it.
-		 */
-		if (ifp->if_flags & IFF_UP)
-			error = ray_init_user(sc);
-		else
-			error = ray_stop_user(sc);
-		break;
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "ADDMULTI/DELMULTI");
-		error = ray_mcast_user(sc);
-		break;
-
-	case SIOCSRAYPARAM:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "SRAYPARAM");
-		if ((error = copyin(ifr->ifr_data, &pr, sizeof(pr))))
-			break;
-		error = ray_upparams_user(sc, &pr);
-		error2 = copyout(&pr, ifr->ifr_data, sizeof(pr));
-		error = error2 ? error2 : error;
-		break;
-
-	case SIOCGRAYPARAM:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GRAYPARAM");
-		if ((error = copyin(ifr->ifr_data, &pr, sizeof(pr))))
-			break;
-		error = ray_repparams_user(sc, &pr);
-		error2 = copyout(&pr, ifr->ifr_data, sizeof(pr));
-		error = error2 ? error2 : error;
-		break;
-
-	case SIOCGRAYSTATS:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GRAYSTATS");
-		error = ray_repstats_user(sc, &sr);
-		error2 = copyout(&sr, ifr->ifr_data, sizeof(sr));
-		error = error2 ? error2 : error;
-		break;
-
-	case SIOCGRAYSIGLEV:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GRAYSIGLEV");
-		error = copyout(sc->sc_siglevs, ifr->ifr_data,
-		    sizeof(sc->sc_siglevs));
-		break;
-
-	case SIOCGIFFLAGS:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GIFFLAGS");
-		error = EINVAL;
-		break;
-
-	case SIOCGIFMETRIC:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GIFMETRIC");
-		error = EINVAL;
-		break;
-
-	case SIOCGIFMTU:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GIFMTU");
-		error = EINVAL;
-		break;
-
-	case SIOCGIFPHYS:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GIFPYHS");
-		error = EINVAL;
-		break;
-
-	case SIOCSIFMEDIA:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "SIFMEDIA");
-		error = EINVAL;
-		break;
-
-	case SIOCGIFMEDIA:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GIFMEDIA");
-		error = EINVAL;
-		break;
-
-	default:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "OTHER (pass to ether)");
-		error = ether_ioctl(ifp, command, data);
-		break;
-
-	}
-
-	splx(s);
-
-	return (error);
-}
-
-/*
- * Ethernet layer entry to ray_init - discard errors
- */
-static void
-ray_init(void *xsc)
-{
-	struct ray_softc *sc = (struct ray_softc *)xsc;
-
-	ray_init_user(sc);
-}
-
-/*
- * User land entry to network initialisation and changes in interface flags.
- * 
- * We do a very little work here, just creating runq entries to
- * processes the actions needed to cope with interface flags. We do it
- * this way in case there are runq entries outstanding from earlier
- * ioctls that modify the interface flags.
- *
- * Returns values are either 0 for success, a varity of resource allocation
- * failures or errors in the command sent to the card.
- *
- * Note, IFF_DRV_RUNNING is eventually set by init_sj_done or init_assoc_done
- */
-static int
-ray_init_user(struct ray_softc *sc)
-{
-	struct ray_comq_entry *com[6];
-	int error, ncom;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-
-	/*
-	 * Create the following runq entries to bring the card up.
-	 *
-	 *		init_download	- download the network to the card
-	 *		init_mcast	- reset multicast list
-	 *		init_sj		- find or start a BSS
-	 *		init_auth	- authenticate with an ESSID if needed
-	 *		init_assoc	- associate with an ESSID if needed
-	 *
-	 * They are only actually executed if the card is not running.
-	 * We may enter this routine from a simple change of IP
-	 * address and do not need to get the card to do these things.
-	 * However, we cannot perform the check here as there may be
-	 * commands in the runq that change the IFF_DRV_RUNNING state of
-	 * the interface.
-	 */
-	ncom = 0;
-	com[ncom++] = RAY_COM_MALLOC(ray_init_download, RAY_COM_FCHKRUNNING);
-	com[ncom++] = RAY_COM_MALLOC(ray_init_mcast, RAY_COM_FCHKRUNNING);
-	com[ncom++] = RAY_COM_MALLOC(ray_init_sj, RAY_COM_FCHKRUNNING);
-	com[ncom++] = RAY_COM_MALLOC(ray_init_auth, RAY_COM_FCHKRUNNING);
-	com[ncom++] = RAY_COM_MALLOC(ray_init_assoc, RAY_COM_FCHKRUNNING);
-
-	/*
-	 * Create runq entries to process flags
-	 *
-	 *		promisc		- set/reset PROMISC and ALLMULTI flags
-	 *
-	 * They are only actually executed if the card is running
-	 */
-	com[ncom++] = RAY_COM_MALLOC(ray_promisc, 0);
-
-	RAY_COM_RUNQ(sc, com, ncom, "rayinit", error);
-
-	/* XXX no real error processing from anything yet! */
-
-	RAY_COM_FREE(com, ncom);
-
-	return (error);
-}
-
-/*
- * Runq entry for resetting driver and downloading start up structures to card
- */
-static void
-ray_init_download(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-
-	/* If the card already running we might not need to download */
-	RAY_COM_CHKRUNNING(sc, com, ifp);
-
-	/*
-	 * Reset instance variables
-	 *
-	 * The first set are network parameters that are read back when
-	 * the card starts or joins the network.
-	 *
-	 * The second set are network parameters that are downloaded to
-	 * the card.
-	 *
-	 * The third set are driver parameters.
-	 *
-	 * All of the variables in these sets can be updated by the
-	 * card or ioctls.
-	 *
-	 */
-	sc->sc_d.np_upd_param = 0;
-	bzero(sc->sc_d.np_bss_id, ETHER_ADDR_LEN);
-	sc->sc_d.np_inited = 0;
-	sc->sc_d.np_def_txrate = RAY_MIB_BASIC_RATE_SET_DEFAULT;
-	sc->sc_d.np_encrypt = 0;
-
-	bzero(sc->sc_d.np_ssid, IEEE80211_NWID_LEN);
-	if (sc->sc_version == RAY_ECFS_BUILD_4) {
-		sc->sc_d.np_net_type = RAY_MIB_NET_TYPE_V4;
-		strncpy(sc->sc_d.np_ssid, RAY_MIB_SSID_V4, IEEE80211_NWID_LEN);
-		sc->sc_d.np_ap_status = RAY_MIB_AP_STATUS_V4;
-		sc->sc_d.np_framing = RAY_FRAMING_ENCAPSULATION;
-	} else {
-		sc->sc_d.np_net_type = RAY_MIB_NET_TYPE_V5;
-		strncpy(sc->sc_d.np_ssid, RAY_MIB_SSID_V5, IEEE80211_NWID_LEN);
-		sc->sc_d.np_ap_status = RAY_MIB_AP_STATUS_V5;
-		sc->sc_d.np_framing = RAY_FRAMING_TRANSLATION;
-	}
-	sc->sc_d.np_priv_start = RAY_MIB_PRIVACY_MUST_START_DEFAULT;
-	sc->sc_d.np_priv_join = RAY_MIB_PRIVACY_CAN_JOIN_DEFAULT;
-	sc->sc_d.np_promisc = !!(ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI));
-
-/* XXX this is a hack whilst I transition the code. The instance
- * XXX variables above should be set somewhere else. This is needed for
- * XXX start_join */
-bcopy(&sc->sc_d, &com->c_desired, sizeof(struct ray_nw_param));
-	    
-	/*
-	 * Download the right firmware defaults
-	 */
-	if (sc->sc_version == RAY_ECFS_BUILD_4)
-		ray_init_download_v4(sc, com);
-	else
-		ray_init_download_v5(sc, com);
-
-	/*
-	 * Kick the card
-	 */
-	ray_ccs_fill(sc, com->c_ccs, RAY_CMD_DOWNLOAD_PARAMS);
-	ray_com_ecf(sc, com);
-}
-
-#define	PUT2(p, v) 	\
-    do { (p)[0] = ((v >> 8) & 0xff); (p)[1] = (v & 0xff); } while(0)
-/*
- * Firmware version 4 defaults - see if_raymib.h for details
- */
-static void
-ray_init_download_v4(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ray_mib_4 ray_mib_4_default;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_MAP_CM(sc);
-
-#define MIB4(m)		ray_mib_4_default.m
-
-	MIB4(mib_net_type)		= com->c_desired.np_net_type;
-	MIB4(mib_ap_status)		= com->c_desired.np_ap_status;
-	bcopy(com->c_desired.np_ssid, MIB4(mib_ssid), IEEE80211_NWID_LEN);
-	MIB4(mib_scan_mode)		= RAY_MIB_SCAN_MODE_V4;
-	MIB4(mib_apm_mode)		= RAY_MIB_APM_MODE_V4;
-	bcopy(sc->sc_station_addr, MIB4(mib_mac_addr), ETHER_ADDR_LEN);
-   PUT2(MIB4(mib_frag_thresh), 		  RAY_MIB_FRAG_THRESH_V4);
-   PUT2(MIB4(mib_dwell_time),		  RAY_MIB_DWELL_TIME_V4);
-   PUT2(MIB4(mib_beacon_period),	  RAY_MIB_BEACON_PERIOD_V4);
-	MIB4(mib_dtim_interval)		= RAY_MIB_DTIM_INTERVAL_V4;
-	MIB4(mib_max_retry)		= RAY_MIB_MAX_RETRY_V4;
-	MIB4(mib_ack_timo)		= RAY_MIB_ACK_TIMO_V4;
-	MIB4(mib_sifs)			= RAY_MIB_SIFS_V4;
-	MIB4(mib_difs)			= RAY_MIB_DIFS_V4;
-	MIB4(mib_pifs)			= RAY_MIB_PIFS_V4;
-   PUT2(MIB4(mib_rts_thresh),		  RAY_MIB_RTS_THRESH_V4);
-   PUT2(MIB4(mib_scan_dwell),		  RAY_MIB_SCAN_DWELL_V4);
-   PUT2(MIB4(mib_scan_max_dwell),	  RAY_MIB_SCAN_MAX_DWELL_V4);
-	MIB4(mib_assoc_timo)		= RAY_MIB_ASSOC_TIMO_V4;
-	MIB4(mib_adhoc_scan_cycle)	= RAY_MIB_ADHOC_SCAN_CYCLE_V4;
-	MIB4(mib_infra_scan_cycle)	= RAY_MIB_INFRA_SCAN_CYCLE_V4;
-	MIB4(mib_infra_super_scan_cycle)
-	 				= RAY_MIB_INFRA_SUPER_SCAN_CYCLE_V4;
-	MIB4(mib_promisc)		= com->c_desired.np_promisc;
-   PUT2(MIB4(mib_uniq_word),		  RAY_MIB_UNIQ_WORD_V4);
-	MIB4(mib_slot_time)		= RAY_MIB_SLOT_TIME_V4;
-	MIB4(mib_roam_low_snr_thresh)	= RAY_MIB_ROAM_LOW_SNR_THRESH_V4;
-	MIB4(mib_low_snr_count)		= RAY_MIB_LOW_SNR_COUNT_V4;
-	MIB4(mib_infra_missed_beacon_count)
-	 				= RAY_MIB_INFRA_MISSED_BEACON_COUNT_V4;
-	MIB4(mib_adhoc_missed_beacon_count)	
-	 				= RAY_MIB_ADHOC_MISSED_BEACON_COUNT_V4;
-	MIB4(mib_country_code)		= RAY_MIB_COUNTRY_CODE_V4;
-	MIB4(mib_hop_seq)		= RAY_MIB_HOP_SEQ_V4;
-	MIB4(mib_hop_seq_len)		= RAY_MIB_HOP_SEQ_LEN_V4;
-	MIB4(mib_cw_max)		= RAY_MIB_CW_MAX_V4;
-	MIB4(mib_cw_min)		= RAY_MIB_CW_MIN_V4;
-	MIB4(mib_noise_filter_gain)	= RAY_MIB_NOISE_FILTER_GAIN_DEFAULT;
-	MIB4(mib_noise_limit_offset)	= RAY_MIB_NOISE_LIMIT_OFFSET_DEFAULT;
-	MIB4(mib_rssi_thresh_offset)	= RAY_MIB_RSSI_THRESH_OFFSET_DEFAULT;
-	MIB4(mib_busy_thresh_offset)	= RAY_MIB_BUSY_THRESH_OFFSET_DEFAULT;
-	MIB4(mib_sync_thresh)		= RAY_MIB_SYNC_THRESH_DEFAULT;
-	MIB4(mib_test_mode)		= RAY_MIB_TEST_MODE_DEFAULT;
-	MIB4(mib_test_min_chan)		= RAY_MIB_TEST_MIN_CHAN_DEFAULT;
-	MIB4(mib_test_max_chan)		= RAY_MIB_TEST_MAX_CHAN_DEFAULT;
-#undef MIB4
-
-	SRAM_WRITE_REGION(sc, RAY_HOST_TO_ECF_BASE,
-	    &ray_mib_4_default, sizeof(ray_mib_4_default));
-}
-
-/*
- * Firmware version 5 defaults - see if_raymib.h for details
- */
-static void
-ray_init_download_v5(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ray_mib_5 ray_mib_5_default;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_MAP_CM(sc);
-
-#define MIB5(m)		ray_mib_5_default.m
-	MIB5(mib_net_type)		= com->c_desired.np_net_type;
-	MIB5(mib_ap_status)		= com->c_desired.np_ap_status;
-	bcopy(com->c_desired.np_ssid, MIB5(mib_ssid), IEEE80211_NWID_LEN);
-	MIB5(mib_scan_mode)		= RAY_MIB_SCAN_MODE_V5;
-	MIB5(mib_apm_mode)		= RAY_MIB_APM_MODE_V5;
-	bcopy(sc->sc_station_addr, MIB5(mib_mac_addr), ETHER_ADDR_LEN);
-   PUT2(MIB5(mib_frag_thresh), 	  	  RAY_MIB_FRAG_THRESH_V5);
-   PUT2(MIB5(mib_dwell_time),		  RAY_MIB_DWELL_TIME_V5);
-   PUT2(MIB5(mib_beacon_period),	  RAY_MIB_BEACON_PERIOD_V5);
-	MIB5(mib_dtim_interval)		= RAY_MIB_DTIM_INTERVAL_V5;
-	MIB5(mib_max_retry)		= RAY_MIB_MAX_RETRY_V5;
-	MIB5(mib_ack_timo)		= RAY_MIB_ACK_TIMO_V5;
-	MIB5(mib_sifs)			= RAY_MIB_SIFS_V5;
-	MIB5(mib_difs)			= RAY_MIB_DIFS_V5;
-	MIB5(mib_pifs)			= RAY_MIB_PIFS_V5;
-   PUT2(MIB5(mib_rts_thresh),		  RAY_MIB_RTS_THRESH_V5);
-   PUT2(MIB5(mib_scan_dwell),		  RAY_MIB_SCAN_DWELL_V5);
-   PUT2(MIB5(mib_scan_max_dwell),	  RAY_MIB_SCAN_MAX_DWELL_V5);
-	MIB5(mib_assoc_timo)		= RAY_MIB_ASSOC_TIMO_V5;
-	MIB5(mib_adhoc_scan_cycle)	= RAY_MIB_ADHOC_SCAN_CYCLE_V5;
-	MIB5(mib_infra_scan_cycle)	= RAY_MIB_INFRA_SCAN_CYCLE_V5;
-	MIB5(mib_infra_super_scan_cycle)
-	 				= RAY_MIB_INFRA_SUPER_SCAN_CYCLE_V5;
-	MIB5(mib_promisc)		= com->c_desired.np_promisc;
-   PUT2(MIB5(mib_uniq_word),		  RAY_MIB_UNIQ_WORD_V5);
-	MIB5(mib_slot_time)		= RAY_MIB_SLOT_TIME_V5;
-	MIB5(mib_roam_low_snr_thresh)	= RAY_MIB_ROAM_LOW_SNR_THRESH_V5;
-	MIB5(mib_low_snr_count)	= RAY_MIB_LOW_SNR_COUNT_V5;
-	MIB5(mib_infra_missed_beacon_count)
-					= RAY_MIB_INFRA_MISSED_BEACON_COUNT_V5;
-	MIB5(mib_adhoc_missed_beacon_count)
-	 				= RAY_MIB_ADHOC_MISSED_BEACON_COUNT_V5;
-	MIB5(mib_country_code)		= RAY_MIB_COUNTRY_CODE_V5;
-	MIB5(mib_hop_seq)		= RAY_MIB_HOP_SEQ_V5;
-	MIB5(mib_hop_seq_len)		= RAY_MIB_HOP_SEQ_LEN_V5;
-   PUT2(MIB5(mib_cw_max),		  RAY_MIB_CW_MAX_V5);
-   PUT2(MIB5(mib_cw_min),		  RAY_MIB_CW_MIN_V5);
-	MIB5(mib_noise_filter_gain)	= RAY_MIB_NOISE_FILTER_GAIN_DEFAULT;
-	MIB5(mib_noise_limit_offset)	= RAY_MIB_NOISE_LIMIT_OFFSET_DEFAULT;
-	MIB5(mib_rssi_thresh_offset)	= RAY_MIB_RSSI_THRESH_OFFSET_DEFAULT;
-	MIB5(mib_busy_thresh_offset)	= RAY_MIB_BUSY_THRESH_OFFSET_DEFAULT;
-	MIB5(mib_sync_thresh)		= RAY_MIB_SYNC_THRESH_DEFAULT;
-	MIB5(mib_test_mode)		= RAY_MIB_TEST_MODE_DEFAULT;
-	MIB5(mib_test_min_chan)		= RAY_MIB_TEST_MIN_CHAN_DEFAULT;
-	MIB5(mib_test_max_chan)		= RAY_MIB_TEST_MAX_CHAN_DEFAULT;
-	MIB5(mib_allow_probe_resp)	= RAY_MIB_ALLOW_PROBE_RESP_DEFAULT;
-	MIB5(mib_privacy_must_start)	= com->c_desired.np_priv_start;
-	MIB5(mib_privacy_can_join)	= com->c_desired.np_priv_join;
-	MIB5(mib_basic_rate_set[0])	= com->c_desired.np_def_txrate;
-#undef MIB5
-
-	SRAM_WRITE_REGION(sc, RAY_HOST_TO_ECF_BASE,
-	    &ray_mib_5_default, sizeof(ray_mib_5_default));
-}
-#undef PUT2
-
-/*
- * Download completion routine
- */
-static void
-ray_init_download_done(struct ray_softc *sc, u_int8_t status, size_t ccs)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_COM_CHECK(sc, ccs);
-
-	RAY_CCSERR(sc, status, if_oerrors); /* XXX error counter */
-
-	ray_com_ecf_done(sc);
-}
-
-/*
- * Runq entry to empty the multicast filter list
- */
-static void
-ray_init_mcast(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_MAP_CM(sc);
-
-	/* If the card already running we might not need to reset the list */
-	RAY_COM_CHKRUNNING(sc, com, ifp);
-
-	/*
-	 * Kick the card
-	 */
-	ray_ccs_fill(sc, com->c_ccs, RAY_CMD_UPDATE_MCAST);
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs, ray_cmd_update_mcast, c_nmcast, 0);
-
-	ray_com_ecf(sc, com);
-}
-
-/*
- * Runq entry to starting or joining a network
- */
-static void
-ray_init_sj(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-	struct ray_net_params np;
-	int update;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_MAP_CM(sc);
-
-	/* If the card already running we might not need to start the n/w */
-	RAY_COM_CHKRUNNING(sc, com, ifp);
-
-	/*
-	 * Set up the right start or join command and determine
-	 * whether we should tell the card about a change in operating
-	 * parameters.
-	 */
-	sc->sc_c.np_havenet = 0;
-	if (sc->sc_d.np_net_type == RAY_MIB_NET_TYPE_ADHOC)
-		ray_ccs_fill(sc, com->c_ccs, RAY_CMD_START_NET);
-	else
-		ray_ccs_fill(sc, com->c_ccs, RAY_CMD_JOIN_NET);
-
-	update = 0;
-	if (sc->sc_c.np_net_type != sc->sc_d.np_net_type)
-		update++;
-	if (bcmp(sc->sc_c.np_ssid, sc->sc_d.np_ssid, IEEE80211_NWID_LEN))
-		update++;
-	if (sc->sc_c.np_priv_join != sc->sc_d.np_priv_join)
-		update++;
-	if (sc->sc_c.np_priv_start != sc->sc_d.np_priv_start)
-		update++;
-	RAY_DPRINTF(sc, RAY_DBG_STARTJOIN,
-	    "%s updating nw params", update?"is":"not");
-	if (update) {
-		bzero(&np, sizeof(np));
-		np.p_net_type = sc->sc_d.np_net_type;
-		bcopy(sc->sc_d.np_ssid, np.p_ssid,  IEEE80211_NWID_LEN);
-		np.p_privacy_must_start = sc->sc_d.np_priv_start;
-		np.p_privacy_can_join = sc->sc_d.np_priv_join;
-		SRAM_WRITE_REGION(sc, RAY_HOST_TO_ECF_BASE, &np, sizeof(np));
-		SRAM_WRITE_FIELD_1(sc, com->c_ccs, ray_cmd_net, c_upd_param, 1);
-	} else
-		SRAM_WRITE_FIELD_1(sc, com->c_ccs, ray_cmd_net, c_upd_param, 0);
-
-	/*
-	 * Kick the card
-	 */
-	ray_com_ecf(sc, com);
-}
-
-/*
- * Complete start command or intermediate step in assoc command
- */
-static void
-ray_init_sj_done(struct ray_softc *sc, u_int8_t status, size_t ccs)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_MAP_CM(sc);
-	RAY_COM_CHECK(sc, ccs);
-
-	RAY_CCSERR(sc, status, if_oerrors); /* XXX error counter */
-
-	/*
-	 * Read back network parameters that the ECF sets
-	 */
-	SRAM_READ_REGION(sc, ccs, &sc->sc_c.p_1, sizeof(struct ray_cmd_net));
-
-	/* Adjust values for buggy firmware */
-	if (sc->sc_c.np_inited == 0x55)
-		sc->sc_c.np_inited = 0;
-	if (sc->sc_c.np_def_txrate == 0x55)
-		sc->sc_c.np_def_txrate = sc->sc_d.np_def_txrate;
-	if (sc->sc_c.np_encrypt == 0x55)
-		sc->sc_c.np_encrypt = sc->sc_d.np_encrypt;
-
-	/*
-	 * Update our local state if we updated the network parameters
-	 * when the START_NET or JOIN_NET was issued.
-	 */
-	if (sc->sc_c.np_upd_param) {
-		RAY_DPRINTF(sc, RAY_DBG_STARTJOIN, "updated parameters");
-		SRAM_READ_REGION(sc, RAY_HOST_TO_ECF_BASE,
-		    &sc->sc_c.p_2, sizeof(struct ray_net_params));
-	}
-
-	/*
-	 * Hurrah! The network is now active.
-	 *
-	 * Clearing IFF_DRV_OACTIVE will ensure that the system will send us
-	 * packets. Just before we return from the interrupt context
-	 * we check to see if packets have been queued.
-	 */
-	if (SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_cmd) == RAY_CMD_START_NET) {
-		sc->sc_c.np_havenet = 1;
-		sc->sc_c.np_framing = sc->sc_d.np_framing;
-		ifp->if_drv_flags |= IFF_DRV_RUNNING;
-		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-	}
-
-	ray_com_ecf_done(sc);
-}
-
-/*
- * Runq entry to authenticate with an access point or another station
- */
-static void
-ray_init_auth(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN | RAY_DBG_AUTH, "");
-
-	/* If card already running we might not need to authenticate */
-	RAY_COM_CHKRUNNING(sc, com, ifp);
-
-	/*
-	 * Don't do anything if we are not in a managed network
-	 *
-	 * XXX V4 adhoc does not need this, V5 adhoc unknown
-	 */
-	if (sc->sc_c.np_net_type != RAY_MIB_NET_TYPE_INFRA) {
-		ray_com_runq_done(sc);
-		return;
-	}
-
-/*
- * XXX_AUTH need to think of run queue when doing auths from request i.e. would
- * XXX_AUTH need to have auth at top of runq?
- * XXX_AUTH ditto for sending any auth response packets...what about timeouts?
- */
-
-	/*
-	 * Kick the card
-	 */
-/* XXX_AUTH check exit status and retry or fail as we can't associate without this */
-	ray_init_auth_send(sc, sc->sc_c.np_bss_id, IEEE80211_AUTH_OPEN_REQUEST);
-}
-
-/*
- * Build and send an authentication packet
- *
- * If an error occurs, returns 1 else returns 0.
- */
-static int
-ray_init_auth_send(struct ray_softc *sc, u_int8_t *dst, int sequence)
-{
-	size_t ccs, bufp;
-	int pktlen = 0;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN | RAY_DBG_AUTH, "");
-
-	/* Get a control block */
-	if (ray_ccs_tx(sc, &ccs, &bufp)) {
-	    	RAY_RECERR(sc, "could not obtain a ccs");
-		return (1);
-	}
-
-	/* Fill the header in */
-	bufp = ray_tx_wrhdr(sc, bufp,
-	    IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_AUTH,
-	    IEEE80211_FC1_DIR_NODS,
-	    dst,
-	    IF_LLADDR(sc->ifp),
-	    sc->sc_c.np_bss_id);
-
-	/* Add algorithm number */
-	SRAM_WRITE_1(sc, bufp + pktlen++, IEEE80211_AUTH_ALG_OPEN);
-	SRAM_WRITE_1(sc, bufp + pktlen++, 0);
-
-	/* Add sequence number */
-	SRAM_WRITE_1(sc, bufp + pktlen++, sequence);
-	SRAM_WRITE_1(sc, bufp + pktlen++, 0);
-
-	/* Add status code */
-	SRAM_WRITE_1(sc, bufp + pktlen++, 0);
-	SRAM_WRITE_1(sc, bufp + pktlen++, 0);
-	pktlen += sizeof(struct ieee80211_frame);
-
-	return (ray_tx_send(sc, ccs, pktlen, dst));
-}
-
-/*
- * Complete authentication runq
- */
-static void
-ray_init_auth_done(struct ray_softc *sc, u_int8_t status)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN | RAY_DBG_AUTH, "");
-
-	if (status != IEEE80211_STATUS_SUCCESS)
-		RAY_RECERR(sc, "authentication failed with status %d", status);
-/*
- * XXX_AUTH retry? if not just recall ray_init_auth_send and dont clear runq?
- * XXX_AUTH association requires that authenitcation is successful
- * XXX_AUTH before we associate, and the runq is the only way to halt the
- * XXX_AUTH progress of associate.
- * XXX_AUTH In this case I might not need the RAY_AUTH_NEEDED state
- */
-	ray_com_runq_done(sc);
-}
-
-/*
- * Runq entry to starting an association with an access point
- */
-static void
-ray_init_assoc(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-
-	/* If the card already running we might not need to associate */
-	RAY_COM_CHKRUNNING(sc, com, ifp);
-
-	/*
-	 * Don't do anything if we are not in a managed network
-	 */
-	if (sc->sc_c.np_net_type != RAY_MIB_NET_TYPE_INFRA) {
-		ray_com_runq_done(sc);
-		return;
-	}
-
-	/*
-	 * Kick the card
-	 */
-	ray_ccs_fill(sc, com->c_ccs, RAY_CMD_START_ASSOC);
-	ray_com_ecf(sc, com);
-}
-
-/*
- * Complete association
- */
-static void
-ray_init_assoc_done(struct ray_softc *sc, u_int8_t status, size_t ccs)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_COM_CHECK(sc, ccs);
-
-	RAY_CCSERR(sc, status, if_oerrors); /* XXX error counter */
-	
-	/*
-	 * Hurrah! The network is now active.
-	 *
-	 * Clearing IFF_DRV_OACTIVE will ensure that the system will send us
-	 * packets. Just before we return from the interrupt context
-	 * we check to see if packets have been queued.
-	 */
-	sc->sc_c.np_havenet = 1;
-	sc->sc_c.np_framing = sc->sc_d.np_framing;
-	ifp->if_drv_flags |= IFF_DRV_RUNNING;
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-
-	ray_com_ecf_done(sc);
-}
-
-/*
- * Network stop.
- *
- * Inhibit card - if we can't prevent reception then do not worry;
- * stopping a NIC only guarantees no TX.
- *
- * The change to the interface flags is done via the runq so that any
- * existing commands can execute normally.
- */
-static int
-ray_stop_user(struct ray_softc *sc)
-{
-	struct ray_comq_entry *com[1];
-	int error, ncom;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STOP, "");
-
-	/*
-	 * Schedule the real stop routine
-	 */
-	ncom = 0;
-	com[ncom++] = RAY_COM_MALLOC(ray_stop, 0);
-
-	RAY_COM_RUNQ(sc, com, ncom, "raystop", error);
-
-	/* XXX no real error processing from anything yet! */
-
-	RAY_COM_FREE(com, ncom);
-
-	return (error);
-}
-
-/*
- * Runq entry for stopping the interface activity
- */
-static void
-ray_stop(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-	struct mbuf *m;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STOP, "");
-
-	/*
-	 * Mark as not running and drain output queue
-	 */
-	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
-	ifp->if_timer = 0;
-	for (;;) {
-		IF_DEQUEUE(&ifp->if_snd, m);
-		if (m == NULL)
-			break;
-		m_freem(m);
-	}
-
-	ray_com_runq_done(sc);
-}
-
-static void
-ray_watchdog(struct ifnet *ifp)
-{
-	struct ray_softc *sc = ifp->if_softc;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	if ((sc == NULL) || (sc->sc_gone))
-		return;
-
-	RAY_PRINTF(sc, "watchdog timeout");
-}
-
-/*
- * Transmit packet handling
- */
-
-/*
- * Send a packet.
- *
- * We make two assumptions here:
- *  1) That the current priority is set to splimp _before_ this code
- *     is called *and* is returned to the appropriate priority after
- *     return
- *  2) That the IFF_DRV_OACTIVE flag is checked before this code is called
- *     (i.e. that the output part of the interface is idle)
- *
- * A simple one packet at a time TX routine is used - we don't bother
- * chaining TX buffers. Performance is sufficient to max out the
- * wireless link on a P75.
- *
- * AST J30 Windows 95A (100MHz Pentium) to
- *   Libretto 50CT FreeBSD-3.1 (75MHz Pentium)		167.37kB/s
- *   Nonname box FreeBSD-3.4 (233MHz AMD K6)		161.82kB/s
- *
- * Libretto 50CT FreeBSD-3.1 (75MHz Pentium) to
- *   AST J30 Windows 95A (100MHz Pentium) 		167.37kB/s
- *   Nonname box FreeBSD-3.4 (233MHz AMD K6)		161.38kB/s
- *
- * Given that 160kB/s is saturating the 2Mb/s wireless link we
- * are about there.
- *
- * In short I'm happy that the added complexity of chaining TX
- * packets together isn't worth it for my machines.
- */
-static void
-ray_tx(struct ifnet *ifp)
-{
-	struct ray_softc *sc = ifp->if_softc;
-	struct mbuf *m0, *m;
-	struct ether_header *eh;
-	struct llc *llc;
-	size_t ccs, bufp;
-	int pktlen, len;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_TX, "");
-	RAY_MAP_CM(sc);
-
-	/*
-	 * Some simple checks first - some are overkill
-	 */
-	if ((sc == NULL) || (sc->sc_gone))
-		return;
-	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
-		RAY_RECERR(sc, "cannot transmit - not running");
-		return;
-	}
-	if (!sc->sc_c.np_havenet) {
-		RAY_RECERR(sc, "cannot transmit - no network");
-		return;
-	}
-	if (!RAY_ECF_READY(sc)) {
-		/* Can't assume that the ECF is busy because of this driver */
-		if ((sc->tx_timerh.callout == NULL) ||
-		    (!callout_active(sc->tx_timerh.callout))) {
-			sc->tx_timerh =
-			    timeout(ray_tx_timo, sc, RAY_TX_TIMEOUT);
-			return;
-		    }
-	} else
-		untimeout(ray_tx_timo, sc, sc->tx_timerh);
-
-	/*
-	 * We find a ccs before we process the mbuf so that we are sure it
-	 * is worthwhile processing the packet. All errors in the mbuf
-	 * processing are either errors in the mbuf or gross configuration
-	 * errors and the packet wouldn't get through anyway.
-	 */
-	if (ray_ccs_tx(sc, &ccs, &bufp)) {
-		ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-		return;
-	}
-    
-	/*
-	 * Get the mbuf and process it - we have to remember to free the
-	 * ccs if there are any errors.
-	 */
-	IF_DEQUEUE(&ifp->if_snd, m0);
-	if (m0 == NULL) {
-		RAY_CCS_FREE(sc, ccs);
-		return;
-	}
-
-	pktlen = m0->m_pkthdr.len;
-	if (pktlen > ETHER_MAX_LEN - ETHER_CRC_LEN) {
-		RAY_RECERR(sc, "mbuf too long %d", pktlen);
-		RAY_CCS_FREE(sc, ccs);
-		ifp->if_oerrors++;
-		m_freem(m0);
-		return;
-	}
-
-	m0 = m_pullup(m0, sizeof(struct ether_header));
-	if (m0 == NULL) {
-		RAY_RECERR(sc, "could not pullup ether");
-		RAY_CCS_FREE(sc, ccs);
-		ifp->if_oerrors++;
-		return;
-	}
-	eh = mtod(m0, struct ether_header *);
-
-	/*
-	 * Write the 802.11 header according to network type etc.
-	 */
-	if (sc->sc_c.np_net_type == RAY_MIB_NET_TYPE_ADHOC)
-		bufp = ray_tx_wrhdr(sc, bufp,
-		    IEEE80211_FC0_TYPE_DATA,
-		    IEEE80211_FC1_DIR_NODS,
-		    eh->ether_dhost,
-		    eh->ether_shost,
-		    sc->sc_c.np_bss_id);
-	else
-		if (sc->sc_c.np_ap_status == RAY_MIB_AP_STATUS_TERMINAL)
-			bufp = ray_tx_wrhdr(sc, bufp,
-			    IEEE80211_FC0_TYPE_DATA,
-			    IEEE80211_FC1_DIR_TODS,
-			    sc->sc_c.np_bss_id,
-			    eh->ether_shost,
-			    eh->ether_dhost);
-		else
-			bufp = ray_tx_wrhdr(sc, bufp,
-			    IEEE80211_FC0_TYPE_DATA,
-			    IEEE80211_FC1_DIR_FROMDS,
-			    eh->ether_dhost,
-			    sc->sc_c.np_bss_id,
-			    eh->ether_shost);
-
-	/*
-	 * Framing
-	 *
-	 * Add to the mbuf.
-	 */
-	switch (sc->sc_c.np_framing) {
-
-    	case RAY_FRAMING_ENCAPSULATION:
-		/* Nice and easy - nothing! (just add an 802.11 header) */
-		break;
-
-    	case RAY_FRAMING_TRANSLATION:
-		/*
-		 * Drop the first address in the ethernet header and
-		 * write an LLC and SNAP header over the second.
-		 */
-		m_adj(m0, ETHER_ADDR_LEN);
-		if (m0 == NULL) {
-			RAY_RECERR(sc, "could not get space for 802.2 header");
-			RAY_CCS_FREE(sc, ccs);
-			ifp->if_oerrors++;
-			return;
-		}
-		llc = mtod(m0, struct llc *);
-		llc->llc_dsap = LLC_SNAP_LSAP;
-		llc->llc_ssap = LLC_SNAP_LSAP;
-		llc->llc_control = LLC_UI;
-		llc->llc_un.type_snap.org_code[0] = 0;
-		llc->llc_un.type_snap.org_code[1] = 0;
-		llc->llc_un.type_snap.org_code[2] = 0;
-		break;
-
-	default:
-		RAY_RECERR(sc, "unknown framing type %d", sc->sc_c.np_framing);
-		RAY_CCS_FREE(sc, ccs);
-		ifp->if_oerrors++;
-		m_freem(m0);
-		return;
-
-	}
-	if (m0 == NULL) {
-		RAY_RECERR(sc, "could not frame packet");
-		RAY_CCS_FREE(sc, ccs);
-		ifp->if_oerrors++;
-		return;
-	}
-	RAY_MBUF_DUMP(sc, RAY_DBG_TX, m0, "framed packet");
-
-	/*
-	 * Copy the mbuf to the buffer in common memory
-	 *
-	 * We drop and don't bother wrapping as Ethernet packets are 1518
-	 * bytes, we checked the mbuf earlier, and our TX buffers are 2048
-	 * bytes. We don't have 530 bytes of headers etc. so something
-	 * must be fubar.
-	 */
-	pktlen = sizeof(struct ieee80211_frame);
-	for (m = m0; m != NULL; m = m->m_next) {
-		pktlen += m->m_len;
-		if ((len = m->m_len) == 0)
-			continue;
-		if ((bufp + len) < RAY_TX_END)
-			SRAM_WRITE_REGION(sc, bufp, mtod(m, u_int8_t *), len);
-		else {
-			RAY_RECERR(sc, "tx buffer overflow");
-			RAY_CCS_FREE(sc, ccs);
-			ifp->if_oerrors++;
-			m_freem(m0);
-			return;
-		}
-		bufp += len;
-	}
-
-	/*
-	 * Send it off
-	 */
-	if (ray_tx_send(sc, ccs, pktlen, eh->ether_dhost))
-		ifp->if_oerrors++;
-	else
-		ifp->if_opackets++;
-	m_freem(m0);
-}
-
-/*
- * Start timeout routine.
- *
- * Used when card was busy but we needed to send a packet.
- */
-static void
-ray_tx_timo(void *xsc)
-{
-	struct ray_softc *sc = (struct ray_softc *)xsc;
-	struct ifnet *ifp = sc->ifp;
-	int s;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	if (!(ifp->if_drv_flags & IFF_DRV_OACTIVE) && (ifp->if_snd.ifq_head != NULL)) {
-		s = splimp();
-		ray_tx(ifp);
-		splx(s);
-	}
-}
-
-/*
- * Write an 802.11 header into the Tx buffer space and return the
- * adjusted buffer pointer.
- */
-static size_t
-ray_tx_wrhdr(struct ray_softc *sc, size_t bufp, u_int8_t type, u_int8_t fc1, u_int8_t *addr1, u_int8_t *addr2, u_int8_t *addr3)
-{
-	struct ieee80211_frame header;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_TX, "");
-	RAY_MAP_CM(sc);
-
-	bzero(&header, sizeof(struct ieee80211_frame));
-	header.i_fc[0] = (IEEE80211_FC0_VERSION_0 | type);
-	header.i_fc[1] = fc1;
-	bcopy(addr1, header.i_addr1, ETHER_ADDR_LEN);
-	bcopy(addr2, header.i_addr2, ETHER_ADDR_LEN);
-	bcopy(addr3, header.i_addr3, ETHER_ADDR_LEN);
-
-	SRAM_WRITE_REGION(sc, bufp, (u_int8_t *)&header,
-	    sizeof(struct ieee80211_frame));
-
-	return (bufp + sizeof(struct ieee80211_frame));
-}
-
-/*
- * Fill in a few loose ends and kick the card to send the packet
- *
- * Returns 0 on success, 1 on failure
- */
-static int
-ray_tx_send(struct ray_softc *sc, size_t ccs, int pktlen, u_int8_t *dst)
-{
-	int i = 0;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_TX, "");
-	RAY_MAP_CM(sc);
-
-	while (!RAY_ECF_READY(sc)) {
-		DELAY(RAY_ECF_SPIN_DELAY);
-		if (++i > RAY_ECF_SPIN_TRIES) {
-			RAY_RECERR(sc, "ECF busy, dropping packet");
-			RAY_CCS_FREE(sc, ccs);
-			return (1);
-		}
-	}
-	if (i != 0)
-		RAY_RECERR(sc, "spun %d times", i);
-
-	SRAM_WRITE_FIELD_2(sc, ccs, ray_cmd_tx, c_len, pktlen);
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd_tx, c_antenna,
-	    ray_tx_best_antenna(sc, dst));
-	SRAM_WRITE_1(sc, RAY_SCB_CCSI, RAY_CCS_INDEX(ccs));
-	RAY_ECF_START_CMD(sc);
-
-	return (0);
-}
-
-/*
- * Determine best antenna to use from rx level and antenna cache
- */
-static u_int8_t
-ray_tx_best_antenna(struct ray_softc *sc, u_int8_t *dst)
-{
-	struct ray_siglev *sl;
-	int i;
-	u_int8_t antenna;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_TX, "");
-
-	if (sc->sc_version == RAY_ECFS_BUILD_4) 
-		return (0);
-
-	/* try to find host */
-	for (i = 0; i < RAY_NSIGLEVRECS; i++) {
-		sl = &sc->sc_siglevs[i];
-		if (bcmp(sl->rsl_host, dst, ETHER_ADDR_LEN) == 0)
-			goto found;
-	}
-	/* not found, return default setting */
-	return (0);
-
-found:
-    	/* This is a simple thresholding scheme that takes the mean
-	 * of the best antenna history. This is okay but as it is a
-	 * filter, it adds a bit of lag in situations where the
-	 * best antenna swaps from one side to the other slowly. Don't know
-	 * how likely this is given the horrible fading though.
-	 */
-	antenna = 0;
-	for (i = 0; i < RAY_NANTENNA; i++) {
-	    	antenna += sl->rsl_antennas[i];
-	}
-
-	return (antenna > (RAY_NANTENNA >> 1));
-}
-
-/*
- * Transmit now complete so clear ccs and network flags.
- */
-static void
-ray_tx_done(struct ray_softc *sc, u_int8_t status, size_t ccs)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_TX, "");
-
-	RAY_CCSERR(sc, status, if_oerrors);
-
-	RAY_CCS_FREE(sc, ccs);
-	ifp->if_timer = 0;
-	if (ifp->if_drv_flags & IFF_DRV_OACTIVE)
-	    ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-}
-
-/*
- * Receiver packet handling
- */
-
-/*
- * Receive a packet from the card
- */
-static void
-ray_rx(struct ray_softc *sc, size_t rcs)
-{
-	struct ieee80211_frame *header;
-	struct ifnet *ifp = sc->ifp;
-	struct mbuf *m0;
-	size_t pktlen, fraglen, readlen, tmplen;
-	size_t bufp, ebufp;
-	u_int8_t siglev, antenna;
-	u_int first, ni, i;
-	u_int8_t *mp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	RAY_DPRINTF(sc, RAY_DBG_CCS, "using rcs 0x%x", rcs);
-
-	m0 = NULL;
-	readlen = 0;
-
-	/*
-	 * Get first part of packet and the length. Do some sanity checks
-	 * and get a mbuf.
-	 */
-	first = RAY_CCS_INDEX(rcs);
-	pktlen = SRAM_READ_FIELD_2(sc, rcs, ray_cmd_rx, c_pktlen);
-	siglev = SRAM_READ_FIELD_1(sc, rcs, ray_cmd_rx, c_siglev);
-	antenna = SRAM_READ_FIELD_1(sc, rcs, ray_cmd_rx, c_antenna);
-
-	if ((pktlen > MCLBYTES) || (pktlen < sizeof(struct ieee80211_frame))) {
-		RAY_RECERR(sc, "packet too big or too small");
-		ifp->if_ierrors++;
-		goto skip_read;
-	}
-
-	MGETHDR(m0, M_DONTWAIT, MT_DATA);
-	if (m0 == NULL) {
-		RAY_RECERR(sc, "MGETHDR failed");
-		ifp->if_ierrors++;
-		goto skip_read;
-	}
-	if (pktlen > MHLEN) {
-		MCLGET(m0, M_DONTWAIT);
-		if (!(m0->m_flags & M_EXT)) {
-			RAY_RECERR(sc, "MCLGET failed");
-			ifp->if_ierrors++;
-			m_freem(m0);
-			m0 = NULL;
-			goto skip_read;
-		}
-	}
-	m0->m_pkthdr.rcvif = ifp;
-	m0->m_pkthdr.len = pktlen;
-	m0->m_len = pktlen;
-	mp = mtod(m0, u_int8_t *);
-
-	/*
-	 * Walk the fragment chain to build the complete packet.
-	 *
-	 * The use of two index variables removes a race with the
-	 * hardware. If one index were used the clearing of the CCS would
-	 * happen before reading the next pointer and the hardware can get in.
-	 * Not my idea but verbatim from the NetBSD driver.
-	 */
-	i = ni = first;
-	while ((i = ni) && (i != RAY_CCS_LINK_NULL)) {
-		rcs = RAY_CCS_ADDRESS(i);
-		ni = SRAM_READ_FIELD_1(sc, rcs, ray_cmd_rx, c_nextfrag);
-		bufp = SRAM_READ_FIELD_2(sc, rcs, ray_cmd_rx, c_bufp);
-		fraglen = SRAM_READ_FIELD_2(sc, rcs, ray_cmd_rx, c_len);
-		if (fraglen + readlen > pktlen) {
-			RAY_RECERR(sc, "bad length current 0x%zx pktlen 0x%zx",
-			    fraglen + readlen, pktlen);
-			ifp->if_ierrors++;
-			m_freem(m0);
-			m0 = NULL;
-			goto skip_read;
-		}
-		if ((i < RAY_RCS_FIRST) || (i > RAY_RCS_LAST)) {
-			RAY_RECERR(sc, "bad rcs index 0x%x", i);
-			ifp->if_ierrors++;
-			m_freem(m0);
-			m0 = NULL;
-			goto skip_read;
-		}
-
-		ebufp = bufp + fraglen;
-		if (ebufp <= RAY_RX_END)
-			SRAM_READ_REGION(sc, bufp, mp, fraglen);
-		else {
-			SRAM_READ_REGION(sc, bufp, mp,
-			    (tmplen = RAY_RX_END - bufp));
-			SRAM_READ_REGION(sc, RAY_RX_BASE, mp + tmplen,
-			    ebufp - RAY_RX_END);
-		}
-		mp += fraglen;
-		readlen += fraglen;
-	}
-
-skip_read:
-
-	/*
-	 * Walk the chain again to free the rcss.
-	 */
-	i = ni = first;
-	while ((i = ni) && (i != RAY_CCS_LINK_NULL)) {
-		rcs = RAY_CCS_ADDRESS(i);
-		ni = SRAM_READ_FIELD_1(sc, rcs, ray_cmd_rx, c_nextfrag);
-		RAY_CCS_FREE(sc, rcs);
-	}
-
-	if (m0 == NULL)
-		return;
-
-	/*
-	 * Check the 802.11 packet type and hand off to
-	 * appropriate functions.
-	 */
-	header = mtod(m0, struct ieee80211_frame *);
-	if ((header->i_fc[0] & IEEE80211_FC0_VERSION_MASK)
-	    != IEEE80211_FC0_VERSION_0) {
-		RAY_RECERR(sc, "header not version 0 fc0 0x%x",
-		    header->i_fc[0]);
-		ifp->if_ierrors++;
-		m_freem(m0);
-		return;
-	}
-	switch (header->i_fc[0] & IEEE80211_FC0_TYPE_MASK) {
-
-	case IEEE80211_FC0_TYPE_DATA:
-		ray_rx_data(sc, m0, siglev, antenna);
-		break;
-
-	case IEEE80211_FC0_TYPE_MGT:
-		ray_rx_mgt(sc, m0);
-		break;
-
-	case IEEE80211_FC0_TYPE_CTL:
-		ray_rx_ctl(sc, m0);
-		break;
-
-	default:
-		RAY_RECERR(sc, "unknown packet fc0 0x%x", header->i_fc[0]);
-		ifp->if_ierrors++;
-		m_freem(m0);
-	}
-}
-
-/*
- * Deal with DATA packet types
- */
-static void
-ray_rx_data(struct ray_softc *sc, struct mbuf *m0, u_int8_t siglev, u_int8_t antenna)
-{
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211_frame *header = mtod(m0, struct ieee80211_frame *);
-	struct llc *llc;
-	u_int8_t *sa = NULL, *da = NULL, *ra = NULL, *ta = NULL;
-	int trim = 0;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_RX, "");
-
-	/*
-	 * Check the the data packet subtype, some packets have
-	 * nothing in them so we will drop them here.
-	 */
-	switch (header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-
-	case IEEE80211_FC0_SUBTYPE_DATA:
-	case IEEE80211_FC0_SUBTYPE_CF_ACK:
-	case IEEE80211_FC0_SUBTYPE_CF_POLL:
-	case IEEE80211_FC0_SUBTYPE_CF_ACPL:
-		RAY_DPRINTF(sc, RAY_DBG_RX, "DATA packet");
-		break;
-
-	case IEEE80211_FC0_SUBTYPE_NODATA:
-	case IEEE80211_FC0_SUBTYPE_CFACK:
-	case IEEE80211_FC0_SUBTYPE_CFPOLL:
-	case IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK:
-		RAY_DPRINTF(sc, RAY_DBG_RX, "NULL packet");
-	    	m_freem(m0);
-		return;
-		break;
-
-	default:
-		RAY_RECERR(sc, "reserved DATA packet subtype 0x%x",
-		    header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
-		ifp->if_ierrors++;
-		m_freem(m0);
-		return;
-	}
-
-	/*
-	 * Parse the To DS and From DS fields to determine the length
-	 * of the 802.11 header for use later on.
-	 *
-	 * Additionally, furtle out the right destination and
-	 * source MAC addresses for the packet. Packets may come via
-	 * APs so the MAC addresses of the immediate node may be
-	 * different from the node that actually sent us the packet.
-	 *
-	 *	da	destination address of final recipient
-	 *	sa	source address of orginator
-	 *	ra	receiver address of immediate recipient
-	 *	ta	transmitter address of immediate orginator
-	 *
-	 * Address matching is performed on da or sa with the AP or
-	 * BSSID in ra and ta.
-	 */
-	RAY_MBUF_DUMP(sc, RAY_DBG_RX, m0, "(1) packet before framing");
-	switch (header->i_fc[1] & IEEE80211_FC1_DIR_MASK) {
-
-	case IEEE80211_FC1_DIR_NODS:
-		da = ra = header->i_addr1;
-		sa = ta = header->i_addr2;
-		trim = sizeof(struct ieee80211_frame);
-		RAY_DPRINTF(sc, RAY_DBG_RX, "from %6D to %6D",
-		    sa, ":", da, ":");
-		break;
-
-	case IEEE80211_FC1_DIR_FROMDS:
-		da = ra = header->i_addr1;
-		ta = header->i_addr2;
-		sa = header->i_addr3;
-		trim = sizeof(struct ieee80211_frame);
-		RAY_DPRINTF(sc, RAY_DBG_RX, "ap %6D from %6D to %6D",
-		    ta, ":", sa, ":", da, ":");
-		break;
-
-	case IEEE80211_FC1_DIR_TODS:
-	    	ra = header->i_addr1;
-		sa = ta = header->i_addr2;
-		da = header->i_addr3;
-		trim = sizeof(struct ieee80211_frame);
-		RAY_DPRINTF(sc, RAY_DBG_RX, "from %6D to %6D ap %6D",
-		    sa, ":", da, ":", ra, ":");
-		break;
-
-	case IEEE80211_FC1_DIR_DSTODS:
-		ra = header->i_addr1;
-		ta = header->i_addr2;
-		da = header->i_addr3;
-		sa = (u_int8_t *)header+1;
-		trim = sizeof(struct ieee80211_frame) + ETHER_ADDR_LEN;
-		RAY_DPRINTF(sc, RAY_DBG_RX, "from %6D to %6D ap %6D to %6D",
-		    sa, ":", da, ":", ta, ":", ra, ":");
-		break;
-	}
-
-	/*
-	 * Framing
-	 *
-	 * Each case must leave an Ethernet header and adjust trim.
-	 */
-	switch (sc->sc_c.np_framing) {
-
-    	case RAY_FRAMING_ENCAPSULATION:
-		/* A NOP as the Ethernet header is in the packet */
-		break;
-
-	case RAY_FRAMING_TRANSLATION:
-	    	/* Check that we have an LLC and SNAP sequence */
-		llc = (struct llc *)((u_int8_t *)header + trim);
-		if (llc->llc_dsap == LLC_SNAP_LSAP &&
-		    llc->llc_ssap == LLC_SNAP_LSAP &&
-		    llc->llc_control == LLC_UI &&
-		    llc->llc_un.type_snap.org_code[0] == 0 &&
-		    llc->llc_un.type_snap.org_code[1] == 0 &&
-		    llc->llc_un.type_snap.org_code[2] == 0) {
-			struct ether_header *eh;
-			/*
-			 * This is not magic. RFC1042 header is 8
-			 * bytes, with the last two bytes being the
-			 * ether type. So all we need is another
-			 * ETHER_ADDR_LEN bytes to write the
-			 * destination into.
-			 */
-			trim -= ETHER_ADDR_LEN;
-			eh = (struct ether_header *)((u_int8_t *)header + trim);
-
-			/*
-			 * Copy carefully to avoid mashing the MAC
-			 * addresses. The address layout in the .11 header
-			 * does make sense, honest, but it is a pain.
-			 * 
-			 * NODS  	da sa		no risk              
-			 * FROMDS	da ta sa	sa then da           
-			 * DSTODS	ra ta da sa	sa then da           
-			 * TODS		ra sa da	da then sa           
-			 */
-			if (sa > da) {
-				/* Copy sa first */
-				bcopy(sa, eh->ether_shost, ETHER_ADDR_LEN);
-				bcopy(da, eh->ether_dhost, ETHER_ADDR_LEN);
-			} else {
-				/* Copy da first */
-				bcopy(da, eh->ether_dhost, ETHER_ADDR_LEN);
-				bcopy(sa, eh->ether_shost, ETHER_ADDR_LEN);
-			}
-
-		} else {
-
-			/* Assume RAY_FRAMING_ENCAPSULATION */
-			RAY_RECERR(sc,
-			    "got encapsulated packet but in translation mode");
-
-		}
-		break;
-
-	default:
-		RAY_RECERR(sc, "unknown framing type %d", sc->sc_c.np_framing);
-		ifp->if_ierrors++;
-		m_freem(m0);
-		return;
-	}
-	RAY_MBUF_DUMP(sc, RAY_DBG_RX, m0, "(2) packet after framing");
-
-	/*
-	 * Finally, do a bit of house keeping before sending the packet
-	 * up the stack.
-	 */
-	m_adj(m0, trim);
-	RAY_MBUF_DUMP(sc, RAY_DBG_RX, m0, "(3) packet after trimming");
-	ifp->if_ipackets++;
-	ray_rx_update_cache(sc, header->i_addr2, siglev, antenna);
-	(*ifp->if_input)(ifp, m0);
-}
-
-/*
- * Deal with MGT packet types
- */
-static void
-ray_rx_mgt(struct ray_softc *sc, struct mbuf *m0)
-{
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211_frame *header = mtod(m0, struct ieee80211_frame *);
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_MGT, "");
-
-	if ((header->i_fc[1] & IEEE80211_FC1_DIR_MASK) !=
-	    IEEE80211_FC1_DIR_NODS) {
-		RAY_RECERR(sc, "MGT TODS/FROMDS wrong fc1 0x%x",
-		    header->i_fc[1] & IEEE80211_FC1_DIR_MASK);
-		ifp->if_ierrors++;
-		m_freem(m0);
-		return;
-	}
-
-	/*
-	 * Check the the mgt packet subtype, some packets should be
-	 * dropped depending on the mode the station is in. See pg
-	 * 52(60) of docs
-	 *
-	 * P - proccess, J - Junk, E - ECF deals with, I - Illegal
- 	 * ECF Proccesses
-  	 *  AHDOC procces or junk
-   	 *   INFRA STA process or junk
-    	 *    INFRA AP process or jumk
-	 * 
- 	 * +PPP	IEEE80211_FC0_SUBTYPE_BEACON
- 	 * +EEE	IEEE80211_FC0_SUBTYPE_PROBE_REQ
- 	 * +EEE	IEEE80211_FC0_SUBTYPE_PROBE_RESP
- 	 *  PPP	IEEE80211_FC0_SUBTYPE_AUTH
- 	 *  PPP	IEEE80211_FC0_SUBTYPE_DEAUTH
- 	 *  JJP	IEEE80211_FC0_SUBTYPE_ASSOC_REQ
- 	 *  JPJ	IEEE80211_FC0_SUBTYPE_ASSOC_RESP
- 	 *  JPP	IEEE80211_FC0_SUBTYPE_DISASSOC
- 	 *  JJP	IEEE80211_FC0_SUBTYPE_REASSOC_REQ
- 	 *  JPJ	IEEE80211_FC0_SUBTYPE_REASSOC_RESP
- 	 * +EEE	IEEE80211_FC0_SUBTYPE_ATIM
-	 */
-	RAY_MBUF_DUMP(sc, RAY_DBG_MGT, m0, "MGT packet");
-	switch (header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-
- 	case IEEE80211_FC0_SUBTYPE_BEACON:
-		RAY_DPRINTF(sc, RAY_DBG_MGT, "BEACON MGT packet");
-		ray_rx_mgt_beacon(sc, m0);
-		break;
-
- 	case IEEE80211_FC0_SUBTYPE_AUTH:
-		RAY_DPRINTF(sc, RAY_DBG_MGT, "AUTH MGT packet");
-		ray_rx_mgt_auth(sc, m0);
-		break;
-
- 	case IEEE80211_FC0_SUBTYPE_DEAUTH:
-		RAY_DPRINTF(sc, RAY_DBG_MGT, "DEAUTH MGT packet");
-		/* XXX ray_rx_mgt_deauth(sc, m0); */
-		break;
-
-	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
-	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
-		RAY_DPRINTF(sc, RAY_DBG_MGT, "(RE)ASSOC_REQ MGT packet");
-		if ((sc->sc_c.np_net_type == RAY_MIB_NET_TYPE_INFRA) &&
-		    (sc->sc_c.np_ap_status == RAY_MIB_AP_STATUS_AP))
-			RAY_RECERR(sc, "can't be an AP yet"); /* XXX_ACTING_AP */
-		break;
-			
- 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
-	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
-		RAY_DPRINTF(sc, RAY_DBG_MGT, "(RE)ASSOC_RESP MGT packet");
-		if ((sc->sc_c.np_net_type == RAY_MIB_NET_TYPE_INFRA) &&
-		    (sc->sc_c.np_ap_status == RAY_MIB_AP_STATUS_TERMINAL))
-			RAY_RECERR(sc, "can't be in INFRA yet"); /* XXX_INFRA */
-		break;
-
-	case IEEE80211_FC0_SUBTYPE_DISASSOC:
-		RAY_DPRINTF(sc, RAY_DBG_MGT, "DISASSOC MGT packet");
-		if (sc->sc_c.np_net_type == RAY_MIB_NET_TYPE_INFRA)
-			RAY_RECERR(sc, "can't be in INFRA yet"); /* XXX_INFRA */
-		break;
-
- 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
- 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-	case IEEE80211_FC0_SUBTYPE_ATIM:
-		RAY_RECERR(sc, "unexpected MGT packet subtype 0x%0x",
-		    header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
-		ifp->if_ierrors++;
-		break;
-	    	
-	default:
-		RAY_RECERR(sc, "reserved MGT packet subtype 0x%x",
-		    header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
-		ifp->if_ierrors++;
-	}
-
-	m_freem(m0);
-}
-
-/*
- * Deal with BEACON management packet types
- * XXX furtle anything interesting out
- * XXX Note that there are rules governing what beacons to read
- * XXX see 8802 S7.2.3, S11.1.2.3
- * XXX is this actually useful?
- */
-static void
-ray_rx_mgt_beacon(struct ray_softc *sc, struct mbuf *m0)
-{
-	struct ieee80211_frame *header = mtod(m0, struct ieee80211_frame *);
-	ieee80211_mgt_beacon_t beacon = (u_int8_t *)(header+1);
-	union ieee80211_information elements;
-
-	u_int64_t *timestamp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_MGT, "");
-
-	timestamp = (u_int64_t *)beacon;
-
-RAY_DPRINTF(sc, RAY_DBG_MGT, "timestamp\t0x%x", *timestamp);
-RAY_DPRINTF(sc, RAY_DBG_MGT, "interval\t\t0x%x", IEEE80211_BEACON_INTERVAL(beacon));
-RAY_DPRINTF(sc, RAY_DBG_MGT, "capability\t0x%x", IEEE80211_BEACON_CAPABILITY(beacon));
-
-	ray_rx_mgt_info(sc, m0, &elements);
-
-}
-
-static void
-ray_rx_mgt_info(struct ray_softc *sc, struct mbuf *m0, union ieee80211_information *elements)
-{
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211_frame *header = mtod(m0, struct ieee80211_frame *);
-	ieee80211_mgt_beacon_t beacon = (u_int8_t *)(header+1);
-	ieee80211_mgt_beacon_t bp, be;
-	int len;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_MGT, "");
-
-	bp = beacon + 12;
-	be = mtod(m0, u_int8_t *) + m0->m_len;
-    	
-    	while (bp < be) {
-		len = *(bp + 1);
-		RAY_DPRINTF(sc, RAY_DBG_MGT, "id 0x%02x length %d", *bp, len);
-
-		switch (*bp) {
-
-		case IEEE80211_ELEMID_SSID:
-			if (len  > IEEE80211_NWID_LEN) {
-				RAY_RECERR(sc, "bad SSD length: %d from %6D",
-				    len, header->i_addr2, ":");
-			}
-		    	strncpy(elements->ssid, bp + 2, len);
-		    	elements->ssid[len] = 0;
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "beacon ssid %s", elements->ssid);
-			break; 
-
-		case IEEE80211_ELEMID_RATES:
-			RAY_DPRINTF(sc, RAY_DBG_MGT, "rates");
-			break;
-
-		case IEEE80211_ELEMID_FHPARMS:
-			elements->fh.dwell = bp[2] + (bp[3] << 8);
-			elements->fh.set = bp[4];
-			elements->fh.pattern = bp[5];
-			elements->fh.index = bp[6];
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "fhparams dwell\t0x%04x", elements->fh.dwell);
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "fhparams set\t0x%02x", elements->fh.set);
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "fhparams pattern\t0x%02x", elements->fh.pattern);
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "fhparams index\t0x%02x", elements->fh.index);
-		    	break;
-
-		case IEEE80211_ELEMID_DSPARMS:
-		    	RAY_RECERR(sc, "got direct sequence params!");
-			break;
-
-		case IEEE80211_ELEMID_CFPARMS:
-		    	RAY_DPRINTF(sc, RAY_DBG_MGT, "cfparams");
-			break;
-
-		case IEEE80211_ELEMID_TIM:
-			elements->tim.count = bp[2];
-			elements->tim.period = bp[3];
-			elements->tim.bitctl = bp[4];
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "tim count\t0x%02x", elements->tim.count);
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "tim period\t0x%02x", elements->tim.period);
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "tim bitctl\t0x%02x", elements->tim.bitctl);
-#if RAY_DEBUG & RAY_DBG_MGT
-			{
-				int i;
-				for (i = 5; i < len + 1; i++)
-					RAY_DPRINTF(sc, RAY_DBG_MGT,
-					    "tim pvt[%03d]\t0x%02x", i-5, bp[i]);
-			}
-#endif /* (RAY_DEBUG & RAY_DBG_MGT) */
-			break;
-		    	
-		case IEEE80211_ELEMID_IBSSPARMS:
-			elements->ibss.atim = bp[2] + (bp[3] << 8);
-			RAY_DPRINTF(sc, RAY_DBG_MGT,
-			    "ibssparams atim\t0x%02x", elements->ibss.atim);
-			break;
-
-		case IEEE80211_ELEMID_CHALLENGE:
-			RAY_DPRINTF(sc, RAY_DBG_MGT, "challenge");
-			break;
-
-		default:
-			RAY_RECERR(sc, "reserved MGT element id 0x%x", *bp);
-			ifp->if_ierrors++;break;
-		}
-		bp += bp[1] + 2; 
-	}
-}
-
-/*
- * Deal with AUTH management packet types
- */
-static void
-ray_rx_mgt_auth(struct ray_softc *sc, struct mbuf *m0)
-{
-	struct ieee80211_frame *header = mtod(m0, struct ieee80211_frame *);
-	ieee80211_mgt_auth_t auth = (u_int8_t *)(header+1);
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_AUTH, "");
-
-	switch (IEEE80211_AUTH_ALGORITHM(auth)) {
-	    
-	case IEEE80211_AUTH_ALG_OPEN:
-		RAY_DPRINTF(sc, RAY_DBG_AUTH,
-		    "open system authentication sequence number %d",
-		    IEEE80211_AUTH_TRANSACTION(auth));
-		if (IEEE80211_AUTH_TRANSACTION(auth) ==
-		    IEEE80211_AUTH_OPEN_REQUEST) {
-
-/* XXX_AUTH use ray_init_auth_send */
-
-		} else if (IEEE80211_AUTH_TRANSACTION(auth) == 
-		    IEEE80211_AUTH_OPEN_RESPONSE)
-			ray_init_auth_done(sc, IEEE80211_AUTH_STATUS(auth));
-		break;
-
-	case IEEE80211_AUTH_ALG_SHARED:
-		RAY_RECERR(sc,
-		    "shared key authentication sequence number %d",
-		    IEEE80211_AUTH_TRANSACTION(auth));
-		break;
-	
-	default:
-		RAY_RECERR(sc,
-		    "reserved authentication subtype 0x%04hx",
-		    IEEE80211_AUTH_ALGORITHM(auth));
-		break;
-	}
-}
-
-/*
- * Deal with CTL packet types
- */
-static void
-ray_rx_ctl(struct ray_softc *sc, struct mbuf *m0)
-{
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211_frame *header = mtod(m0, struct ieee80211_frame *);
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_CTL, "");
-
-	if ((header->i_fc[1] & IEEE80211_FC1_DIR_MASK) !=
-	    IEEE80211_FC1_DIR_NODS) {
-		RAY_RECERR(sc, "CTL TODS/FROMDS wrong fc1 0x%x",
-		    header->i_fc[1] & IEEE80211_FC1_DIR_MASK);
-		ifp->if_ierrors++;
-		m_freem(m0);
-		return;
-	}
-
-	/*
-	 * Check the the ctl packet subtype, some packets should be
-	 * dropped depending on the mode the station is in. The ECF
-	 * should deal with everything but the power save poll to an
-	 * AP. See pg 52(60) of docs.
-	 */
-	RAY_MBUF_DUMP(sc, RAY_DBG_CTL, m0, "CTL packet");
-	switch (header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-
-	case IEEE80211_FC0_SUBTYPE_PS_POLL:
-		RAY_DPRINTF(sc, RAY_DBG_CTL, "PS_POLL CTL packet");
-		if ((sc->sc_d.np_net_type == RAY_MIB_NET_TYPE_INFRA) &&
-		    (sc->sc_c.np_ap_status == RAY_MIB_AP_STATUS_AP))
-			RAY_RECERR(sc, "can't be an AP yet"); /* XXX_ACTING_AP */
-		break;
-
-	case IEEE80211_FC0_SUBTYPE_RTS:
-	case IEEE80211_FC0_SUBTYPE_CTS:
-	case IEEE80211_FC0_SUBTYPE_ACK:
-	case IEEE80211_FC0_SUBTYPE_CF_END:
-	case IEEE80211_FC0_SUBTYPE_CF_END_ACK:
-		RAY_RECERR(sc, "unexpected CTL packet subtype 0x%0x",
-		    header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
-		ifp->if_ierrors++;
-		break;
-
-	default:
-		RAY_RECERR(sc, "reserved CTL packet subtype 0x%x",
-		    header->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
-		ifp->if_ierrors++;
-	}
-
-	m_freem(m0);
-}
-
-/*
- * Update rx level and antenna cache
- */
-static void
-ray_rx_update_cache(struct ray_softc *sc, u_int8_t *src, u_int8_t siglev, u_int8_t antenna)
-{
-	struct timeval mint;
-	struct ray_siglev *sl;
-	int i, mini;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	/* Try to find host */
-	for (i = 0; i < RAY_NSIGLEVRECS; i++) {
-		sl = &sc->sc_siglevs[i];
-		if (bcmp(sl->rsl_host, src, ETHER_ADDR_LEN) == 0)
-			goto found;
-	}
-	/* Not found, find oldest slot */
-	mini = 0;
-	mint.tv_sec = LONG_MAX;
-	mint.tv_usec = 0;
-	for (i = 0; i < RAY_NSIGLEVRECS; i++) {
-		sl = &sc->sc_siglevs[i];
-		if (timevalcmp(&sl->rsl_time, &mint, <)) {
-			mini = i;
-			mint = sl->rsl_time;
-		}
-	}
-	sl = &sc->sc_siglevs[mini];
-	bzero(sl->rsl_siglevs, RAY_NSIGLEV);
-	bzero(sl->rsl_antennas, RAY_NANTENNA);
-	bcopy(src, sl->rsl_host, ETHER_ADDR_LEN);
-
-found:
-	microtime(&sl->rsl_time);
-	bcopy(sl->rsl_siglevs, &sl->rsl_siglevs[1], RAY_NSIGLEV-1);
-	sl->rsl_siglevs[0] = siglev;
-	if (sc->sc_version != RAY_ECFS_BUILD_4) {
-		bcopy(sl->rsl_antennas, &sl->rsl_antennas[1], RAY_NANTENNA-1);
-		sl->rsl_antennas[0] = antenna;
-	}
-}
-
-/*
- * Interrupt handling
- */
-
-/*
- * Process an interrupt
- */
-static void
-ray_intr(void *xsc)
-{
-	struct ray_softc *sc = (struct ray_softc *)xsc;
-	struct ifnet *ifp = sc->ifp;
-	size_t ccs;
-	u_int8_t cmd, status;
-	int ccsi;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	if ((sc == NULL) || (sc->sc_gone))
-		return;
-
-	/*
-	 * Check that the interrupt was for us, if so get the rcs/ccs
-	 * and vector on the command contained within it.
-	 */
-	if (RAY_HCS_INTR(sc)) {
-		ccsi = SRAM_READ_1(sc, RAY_SCB_RCSI);
-		ccs = RAY_CCS_ADDRESS(ccsi);
-		cmd = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_cmd);
-		status = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_status);
-		if (ccsi <= RAY_CCS_LAST)
-			ray_intr_ccs(sc, cmd, status, ccs);
-		else if (ccsi <= RAY_RCS_LAST)
-			ray_intr_rcs(sc, cmd, ccs);
-		else
-		    RAY_RECERR(sc, "bad ccs index 0x%x", ccsi);
-		RAY_HCS_CLEAR_INTR(sc);
-	}
-
-	/* Send any packets lying around and update error counters */
-	if (!(ifp->if_drv_flags & IFF_DRV_OACTIVE) && (ifp->if_snd.ifq_head != NULL))
-		ray_tx(ifp);
-	if ((++sc->sc_checkcounters % 32) == 0)
-		ray_intr_updt_errcntrs(sc);
-}
-
-/*
- * Read the error counters.
- */
-static void
-ray_intr_updt_errcntrs(struct ray_softc *sc)
-{
-	size_t csc;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	/*
-	 * The card implements the following protocol to keep the
-	 * values from being changed while read: It checks the `own'
-	 * bit and if zero writes the current internal counter value,
-	 * it then sets the `own' bit to 1. If the `own' bit was 1 it
-	 * incremenets its internal counter. The user thus reads the
-	 * counter if the `own' bit is one and then sets the own bit
-	 * to 0.
-	 */
-	csc = RAY_STATUS_BASE;
-	if (SRAM_READ_FIELD_1(sc, csc, ray_csc, csc_mrxo_own)) {
-		sc->sc_rxoverflow +=
-		    SRAM_READ_FIELD_2(sc, csc, ray_csc, csc_mrx_overflow);
-		SRAM_WRITE_FIELD_1(sc, csc, ray_csc, csc_mrxo_own, 0);
-	}
-	if (SRAM_READ_FIELD_1(sc, csc, ray_csc, csc_mrxc_own)) {
-		sc->sc_rxcksum +=
-		    SRAM_READ_FIELD_2(sc, csc, ray_csc, csc_mrx_overflow);
-		SRAM_WRITE_FIELD_1(sc, csc, ray_csc, csc_mrxc_own, 0);
-	}
-	if (SRAM_READ_FIELD_1(sc, csc, ray_csc, csc_rxhc_own)) {
-		sc->sc_rxhcksum +=
-		    SRAM_READ_FIELD_2(sc, csc, ray_csc, csc_rx_hcksum);
-		SRAM_WRITE_FIELD_1(sc, csc, ray_csc, csc_rxhc_own, 0);
-	}
-	sc->sc_rxnoise = SRAM_READ_FIELD_1(sc, csc, ray_csc, csc_rx_noise);
-}
-
-/*
- * Process CCS command completion
- */
-static void
-ray_intr_ccs(struct ray_softc *sc, u_int8_t cmd, u_int8_t status, size_t ccs)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	switch (cmd) {
-
-	case RAY_CMD_DOWNLOAD_PARAMS:
-		RAY_DPRINTF(sc, RAY_DBG_COM, "START_PARAMS");
-		ray_init_download_done(sc, status, ccs);
-		break;
-
-	case RAY_CMD_UPDATE_PARAMS:
-		RAY_DPRINTF(sc, RAY_DBG_COM, "UPDATE_PARAMS");
-		ray_upparams_done(sc, status, ccs);
-		break;
-
-	case RAY_CMD_REPORT_PARAMS:
-		RAY_DPRINTF(sc, RAY_DBG_COM, "REPORT_PARAMS");
-		ray_repparams_done(sc, status, ccs);
-		break;
-
-	case RAY_CMD_UPDATE_MCAST:
-		RAY_DPRINTF(sc, RAY_DBG_COM, "UPDATE_MCAST");
-		ray_mcast_done(sc, status, ccs);
-		break;
-
-	case RAY_CMD_START_NET:
-	case RAY_CMD_JOIN_NET:
-		RAY_DPRINTF(sc, RAY_DBG_COM, "START|JOIN_NET");
-		ray_init_sj_done(sc, status, ccs);
-		break;
-
-	case RAY_CMD_TX_REQ:
-		RAY_DPRINTF(sc, RAY_DBG_COM, "TX_REQ");
-		ray_tx_done(sc, status, ccs);
-		break;
-
-	case RAY_CMD_START_ASSOC:
-		RAY_DPRINTF(sc, RAY_DBG_COM, "START_ASSOC");
-		ray_init_assoc_done(sc, status, ccs);
-		break;
-
-	case RAY_CMD_UPDATE_APM:
-		RAY_RECERR(sc, "unexpected UPDATE_APM");
-		break;
-
-	case RAY_CMD_TEST_MEM:
-		RAY_RECERR(sc, "unexpected TEST_MEM");
-		break;
-
-	case RAY_CMD_SHUTDOWN:
-		RAY_RECERR(sc, "unexpected SHUTDOWN");
-		break;
-
-	case RAY_CMD_DUMP_MEM:
-		RAY_RECERR(sc, "unexpected DUMP_MEM");
-		break;
-
-	case RAY_CMD_START_TIMER:
-		RAY_RECERR(sc, "unexpected START_TIMER");
-		break;
-
-	default:
-		RAY_RECERR(sc, "unknown command 0x%x", cmd);
-		break;
-	}
-}
-
-/*
- * Process ECF command request
- */
-static void
-ray_intr_rcs(struct ray_softc *sc, u_int8_t cmd, size_t rcs)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	switch (cmd) {
-
-	case RAY_ECMD_RX_DONE:
-		RAY_DPRINTF(sc, RAY_DBG_RX, "RX_DONE");
-		ray_rx(sc, rcs);
-		break;
-
-	case RAY_ECMD_REJOIN_DONE:
-		RAY_DPRINTF(sc, RAY_DBG_RX, "REJOIN_DONE");
-		sc->sc_c.np_havenet = 1;
-		break;
-
-	case RAY_ECMD_ROAM_START:
-		RAY_DPRINTF(sc, RAY_DBG_RX, "ROAM_START");
-		sc->sc_c.np_havenet = 0;
-		break;
-
-	case RAY_ECMD_JAPAN_CALL_SIGNAL:
-		RAY_RECERR(sc, "unexpected JAPAN_CALL_SIGNAL");
-		break;
-
-	default:
-		RAY_RECERR(sc, "unknown command 0x%x", cmd);
-		break;
-	}
-
-	RAY_CCS_FREE(sc, rcs);
-}
-
-/*
- * User land entry to multicast list changes
- */
-static int
-ray_mcast_user(struct ray_softc *sc)
-{
-	struct ray_comq_entry *com[2];
-	int error, ncom;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	/*
-	 * Do all checking in the runq to preserve ordering.
-	 *
-	 * We run promisc to pick up changes to the ALL_MULTI
-	 * interface flag.
-	 */
-	ncom = 0;
-	com[ncom++] = RAY_COM_MALLOC(ray_mcast, 0);
-	com[ncom++] = RAY_COM_MALLOC(ray_promisc, 0);
-
-	RAY_COM_RUNQ(sc, com, ncom, "raymcast", error);
-
-	/* XXX no real error processing from anything yet! */
-
-	RAY_COM_FREE(com, ncom);
-
-	return (error);
-}
-
-/*
- * Runq entry to setting the multicast filter list
- *
- * MUST always be followed by a call to ray_promisc to pick up changes
- * to promisc flag
- */
-static void
-ray_mcast(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-	struct ifmultiaddr *ifma;
-	size_t bufp;
-	int count = 0;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	/*
-	 * If card is not running we don't need to update this.
-	 */
-	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "not running");
-		ray_com_runq_done(sc);
-		return;
-	}
-
-	/*
-	 * The multicast list is only 16 items long so use promiscuous
-	 * mode and don't bother updating the multicast list.
-	 */
-	IF_ADDR_LOCK(ifp);
-	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
-		count++;
-	if (count == 0) {
-		IF_ADDR_UNLOCK(ifp);
-		ray_com_runq_done(sc);
-		return;
-	} else if (count > 16) {
-		ifp->if_flags |= IFF_ALLMULTI;
-		IF_ADDR_UNLOCK(ifp);
-		ray_com_runq_done(sc);
-		return;
-	} else if (ifp->if_flags & IFF_ALLMULTI)
-		ifp->if_flags &= ~IFF_ALLMULTI;
-
-	/*
-	 * Kick the card
-	 */
-	ray_ccs_fill(sc, com->c_ccs, RAY_CMD_UPDATE_MCAST);
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs,
-	    ray_cmd_update_mcast, c_nmcast, count);
-	bufp = RAY_HOST_TO_ECF_BASE;
-	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-		SRAM_WRITE_REGION(
-		    sc,
-		    bufp,
-		    LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
-		    ETHER_ADDR_LEN
-		);
-		bufp += ETHER_ADDR_LEN;
-	}
-	IF_ADDR_UNLOCK(ifp);
-
-	ray_com_ecf(sc, com);
-}
-
-/*
- * Complete the multicast filter list update
- */
-static void
-ray_mcast_done(struct ray_softc *sc, u_int8_t status, size_t ccs)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
-	RAY_COM_CHECK(sc, ccs);
-
-	RAY_CCSERR(sc, status, if_oerrors); /* XXX error counter */
-
-	ray_com_ecf_done(sc);
-}
-
-/*
- * Runq entry to set/reset promiscuous mode
- */
-static void
-ray_promisc(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	struct ifnet *ifp = sc->ifp;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	/*
-	 * If card not running or we already have the right flags
-	 * we don't need to update this
-	 */
-	sc->sc_d.np_promisc = !!(ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI));
-	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING) ||
-	    (sc->sc_c.np_promisc == sc->sc_d.np_promisc)) {
-		ray_com_runq_done(sc);
-		return;
-	}
-
-	/*
-	 * Kick the card
-	 */
-	ray_ccs_fill(sc, com->c_ccs, RAY_CMD_UPDATE_PARAMS);
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs,
-	    ray_cmd_update, c_paramid, RAY_MIB_PROMISC);
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs, ray_cmd_update, c_nparam, 1);
-	SRAM_WRITE_1(sc, RAY_HOST_TO_ECF_BASE, sc->sc_d.np_promisc);
-
-	ray_com_ecf(sc, com);
-}
-
-/*
- * User land entry to parameter reporting
- *
- * As we by pass the runq to report current parameters this function
- * only provides a snap shot of the driver's state.
- */
-static int
-ray_repparams_user(struct ray_softc *sc, struct ray_param_req *pr)
-{
-	struct ray_comq_entry *com[1];
-	int error, ncom;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	/*
-	 * Test for illegal values or immediate responses
-	 */
-	if (pr->r_paramid > RAY_MIB_MAX)
-		return (EINVAL);
-	if ((sc->sc_version == RAY_ECFS_BUILD_4) &&
-	    !(mib_info[pr->r_paramid][0] & RAY_V4))
-		return (EINVAL);
-	if ((sc->sc_version == RAY_ECFS_BUILD_5) &&
-	    !(mib_info[pr->r_paramid][0] & RAY_V5))
-		return (EINVAL);
-	if (pr->r_paramid > RAY_MIB_LASTUSER) {
-	    	switch (pr->r_paramid) {
-
-		case  RAY_MIB_VERSION:
-			if (sc->sc_version == RAY_ECFS_BUILD_4)
-			    *pr->r_data = RAY_V4;
-			else
-			    *pr->r_data = RAY_V5;
-			break;
-		case  RAY_MIB_CUR_BSSID:
-		    	bcopy(sc->sc_c.np_bss_id, pr->r_data, ETHER_ADDR_LEN);
-			break;
-		case  RAY_MIB_CUR_INITED:
-		    	*pr->r_data = sc->sc_c.np_inited;
-			break;
-		case  RAY_MIB_CUR_DEF_TXRATE:
-		    	*pr->r_data = sc->sc_c.np_def_txrate;
-			break;
-		case  RAY_MIB_CUR_ENCRYPT:
-		    	*pr->r_data = sc->sc_c.np_encrypt;
-			break;
-		case  RAY_MIB_CUR_NET_TYPE:
-		    	*pr->r_data = sc->sc_c.np_net_type;
-			break;
-		case  RAY_MIB_CUR_SSID:
-		    	bcopy(sc->sc_c.np_ssid, pr->r_data, IEEE80211_NWID_LEN);
-			break;
-		case  RAY_MIB_CUR_PRIV_START:
-		    	*pr->r_data = sc->sc_c.np_priv_start;
-			break;
-		case  RAY_MIB_CUR_PRIV_JOIN:
-		    	*pr->r_data = sc->sc_c.np_priv_join;
-			break;
-		case  RAY_MIB_DES_BSSID:
-		    	bcopy(sc->sc_d.np_bss_id, pr->r_data, ETHER_ADDR_LEN);
-			break;
-		case  RAY_MIB_DES_INITED:
-		    	*pr->r_data = sc->sc_d.np_inited;
-			break;
-		case  RAY_MIB_DES_DEF_TXRATE:
-		    	*pr->r_data = sc->sc_d.np_def_txrate;
-			break;
-		case  RAY_MIB_DES_ENCRYPT:
-		    	*pr->r_data = sc->sc_d.np_encrypt;
-			break;
-		case  RAY_MIB_DES_NET_TYPE:
-		    	*pr->r_data = sc->sc_d.np_net_type;
-			break;
-		case  RAY_MIB_DES_SSID:
-		    	bcopy(sc->sc_d.np_ssid, pr->r_data, IEEE80211_NWID_LEN);
-			break;
-		case  RAY_MIB_DES_PRIV_START:
-		    	*pr->r_data = sc->sc_d.np_priv_start;
-			break;
-		case  RAY_MIB_DES_PRIV_JOIN:
-		    	*pr->r_data = sc->sc_d.np_priv_join;
-			break;
-		case  RAY_MIB_CUR_AP_STATUS:
-		    	*pr->r_data = sc->sc_c.np_ap_status;
-			break;
-		case  RAY_MIB_CUR_PROMISC:
-		    	*pr->r_data = sc->sc_c.np_promisc;
-			break;
-		case  RAY_MIB_DES_AP_STATUS:
-		    	*pr->r_data = sc->sc_d.np_ap_status;
-			break;
-		case  RAY_MIB_DES_PROMISC:
-		    	*pr->r_data = sc->sc_d.np_promisc;
-			break;
-		case RAY_MIB_CUR_FRAMING:
-		    	*pr->r_data = sc->sc_c.np_framing;
-			break;
-		case RAY_MIB_DES_FRAMING:
-		    	*pr->r_data = sc->sc_d.np_framing;
-			break;
-
-		default:
-		    	return (EINVAL);
-			break;
-		}
-		pr->r_failcause = 0;
-		if (sc->sc_version == RAY_ECFS_BUILD_4)
-		    pr->r_len = mib_info[pr->r_paramid][RAY_MIB_INFO_SIZ4];
-		else if (sc->sc_version == RAY_ECFS_BUILD_5)
-		    pr->r_len = mib_info[pr->r_paramid][RAY_MIB_INFO_SIZ5];
-		return (0);
-	}
-
-	pr->r_failcause = 0;
-	ncom = 0;
-	com[ncom++] = RAY_COM_MALLOC(ray_repparams, RAY_COM_FWOK);
-	com[ncom-1]->c_pr = pr;
-
-	RAY_COM_RUNQ(sc, com, ncom, "rayrparm", error);
-
-	/* XXX no real error processing from anything yet! */
-	if (!com[0]->c_retval && pr->r_failcause)
-		error = EINVAL;
-
-	RAY_COM_FREE(com, ncom);
-
-	return (error);
-}
-
-/*
- * Runq entry to read the required parameter
- *
- * The card and driver are happy for parameters to be read
- * whenever the card is plugged in
- */
-static void
-ray_repparams(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	/*
-	 * Kick the card
-	 */
-	ray_ccs_fill(sc, com->c_ccs, RAY_CMD_REPORT_PARAMS);
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs,
-	    ray_cmd_report, c_paramid, com->c_pr->r_paramid);
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs, ray_cmd_report, c_nparam, 1);
-
-	ray_com_ecf(sc, com);
-}
-
-/*
- * Complete the parameter reporting
- */
-static void
-ray_repparams_done(struct ray_softc *sc, u_int8_t status, size_t ccs)
-{
-	struct ray_comq_entry *com;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-	RAY_COM_CHECK(sc, ccs);
-
-	RAY_CCSERR(sc, status, if_oerrors); /* XXX error counter */
-
-	com = TAILQ_FIRST(&sc->sc_comq);
-	com->c_pr->r_failcause =
-	    SRAM_READ_FIELD_1(sc, ccs, ray_cmd_report, c_failcause);
-	com->c_pr->r_len =
-	    SRAM_READ_FIELD_1(sc, ccs, ray_cmd_report, c_len);
-	SRAM_READ_REGION(sc, RAY_ECF_TO_HOST_BASE,
-	    com->c_pr->r_data, com->c_pr->r_len);
-
-	ray_com_ecf_done(sc);
-}
-
-/*
- * User land entry (and exit) to the error counters
- */
-static int
-ray_repstats_user(struct ray_softc *sc, struct ray_stats_req *sr)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	sr->rxoverflow = sc->sc_rxoverflow;
-	sr->rxcksum = sc->sc_rxcksum;
-	sr->rxhcksum = sc->sc_rxhcksum;
-	sr->rxnoise = sc->sc_rxnoise;
-
-	return (0);
-}
-
-/*
- * User land entry to parameter update changes
- *
- * As a parameter change can cause the network parameters to be
- * invalid we have to re-start/join.
- */
-static int
-ray_upparams_user(struct ray_softc *sc, struct ray_param_req *pr)
-{
-	struct ray_comq_entry *com[4];
-	int error, ncom, todo;
-#define RAY_UPP_SJ	0x1
-#define RAY_UPP_PARAMS	0x2
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	/*
-	 * Check that the parameter is available based on firmware version
-	 */
-	pr->r_failcause = 0;
-	if (pr->r_paramid > RAY_MIB_LASTUSER)
-		return (EINVAL);
-	if ((sc->sc_version == RAY_ECFS_BUILD_4) &&
-	    !(mib_info[pr->r_paramid][0] & RAY_V4))
-		return (EINVAL);
-	if ((sc->sc_version == RAY_ECFS_BUILD_5) &&
-	    !(mib_info[pr->r_paramid][0] & RAY_V5))
-		return (EINVAL);
-
-	/*
-	 * Handle certain parameters specially
-	 */
-	todo = 0;
-	switch (pr->r_paramid) {
-	case RAY_MIB_NET_TYPE:		/* Updated via START_NET JOIN_NET  */
-		sc->sc_d.np_net_type = *pr->r_data;
-		todo |= RAY_UPP_SJ;
-		break;
-
-	case RAY_MIB_SSID:		/* Updated via START_NET JOIN_NET  */
-		bcopy(pr->r_data, sc->sc_d.np_ssid, IEEE80211_NWID_LEN);
-		todo |= RAY_UPP_SJ;
-		break;
-
-	case RAY_MIB_PRIVACY_MUST_START:/* Updated via START_NET */
-		if (sc->sc_c.np_net_type != RAY_MIB_NET_TYPE_ADHOC)
-			return (EINVAL);
-		sc->sc_d.np_priv_start = *pr->r_data;
-		todo |= RAY_UPP_SJ;
-		break;
-
-	case RAY_MIB_PRIVACY_CAN_JOIN:	/* Updated via START_NET JOIN_NET  */
-		sc->sc_d.np_priv_join = *pr->r_data;
-		todo |= RAY_UPP_SJ;
-		break;
-
-	case RAY_MIB_BASIC_RATE_SET:
-		sc->sc_d.np_def_txrate = *pr->r_data;
-		todo |= RAY_UPP_PARAMS;
-		break;
-
-	case RAY_MIB_AP_STATUS:	/* Unsupported */
-	case RAY_MIB_MAC_ADDR:	/* XXX Need interface up but could be done */
-	case RAY_MIB_PROMISC:	/* BPF */
-		return (EINVAL);
-		break;
-
-	default:
-		todo |= RAY_UPP_PARAMS;
-		todo |= RAY_UPP_SJ;
-		break;
-	}
-
-	/*
-	 * Generate the runq entries as needed
-	 */
-	ncom = 0;
-	if (todo & RAY_UPP_PARAMS) {
-		com[ncom++] = RAY_COM_MALLOC(ray_upparams, 0);
-		com[ncom-1]->c_pr = pr;
-	}
-	if (todo & RAY_UPP_SJ) {
-		com[ncom++] = RAY_COM_MALLOC(ray_init_sj, 0);
-		com[ncom++] = RAY_COM_MALLOC(ray_init_auth, 0);
-		com[ncom++] = RAY_COM_MALLOC(ray_init_assoc, 0);
-	}
-
-	RAY_COM_RUNQ(sc, com, ncom, "rayuparam", error);
-
-	/* XXX no real error processing from anything yet! */
-	if (!com[0]->c_retval && pr->r_failcause)
-		error = EINVAL;
-
-	RAY_COM_FREE(com, ncom);
-
-	return (error);
-}
-
-/*
- * Runq entry to update a parameter
- *
- * The card and driver are basically happy for parameters to be updated
- * whenever the card is plugged in. However, there may be a couple of
- * network hangs whilst the update is performed. Reading parameters back
- * straight away may give the wrong answer and some parameters cannot be
- * read at all. Local copies should be kept.
- */
-static void
-ray_upparams(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-
-	ray_ccs_fill(sc, com->c_ccs, RAY_CMD_UPDATE_PARAMS);
-
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs,
-	    ray_cmd_update, c_paramid, com->c_pr->r_paramid);
-	SRAM_WRITE_FIELD_1(sc, com->c_ccs, ray_cmd_update, c_nparam, 1);
-	SRAM_WRITE_REGION(sc, RAY_HOST_TO_ECF_BASE,
-	    com->c_pr->r_data, com->c_pr->r_len);
-
-	ray_com_ecf(sc, com);
-}
-
-/*
- * Complete the parameter update, note that promisc finishes up here too
- */
-static void
-ray_upparams_done(struct ray_softc *sc, u_int8_t status, size_t ccs)
-{
-	struct ray_comq_entry *com;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-	RAY_MAP_CM(sc);
-	RAY_COM_CHECK(sc, ccs);
-
-	RAY_CCSERR(sc, status, if_oerrors); /* XXX error counter */
-
-	com = TAILQ_FIRST(&sc->sc_comq);
-
-	switch (SRAM_READ_FIELD_1(sc, ccs, ray_cmd_update, c_paramid)) {
-
-	case RAY_MIB_PROMISC:
-		sc->sc_c.np_promisc = SRAM_READ_1(sc, RAY_HOST_TO_ECF_BASE);
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL,
-		    "promisc value %d", sc->sc_c.np_promisc);
-		break;
-
-	default:
-		com->c_pr->r_failcause =
-		    SRAM_READ_FIELD_1(sc, ccs, ray_cmd_update, c_failcause);
-		break;
-
-	}
-
-	ray_com_ecf_done(sc);
-}
-
-/*
- * Command queuing and execution
- */
-
-/*
- * Set up a comq entry struct
- */
-static struct ray_comq_entry *
-ray_com_init(struct ray_comq_entry *com, ray_comqfn_t function, int flags, char *mesg)
-{
-	com->c_function = function;
-	com->c_flags = flags;
-	com->c_retval = 0;
-	com->c_ccs = 0;
-	com->c_wakeup = NULL;
-	com->c_pr = NULL;
-	com->c_mesg = mesg;
-
-	return (com);
-}
-
-/*
- * Malloc and set up a comq entry struct
- */
-static struct ray_comq_entry *
-ray_com_malloc(ray_comqfn_t function, int flags, char *mesg)
-{
-	struct ray_comq_entry *com;
-
-	com = malloc(sizeof(struct ray_comq_entry), M_RAYCOM, M_WAITOK);
-    
-	return (ray_com_init(com, function, flags, mesg));
-}
-
-/*
- * Add an array of commands to the runq, get some ccs's for them and
- * then run, waiting on the last command.
- *
- * We add the commands to the queue first to preserve ioctl ordering.
- *
- * On recoverable errors, this routine removes the entries from the
- * runq. A caller can requeue the commands (and still preserve its own
- * processes ioctl ordering) but doesn't have to. When the card is
- * detached we get out quickly to prevent panics and don't bother
- * about the runq.
- */
-static int
-ray_com_runq_add(struct ray_softc *sc, struct ray_comq_entry *com[], int ncom, char *wmesg)
-{
-	int i, error;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_COM, "");
-
-	error = 0;
-	/*
-	 * Add the commands to the runq but don't let it run until
-	 * the ccs's are allocated successfully
-	 */
-	com[0]->c_flags |= RAY_COM_FWAIT;
-	for (i = 0; i < ncom; i++) {
-		com[i]->c_wakeup = com[ncom-1];
-		RAY_DPRINTF(sc, RAY_DBG_COM, "adding %p", com[i]);
-		RAY_DCOM(sc, RAY_DBG_DCOM, com[i], "adding");
-		TAILQ_INSERT_TAIL(&sc->sc_comq, com[i], c_chain);
-	}
-	com[ncom-1]->c_flags |= RAY_COM_FWOK;
-
-	/*
-	 * Allocate ccs's for each command.
-	 */
-	for (i = 0; i < ncom; i++) {
-		error = ray_ccs_alloc(sc, &com[i]->c_ccs, wmesg);
-		if (error == ENXIO)
-			return (ENXIO);
-		else if (error)
-			goto cleanup;
-	}
-
-	/*
-	 * Allow the queue to run and sleep if needed.
-	 *
-	 * Iff the FDETACHED flag is set in the com entry we waited on
-	 * the driver is in a zombie state! The softc structure has been
-	 * freed by the generic bus detach methods - eek. We tread very
-	 * carefully!
-	 */
-	com[0]->c_flags &= ~RAY_COM_FWAIT;
-	ray_com_runq(sc);
-	if (TAILQ_FIRST(&sc->sc_comq) != NULL) {
-		RAY_DPRINTF(sc, RAY_DBG_COM, "sleeping");
-		error = tsleep(com[ncom-1], PCATCH | PRIBIO, wmesg, 0);
-		if (com[ncom-1]->c_flags & RAY_COM_FDETACHED)
-			return (ENXIO);
-		RAY_DPRINTF(sc, RAY_DBG_COM,
-		    "awakened, tsleep returned 0x%x", error);
-	} else
-		error = 0;
-
-cleanup:
-	/*
-	 * Only clean the queue on real errors - we don't care about it
-	 * when we detach as the queue entries are freed by the callers.
-	 */
-	if (error && (error != ENXIO))
-		for (i = 0; i < ncom; i++)
-		    	if (!(com[i]->c_flags & RAY_COM_FCOMPLETED)) {
-				RAY_DPRINTF(sc, RAY_DBG_COM, "removing %p",
-				    com[i]);
-				RAY_DCOM(sc, RAY_DBG_DCOM, com[i], "removing");
-				TAILQ_REMOVE(&sc->sc_comq, com[i], c_chain);
-				ray_ccs_free(sc, com[i]->c_ccs);
-				com[i]->c_ccs = 0;
-			}
-
-	return (error);
-}
-
-/*
- * Run the command at the head of the queue (if not already running)
- */
-static void
-ray_com_runq(struct ray_softc *sc)
-{
-	struct ray_comq_entry *com;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_COM, "");
-
-	com = TAILQ_FIRST(&sc->sc_comq);
-	if ((com == NULL) ||
-	    (com->c_flags & RAY_COM_FRUNNING) ||
-	    (com->c_flags & RAY_COM_FWAIT) ||
-	    (com->c_flags & RAY_COM_FDETACHED))
-		return;
-
-	com->c_flags |= RAY_COM_FRUNNING;
-	RAY_DPRINTF(sc, RAY_DBG_COM, "running %p", com);
-	RAY_DCOM(sc, RAY_DBG_DCOM, com, "running");
-	com->c_function(sc, com);
-}
-
-/*
- * Remove run command, free ccs and wakeup caller.
- *
- * Minimal checks are done here as we ensure that the com and command
- * handler were matched up earlier. Must be called at splnet or higher
- * so that entries on the command queue are correctly removed.
- *
- * Remove the com from the comq, and wakeup the caller if it requested
- * to be woken. This is used for ensuring a sequence of commands
- * completes. Finally, re-run the queue.
- */
-static void
-ray_com_runq_done(struct ray_softc *sc)
-{
-    	struct ray_comq_entry *com;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_COM, "");
-
-	com = TAILQ_FIRST(&sc->sc_comq); /* XXX shall we check this as below */
-	RAY_DPRINTF(sc, RAY_DBG_COM, "removing %p", com);
-	RAY_DCOM(sc, RAY_DBG_DCOM, com, "removing");
-	TAILQ_REMOVE(&sc->sc_comq, com, c_chain);
-
-	com->c_flags &= ~RAY_COM_FRUNNING;
-	com->c_flags |= RAY_COM_FCOMPLETED;
-	com->c_retval = 0;
-	ray_ccs_free(sc, com->c_ccs);
-	com->c_ccs = 0;
-
-	if (com->c_flags & RAY_COM_FWOK)
-		wakeup(com->c_wakeup);
-
-	ray_com_runq(sc);
-
-	/* XXX what about error on completion then? deal with when i fix
-	 * XXX the status checking
-	 *
-	 * XXX all the runq_done calls from IFF_DRV_RUNNING checks in runq
-	 * XXX routines should return EIO but shouldn't abort the runq
-	 */
-}
-
-/*
- * Send a command to the ECF.
- */
-static void
-ray_com_ecf(struct ray_softc *sc, struct ray_comq_entry *com)
-{
-	int i = 0;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_COM, "");
-	RAY_MAP_CM(sc);
-
-	while (!RAY_ECF_READY(sc)) {
-		DELAY(RAY_ECF_SPIN_DELAY);
-		if (++i > RAY_ECF_SPIN_TRIES)
-			RAY_PANIC(sc, "spun too long");
-	}
-	if (i != 0)
-		RAY_RECERR(sc, "spun %d times", i);
-
-	RAY_DPRINTF(sc, RAY_DBG_COM, "sending %p", com);
-	RAY_DCOM(sc, RAY_DBG_DCOM, com, "sending");
-	SRAM_WRITE_1(sc, RAY_SCB_CCSI, RAY_CCS_INDEX(com->c_ccs));
-	RAY_ECF_START_CMD(sc);
-
-	if (RAY_COM_NEEDS_TIMO(
-	    SRAM_READ_FIELD_1(sc, com->c_ccs, ray_cmd, c_cmd))) {
-	    	RAY_DPRINTF(sc, RAY_DBG_COM, "adding timeout");
-		sc->com_timerh = timeout(ray_com_ecf_timo, sc, RAY_COM_TIMEOUT);
-	}
-}
-
-/*
- * Deal with commands that require a timeout to test completion.
- *
- * This routine is coded to only expect one outstanding request for the
- * timed out requests at a time, but thats all that can be outstanding
- * per hardware limitations and all that we issue anyway.
- *
- * We don't do any fancy testing of the command currently issued as we
- * know it must be a timeout based one...unless I've got this wrong!
- */
-static void
-ray_com_ecf_timo(void *xsc)
-{
-	struct ray_softc *sc = (struct ray_softc *)xsc;
-    	struct ray_comq_entry *com;
-	u_int8_t cmd, status;
-	int s;
-
-	s = splnet();
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_COM, "");
-	RAY_MAP_CM(sc);
-
-	com = TAILQ_FIRST(&sc->sc_comq);
-
-	cmd = SRAM_READ_FIELD_1(sc, com->c_ccs, ray_cmd, c_cmd);
-	status = SRAM_READ_FIELD_1(sc, com->c_ccs, ray_cmd, c_status);
-	switch (status) {
-
-	case RAY_CCS_STATUS_COMPLETE:
-	case RAY_CCS_STATUS_FREE:			/* Buggy firmware */
-		ray_intr_ccs(sc, cmd, status, com->c_ccs);
-		break;
-
-	case RAY_CCS_STATUS_BUSY:
-		sc->com_timerh = timeout(ray_com_ecf_timo, sc, RAY_COM_TIMEOUT);
-		break;
-
-	default:					/* Replicates NetBSD */
-		if (sc->sc_ccsinuse[RAY_CCS_INDEX(com->c_ccs)] == 1) {
-			/* give a chance for the interrupt to occur */
-			sc->sc_ccsinuse[RAY_CCS_INDEX(com->c_ccs)] = 2;
-			sc->com_timerh = timeout(ray_com_ecf_timo, sc,
-			    RAY_COM_TIMEOUT);
-		} else
-			ray_intr_ccs(sc, cmd, status, com->c_ccs);
-		break;
-
-	}
-
-	splx(s);
-}
-
-/*
- * Called when interrupt handler for the command has done all it
- * needs to. Will be called at splnet.
- */
-static void
-ray_com_ecf_done(struct ray_softc *sc)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_COM, "");
-
-	untimeout(ray_com_ecf_timo, sc, sc->com_timerh);
-
-	ray_com_runq_done(sc);
-}
-
-#if RAY_DEBUG & RAY_DBG_COM
-/*
- * Process completed ECF commands that probably came from the command queue
- *
- * This routine is called after vectoring the completed ECF command
- * to the appropriate _done routine. It helps check everything is okay.
- */
-static void
-ray_com_ecf_check(struct ray_softc *sc, size_t ccs, char *mesg)
-{
-    	struct ray_comq_entry *com;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_COM, "%s", mesg);
-
-	com = TAILQ_FIRST(&sc->sc_comq);
-
-	if (com == NULL)
-		RAY_PANIC(sc, "no command queue");
-	if (com->c_ccs != ccs)
-		RAY_PANIC(sc, "ccs's don't match");
-}
-#endif /* RAY_DEBUG & RAY_DBG_COM */
-
-/*
- * CCS allocators
- */
-
-/*
- * Obtain a ccs for a commmand
- *
- * Returns 0 and in `ccsp' the bus offset of the free ccs. Will block
- * awaiting free ccs if needed - if the sleep is interrupted
- * EINTR/ERESTART is returned, if the card is ejected we return ENXIO.
- */
-static int
-ray_ccs_alloc(struct ray_softc *sc, size_t *ccsp, char *wmesg)
-{
-	size_t ccs;
-	u_int i;
-	int error;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_CCS, "");
-	RAY_MAP_CM(sc);
-
-	for (;;) {
-		for (i = RAY_CCS_CMD_FIRST; i <= RAY_CCS_CMD_LAST; i++) {
-			/* we probe here to make the card go */
-			(void)SRAM_READ_FIELD_1(sc, RAY_CCS_ADDRESS(i), ray_cmd,
-			    c_status);
-			if (!sc->sc_ccsinuse[i])
-				break;
-		}
-		if (i > RAY_CCS_CMD_LAST) {
-			RAY_DPRINTF(sc, RAY_DBG_CCS, "sleeping");
-			error = tsleep(ray_ccs_alloc, PCATCH | PRIBIO,
-			    wmesg, 0);
-			if ((sc == NULL) || (sc->sc_gone))
-				return (ENXIO);
-			RAY_DPRINTF(sc, RAY_DBG_CCS,
-			    "awakened, tsleep returned 0x%x", error);
-			if (error)
-				return (error);
-		} else
-			break;
-	}
-	RAY_DPRINTF(sc, RAY_DBG_CCS, "allocated 0x%02x", i);
-	sc->sc_ccsinuse[i] = 1;
-	ccs = RAY_CCS_ADDRESS(i);
-	*ccsp = ccs;
-
-	return (0);
-}
-
-/*
- * Fill the easy bits in of a pre-allocated CCS
- */
-static void
-ray_ccs_fill(struct ray_softc *sc, size_t ccs, u_int cmd)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_CCS, "");
-	RAY_MAP_CM(sc);
-
-	if (ccs == 0)
-		RAY_PANIC(sc, "ccs not allocated");
-
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd, c_status, RAY_CCS_STATUS_BUSY);
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd, c_cmd, cmd);
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd, c_link, RAY_CCS_LINK_NULL);
-}
-
-/*
- * Free up a ccs allocated via ray_ccs_alloc
- *
- * Return the old status. This routine is only used for ccs allocated via
- * ray_ccs_alloc (not tx, rx or ECF command requests).
- */
-static void
-ray_ccs_free(struct ray_softc *sc, size_t ccs)
-{
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_CCS, "");
-	RAY_MAP_CM(sc);
-
-#if 1 | (RAY_DEBUG & RAY_DBG_CCS)
-	if (!sc->sc_ccsinuse[RAY_CCS_INDEX(ccs)])
-		RAY_RECERR(sc, "freeing free ccs 0x%02zx", RAY_CCS_INDEX(ccs));
-#endif /* RAY_DEBUG & RAY_DBG_CCS */
-	if (!sc->sc_gone)
-		RAY_CCS_FREE(sc, ccs);
-	sc->sc_ccsinuse[RAY_CCS_INDEX(ccs)] = 0;
-	RAY_DPRINTF(sc, RAY_DBG_CCS, "freed 0x%02zx", RAY_CCS_INDEX(ccs));
-	wakeup(ray_ccs_alloc);
-}
-
-/*
- * Obtain a ccs and tx buffer to transmit with and fill them in.
- *
- * Returns 0 and in `ccsp' the bus offset of the free ccs. Will not block
- * and if none available and will returns EAGAIN.
- *
- * The caller must fill in the length later.
- * The caller must clear the ccs on errors.
- */
-static int
-ray_ccs_tx(struct ray_softc *sc, size_t *ccsp, size_t *bufpp)
-{
-	size_t ccs, bufp;
-	int i;
-	u_int8_t status;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_CCS, "");
-	RAY_MAP_CM(sc);
-
-	i = RAY_CCS_TX_FIRST;
-	do {
-		status = SRAM_READ_FIELD_1(sc, RAY_CCS_ADDRESS(i),
-		    ray_cmd, c_status);
-		if (status == RAY_CCS_STATUS_FREE)
-			break;
-		i++;
-	} while (i <= RAY_CCS_TX_LAST);
-	if (i > RAY_CCS_TX_LAST) {
-		return (EAGAIN);
-	}
-	RAY_DPRINTF(sc, RAY_DBG_CCS, "allocated 0x%02x", i);
-
-	/*
-	 * Reserve and fill the ccs - must do the length later.
-	 *
-	 * Even though build 4 and build 5 have different fields all these
-	 * are common apart from tx_rate. Neither the NetBSD driver or Linux
-	 * driver bother to overwrite this for build 4 cards.
-	 *
-	 * The start of the buffer must be aligned to a 256 byte boundary
-	 * (least significant byte of address = 0x00).
-	 */
-	ccs = RAY_CCS_ADDRESS(i);
-	bufp = RAY_TX_BASE + i * RAY_TX_BUF_SIZE;
-	bufp += sc->sc_tibsize;
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd_tx, c_status, RAY_CCS_STATUS_BUSY);
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd_tx, c_cmd, RAY_CMD_TX_REQ);
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd_tx, c_link, RAY_CCS_LINK_NULL);
-	SRAM_WRITE_FIELD_2(sc, ccs, ray_cmd_tx, c_bufp, bufp);
-	SRAM_WRITE_FIELD_1(sc,
-	    ccs, ray_cmd_tx, c_tx_rate, sc->sc_c.np_def_txrate);
-	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd_tx, c_apm_mode, 0);
-	bufp += sizeof(struct ray_tx_phy_header);
-
-	*ccsp = ccs;
-	*bufpp = bufp;
-    	return (0);
-}
-
-/*
- * Routines to obtain resources for the card
- */
-
-/*
- * Allocate the attribute memory on the card
- *
- * The attribute memory space is abused by these devices as IO space. As such
- * the OS card services don't have a chance of knowing that they need to keep
- * the attribute space mapped. We have to do it manually.
- */
-static int
-ray_res_alloc_am(struct ray_softc *sc)
-{
-	int error;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_CM, "");
-
-	sc->am_rid = RAY_AM_RID;
-	sc->am_res = bus_alloc_resource(sc->dev, SYS_RES_MEMORY,
-	    &sc->am_rid, 0UL, ~0UL, 0x1000, RF_ACTIVE);
-	if (!sc->am_res) {
-		RAY_PRINTF(sc, "Cannot allocate attribute memory");
-		return (ENOMEM);
-	}
-	error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->dev), sc->dev,
-	    sc->am_rid, 0, NULL);
-	if (error) {
-		RAY_PRINTF(sc, "CARD_SET_MEMORY_OFFSET returned 0x%0x", error);
-		return (error);
-	}
-	error = CARD_SET_RES_FLAGS(device_get_parent(sc->dev), sc->dev,
-	    SYS_RES_MEMORY, sc->am_rid, PCCARD_A_MEM_ATTR);
-	if (error) {
-		RAY_PRINTF(sc, "CARD_SET_RES_FLAGS returned 0x%0x", error);
-		return (error);
-	}
-	error = CARD_SET_RES_FLAGS(device_get_parent(sc->dev), sc->dev,
-	    SYS_RES_MEMORY, sc->am_rid, PCCARD_A_MEM_8BIT);
-	if (error) {
-		RAY_PRINTF(sc, "CARD_SET_RES_FLAGS returned 0x%0x", error);
-		return (error);
-	}
-	sc->am_bsh = rman_get_bushandle(sc->am_res);
-	sc->am_bst = rman_get_bustag(sc->am_res);
-
-#if RAY_DEBUG & (RAY_DBG_CM | RAY_DBG_BOOTPARAM)
-{
-    	u_long flags;
-	u_int32_t offset;
-	CARD_GET_RES_FLAGS(device_get_parent(sc->dev), sc->dev,
-	    SYS_RES_MEMORY, sc->am_rid, &flags);
-	CARD_GET_MEMORY_OFFSET(device_get_parent(sc->dev), sc->dev,
-	    sc->am_rid, &offset);
-	RAY_PRINTF(sc, "allocated attribute memory:\n"
-	    ".  start 0x%0lx count 0x%0lx flags 0x%0lx offset 0x%0x",
-	    bus_get_resource_start(sc->dev, SYS_RES_MEMORY, sc->am_rid),
-	    bus_get_resource_count(sc->dev, SYS_RES_MEMORY, sc->am_rid),
-	    flags, offset);
-}
-#endif /* RAY_DEBUG & (RAY_DBG_CM | RAY_DBG_BOOTPARAM) */
-
-	return (0);
-}
-
-/*
- * Allocate the common memory on the card
- *
- * As this memory is described in the CIS, the OS card services should
- * have set the map up okay, but the card uses 8 bit RAM. This is not
- * described in the CIS.
- */
-static int
-ray_res_alloc_cm(struct ray_softc *sc)
-{
-	u_long start, count, end;
-	int error;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_CM, "");
-
-	RAY_DPRINTF(sc,RAY_DBG_CM | RAY_DBG_BOOTPARAM,
-	    "cm start 0x%0lx count 0x%0lx",
-	    bus_get_resource_start(sc->dev, SYS_RES_MEMORY, RAY_CM_RID),
-	    bus_get_resource_count(sc->dev, SYS_RES_MEMORY, RAY_CM_RID));
-
-	sc->cm_rid = RAY_CM_RID;
-	start = bus_get_resource_start(sc->dev, SYS_RES_MEMORY, sc->cm_rid);
-	count = bus_get_resource_count(sc->dev, SYS_RES_MEMORY, sc->cm_rid);
-	end = start + count - 1;
-	sc->cm_res = bus_alloc_resource(sc->dev, SYS_RES_MEMORY,
-	    &sc->cm_rid, start, end, count, RF_ACTIVE);
-	if (!sc->cm_res) {
-		RAY_PRINTF(sc, "Cannot allocate common memory");
-		return (ENOMEM);
-	}
-	error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->dev), sc->dev,
-	    sc->cm_rid, 0, NULL);
-	if (error) {
-		RAY_PRINTF(sc, "CARD_SET_MEMORY_OFFSET returned 0x%0x", error);
-		return (error);
-	}
-	error = CARD_SET_RES_FLAGS(device_get_parent(sc->dev), sc->dev,
-	    SYS_RES_MEMORY, sc->cm_rid, PCCARD_A_MEM_COM);
-	if (error) {
-		RAY_PRINTF(sc, "CARD_SET_RES_FLAGS returned 0x%0x", error);
-		return (error);
-	}
-	error = CARD_SET_RES_FLAGS(device_get_parent(sc->dev), sc->dev,
-	    SYS_RES_MEMORY, sc->cm_rid, PCCARD_A_MEM_8BIT);
-	if (error) {
-		RAY_PRINTF(sc, "CARD_SET_RES_FLAGS returned 0x%0x", error);
-		return (error);
-	}
-	sc->cm_bsh = rman_get_bushandle(sc->cm_res);
-	sc->cm_bst = rman_get_bustag(sc->cm_res);
-
-#if RAY_DEBUG & (RAY_DBG_CM | RAY_DBG_BOOTPARAM)
-{
-	u_long flags;
-	u_int32_t offset;
-	CARD_GET_RES_FLAGS(device_get_parent(sc->dev), sc->dev,
-	    SYS_RES_MEMORY, sc->cm_rid, &flags);
-	CARD_GET_MEMORY_OFFSET(device_get_parent(sc->dev), sc->dev,
-	    sc->cm_rid, &offset);
-	RAY_PRINTF(sc, "allocated common memory:\n"
-	    ".  start 0x%0lx count 0x%0lx flags 0x%0lx offset 0x%0x",
-	    bus_get_resource_start(sc->dev, SYS_RES_MEMORY, sc->cm_rid),
-	    bus_get_resource_count(sc->dev, SYS_RES_MEMORY, sc->cm_rid),
-	    flags, offset);
-}
-#endif /* RAY_DEBUG & (RAY_DBG_CM | RAY_DBG_BOOTPARAM) */
-
-	return (0);
-}
-
-/*
- * Get an irq and attach it to the bus
- */
-static int
-ray_res_alloc_irq(struct ray_softc *sc)
-{
-	int error;
-
-	RAY_DPRINTF(sc, RAY_DBG_SUBR, "");
-
-	RAY_DPRINTF(sc,RAY_DBG_CM | RAY_DBG_BOOTPARAM,
-	    "irq start 0x%0lx count 0x%0lx",
-	    bus_get_resource_start(sc->dev, SYS_RES_IRQ, 0),
-	    bus_get_resource_count(sc->dev, SYS_RES_IRQ, 0));
-
-	sc->irq_rid = 0;
-	sc->irq_res = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, &sc->irq_rid,
-	    RF_ACTIVE);
-	if (!sc->irq_res) {
-		RAY_PRINTF(sc, "Cannot allocate irq");
-		return (ENOMEM);
-	}
-	if ((error = bus_setup_intr(sc->dev, sc->irq_res, INTR_TYPE_NET,
-	    NULL, ray_intr, sc, &sc->irq_handle)) != 0) {
-		RAY_PRINTF(sc, "Failed to setup irq");
-		return (error);
-	}
-	RAY_DPRINTF(sc, RAY_DBG_CM | RAY_DBG_BOOTPARAM, "allocated irq:\n"
-	    ".  start 0x%0lx count 0x%0lx",
-	    bus_get_resource_start(sc->dev, SYS_RES_IRQ, sc->irq_rid),
-	    bus_get_resource_count(sc->dev, SYS_RES_IRQ, sc->irq_rid));
-
-	return (0);
-}
-
-/*
- * Release all of the card's resources
- */
-static void
-ray_res_release(struct ray_softc *sc)
-{
-	if (sc->irq_res != 0) {
-		bus_teardown_intr(sc->dev, sc->irq_res, sc->irq_handle);
-		bus_release_resource(sc->dev, SYS_RES_IRQ,
-		    sc->irq_rid, sc->irq_res);
-		sc->irq_res = 0;
-	}
-	if (sc->am_res != 0) {
-		bus_release_resource(sc->dev, SYS_RES_MEMORY,
-		    sc->am_rid, sc->am_res);
-		sc->am_res = 0;
-	}
-	if (sc->cm_res != 0) {
-		bus_release_resource(sc->dev, SYS_RES_MEMORY,
-		    sc->cm_rid, sc->cm_res);
-		sc->cm_res = 0;
-	}
-}
-
-/*
- * mbuf dump
- */
-#if RAY_DEBUG & RAY_DBG_MBUF
-static void
-ray_dump_mbuf(struct ray_softc *sc, struct mbuf *m, char *s)
-{
-	u_int8_t *d, *ed;
-	u_int i;
-	char p[17];
-
-	RAY_PRINTF(sc, "%s", s);
-	RAY_PRINTF(sc, "\nm0->data\t0x%p\nm_pkthdr.len\t%d\nm_len\t%d",
-	    mtod(m, u_int8_t *), m->m_pkthdr.len, m->m_len);
-	i = 0;
-	bzero(p, 17);
-	for (; m; m = m->m_next) {
-		d = mtod(m, u_int8_t *);
-		ed = d + m->m_len;
-
-		for (; d < ed; i++, d++) {
-			if ((i % 16) == 0) {
-				printf("  %s\n\t", p);
-			} else if ((i % 8) == 0)
-				printf("  ");
-			printf(" %02x", *d);
-			p[i % 16] = ((*d >= 0x20) && (*d < 0x80)) ? *d : '.';
-		}
-	}
-	if ((i - 1) % 16)
-		printf("  %s\n", p);
-}
-#endif /* RAY_DEBUG & RAY_DBG_MBUF */
diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h
deleted file mode 100644
index 4981da6..0000000
--- a/sys/dev/ray/if_raydbg.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * Copyright (C) 2000
- * Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
- *
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DUNCAN BARCLAY 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 DUNCAN BARCLAY 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.
- *
- * $FreeBSD$
- *
- */
-
-/*
- * Debugging odds and odds
- */
-
-/*
- * RAY_DEBUG settings
- *
- *	AUTH		Authentication
- *	SUBR		Subroutine entry
- *	BOOTPARAM	Startup CM dump
- *	STARTJOIN	State transitions for start/join
- *	CCS		CCS info
- *	IOCTL		IOCTL calls
- *	MBUF		MBUFs dumped - needs one of TX, RX, MGT, or CTL
- *	RX		packet types reported
- *	CM		common memory re-mapping
- *	COM		new command sleep/wakeup
- *	STOP		driver detaching
- *	CTL		CTL packets
- *	MGT		MGT packets
- *	TX		TX routine info
- *	DCOM		dump comq entries
- */
-#define RAY_DBG_AUTH		0x0001
-#define RAY_DBG_SUBR		0x0002
-#define RAY_DBG_BOOTPARAM	0x0004
-#define RAY_DBG_STARTJOIN	0x0008
-#define RAY_DBG_CCS		0x0010
-#define RAY_DBG_IOCTL		0x0020
-#define RAY_DBG_MBUF		0x0080
-#define RAY_DBG_RX		0x0100
-#define RAY_DBG_CM		0x0200
-#define RAY_DBG_COM		0x0400
-#define RAY_DBG_STOP		0x0800
-#define RAY_DBG_CTL		0x1000
-#define RAY_DBG_MGT		0x2000
-#define RAY_DBG_TX		0x4000
-#define RAY_DBG_DCOM		0x8000
-/* Cut and paste this into a kernel configuration file */
-#if 0
-#define RAY_DEBUG	(				\
- 			/* RAY_DBG_SUBR		| */ 	\
-			/* RAY_DBG_BOOTPARAM	| */	\
-			/* RAY_DBG_STARTJOIN	| */	\
-			/* RAY_DBG_CCS		| */	\
-                        /* RAY_DBG_IOCTL	| */	\
-                        /* RAY_DBG_MBUF		| */ 	\
-                        /* RAY_DBG_RX		| */	\
-                        /* RAY_DBG_CM		| */	\
-                        /* RAY_DBG_COM		| */	\
-                        /* RAY_DBG_STOP		| */	\
-                        /* RAY_DBG_CTL		| */ 	\
-                        /* RAY_DBG_MGT		| */  	\
-                        /* RAY_DBG_TX		| */  	\
-                        /* RAY_DBG_DCOM		| */  	\
-			0				\
-			)
-#endif
-
-#if RAY_DEBUG
-
-#define RAY_DPRINTF(sc, mask, fmt, args...) do {if (RAY_DEBUG & (mask)) {\
-    device_printf((sc)->dev, "%s(%d) " fmt "\n",			\
-    	__func__ , __LINE__ , ##args);					\
-} } while (0)
-
-/* This macro assumes that common memory is mapped into kernel space */
-#define RAY_DHEX8(sc, mask, off, len, s) do { if (RAY_DEBUG & (mask)) {	\
-    int i, j;								\
-    device_printf((sc)->dev, "%s(%d) %s\n",				\
-    	__func__ , __LINE__ , (s));					\
-    for (i = (off); i < (off)+(len); i += 8) {				\
-	    printf(".  0x%04x ", i);					\
-	    for (j = 0; j < 8; j++)					\
-		    printf("%02x ", SRAM_READ_1((sc), i+j));		\
-	    printf("\n");						\
-    }									\
-} } while (0)
-
-#define RAY_DCOM(sc, mask, com, s) do { if (RAY_DEBUG & (mask)) {	\
-    device_printf((sc)->dev, "%s(%d) %s com entry 0x%p\n",		\
-        __func__ , __LINE__ , (s) , (com));				\
-    printf(".  c_mesg %s\n", (com)->c_mesg);				\
-    printf(".  c_flags 0x%b\n", (com)->c_flags, RAY_COM_FLAGS_PRINTFB);	\
-    printf(".  c_retval 0x%x\n", (com)->c_retval);			\
-    printf(".  c_ccs 0x%0x index 0x%02x\n",				\
-        (com)->c_ccs, RAY_CCS_INDEX((com)->c_ccs));			\
-} } while (0)
-
-#else
-#define RAY_DPRINTF(sc, mask, fmt, args...)
-#define RAY_DHEX8(sc, mask, off, len, s)
-#define RAY_DCOM(sc, mask, com, s)
-#endif /* RAY_DEBUG > 0 */
-
-/*
- * These override macros defined in if_ray.c to turn them into
- * debugging ones.
- */
-#if RAY_DEBUG
-#define RAY_RECERR(sc, fmt, args...) do {				\
-    device_printf((sc)->dev, "%s(%d) " fmt "\n",			\
-	__func__ , __LINE__ , ##args);					\
-} while (0)
-#endif /* RAY_DEBUG */
-
-#if RAY_DEBUG & RAY_DBG_COM
-#define RAY_COM_CHECK(sc, com) do { if (RAY_DEBUG & RAY_DBG_COM) {	\
-    ray_com_ecf_check((sc), (com), __func__ );				\
-} } while (0)
-#endif /* RAY_DEBUG & RAY_DBG_COM */
-
-#if RAY_DEBUG & RAY_DBG_MBUF
-#define RAY_MBUF_DUMP(sc, mask, m, s)	do { if (RAY_DEBUG & (mask)) {	\
-    ray_dump_mbuf((sc), (m), (s));					\
-} } while (0)
-#endif /* RAY_DEBUG & RAY_DBG_MBUF */
diff --git a/sys/dev/ray/if_raymib.h b/sys/dev/ray/if_raymib.h
deleted file mode 100644
index de3bb16..0000000
--- a/sys/dev/ray/if_raymib.h
+++ /dev/null
@@ -1,1183 +0,0 @@
-/*-
- * Copyright (C) 2000
- * Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
- *
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DUNCAN BARCLAY 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 DUNCAN BARCLAY 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.
- *
- * $FreeBSD$
- *
- */
-
-/*
- * Bit mask definitions for firmware versioning
- */
-#define RAY_V4	0x1
-#define RAY_V5	0x2
-
-/*
- * MIB stuctures
- */
-struct ray_mib_common_head {			/*Offset*/	/*Size*/
-    u_int8_t	mib_net_type;			/*00*/ 
-    u_int8_t	mib_ap_status;			/*01*/
-    u_int8_t	mib_ssid[IEEE80211_NWID_LEN];	/*02*/		/*20*/
-    u_int8_t	mib_scan_mode;			/*22*/
-    u_int8_t	mib_apm_mode;			/*23*/
-    u_int8_t	mib_mac_addr[ETHER_ADDR_LEN];	/*24*/		/*06*/
-    u_int8_t	mib_frag_thresh[2];		/*2a*/		/*02*/
-    u_int8_t	mib_dwell_time[2];		/*2c*/		/*02*/
-    u_int8_t	mib_beacon_period[2];		/*2e*/		/*02*/
-    u_int8_t	mib_dtim_interval;		/*30*/
-    u_int8_t	mib_max_retry;			/*31*/
-    u_int8_t	mib_ack_timo;			/*32*/
-    u_int8_t	mib_sifs;			/*33*/
-    u_int8_t	mib_difs;			/*34*/
-    u_int8_t	mib_pifs;			/*35*/
-    u_int8_t	mib_rts_thresh[2];		/*36*/		/*02*/
-    u_int8_t	mib_scan_dwell[2];		/*38*/		/*02*/
-    u_int8_t	mib_scan_max_dwell[2];		/*3a*/		/*02*/
-    u_int8_t	mib_assoc_timo;			/*3c*/
-    u_int8_t	mib_adhoc_scan_cycle;		/*3d*/
-    u_int8_t	mib_infra_scan_cycle;		/*3e*/
-    u_int8_t	mib_infra_super_scan_cycle;	/*3f*/
-    u_int8_t	mib_promisc;			/*40*/
-    u_int8_t	mib_uniq_word[2];		/*41*/		/*02*/
-    u_int8_t	mib_slot_time;			/*43*/
-    u_int8_t	mib_roam_low_snr_thresh;	/*44*/
-    u_int8_t	mib_low_snr_count;		/*45*/
-    u_int8_t	mib_infra_missed_beacon_count;	/*46*/
-    u_int8_t	mib_adhoc_missed_beacon_count;	/*47*/
-    u_int8_t	mib_country_code;		/*48*/
-    u_int8_t	mib_hop_seq;			/*49*/
-    u_int8_t	mib_hop_seq_len;		/*4a*/
-} __packed;
-
-struct ray_mib_common_tail {
-    u_int8_t	mib_noise_filter_gain;		/*00*/
-    u_int8_t	mib_noise_limit_offset;		/*01*/
-    u_int8_t	mib_rssi_thresh_offset;		/*02*/
-    u_int8_t	mib_busy_thresh_offset;		/*03*/
-    u_int8_t	mib_sync_thresh;		/*04*/
-    u_int8_t	mib_test_mode;			/*05*/
-    u_int8_t	mib_test_min_chan;		/*06*/
-    u_int8_t	mib_test_max_chan;		/*07*/
-} __packed;
-
-struct ray_mib_4 {
-    struct ray_mib_common_head	mib_head;	/*00*/
-    u_int8_t			mib_cw_max;	/*4b*/
-    u_int8_t			mib_cw_min;	/*4c*/
-    struct ray_mib_common_tail	mib_tail;	/*4d*/
-} __packed;
-
-struct ray_mib_5 {
-    struct ray_mib_common_head	mib_head;		/*00*/
-    u_int8_t			mib_cw_max[2];		/*4b*/		/*02*/
-    u_int8_t			mib_cw_min[2];		/*4d*/		/*02*/
-    struct ray_mib_common_tail	mib_tail;		/*4f*/
-    u_int8_t			mib_allow_probe_resp;	/*57*/
-    u_int8_t			mib_privacy_must_start;	/*58*/
-    u_int8_t			mib_privacy_can_join;	/*59*/
-    u_int8_t			mib_basic_rate_set[8];	/*5a*/		/*08*/
-} __packed;
-
-#define mib_net_type		mib_head.mib_net_type
-#define mib_ap_status		mib_head.mib_ap_status
-#define mib_ssid		mib_head.mib_ssid
-#define mib_scan_mode		mib_head.mib_scan_mode
-#define mib_apm_mode		mib_head.mib_apm_mode
-#define mib_mac_addr		mib_head.mib_mac_addr
-#define mib_frag_thresh		mib_head.mib_frag_thresh
-#define mib_dwell_time		mib_head.mib_dwell_time
-#define mib_beacon_period	mib_head.mib_beacon_period
-#define mib_dtim_interval	mib_head.mib_dtim_interval
-#define mib_max_retry		mib_head.mib_max_retry
-#define mib_ack_timo		mib_head.mib_ack_timo
-#define mib_sifs		mib_head.mib_sifs
-#define mib_difs		mib_head.mib_difs
-#define mib_pifs		mib_head.mib_pifs
-#define mib_rts_thresh		mib_head.mib_rts_thresh
-#define mib_scan_dwell		mib_head.mib_scan_dwell
-#define mib_scan_max_dwell	mib_head.mib_scan_max_dwell
-#define mib_assoc_timo		mib_head.mib_assoc_timo
-#define mib_adhoc_scan_cycle	mib_head.mib_adhoc_scan_cycle
-#define mib_infra_scan_cycle	mib_head.mib_infra_scan_cycle
-#define mib_infra_super_scan_cycle \
-				mib_head.mib_infra_super_scan_cycle
-#define mib_promisc		mib_head.mib_promisc
-#define mib_uniq_word		mib_head.mib_uniq_word
-#define mib_slot_time		mib_head.mib_slot_time
-#define mib_roam_low_snr_thresh	mib_head.mib_roam_low_snr_thresh
-#define mib_low_snr_count	mib_head.mib_low_snr_count
-#define mib_infra_missed_beacon_count \
-				mib_head.mib_infra_missed_beacon_count
-#define mib_adhoc_missed_beacon_count \
-				mib_head.mib_adhoc_missed_beacon_count
-#define mib_country_code	mib_head.mib_country_code
-#define mib_hop_seq		mib_head.mib_hop_seq
-#define mib_hop_seq_len		mib_head.mib_hop_seq_len
-
-#define mib_noise_filter_gain	mib_tail.mib_noise_filter_gain
-#define mib_noise_limit_offset	mib_tail.mib_noise_limit_offset
-#define mib_rssi_thresh_offset	mib_tail.mib_rssi_thresh_offset
-#define mib_busy_thresh_offset	mib_tail.mib_busy_thresh_offset
-#define mib_sync_thresh		mib_tail.mib_sync_thresh
-#define mib_test_mode		mib_tail.mib_test_mode
-#define mib_test_min_chan	mib_tail.mib_test_min_chan
-#define mib_test_max_chan	mib_tail.mib_test_max_chan
-
-/*
- * MIB IDs for the update/report param commands
- */
-#define	RAY_MIB_NET_TYPE			0
-#define	RAY_MIB_AP_STATUS			1
-#define	RAY_MIB_SSID				2
-#define RAY_MIB_SCAN_MODE			3
-#define	RAY_MIB_APM_MODE			4
-#define	RAY_MIB_MAC_ADDR			5
-#define	RAY_MIB_FRAG_THRESH			6
-#define	RAY_MIB_DWELL_TIME			7
-#define	RAY_MIB_BEACON_PERIOD			8
-#define	RAY_MIB_DTIM_INTERVAL			9
-#define	RAY_MIB_MAX_RETRY			10
-#define	RAY_MIB_ACK_TIMO			11
-#define	RAY_MIB_SIFS				12
-#define	RAY_MIB_DIFS				13
-#define	RAY_MIB_PIFS				14
-#define	RAY_MIB_RTS_THRESH			15
-#define	RAY_MIB_SCAN_DWELL			16
-#define	RAY_MIB_SCAN_MAX_DWELL			17
-#define	RAY_MIB_ASSOC_TIMO			18
-#define	RAY_MIB_ADHOC_SCAN_CYCLE		19
-#define	RAY_MIB_INFRA_SCAN_CYCLE		20
-#define	RAY_MIB_INFRA_SUPER_SCAN_CYCLE		21
-#define	RAY_MIB_PROMISC				22
-#define	RAY_MIB_UNIQ_WORD			23
-#define	RAY_MIB_SLOT_TIME			24
-#define	RAY_MIB_ROAM_LOW_SNR_THRESH		25
-#define	RAY_MIB_LOW_SNR_COUNT			26
-#define	RAY_MIB_INFRA_MISSED_BEACON_COUNT	27
-#define	RAY_MIB_ADHOC_MISSED_BEACON_COUNT	28
-#define	RAY_MIB_COUNTRY_CODE			29
-#define	RAY_MIB_HOP_SEQ				30
-#define	RAY_MIB_HOP_SEQ_LEN			31
-#define	RAY_MIB_CW_MAX				32
-#define	RAY_MIB_CW_MIN				33
-#define	RAY_MIB_NOISE_FILTER_GAIN		34
-#define	RAY_MIB_NOISE_LIMIT_OFFSET		35
-#define	RAY_MIB_RSSI_THRESH_OFFSET		36
-#define	RAY_MIB_BUSY_THRESH_OFFSET		37
-#define	RAY_MIB_SYNC_THRESH			38
-#define	RAY_MIB_TEST_MODE			39
-#define	RAY_MIB_TEST_MIN_CHAN			40
-#define	RAY_MIB_TEST_MAX_CHAN			41
-#define	RAY_MIB_ALLOW_PROBE_RESP		42
-#define	RAY_MIB_PRIVACY_MUST_START		43
-#define	RAY_MIB_PRIVACY_CAN_JOIN		44
-#define	RAY_MIB_BASIC_RATE_SET			45
-#define RAY_MIB_VERSION				46
-#define RAY_MIB_CUR_BSSID			47
-#define RAY_MIB_CUR_INITED			48
-#define RAY_MIB_CUR_DEF_TXRATE			49
-#define RAY_MIB_CUR_ENCRYPT			50
-#define RAY_MIB_CUR_NET_TYPE			51
-#define RAY_MIB_CUR_SSID			52
-#define RAY_MIB_CUR_PRIV_START			53
-#define RAY_MIB_CUR_PRIV_JOIN			54
-#define RAY_MIB_DES_BSSID			55
-#define RAY_MIB_DES_INITED			56
-#define RAY_MIB_DES_DEF_TXRATE			57
-#define RAY_MIB_DES_ENCRYPT			58
-#define RAY_MIB_DES_NET_TYPE			59
-#define RAY_MIB_DES_SSID			60
-#define RAY_MIB_DES_PRIV_START			61
-#define RAY_MIB_DES_PRIV_JOIN			62
-#define RAY_MIB_CUR_AP_STATUS			63
-#define RAY_MIB_CUR_PROMISC			64
-#define RAY_MIB_DES_AP_STATUS			65
-#define RAY_MIB_DES_PROMISC			66
-#define RAY_MIB_CUR_FRAMING			67
-#define RAY_MIB_DES_FRAMING			68
-
-#define	RAY_MIB_LASTUSER			45
-#define	RAY_MIB_MAX				68
-
-/*
- * Strings for the MIB
- */
-#define RAY_MIB_STRINGS {		\
-	"Network type",			\
-	"AP status",			\
-	"SSID",				\
-	"Scan mode",			\
-	"APM mode",			\
-	"MAC address",			\
-	"Fragmentation threshold",	\
-	"Dwell time",			\
-	"Beacon period",		\
-	"DTIM_INTERVAL",		\
-	"MAX_RETRY",			\
-	"ACK_TIMO",			\
-	"SIFS",				\
-	"DIFS",				\
-	"PIFS",				\
-	"RTS_THRESH",			\
-	"SCAN_DWELL",			\
-	"SCAN_MAX_DWELL",		\
-	"ASSOC_TIMO",			\
-	"ADHOC_SCAN_CYCLE",		\
-	"INFRA_SCAN_CYCLE",		\
-	"INFRA_SUPER_SCAN_CYCLE",	\
-	"PROMISC",			\
-	"UNIQ_WORD",			\
-	"SLOT_TIME",			\
-	"ROAM_LOW_SNR_THRESH",		\
-	"LOW_SNR_COUNT",		\
-	"INFRA_MISSED_BEACON_COUNT",	\
-	"ADHOC_MISSED_BEACON_COUNT",	\
-	"COUNTRY_CODE",			\
-	"HOP_SEQ",			\
-	"HOP_SEQ_LEN",			\
-	"CW_MAX",			\
-	"CW_MIN",			\
-	"NOISE_FILTER_GAIN",		\
-	"NOISE_LIMIT_OFFSET",		\
-	"RSSI_THRESH_OFFSET",		\
-	"BUSY_THRESH_OFFSET",		\
-	"SYNC_THRESH",			\
-	"TEST_MODE",			\
-	"TEST_MIN_CHAN",		\
-	"TEST_MAX_CHAN",		\
-	"ALLOW_PROBE_RESP",		\
-	"PRIVACY_MUST_START",		\
-	"PRIVACY_CAN_JOIN",		\
-	"BASIC_RATE_SET",		\
-	"Firmware version",		\
-	"Current BSS Id",		\
-	"Current INITED",		\
-	"Current DEF_TXRATE",		\
-	"Current ENCRYPT",		\
-	"Current NET_TYPE",		\
-	"Current SSID",			\
-	"Current PRIV_START",		\
-	"Current PRIV_JOIN",		\
-	"Desired BSSID",		\
-	"Desired INITED",		\
-	"Desired DEF_TXRATE",		\
-	"Desired ENCRYPT",		\
-	"Desired NET_TYPE",		\
-	"Desired SSID",			\
-	"Desired PRIV_START",		\
-	"Desired PRIV_JOIN",		\
-	"Current AP_STATUS",		\
-	"Current PROMISC",		\
-	"Desired AP_STATUS",		\
-	"Desired PROMISC",		\
-	"Current FRAMING",		\
-	"Desired FRAMING"		\
-}
-
-#define RAY_MIB_HELP_STRINGS {			\
-	"0 Ad hoc, 1 Infrastructure",		\
-	"0 Station, 1 Access Point",		\
-	"",					\
-	"0 Passive, 1 Active",			\
-	"0 Off, 1 On",				\
-	"",					\
-	"Bytes",				\
-	"DWELL_TIME",				\
-	"BEACON_PERIOD",			\
-	"DTIM_INTERVAL",			\
-	"MAX_RETRY",				\
-	"ACK_TIMO",				\
-	"SIFS",					\
-	"DIFS",					\
-	"PIFS",					\
-	"RTS_THRESH",				\
-	"SCAN_DWELL",				\
-	"SCAN_MAX_DWELL",			\
-	"ASSOC_TIMO",				\
-	"ADHOC_SCAN_CYCLE",			\
-	"INFRA_SCAN_CYCLE",			\
-	"INFRA_SUPER_SCAN_CYCLE",		\
-	"PROMISC",				\
-	"UNIQ_WORD",				\
-	"SLOT_TIME",				\
-	"ROAM_LOW_SNR_THRESH",			\
-	"LOW_SNR_COUNT",			\
-	"INFRA_MISSED_BEACON_COUNT",		\
-	"ADHOC_MISSED_BEACON_COUNT",		\
-	"COUNTRY_CODE",				\
-	"HOP_SEQ",				\
-	"HOP_SEQ_LEN",				\
-	"CW_MAX",				\
-	"CW_MIN",				\
-	"NOISE_FILTER_GAIN",			\
-	"NOISE_LIMIT_OFFSET",			\
-	"RSSI_THRESH_OFFSET",			\
-	"BUSY_THRESH_OFFSET",			\
-	"SYNC_THRESH",				\
-	"TEST_MODE",				\
-	"TEST_MIN_CHAN",			\
-	"TEST_MAX_CHAN",			\
-	"ALLOW_PROBE_RESP",			\
-	"PRIVACY_MUST_START",			\
-	"PRIVACY_CAN_JOIN",			\
-	"BASIC_RATE_SET",			\
-	"",					\
-	"",					\
-	"0 Joined a net, 1 Created a net",	\
-	"Current DEF_TXRATE",			\
-	"Current ENCRYPT",			\
-	"Current NET_TYPE",			\
-	"",					\
-	"Current PRIV_START",			\
-	"Current PRIV_JOIN",			\
-	"",					\
-	"N/A",					\
-	"Desired DEF_TXRATE",			\
-	"Desired ENCRYPT",			\
-	"Desired NET_TYPE",			\
-	"",					\
-	"Desired PRIV_START",			\
-	"Desired PRIV_JOIN",			\
-	"Current AP_STATUS",			\
-	"Current PROMISC",			\
-	"Desired AP_STATUS",			\
-	"Desired PROMISC",			\
-	"Current FRAMING",			\
-	"Desired FRAMING"			\
-}
-
-/*
- * Applicable versions and work size for each MIB element
- */
-#define RAY_MIB_INFO_SIZ4 1
-#define RAY_MIB_INFO_SIZ5 2
-#define RAY_MIB_SIZE(info, mib, version) \
-	info[(mib)][(version & RAY_V4)?RAY_MIB_INFO_SIZ4:RAY_MIB_INFO_SIZ5]
-#define RAY_MIB_INFO {							\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_NET_TYPE */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_AP_STATUS */			\
-{RAY_V4|RAY_V5,	IEEE80211_NWID_LEN, 					\
-			IEEE80211_NWID_LEN},/* RAY_MIB_SSID */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_SCAN_MODE */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_APM_MODE */			\
-{RAY_V4|RAY_V5,	ETHER_ADDR_LEN,						\
-			ETHER_ADDR_LEN},/* RAY_MIB_MAC_ADDR */		\
-{RAY_V4|RAY_V5,	2,	2},	/* RAY_MIB_FRAG_THRESH */		\
-{RAY_V4|RAY_V5,	2,	2},	/* RAY_MIB_DWELL_TIME */		\
-{RAY_V4|RAY_V5,	2,	2},	/* RAY_MIB_BEACON_PERIOD */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_DTIM_INTERVAL */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_MAX_RETRY */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_ACK_TIMO */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_SIFS */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_DIFS */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_PIFS */			\
-{RAY_V4|RAY_V5,	2,	2},	/* RAY_MIB_RTS_THRESH */		\
-{RAY_V4|RAY_V5,	2,	2},	/* RAY_MIB_SCAN_DWELL */		\
-{RAY_V4|RAY_V5,	2,	2},	/* RAY_MIB_SCAN_MAX_DWELL */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_ASSOC_TIMO */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_ADHOC_SCAN_CYCLE */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_INFRA_SCAN_CYCLE */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_INFRA_SUPER_SCAN_CYCLE */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_PROMISC */			\
-{RAY_V4|RAY_V5,	2,	2},	/* RAY_MIB_UNIQ_WORD */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_SLOT_TIME */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_ROAM_LOW_SNR_THRESH */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_LOW_SNR_COUNT */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_INFRA_MISSED_BEACON_COUNT */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_ADHOC_MISSED_BEACON_COUNT */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_COUNTRY_CODE */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_HOP_SEQ */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_HOP_SEQ_LEN */		\
-{RAY_V4|RAY_V5,	1,	2},	/* RAY_MIB_CW_MAX */			\
-{RAY_V4|RAY_V5,	1,	2},	/* RAY_MIB_CW_MIN */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_NOISE_FILTER_GAIN */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_NOISE_LIMIT_OFFSET */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_RSSI_THRESH_OFFSET */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_BUSY_THRESH_OFFSET */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_SYNC_THRESH */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_TEST_MODE */			\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_TEST_MIN_CHAN */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_TEST_MAX_CHAN */		\
-{       RAY_V5,	0,	1},	/* RAY_MIB_ALLOW_PROBE_RESP */		\
-{       RAY_V5,	0,	1},	/* RAY_MIB_PRIVACY_MUST_START */	\
-{       RAY_V5,	0,	1},	/* RAY_MIB_PRIVACY_CAN_JOIN */		\
-{       RAY_V5,	0,	8},	/* RAY_MIB_BASIC_RATE_SET */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_VERSION */			\
-{RAY_V4|RAY_V5,	ETHER_ADDR_LEN,						\
-			ETHER_ADDR_LEN},/* RAY_MIB_CUR_BSSID */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_CUR_INITED */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_CUR_DEF_TXRATE */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_CUR_ENCRYPT */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_CUR_NET_TYPE */		\
-{RAY_V4|RAY_V5,	IEEE80211_NWID_LEN,					\
-			IEEE80211_NWID_LEN}, /* RAY_MIB_CUR_SSID */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_CUR_PRIV_START */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_CUR_PRIV_JOIN */		\
-{RAY_V4|RAY_V5,	ETHER_ADDR_LEN,						\
-			ETHER_ADDR_LEN},/* RAY_MIB_DES_BSSID */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_DES_INITED */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_DES_DEF_TXRATE */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_DES_ENCRYPT */		\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_DES_NET_TYPE */		\
-{RAY_V4|RAY_V5,	IEEE80211_NWID_LEN, 					\
-			IEEE80211_NWID_LEN}, /* RAY_MIB_DES_SSID */	\
-{RAY_V4|RAY_V5,	1,	1},	/* RAY_MIB_DES_PRIV_START */		\
-{RAY_V4|RAY_V5,	1, 	1}, 	/* RAY_MIB_DES_PRIV_JOIN */		\
-{RAY_V4|RAY_V5,	1, 	1}, 	/* RAY_MIB_CUR_AP_STATUS */		\
-{RAY_V4|RAY_V5,	1, 	1}, 	/* RAY_MIB_CUR_PROMISC */		\
-{RAY_V4|RAY_V5,	1, 	1}, 	/* RAY_MIB_DES_AP_STATUS */		\
-{RAY_V4|RAY_V5,	1, 	1}, 	/* RAY_MIB_DES_PROMISC */		\
-{RAY_V4|RAY_V5,	1, 	1}, 	/* RAY_MIB_CUR_FRAMING */		\
-{RAY_V4|RAY_V5,	1, 	1} 	/* RAY_MIB_DES_FRAMING */		\
-}
-
-/*
- * MIB values
- *
- * I've included comments as to where the numbers have originated
- * from.
- *
- * Linux refers to ray_cs.c and rayctl.h from version 167 of the
- * Linux Raylink driver.
- *
- * NetBSD refers to if_ray.c from version 1.12 of the NetBSD Raylink
- * driver.
- *
- * Symb refers to numbers cleaned from the 802.11 specification,
- * discussion with 802.11 knowledgable people at Symbionics or
- * stuff needed by me (i.e. me, * aps, ifo, hjl).
- *
- * V4 and V5 refer to settings for version 4 and version 5 of
- * the firmware.
- *
- * DOC refers to the
- *	Combined Interface Requirements Specification
- *	and Interface Design Document (IRS/IDD)
- *	for the
- *	WLAN System Interfaces Between the
- *	HOST COMPUTER and the
- *	PCMCIA WLAN INTERFACE CARD
- *	Revision ECF 5.00
- *	17 June, 1998
- */
-
-/* Obtained by raycontrol _before_ downloading
- *
- * WebGear Aviator
- *
- * # raycontrol -i ray0
- * Firmware version                4
- * Network type                    0x01    0 Ad hoc, 1 Infrastructure
- * AP status                       0x00    0 Station, 1 Access Point
- * SSID                                                            
- * Scan mode                       0x01    0 Passive, 1 Active
- * APM mode                        0x00    0 Off, 1 On
- * MAC address                     00:00:8f:48:e4:44
- * Fragmentation threshold         0x0200  FRAG_THRESH
- * Dwell tIME                      0x01    DWELL_TIME
- * Beacon period                   0x01    BEACON_PERIOD
- * DTIM_INTERVAL                   0x05    DTIM_INTERVAL
- * MAX_RETRY                       0x03    MAX_RETRY
- * ACK_TIMO                        0x8c    ACK_TIMO
- * SIFS                            0x1e    SIFS
- * DIFS                            0x82    DIFS
- * PIFS                            0xce    PIFS
- * RTS_THRESH                      0x0100  RTS_THRESH
- * SCAN_DWELL                      0xfc18  SCAN_DWELL
- * SCAN_MAX_DWELL                  0xc180  SCAN_MAX_DWELL
- * ASSOC_TIMO                      0x05    ASSOC_TIMO
- * ADHOC_SCAN_CYCLE                0x04    ADHOC_SCAN_CYCLE
- * INFRA_SCAN_CYCLE                0x02    INFRA_SCAN_CYCLE
- * INFRA_SUPER_SCAN_CYCLE          0x04    INFRA_SUPER_SCAN_CYCLE
- * PROMISC                         0x00    PROMISC
- * UNIQ_WORD                       0x0cbd  UNIQ_WORD
- * SLOT_TIME                       0x4e    SLOT_TIME
- * ROAM_LOW_SNR_THRESH             0x20    ROAM_LOW_SNR_THRESH
- * LOW_SNR_COUNT                   0x04    LOW_SNR_COUNT
- * INFRA_MISSED_BEACON_COUNT       0x04    INFRA_MISSED_BEACON_COUNT
- * ADHOC_MISSED_BEACON_COUNT       0x04    ADHOC_MISSED_BEACON_COUNT
- * COUNTRY_CODE                    0x01    COUNTRY_CODE
- * HOP_SEQ                         0x07    HOP_SEQ
- * HOP_SEQ_LEN                     0x4e    HOP_SEQ_LEN
- * CW_MAX                          0x3f    CW_MAX
- * CW_MIN                          0x0f    CW_MIN
- * NOISE_FILTER_GAIN               0x00    NOISE_FILTER_GAIN
- * NOISE_LIMIT_OFFSET              0x00    NOISE_LIMIT_OFFSET
- * RSSI_THRESH_OFFSET              0x70    RSSI_THRESH_OFFSET
- * BUSY_THRESH_OFFSET              0x70    BUSY_THRESH_OFFSET
- * SYNC_THRESH                     0x07    SYNC_THRESH
- * TEST_MODE                       0x00    TEST_MODE
- * TEST_MIN_CHAN                   0x02    TEST_MIN_CHAN
- * TEST_MAX_CHAN                   0x02    TEST_MAX_CHAN
- *
- * Raylink
- * Firmware version          	5
- * Network type              	0x01	0 Ad hoc, 1 Infrastructure
- * AP status                 	0x00	0 Station, 1 Access Point
- * SSID                      	ESSID1                          	
- * Scan mode                 	0x01	0 Passive, 1 Active
- * APM mode                  	0x00	0 Off, 1 On
- * MAC address               	00:00:8f:a8:17:06	
- * Fragmentation threshold   	0x7fff	Bytes
- * Dwell time                	0x0080	DWELL_TIME
- * Beacon period             	0x0100	BEACON_PERIOD
- * DTIM_INTERVAL             	0x01	DTIM_INTERVAL
- * MAX_RETRY                 	0x1f	MAX_RETRY
- * ACK_TIMO                  	0x86	ACK_TIMO
- * SIFS                      	0x1c	SIFS
- * DIFS                      	0x82	DIFS
- * PIFS                      	0x4e	PIFS
- * RTS_THRESH                	0x7fff	RTS_THRESH
- * SCAN_DWELL                	0x04e2	SCAN_DWELL
- * SCAN_MAX_DWELL            	0x38a4	SCAN_MAX_DWELL
- * ASSOC_TIMO                	0x05	ASSOC_TIMO
- * ADHOC_SCAN_CYCLE          	0x08	ADHOC_SCAN_CYCLE
- * INFRA_SCAN_CYCLE          	0x02	INFRA_SCAN_CYCLE
- * INFRA_SUPER_SCAN_CYCLE    	0x08	INFRA_SUPER_SCAN_CYCLE
- * PROMISC                   	0x00	PROMISC
- * UNIQ_WORD                 	0x0cbd	UNIQ_WORD
- * SLOT_TIME                 	0x32	SLOT_TIME
- * ROAM_LOW_SNR_THRESH       	0xff	ROAM_LOW_SNR_THRESH
- * LOW_SNR_COUNT             	0xff	LOW_SNR_COUNT
- * INFRA_MISSED_BEACON_COUNT 	0x02	INFRA_MISSED_BEACON_COUNT
- * ADHOC_MISSED_BEACON_COUNT 	0xff	ADHOC_MISSED_BEACON_COUNT
- * COUNTRY_CODE              	0x01	COUNTRY_CODE
- * HOP_SEQ                   	0x0b	HOP_SEQ
- * HOP_SEQ_LEN               	0x55	HOP_SEQ_LEN
- * CW_MAX                    	0x003f	CW_MAX
- * CW_MIN                    	0x000f	CW_MIN
- * NOISE_FILTER_GAIN         	0x04	NOISE_FILTER_GAIN
- * NOISE_LIMIT_OFFSET        	0x08	NOISE_LIMIT_OFFSET
- * RSSI_THRESH_OFFSET        	0x28	RSSI_THRESH_OFFSET
- * BUSY_THRESH_OFFSET        	0x28	BUSY_THRESH_OFFSET
- * SYNC_THRESH               	0x07	SYNC_THRESH
- * TEST_MODE                 	0x00	TEST_MODE
- * TEST_MIN_CHAN             	0x02	TEST_MIN_CHAN
- * TEST_MAX_CHAN             	0x02	TEST_MAX_CHAN
- * ALLOW_PROBE_RESP          	0x00	ALLOW_PROBE_RESP
- * PRIVACY_MUST_START        	0x00	PRIVACY_MUST_START
- * PRIVACY_CAN_JOIN          	0x00	PRIVACY_CAN_JOIN
- * BASIC_RATE_SET            	0x02	BASIC_RATE_SET
- */
-
-/*
- * mib_net_type
- *
- * DOC		0x01	- Defines network type for Start and Join
- *			- Network commands.
- *
- * As the V4 cards don't do infra we have to use adhoc. For V5 cards
- * we follow standard FreeBSD practise and use infrastructure mode.
- */
-#define	RAY_MIB_NET_TYPE_ADHOC			0x00
-#define	RAY_MIB_NET_TYPE_INFRA			0x01
-#define	RAY_MIB_NET_TYPE_V4			RAY_MIB_NET_TYPE_ADHOC
-#define	RAY_MIB_NET_TYPE_V5			RAY_MIB_NET_TYPE_INFRA
-
-/*
- * mib_ap_status
- *
- * DOC		0x00	- Applicable only when Network Type is
- *			- Infrastructure.
- */
-#define	RAY_MIB_AP_STATUS_TERMINAL		0x00
-#define	RAY_MIB_AP_STATUS_AP			0x01
-#define	RAY_MIB_AP_STATUS_V4			RAY_MIB_AP_STATUS_TERMINAL
-#define	RAY_MIB_AP_STATUS_V5			RAY_MIB_AP_STATUS_TERMINAL
-
-/*
- * mib_ssid
- *
- * DOC		ESSID1	- Service Set ID. Can be any ASCII string
- *			- up to 32 bytes in length. If the string is
- *			- less than 32 bytes long, it must be
- *			- followed by a byte of 00h.
- *
- * Symb			- windows setting comes from the Aviator software v1.1
- */
-#define RAY_MIB_SSID_WINDOWS			"NETWORK_NAME"
-#define RAY_MIB_SSID_RAYLINK			"ESSID1"
-#define RAY_MIB_SSID_V4				RAY_MIB_SSID_WINDOWS
-#define RAY_MIB_SSID_V5				RAY_MIB_SSID_RAYLINK
-
-/*
- * mib_scan_mode
- *
- * DOC		0x01	- Defines acquisition approach for
- *			- terminals operating in either Ad Hoc or
- *			- Infrastructure Networks. N/A for APs. 
- */
-#define	RAY_MIB_SCAN_MODE_PASSIVE		0x00
-#define	RAY_MIB_SCAN_MODE_ACTIVE		0x01
-#define	RAY_MIB_SCAN_MODE_V4			RAY_MIB_SCAN_MODE_ACTIVE
-#define	RAY_MIB_SCAN_MODE_V5			RAY_MIB_SCAN_MODE_ACTIVE
-
-/*
- * mib_apm_mode
- *
- * DOC		0x00	- Defines power management mode for
- *			- stations operating in either Ad Hoc or
- *			- Infrastructure Networks. Must always
- *			- be 0 for APs.
- */
-#define	RAY_MIB_APM_MODE_NONE			0x00
-#define	RAY_MIB_APM_MODE_POWERSAVE		0x01
-#define	RAY_MIB_APM_MODE_V4			RAY_MIB_APM_MODE_NONE
-#define	RAY_MIB_APM_MODE_V5			RAY_MIB_APM_MODE_NONE
-
-/*
- * mib_mac_addr
- *
- * DOC			- MAC Address to be used by WIC (For
- *			- format see Figure 3.2.4.1.2-1, MAC
- *			- Address Format). Host may echo card
- *			- supplied address or use locally
- *			- administered address.
- */
-
-/*
- * mib_frag_thresh
- *
- * DOC		0x7fff	- Maximum over-the-air packet size (in
- *			- bytes)
- *
- * Symb		0xXXXX	- you really should fragment when in low signal
- *			- conditions but getting it wrong
- *			  crucifies the performance
- */
-#define RAY_MIB_FRAG_THRESH_MINIMUM		0
-#define RAY_MIB_FRAG_THRESH_MAXIMUM		2346
-#define RAY_MIB_FRAG_THRESH_DISABLE		0x7fff
-#define RAY_MIB_FRAG_THRESH_V4			RAY_MIB_FRAG_THRESH_DISABLE
-#define RAY_MIB_FRAG_THRESH_V5			RAY_MIB_FRAG_THRESH_DISABLE
-
-/*
- * mib_dwell_time
- *
- * DOC		0x0080	- Defines hop dwell time in Kusec.
- *			- Required only of stations which intend
- *			- to issue a Start Network command.
- *			- Forward Compatible Firmware (Build
- *			- 5) requires that the dwell time be one of
- *			- the set 16, 32, 64, 128, and 256.
- *
- * Linux.h		- 16k * 2**n, n=0-4 in Kus
- * Linux.c-V4	0x0200
- * Linux.c-V5	0x0080	- 128 Kus
- * NetBSD-V4	0x0200	- from Linux
- * NetBSD-V4	0x0400	- "divined"
- * NetBSD-V5	0x0080
- * Symb-V4	0xXXXX	- 802.11 dwell time is XXX Kus
- * Symb-V5	0xXXXX	- 802.11 dwell time is XXX Kus
- *
- * XXX confirm that 1024Kus is okay for windows driver - how? and see
- * XXX how it is over the maximum
- */
-#define RAY_MIB_DWELL_TIME_MINIMUM		1
-#define RAY_MIB_DWELL_TIME_MAXIMUM		390
-#define	RAY_MIB_DWELL_TIME_V4			0x0400
-#define	RAY_MIB_DWELL_TIME_V5			0x0080
-
-/*
- * mib_beacon_period
- *
- * DOC		0x0100	- Defines time between target beacon
- *			- transmit times (TBTT) in Kusec.
- *			- Forward Compatible Firmware (Build
- *			- 5) requires that the Beacon Period be an
- *			- integral multiple of the Dwell Time (not
- *			- exceeding 255 hops).
- *			- Required only of stations which intend
- *			- to issue a Start Network command.
- *
- * Linux.h		- n * a_hop_time  in Kus
- * Linux.c-V4	0x0001
- * Linux.c-V5	0x0100	- 256 Kus
- * NetBSD-V4	0x0001	- from Linux
- * NetBSD-V4	0x0000	- "divined"
- * NetBSD-V5	0x0100
- * Symb-V4	0x0001	- best performance is one beacon each dwell XXX
- * Symb-V5	0x0080	- best performance is one beacon each dwell XXX
- *
- * XXX V4 should probably set this to dwell_time
- */
-#define	RAY_MIB_BEACON_PERIOD_MINIMUM		1
-#define	RAY_MIB_BEACON_PERIOD_MAXIMUM		0xffff
-#define	RAY_MIB_BEACON_PERIOD_V4		0x0001
-#define	RAY_MIB_BEACON_PERIOD_V5		(2*RAY_MIB_DWELL_TIME_V5)
-
-/*
- * mib_dtim_interval
- *
- * DOC		0x01	- Number of beacons per DTIM period.
- *			- Only APs will use this parameter, to set
- *			- the DTIM period.
- *
- * Linux.h		- in beacons
- * Linux.c	0x01
- * NetBSD	0x01
- * Symb		0xXX	- need to find out what DTIM is
- */
-#define	RAY_MIB_DTIM_INTERVAL_MINIMUM		1
-#define	RAY_MIB_DTIM_INTERVAL_MAXIMUM		255
-#define	RAY_MIB_DTIM_INTERVAL_V4		0x01
-#define	RAY_MIB_DTIM_INTERVAL_V5		0x01
-
-/*
- * mib_max_retry
- *
- * DOC		31	- Number of times WIC will attempt to
- *			- retransmit a failed packet.
- *
- * Linux.c	0x07
- * NetBSD	0x01	- "documented default for 5/6"
- * NetBSD	0x07	- from Linux
- * NetBSD	0x03	- "divined"
- * Symb		0xXX	- 7 retries seems okay but check with APS
- */
-#define	RAY_MIB_MAX_RETRY_MINIMUM		0
-#define	RAY_MIB_MAX_RETRY_MAXIMUM		255
-#define	RAY_MIB_MAX_RETRY_V4			0x07
-#define	RAY_MIB_MAX_RETRY_V5			0x1f
-
-/*
- * mib_ack_timo
- *
- * DOC		0x86	- Time WIC will wait after completion of
- *			- a transmit before timing out anticipated
- *			- ACK (2 usec steps). Should equal
- *			- SIFS + constant.
- *
- * Linux.c	0xa3
- * NetBSD	0x86	- documented default for 5/6
- * NetBSD	0xa3	- from Linux
- * NetBSD	0xa3	- "divined"
- * Symb		0xXX	- this must be a 802.11 defined setting?
- */
-#define	RAY_MIB_ACK_TIMO_MINIMUM		0
-#define	RAY_MIB_ACK_TIMO_MAXIMUM		255
-#define	RAY_MIB_ACK_TIMO_V4			0xa3
-#define	RAY_MIB_ACK_TIMO_V5			0x86
-
-/*
- * mib_sifs
- *
- * DOC		0x1c	- SIFS time in usec.
- *
- * Linux.c	0x1d
- * NetBSD	0x1c	- documented default for 5/6
- * NetBSD	0x1d	- from Linux
- * NetBSD	0x1d	- "divined"
- * Symb		0xXX	- default SIFS for 802.11
- */
-#define	RAY_MIB_SIFS_MINIMUM			28
-#define	RAY_MIB_SIFS_MAXIMUM			62
-#define	RAY_MIB_SIFS_V4				0x1d
-#define	RAY_MIB_SIFS_V5				0x1c
-
-/*
- * mib_difs
- *
- * DOC		0x82	- DIFS time in usec.
- */
-#define	RAY_MIB_DIFS_MINIMUM			130
-#define	RAY_MIB_DIFS_MAXIMUM			255
-#define	RAY_MIB_DIFS_V4				0x82
-#define	RAY_MIB_DIFS_V5				0x82
-
-/*
- * mib_pifs
- *
- * DOC		78	- PIFS time in usec. (Not currently
- *			- implemented.
- */
-#define	RAY_MIB_PIFS_MINIMUM			78
-#define	RAY_MIB_PIFS_MAXIMUM			255
-#define	RAY_MIB_PIFS_V4				0xce
-#define	RAY_MIB_PIFS_V5				0x4e
-
-/*
- * mib_rts_thresh
- *
- * DOC		0x7ffff	- Threshold size in bytes below which
- *			- messages will not require use of RTS
- *			- Protocol.
- *
- * Linux.c	0x7fff
- * NetBSD	0x7fff	- disabled
- * Symb		0xXXXX	- need to set this realistically to get CTS/RTS mode
- *			  working right
- */
-#define	RAY_MIB_RTS_THRESH_MINIMUM		0
-#define	RAY_MIB_RTS_THRESH_MAXIMUM		2346
-#define	RAY_MIB_RTS_THRESH_DISABLE		0x7fff
-#define	RAY_MIB_RTS_THRESH_V4			RAY_MIB_RTS_THRESH_DISABLE
-#define	RAY_MIB_RTS_THRESH_V5			RAY_MIB_RTS_THRESH_DISABLE
-
-/*
- * mib_scan_dwell
- *
- * DOC		0x04e2	- Time channel remains clear after probe
- *			- transmission prior to hopping to next
- *			- channel. (in 2 msec steps).
- *
- * Linux.c-V4	0xfb1e	- 128572us
- * Linix.c-V5	0x04e2	-   2500us
- * NetBSD-V4	0xfb1e
- * NetBSD-V5	0x04e2
- * Symb		0xXXXX	- Check that v4 h/w can do 2.5ms and default it
- */
-#define	RAY_MIB_SCAN_DWELL_MINIMUM		1
-#define	RAY_MIB_SCAN_DWELL_MAXIMUM		65535
-#define	RAY_MIB_SCAN_DWELL_V4			0xfb1e
-#define	RAY_MIB_SCAN_DWELL_V5			0x04e2
-
-/*
- * mib_scan_max_dwell
- *
- * DOC		0x38a4	- Time to remain on a frequency channel
- *			- if CCA is detected after probe
- *			- transmission. (in 2 usec steps).
- *
- * Linux.c-V4	0xc75c	- 102072us
- * Linix.c-V5	0x38a4	-  29000us
- * NetBSD-V4	0xc75c
- * NetBSD-V5	0x38a4
- * Symb		0xXXXX	- see above - this may be total time before giving up
- */
-#define	RAY_MIB_SCAN_MAX_DWELL_MINIMUM		1
-#define	RAY_MIB_SCAN_MAX_DWELL_MAXIMUM		65535
-#define	RAY_MIB_SCAN_MAX_DWELL_V4		0xc75c
-#define	RAY_MIB_SCAN_MAX_DWELL_V5		0x38a4
-
-/*
- * mib_assoc_timo
- *
- * DOC		0x05	- Time (in hops) a station waits after
- *			- transmitting an Association Request
- *			- Message before association attempt is
- *			- considered failed. N/A for Ad Hoc
- *			- Networks and for APs in Infrastructure
- */
-#define	RAY_MIB_ASSOC_TIMO_MINIMUM		0
-#define	RAY_MIB_ASSOC_TIMO_MAXIMUM		255
-#define	RAY_MIB_ASSOC_TIMO_V4			0x05
-#define	RAY_MIB_ASSOC_TIMO_V5			0x05
-
-/*
- * mib_adhoc_scan_cycle
- *
- * DOC		0x08	- Maximum number of times to cycle
- *			- through frequency hopping pattern as
- *			- part of scanning during Ad Hoc
- *			- Acquisition.
- */
-#define	RAY_MIB_ADHOC_SCAN_CYCLE_MINIMUM	1
-#define	RAY_MIB_ADHOC_SCAN_CYCLE_MAXIMUM	255
-#define	RAY_MIB_ADHOC_SCAN_CYCLE_V4		0x08
-#define	RAY_MIB_ADHOC_SCAN_CYCLE_V5		0x08
-
-/*
- * mib_infra_scan_cycle
- *
- * DOC		0x02	- Number of times to cycle through
- *			- frequency hopping pattern as part of
- *			- scanning during Infrastructure Network
- *			- Acquisition.
- */
-#define	RAY_MIB_INFRA_SCAN_CYCLE_MINIMUM	1
-#define	RAY_MIB_INFRA_SCAN_CYCLE_MAXIMUM	255
-#define	RAY_MIB_INFRA_SCAN_CYCLE_V4		0x02
-#define	RAY_MIB_INFRA_SCAN_CYCLE_V5		0x02
-
-/*
- * mib_infra_super_scan_cycle
- *
- * DOC		0x08	- Number of times to repeat an
- *			- Infrastructure scan cycle if no APs are
- *			- found before indicating a failure.
- */
-#define	RAY_MIB_INFRA_SUPER_SCAN_CYCLE_MINIMUM	1
-#define	RAY_MIB_INFRA_SUPER_SCAN_CYCLE_MAXIMUM	255
-#define	RAY_MIB_INFRA_SUPER_SCAN_CYCLE_V4		0x08
-#define	RAY_MIB_INFRA_SUPER_SCAN_CYCLE_V5		0x08
-
-/*
- * mib_promisc
- *
- * DOC		0x00	- Controls operation of WIC in
- *			- promiscuous mode.
- */
-#define	RAY_MIB_PROMISC_DISABLED		0
-#define	RAY_MIB_PROMISC_ENABLED			1
-#define	RAY_MIB_PROMISC_V4			0x00
-#define	RAY_MIB_PROMISC_V5			0x00
-
-/*
- * mib_uniq_word
- *
- * DOC		0x0cdb	- Unique word pattern (Transmitted as
- *			- 0CBDh per 802.11)
- */
-#define	RAY_MIB_UNIQ_WORD_MINIMUM		0
-#define	RAY_MIB_UNIQ_WORD_MAXIMUM		0xffff
-#define	RAY_MIB_UNIQ_WORD_V4			0x0cbd
-#define	RAY_MIB_UNIQ_WORD_V5			0x0cbd
-
-/*
- * mib_slot_time
- *
- * DOC		0x32	- Slot time in usec
- *
- * Linux.c-V4	0x4e
- * Linix.c-V5	0x32
- * NetBSD-V4	0x4e	- Linux
- * NetBSD-V4	0x18	- "divined"
- * NetBSD-V5	0x32	- mentions spec. is 50us i.e. 0x32
- * Symb		0xXX	- wtf 0x4e = 78
- */
-#define	RAY_MIB_SLOT_TIME_MINIMUM		1
-#define	RAY_MIB_SLOT_TIME_MAXIMUM		128
-#define	RAY_MIB_SLOT_TIME_V4			0x4e
-#define	RAY_MIB_SLOT_TIME_V5			0x32
-
-/*
- * mib_roam_low_snr_thresh
- *
- * DOC		0xff	- SNR Threshold for use by roaming
- *			- algorithm. [Low power count is
- *			- incremented when Beacon is received at
- *			- SNR lower than Roaming Low SNR
- *			- Threshold.] To disable, set to FFh.
- *
- * Linux.c	0xff
- * NetBSD-V4	0xff	- Linux
- * NetBSD-V4	0x30	- "divined"
- * NetBSD-V5	0xff	- disabled
- * NetBSD.h		- if below this inc count
- * Symb		0xXX	- hmm is 0xff really disabled? need this to work
- */
-#define	RAY_MIB_ROAM_LOW_SNR_THRESH_MINIMUM	0
-#define	RAY_MIB_ROAM_LOW_SNR_THRESH_MAXIMUM	255
-#define	RAY_MIB_ROAM_LOW_SNR_THRESH_DISABLED	0xff
-#define	RAY_MIB_ROAM_LOW_SNR_THRESH_V4		RAY_MIB_ROAM_LOW_SNR_THRESH_DISABLED	
-#define	RAY_MIB_ROAM_LOW_SNR_THRESH_V5		RAY_MIB_ROAM_LOW_SNR_THRESH_DISABLED	
-
-/*
- * mib_low_snr_count
- *
- * DOC		0xff	- Threshold that number of consecutive
- *			- beacons received at SNR < Roaming
- *			- Low SNR Threshold must exceed
- *			- before roaming processing begins. To
- *			- disable, set to FFh.
- *
- * Linux.c	0xff
- * NetBSD	0x07	- "divined - check" and marked as disabled
- * NetBSD	0xff	- disabled
- * NetBSD.h		- roam after cnt below thrsh
- * Symb		0xXX	- hmm is 0xff really disabled? need
- *			- this to work in infrastructure mode with mutliple APs
- */
-#define	RAY_MIB_LOW_SNR_COUNT_MINIMUM		0
-#define	RAY_MIB_LOW_SNR_COUNT_MAXIMUM		255
-#define	RAY_MIB_LOW_SNR_COUNT_DISABLED		0xff
-#define	RAY_MIB_LOW_SNR_COUNT_V4		RAY_MIB_LOW_SNR_COUNT_DISABLED
-#define	RAY_MIB_LOW_SNR_COUNT_V5		RAY_MIB_LOW_SNR_COUNT_DISABLED
-
-/*
- * mib_infra_missed_beacon_count
- *
- * DOC		0x02	- Threshold that number of consecutive
- *			- beacons not received must exceed
- *			- before roaming processing begins in an
- *			- infrastructure network. To disable, set
- *			- to FFh.
- * Linux.c	0x05
- * NetBSD	0x02	- documented default for 5/6
- * NetBSD	0x05	- Linux
- * NetBSD	0x07	- "divined - check, looks fishy"
- * Symb		0xXX	- 5 missed beacons is probably okay
- */
-#define	RAY_MIB_INFRA_MISSED_BEACON_COUNT_MINIMUM	0
-#define	RAY_MIB_INFRA_MISSED_BEACON_COUNT_MAXIMUM	255
-#define	RAY_MIB_INFRA_MISSED_BEACON_COUNT_V4		0x05
-#define	RAY_MIB_INFRA_MISSED_BEACON_COUNT_V5		0x02
-
-/*
- * mib_adhoc_missed_beacon_count
- *
- * DOC		0xff	- Threshold that number of consecutive
- *			- beacons transmitted by a terminal must
- *			- exceed before reacquisition processing
- *			- begins in Ad Hoc Network.
- */
-#define	RAY_MIB_ADHOC_MISSED_BEACON_COUNT_MINIMUM	0
-#define	RAY_MIB_ADHOC_MISSED_BEACON_COUNT_MAXIMUM	255
-#define	RAY_MIB_ADHOC_MISSED_BEACON_COUNT_DISABLED	0xff
-#define	RAY_MIB_ADHOC_MISSED_BEACON_COUNT_V4		RAY_MIB_ADHOC_MISSED_BEACON_COUNT_DISABLED
-#define	RAY_MIB_ADHOC_MISSED_BEACON_COUNT_V5		RAY_MIB_ADHOC_MISSED_BEACON_COUNT_DISABLED
-
-/*
- * mib_country_code
- *
- * DOC		0x01	- Country set of hopping patterns
- *			- (element value in beacon)
- *			- Note: Japan Test is for a special test
- *			- mode required by the Japanese
- *			- regulatory authorities.
- */
-#define	RAY_MIB_COUNTRY_CODE_MIMIMUM		0x01
-#define	RAY_MIB_COUNTRY_CODE_MAXIMUM		0x09
-#define	RAY_MIB_COUNTRY_CODE_USA		0x01
-#define	RAY_MIB_COUNTRY_CODE_EUROPE		0x02
-#define	RAY_MIB_COUNTRY_CODE_JAPAN		0x03
-#define	RAY_MIB_COUNTRY_CODE_KOREA		0x04
-#define	RAY_MIB_COUNTRY_CODE_SPAIN		0x05
-#define	RAY_MIB_COUNTRY_CODE_FRANCE		0x06
-#define	RAY_MIB_COUNTRY_CODE_ISRAEL		0x07
-#define	RAY_MIB_COUNTRY_CODE_AUSTRALIA		0x08
-#define	RAY_MIB_COUNTRY_CODE_JAPAN_TEST		0x09
-#define	RAY_MIB_COUNTRY_CODE_V4			RAY_MIB_COUNTRY_CODE_USA
-#define	RAY_MIB_COUNTRY_CODE_V5			RAY_MIB_COUNTRY_CODE_USA
-
-/*
- * mib_hop_seq
- *
- * DOC		0x0b	- Hop Pattern to use. (Currently 66
- *			- US/Europe plus 12 Japanese).
- *
- * NetBSD.h		- no longer supported
- */
-#define	RAY_MIB_HOP_SEQ_MINIMUM			6
-#define	RAY_MIB_HOP_SEQ_MAXIMUM			72
-#define	RAY_MIB_HOP_SEQ_V4			0x0b
-#define	RAY_MIB_HOP_SEQ_V5			0x04
-
-/*
- * mib_hop_seq_len
- *
- * DOC		0x4f	- Number of frequency channels in
- *			- hopping pattern is now set to the value
- *			- defined in IEEE802.11 for the selected
- *			- Current Country Code.
- */
-#define	RAY_MIB_HOP_SEQ_LEN_MINIMUM		1
-#define	RAY_MIB_HOP_SEQ_LEN_MAXIMUM		79
-#define	RAY_MIB_HOP_SEQ_LEN_V4			0x4e
-#define	RAY_MIB_HOP_SEQ_LEN_V5			0x4f
-
-/*
- * All from here down are the same in Linux/NetBSD and seem to be sane.
- */
-#define	RAY_MIB_CW_MAX_V4			0x3f
-#define	RAY_MIB_CW_MAX_V5			0x003f
-
-#define	RAY_MIB_CW_MIN_V4			0x0f
-#define	RAY_MIB_CW_MIN_V5			0x000f
-
-/*
- * Symb		0xXX	- these parameters will affect the clear channel
- *			  assesment false triggering
- *
- */
-#define	RAY_MIB_NOISE_FILTER_GAIN_DEFAULT	0x04
-#define	RAY_MIB_NOISE_LIMIT_OFFSET_DEFAULT	0x08
-#define RAY_MIB_RSSI_THRESH_OFFSET_DEFAULT	0x28
-#define RAY_MIB_BUSY_THRESH_OFFSET_DEFAULT	0x28
-#define RAY_MIB_SYNC_THRESH_DEFAULT		0x07
-
-#define	RAY_MIB_TEST_MODE_NORMAL		0x0
-#define	RAY_MIB_TEST_MODE_ANT_1			0x1
-#define	RAY_MIB_TEST_MODE_ATN_2			0x2
-#define	RAY_MIB_TEST_MODE_ATN_BOTH		0x3
-#define RAY_MIB_TEST_MODE_DEFAULT		RAY_MIB_TEST_MODE_NORMAL
-
-#define RAY_MIB_TEST_MIN_CHAN_DEFAULT		0x02
-#define RAY_MIB_TEST_MAX_CHAN_DEFAULT		0x02
-
-#define	RAY_MIB_ALLOW_PROBE_RESP_DISALLOW	0x0
-#define	RAY_MIB_ALLOW_PROBE_RESP_ALLOW		0x1
-#define	RAY_MIB_ALLOW_PROBE_RESP_DEFAULT	RAY_MIB_ALLOW_PROBE_RESP_DISALLOW
-
-#define	RAY_MIB_PRIVACY_MUST_START_NOWEP	0x0
-#define	RAY_MIB_PRIVACY_MUST_START_WEP		0x1
-#define	RAY_MIB_PRIVACY_MUST_START_DEFAULT	RAY_MIB_PRIVACY_MUST_START_NOWEP
-
-#define	RAY_MIB_PRIVACY_CAN_JOIN_NOWEP		0x0
-#define	RAY_MIB_PRIVACY_CAN_JOIN_WEP		0x1
-#define	RAY_MIB_PRIVACY_CAN_JOIN_DONT_CARE	0x2
-#define	RAY_MIB_PRIVACY_CAN_JOIN_DEFAULT	RAY_MIB_PRIVACY_CAN_JOIN_NOWEP
-
-#define	RAY_MIB_BASIC_RATE_SET_MINIMUM		1
-#define	RAY_MIB_BASIC_RATE_SET_MAXIMUM		4
-#define	RAY_MIB_BASIC_RATE_SET_500K		1
-#define	RAY_MIB_BASIC_RATE_SET_1000K		2
-#define	RAY_MIB_BASIC_RATE_SET_1500K		3
-#define	RAY_MIB_BASIC_RATE_SET_2000K		4
-#define	RAY_MIB_BASIC_RATE_SET_DEFAULT		RAY_MIB_BASIC_RATE_SET_2000K
-
-/*
- * IOCTL support
- */
-struct ray_param_req {
-	int		r_failcause;
-	u_int8_t	r_paramid;
-	u_int8_t	r_len;
-	u_int8_t	r_data[256];
-};
-struct ray_stats_req {
-	u_int64_t	rxoverflow;	/* Number of rx overflows	*/
-	u_int64_t	rxcksum;	/* Number of checksum errors	*/
-	u_int64_t	rxhcksum;	/* Number of header checksum errors */
-	u_int8_t	rxnoise;	/* Average receiver level	*/
-};
-#define	RAY_FAILCAUSE_EIDRANGE	1
-#define	RAY_FAILCAUSE_ELENGTH	2
-/* device can possibly return up to 255 */
-#define	RAY_FAILCAUSE_EDEVSTOP	256
-
-/* Get a param the data is a ray_param_req structure */
-#define	SIOCSRAYPARAM	SIOCSIFGENERIC
-#define	SIOCGRAYPARAM	SIOCGIFGENERIC
-/* Get the error counters the data is a ray_stats_req structure */
-#define	SIOCGRAYSTATS	_IOWR('i', 201, struct ifreq)
-#define SIOCGRAYSIGLEV  _IOWR('i', 202, struct ifreq)
-
-#define RAY_NSIGLEVRECS 8
-#define RAY_NSIGLEV 8
-#define RAY_NANTENNA 8
-
-struct ray_siglev {
-	u_int8_t	rsl_host[ETHER_ADDR_LEN]; /* MAC address */
-	u_int8_t	rsl_siglevs[RAY_NSIGLEV]; /* levels, newest in [0] */
-	u_int8_t	rsl_antennas[RAY_NANTENNA]; /* best antenna */
-	struct timeval	rsl_time; 		  /* time of last packet */
-};
diff --git a/sys/dev/ray/if_rayreg.h b/sys/dev/ray/if_rayreg.h
deleted file mode 100644
index 562279f..0000000
--- a/sys/dev/ray/if_rayreg.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*-
- * Copyright (C) 2000
- * Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
- *
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DUNCAN BARCLAY 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 DUNCAN BARCLAY 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.
- *
- * $FreeBSD$
- *
- */
-
-/*	$NetBSD: if_rayreg.h,v 1.1 2000/01/23 23:59:22 chopps Exp $	*/
-/* 
- * Copyright (c) 2000 Christian E. Hopps
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- */
-
-/*
- * CCR registers, appearing in the attribute memory space
- */
-#define RAY_CCR		0xf00			/* CCR register offset */
-#define RAY_COR		(RAY_CCR + 0x00)	/* config option register */
-#define	RAY_CCSR	(RAY_CCR + 0x01)	/* config/status register */
-#define	RAY_PIN		(RAY_CCR + 0x02)	/* not used by hw */
-#define	RAY_SOCKETCOPY	(RAY_CCR + 0x03)	/* not used by hw */
-#define	RAY_HCSIR	(RAY_CCR + 0x05)	/* HCS intr register */
-#define	RAY_ECFIR	(RAY_CCR + 0x06)	/* ECF intr register */
-/*
- * We don't seem to be able to access these in a simple manner
- */
-#define	RAY_AR0		(RAY_CCR + 0x08)	/* authorization register 0 (unused) */
-#define	RAY_AR1		(RAY_CCR + 0x09)	/* authorization register 1 (unused) */
-#define	RAY_PMR		(RAY_CCR + 0x0a)	/* program mode register (unused) */
-#define	RAY_TMR		(RAY_CCR + 0x0b)	/* pc test mode register (unused) */
-#define	RAY_FCWR	(RAY_CCR + 0x10)	/* frequency control word register */
-#define RAY_TMC1	(RAY_CCR + 0x14)	/* test mode control 1 (unused) */
-#define RAY_TMC2	(RAY_CCR + 0x15)	/* test mode control 1 (unused) */
-#define RAY_TMC3	(RAY_CCR + 0x16)	/* test mode control 1 (unused) */
-#define RAY_TMC4	(RAY_CCR + 0x17)	/* test mode control 1 (unused) */
-
-/*
- * COR register bits
- */
-#define	RAY_COR_CFG_NUM		0x01	/* currently ignored and set */
-#define RAY_COR_CFG_MASK	0x3f	/* mask for function */
-#define	RAY_COR_LEVEL_IRQ	0x40	/* currently ignored and set */
-#define	RAY_COR_RESET		0x80	/* soft-reset the card */
-#define RAY_COR_DEFAULT		(RAY_COR_CFG_NUM | RAY_COR_LEVEL_IRQ)
-
-/*
- * CCS register bits
- */
-#define	RAY_CCS_NORMAL		0x00	/* normal operation */
-#define	RAY_CCS_IRQ		0x02	/* interrupt pending */
-#define	RAY_CCS_POWER_DOWN	0x04	/* when written powers down card */
-
-/*
- * HCSIR bits
- *
- * the host can only clear this bit.
- */
-#define	RAY_HCSIR_IRQ		0x01	/* indicates an interrupt */
-
-/*
- * ECFIR values
- */
-#define	RAY_ECFIR_IRQ		0x01	/* interrupt the card */
-
-/*
- * AR0 values
- * used for testing/programming the card (unused)
- */
-#define	RAY_AR0_ON		0x57
-
-/*
- * AR1 values
- * used for testing/programming the card (unused)
- */
-#define	RAY_AR1_ON		0x82
-
-/*
- * PMR bits 
- * these are used to program the card (unused)
- */
-#define	RAY_PMR_NORMAL		0x00	/* normal operation */
-#define	RAY_PMR_PC2PM		0x02	/* grant access to firmware flash */
-#define	RAY_PMR_PC2CAL		0x10	/* read access to the A/D modem inp */
-#define	RAY_PMR_MLSE		0x20	/* read access to the MSLE prom */
-
-/*
- * TMR bits
- * get access to test modes (unused)
- */
-#define	RAY_TMR_NORMAL		0x00	/* normal operation */
-#define	RAY_TMR_TEST		0x08	/* test mode */
-
-/*
- * FCWR -- frequency control word, values from [0x02,0xA6] map to
- * RF frequency values.
- */
-
-/*
- * 48k of memory
- */
-#define	RAY_SRAM_MEM_BASE	0
-#define	RAY_SRAM_MEM_SIZE	0xc000
-
-/*
- * offsets into shared ram
- */
-#define	RAY_SCB_BASE		0x0000	/* cfg/status/ctl area */
-#define	RAY_STATUS_BASE		0x0100
-#define	RAY_HOST_TO_ECF_BASE	0x0200
-#define	RAY_ECF_TO_HOST_BASE	0x0300
-#define	RAY_CCS_BASE		0x0400
-#define	RAY_RCS_BASE		0x0800
-#define	RAY_APOINT_TIM_BASE	0x0c00
-#define	RAY_SSID_LIST_BASE	0x0d00
-#define	RAY_TX_BASE		0x1000
-#define	RAY_TX_SIZE		0x7000
-#define	RAY_TX_END		0x8000
-#define	RAY_RX_BASE		0x8000
-#define	RAY_RX_END		0xc000
-#define	RAY_RX_MASK		0x3fff
-
-/*
- * Startup reporting stucture
- */
-struct ray_ecf_startup_v4 {
-    u_int8_t	e_status;
-    u_int8_t	e_station_addr[ETHER_ADDR_LEN];
-    u_int8_t	e_prg_cksum;
-    u_int8_t	e_cis_cksum;
-    u_int8_t	e_resv0[7];
-    u_int8_t	e_japan_callsign[12];
-};
-struct ray_ecf_startup_v5 {
-    u_int8_t	e_status;
-    u_int8_t	e_station_addr[ETHER_ADDR_LEN];
-    u_int8_t	e_resv0;
-    u_int8_t	e_rates[8];
-    u_int8_t	e_japan_callsign[12];
-    u_int8_t	e_prg_cksum;
-    u_int8_t	e_cis_cksum;
-    u_int8_t	e_fw_build_string;
-    u_int8_t	e_fw_build;
-    u_int8_t	e_fw_resv;
-    u_int8_t	e_asic_version;
-    u_int8_t	e_tibsize;
-    u_int8_t	e_resv1[29];
-};
-
-/*
- * Startup status word result codes
- */
-#define	RAY_ECFS_RESERVED0		0x01
-#define	RAY_ECFS_PROC_SELF_TEST		0x02
-#define	RAY_ECFS_PROG_MEM_CHECKSUM	0x04
-#define	RAY_ECFS_DATA_MEM_TEST		0x08
-#define	RAY_ECFS_RX_CALIBRATION		0x10
-#define	RAY_ECFS_FW_VERSION_COMPAT	0x20
-#define	RAY_ECFS_RERSERVED1		0x40
-#define	RAY_ECFS_TEST_COMPLETE		0x80
-#define	RAY_ECFS_CARD_OK		RAY_ECFS_TEST_COMPLETE
-#define RAY_ECFS_PRINTFB	\
-	"\020"			\
-	"\001RESERVED0"		\
-	"\002PROC_SELF_TEST"	\
-	"\003PROG_MEM_CHECKSUM"	\
-	"\004DATA_MEM_TEST"	\
-	"\005RX_CALIBRATION"	\
-	"\006FW_VERSION_COMPAT"	\
-	"\007RERSERVED1"	\
-	"\010TEST_COMPLETE"
-
-/*
- * Firmware build codes
- */
-#define	RAY_ECFS_BUILD_4		0x55
-#define	RAY_ECFS_BUILD_5		0x5
-
-/*
- * System Control Block
- */
-#define	RAY_SCB_CCSI		0x00	/* host CCS index */
-#define	RAY_SCB_RCSI		0x01	/* ecf RCS index */
-
-/*
- * command control structures (for CCSR commands)
- */
-
-/*
- * commands for CCSR
- */
-#define	RAY_CMD_DOWNLOAD_PARAMS	0x01	/* download start params */
-#define	RAY_CMD_UPDATE_PARAMS	0x02	/* update params */
-#define	RAY_CMD_REPORT_PARAMS	0x03	/* report params */
-#define	RAY_CMD_UPDATE_MCAST	0x04	/* update mcast list */
-#define	RAY_CMD_UPDATE_APM	0x05	/* update power saving mode */
-#define	RAY_CMD_START_NET	0x06
-#define	RAY_CMD_JOIN_NET	0x07
-#define	RAY_CMD_START_ASSOC	0x08
-#define	RAY_CMD_TX_REQ		0x09
-#define	RAY_CMD_TEST_MEM	0x0a
-#define	RAY_CMD_SHUTDOWN	0x0b
-#define	RAY_CMD_DUMP_MEM	0x0c
-#define	RAY_CMD_START_TIMER	0x0d
-#define	RAY_CMD_MAX		0x0e
-
-/*
- * unsolicted commands from the ECF
- */
-#define	RAY_ECMD_RX_DONE		0x80	/* process rx packet */
-#define	RAY_ECMD_REJOIN_DONE		0x81	/* rejoined the network */
-#define	RAY_ECMD_ROAM_START		0x82	/* romaining started */
-#define	RAY_ECMD_JAPAN_CALL_SIGNAL	0x83	/* japan test thing */
-
-
-/*
- * Configure/status/control memory
- */
-struct ray_csc {
-    u_int8_t	csc_mrxo_own;		/* 0 ECF writes, 1 host write */
-    u_int8_t	csc_mrxc_own;		/* 0 ECF writes, 1 host write */
-    u_int8_t	csc_rxhc_own;		/* 0 ECF writes, 1 host write */
-    u_int8_t	csc_resv;
-    u_int16_t	csc_mrx_overflow;	/* ECF incs on rx overflow */
-    u_int16_t	csc_mrx_cksum;		/* ECF incs on cksum error */
-    u_int16_t	csc_rx_hcksum;		/* ECF incs on header cksum error */
-    u_int8_t	csc_rx_noise;		/* average RSL measuremant */
-};
-
-/*
- * CCS area
- */
-#define	RAY_CCS_LINK_NULL	0xff
-#define	RAY_CCS_SIZE		16
-
-#define	RAY_CCS_TX_FIRST	0
-#define	RAY_CCS_TX_LAST		13
-#define	RAY_CCS_NTX		(RAY_CCS_TX_LAST - RAY_CCS_TX_FIRST + 1)
-#define	RAY_TX_BUF_SIZE		2048
-#define	RAY_CCS_CMD_FIRST	14
-#define	RAY_CCS_CMD_LAST	63
-#define	RAY_CCS_NCMD		(RAY_CCS_CMD_LAST - RAY_CCS_CMD_FIRST + 1)
-#define	RAY_CCS_LAST		63
-
-#define	RAY_CCS_INDEX(ccs)	(((ccs) - RAY_CCS_BASE) / RAY_CCS_SIZE)
-#define	RAY_CCS_ADDRESS(i)	(RAY_CCS_BASE + (i) * RAY_CCS_SIZE)
-
-/*
- * RCS area
- */
-#define	RAY_RCS_FIRST	64
-#define	RAY_RCS_LAST	127
-
-/*
- * CCS commands
- */
-struct ray_cmd {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-};
-
-#define	RAY_CCS_STATUS_FREE		0x0
-#define	RAY_CCS_STATUS_BUSY		0x1
-#define	RAY_CCS_STATUS_COMPLETE		0x2
-#define	RAY_CCS_STATUS_FAIL		0x3
-#define RAY_CCS_STATUS_STRINGS {	\
-    "free",				\
-    "busy",				\
-    "complete",				\
-    "fail"				\
-}
-
-/* RAY_CMD_UPDATE_PARAMS */
-struct ray_cmd_update {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_paramid;
-    u_int8_t	c_nparam;
-    u_int8_t	c_failcause;
-};
-
-/* RAY_CMD_REPORT_PARAMS */
-struct ray_cmd_report {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_paramid;
-    u_int8_t	c_nparam;
-    u_int8_t	c_failcause;
-    u_int8_t	c_len;
-};
-
-/* RAY_CMD_UPDATE_MCAST */
-struct ray_cmd_update_mcast {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_nmcast;
-};
-
-/* RAY_CMD_UPDATE_APM */
-struct ray_cmd_udpate_apm {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_mode;
-};
-
-/* RAY_CMD_START_NET and RAY_CMD_JOIN_NET */
-struct ray_cmd_net {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_upd_param;
-    u_int8_t	c_bss_id[ETHER_ADDR_LEN];
-    u_int8_t	c_inited;
-    u_int8_t	c_def_txrate;
-    u_int8_t	c_encrypt;
-};
-/* Parameters passed in HOST_TO_ECF section when c_upd_param is set in
- * ray_cmd_net. */
-struct ray_net_params {
-    u_int8_t	p_net_type;
-    u_int8_t	p_ssid[32];
-    u_int8_t	p_privacy_must_start;
-    u_int8_t	p_privacy_can_join;
-};
-
-/* RAY_CMD_START_ASSOC */
-struct ray_cmd_update_assoc {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_astatus;
-    u_int8_t	c_aid[2];
-};
-
-/* RAY_CMD_TX_REQ */
-struct ray_cmd_tx {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_bufp[2];
-    u_int8_t	c_len[2];
-    u_int8_t	c_resv[5];
-    u_int8_t	c_tx_rate;
-    u_int8_t	c_apm_mode;
-    u_int8_t	c_nretry;
-    u_int8_t	c_antenna;
-};
-struct ray_cmd_tx_4 {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_bufp[2];
-    u_int8_t	c_len[2];
-    u_int8_t	c_addr[ETHER_ADDR_LEN];
-    u_int8_t	c_apm_mode;
-    u_int8_t	c_nretry;
-    u_int8_t	c_antenna;
-};
-
-/* RAY_CMD_DUMP_MEM */
-struct ray_cmd_dump_mem {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_memtype;
-    u_int8_t	c_memp[2];
-    u_int8_t	c_len;
-};
-
-/* RAY_CMD_START_TIMER */
-struct ray_cmd_start_timer {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_duration[2];
-};
-
-/* RAY_ECMD_RX_DONE */
-struct ray_cmd_rx {
-    u_int8_t	c_status;		/* ccs generic header */
-    u_int8_t	c_cmd;			/* " */
-    u_int8_t	c_link;			/* " */
-    u_int8_t	c_bufp[2];		/* buffer pointer */
-    u_int8_t	c_len[2];		/* length */
-    u_int8_t	c_siglev;		/* signal level */
-    u_int8_t	c_nextfrag;		/* next fragment in packet */
-    u_int8_t	c_pktlen[2];		/* total packet length */
-    u_int8_t	c_antenna;		/* ant. with best reception */
-    u_int8_t	c_updbss;		/* only 1 for beacon messages */
-};
-
-/*
- * Transmit scratch space and phy header structures
- */
-struct ray_tx_tib {
-    u_int8_t	t_ccs_index;
-    u_int8_t	t_psm;
-    u_int8_t	t_pass_fail;
-    u_int8_t	t_retry_count;
-    u_int8_t	t_max_retries;
-    u_int8_t	t_frags_remaining;
-    u_int8_t	t_no_rb;
-    u_int8_t	t_rts_reqd;
-    u_int8_t	t_csma_tx_cntrl_2;
-    u_int8_t	t_sifs_tx_cntrl_2;
-    u_int8_t	t_tx_dma_addr_1[2];
-    u_int8_t	t_tx_dma_addr_2[2];
-    u_int8_t	t_var_dur_2mhz[2];
-    u_int8_t	t_var_dur_1mhz[2];
-    u_int8_t	t_max_dur_2mhz[2];
-    u_int8_t	t_max_dur_1mhz[2];
-    u_int8_t	t_hdr_len;
-    u_int8_t	t_max_frag_len[2];
-    u_int8_t	t_var_len[2];
-    u_int8_t	t_phy_hdr_4;
-    u_int8_t	t_mac_hdr_1;
-    u_int8_t	t_mac_hdr_2;
-    u_int8_t	t_sid[2];
-};
-
-struct ray_tx_phy_header {
-    u_int8_t	t_sfd[2];
-    u_int8_t	t_hdr_3;
-    u_int8_t	t_hdr_4;
-};
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
deleted file mode 100644
index d3498a4..0000000
--- a/sys/dev/ray/if_rayvar.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*-
- * Copyright (C) 2000
- * Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
- *
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DUNCAN BARCLAY 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 DUNCAN BARCLAY 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.
- *
- * $FreeBSD$
- *
- */
-
-/*
- * Network parameters, used twice in softc to store what we want and what
- * we have.
- *
- * The current parameters are ONLY valid in a function called from the runq
- * and should not be accessed directly from ioctls.
- */
-struct ray_nw_param {
-    struct ray_cmd_net	p_1;
-    struct ray_net_params \
-    			p_2;
-    u_int8_t		np_ap_status;
-    int			np_promisc;	/* Promiscious mode status	*/
-    int			np_framing;	/* Packet framing types		*/
-    int			np_auth;	/* Authentication status	*/
-    int			np_havenet;	/* True if we have a network	*/
-};
-#define np_upd_param	p_1.c_upd_param
-#define	np_bss_id	p_1.c_bss_id
-#define	np_inited	p_1.c_inited
-#define	np_def_txrate	p_1.c_def_txrate
-#define	np_encrypt	p_1.c_encrypt
-#define np_net_type	p_2.p_net_type
-#define np_ssid		p_2.p_ssid
-#define np_priv_start	p_2.p_privacy_must_start
-#define np_priv_join	p_2.p_privacy_can_join
-
-/*
- * One of these structures per allocated device
- */
-struct ray_softc {
-
-    device_t dev;			/* Device */
-    struct ifnet	*ifp;		/* Ethernet common 		*/
-    struct callout_handle
-    			tx_timerh;	/* Handle for tx timer	*/
-    struct callout_handle
-    			com_timerh;	/* Handle for command timer	*/
-
-    bus_space_tag_t	am_bst;		/* Bus space tag for attribute memory */
-    bus_space_handle_t	am_bsh;		/* Bus space handle for attribute mem */
-    int			am_rid;		/* Resource id for attribute memory */
-    struct resource*	am_res;		/* Resource for attribute memory */
-    bus_space_tag_t	cm_bst;		/* Bus space tag for common memory */
-    bus_space_handle_t	cm_bsh;		/* Bus space handle for common memory */
-    int			cm_rid;		/* Resource id for common memory */
-    struct resource*	cm_res;		/* Resource for common memory */
-    int			irq_rid;	/* Resource id for irq */
-    struct resource*	irq_res;	/* Resource for irq */
-    void *		irq_handle;	/* Handle for irq handler */
-
-    u_int8_t		sc_ccsinuse[64];/* ccss' in use -- not for tx	*/
-    u_char		sc_gone;	/* 1 = Card bailed out		*/
-
-    struct ray_ecf_startup_v5
-    			sc_ecf_startup; /* Startup info from card	*/
-
-    TAILQ_HEAD(ray_comq, ray_comq_entry) 
-			sc_comq;	/* Command queue		*/
-
-    struct ray_nw_param	sc_c;		/* current network params 	*/
-    struct ray_nw_param sc_d;		/* desired network params	*/
-
-    int			sc_checkcounters;
-    u_int64_t		sc_rxoverflow;	/* Number of rx overflows	*/
-    u_int64_t		sc_rxcksum;	/* Number of checksum errors	*/
-    u_int64_t		sc_rxhcksum;	/* Number of header checksum errors */
-    u_int8_t		sc_rxnoise;	/* Average receiver level	*/
-    struct ray_siglev	sc_siglevs[RAY_NSIGLEVRECS]; /* Antenna/levels	*/
-};
-
-#define	sc_station_addr	sc_ecf_startup.e_station_addr
-#define	sc_version	sc_ecf_startup.e_fw_build_string
-#define	sc_tibsize	sc_ecf_startup.e_tibsize
-
-/*
- * Command queue definitions
- */
-typedef void (*ray_comqfn_t)(struct ray_softc *sc, struct ray_comq_entry *com);
-struct ray_comq_entry {
-	TAILQ_ENTRY(ray_comq_entry) c_chain;	/* Tail queue.		*/
-	ray_comqfn_t	c_function;		/* Function to call */
-	int		c_flags;		/* Flags		*/
-	u_int8_t	c_retval;		/* Return value		*/
-	void		*c_wakeup;		/* Sleeping on this	*/
-	size_t		c_ccs;			/* CCS structure	*/
-	struct ray_nw_param
-			c_desired;		/* network settings	*/
-	struct ray_param_req
-    			*c_pr;			/* MIB report/update	*/
-	char		*c_mesg;
-};
-
-/*
- * Macro's and constants
- */
-static int mib_info[RAY_MIB_MAX+1][3] = RAY_MIB_INFO;
-
-/* Indirections for reading/writing memory - from NetBSD/if_ray.c */
-#ifndef offsetof
-#define offsetof(type, member) \
-    ((size_t)(&((type *)0)->member))
-#endif /* offsetof */
-
-#define ATTR_READ_1(sc, off) \
-    ((u_int8_t)bus_space_read_1((sc)->am_bst, (sc)->am_bsh, (off)))
-
-#define ATTR_WRITE_1(sc, off, val) \
-    bus_space_write_1((sc)->am_bst, (sc)->am_bsh, (off), (val))
-
-#define	SRAM_READ_1(sc, off) \
-    ((u_int8_t)bus_space_read_1((sc)->cm_bst, (sc)->cm_bsh, (off)))
-
-#define SRAM_READ_REGION(sc, off, p, n) \
-    bus_space_read_region_1((sc)->cm_bst, (sc)->cm_bsh, (off), (void *)(p), (n))
-
-#define	SRAM_READ_FIELD_1(sc, off, s, f) \
-    SRAM_READ_1((sc), (off) + offsetof(struct s, f))
-
-#define	SRAM_READ_FIELD_2(sc, off, s, f)			\
-    ((((u_int16_t)SRAM_READ_1((sc), (off) + offsetof(struct s, f)) << 8) \
-    |(SRAM_READ_1((sc), (off) + 1 + offsetof(struct s, f)))))
-
-#define	SRAM_READ_FIELD_N(sc, off, s, f, p, n)	\
-    SRAM_READ_REGION((sc), (off) + offsetof(struct s, f), (p), (n))
-
-#define	SRAM_WRITE_1(sc, off, val)	\
-    bus_space_write_1((sc)->cm_bst, (sc)->cm_bsh, (off), (val))
-
-#define SRAM_WRITE_REGION(sc, off, p, n) \
-    bus_space_write_region_1((sc)->cm_bst, (sc)->cm_bsh, (off), (void *)(p), (n))
-
-#define	SRAM_WRITE_FIELD_1(sc, off, s, f, v) 	\
-    SRAM_WRITE_1((sc), (off) + offsetof(struct s, f), (v))
-
-#define	SRAM_WRITE_FIELD_2(sc, off, s, f, v) do {	\
-    SRAM_WRITE_1((sc), (off) + offsetof(struct s, f), (((v) >> 8 ) & 0xff)); \
-    SRAM_WRITE_1((sc), (off) + 1 + offsetof(struct s, f), ((v) & 0xff)); \
-} while (0)
-
-#define	SRAM_WRITE_FIELD_N(sc, off, s, f, p, n)	\
-    SRAM_WRITE_REGION((sc), (off) + offsetof(struct s, f), (p), (n))
-
-/* Framing types */
-/* XXX maybe better as part of the if structure? */
-#define RAY_FRAMING_ENCAPSULATION	0
-#define RAY_FRAMING_TRANSLATION		1
-
-/* Authentication states */
-#define RAY_AUTH_UNAUTH		0
-#define RAY_AUTH_WAITING	1
-#define RAY_AUTH_AUTH		2
-#define RAY_AUTH_NEEDED		3
-
-/* Flags for runq entries */
-#define RAY_COM_FWOK		0x0001		/* Wakeup on completion	*/
-#define RAY_COM_FRUNNING	0x0002		/* This one running	*/
-#define RAY_COM_FCOMPLETED	0x0004		/* This one completed	*/
-#define RAY_COM_FWAIT		0x0008		/* Do not run the queue */
-#define RAY_COM_FCHKRUNNING	0x0010		/* Check IFF_DRV_RUNNING*/
-#define RAY_COM_FDETACHED	0x0020		/* Card is gone		*/
-#define RAY_COM_FWOKEN		0x0040		/* Woken by detach	*/
-#define RAY_COM_FLAGS_PRINTFB	\
-	"\020"			\
-	"\001WOK"		\
-	"\002RUNNING"		\
-	"\003COMPLETED"		\
-	"\004WAIT"		\
-	"\005CHKRUNNING"	\
-	"\006DETACHED"
-
-#define RAY_COM_NEEDS_TIMO(cmd)	(		\
-	 (cmd == RAY_CMD_DOWNLOAD_PARAMS) ||	\
-	 (cmd == RAY_CMD_UPDATE_PARAMS) ||	\
-	 (cmd == RAY_CMD_UPDATE_MCAST)		\
-	)
-
-#ifndef RAY_COM_TIMEOUT
-#define RAY_COM_TIMEOUT		(hz / 2)
-#endif
-
-#ifndef RAY_RESET_TIMEOUT
-#define RAY_RESET_TIMEOUT	(10 * hz)
-#endif
-
-#ifndef RAY_TX_TIMEOUT
-#define RAY_TX_TIMEOUT		(hz / 2)
-#endif
-
-#define RAY_CCS_FREE(sc, ccs) \
-    SRAM_WRITE_FIELD_1((sc), (ccs), ray_cmd, c_status, RAY_CCS_STATUS_FREE)
-
-#define RAY_ECF_READY(sc) \
-    (!(ATTR_READ_1((sc), RAY_ECFIR) & RAY_ECFIR_IRQ))
-
-#define	RAY_ECF_START_CMD(sc)	ATTR_WRITE_1((sc), RAY_ECFIR, RAY_ECFIR_IRQ)
-
-#define	RAY_HCS_CLEAR_INTR(sc)	ATTR_WRITE_1((sc), RAY_HCSIR, 0)
-
-#define RAY_HCS_INTR(sc)	(ATTR_READ_1((sc), RAY_HCSIR) & RAY_HCSIR_IRQ)
-
-#define RAY_PANIC(sc, fmt, args...) do {				\
-    panic("ray%d: %s(%d) " fmt "\n", device_get_unit((sc)->dev),	\
-	__func__ , __LINE__ , ##args);					\
-} while (0)
-
-#define RAY_PRINTF(sc, fmt, args...) do {				\
-    device_printf((sc)->dev, "%s(%d) " fmt "\n",			\
-        __func__ , __LINE__ , ##args);					\
-} while (0)
-
-#define RAY_COM_MALLOC(function, flags)	\
-    ray_com_malloc((function), (flags), __STRING(function));
-
-#define RAY_COM_FREE(com, ncom)	do {					\
-    int i;								\
-    for (i = 0; i < ncom; i++)						\
-	    free(com[i], M_RAYCOM);					\
-} while (0)
-
-/*
- * This macro handles adding commands to the runq and quickly
- * getting away when the card is detached. The macro returns
- * from the current function with ENXIO.
- */
-#define RAY_COM_RUNQ(sc, com, ncom, mesg, error) do {			\
-    (error) = ray_com_runq_add((sc), (com), (ncom), (mesg));		\
-    if ((error) == ENXIO) {						\
-	    RAY_COM_FREE((com), (ncom));				\
-	    return (error);						\
-    } else if ((error) && ((error) != ENXIO))				\
-	    RAY_PRINTF(sc, "got error from runq 0x%x", (error));	\
-} while (0)
-
-/*
- * There are a number of entry points into the ray_init_xxx routines.
- * These can be classed into two types: a) those that happen as a result
- * of a change to the cards operating parameters (e.g. BSSID change), and
- * b) those that happen as a result of a change to the interface parameters
- * (e.g. a change to the IP address). The second set of entries need not
- * send a command to the card when the card is IFF_DRV_RUNNING. The
- * RAY_COM_FCHKRUNNING flags indicates when the RUNNING flag should be
- * checked, and this macro does the necessary check and command abort.
- */
-#define RAY_COM_CHKRUNNING(sc, com, ifp) do {				\
-    if (((com)->c_flags & RAY_COM_FCHKRUNNING) &&			\
-	((ifp)->if_drv_flags & IFF_DRV_RUNNING)) {			\
-	    ray_com_runq_done(sc);					\
-	    return;							\
-} } while (0)
-    
-    
-
-#define RAY_COM_INIT(com, function, flags)	\
-    ray_com_init((com), (function), (flags), __STRING(function));
-
-#ifndef RAY_COM_CHECK
-#define RAY_COM_CHECK(sc, com)
-#endif /* RAY_COM_CHECK */
-
-#ifndef RAY_MBUF_DUMP
-#define RAY_MBUF_DUMP(sc, mask, m, s)
-#endif /* RAY_MBUF_DUMP */
-
-#ifndef RAY_RECERR
-#define RAY_RECERR(sc, fmt, args...) do {				\
-    struct ifnet *ifp = (sc)->ifp;				\
-    if (ifp->if_flags & IFF_DEBUG) {					\
-	    device_printf((sc)->dev, "%s(%d) " fmt "\n",		\
-		__func__ , __LINE__ , ##args);				\
-} } while (0)
-#endif /* RAY_RECERR */
-
-/* XXX this should be in CCSERR but don't work - probably need to use ##ifp->(iferrcounter)++;						\*/
-#ifndef RAY_CCSERR
-#define RAY_CCSERR(sc, status, iferrcounter) do {			\
-    struct ifnet *ifp = (sc)->ifp;				\
-    char *ss[] = RAY_CCS_STATUS_STRINGS;				\
-    if ((status) != RAY_CCS_STATUS_COMPLETE) {				\
-	if (ifp->if_flags & IFF_DEBUG) {				\
-	    device_printf((sc)->dev,					\
-	        "%s(%d) ECF command completed with status %s\n",	\
-		__func__ , __LINE__ , ss[(status)]);			\
-} } } while (0)
-#endif /* RAY_CCSERR */
-
-#ifndef RAY_MAP_CM
-#define RAY_MAP_CM(sc)
-#endif /* RAY_MAP_CM */
-
-/*
- * Management information element payloads
- */
-union ieee80211_information {
-	char	ssid[IEEE80211_NWID_LEN+1];
-	struct rates {
-		u_int8_t	*p;
-	} rates;
-	struct fh {
-		u_int16_t	dwell;
-		u_int8_t	set;
-		u_int8_t	pattern;
-		u_int8_t	index;
-	} fh;
-	struct ds {
-		u_int8_t	channel;
-	} ds;
-	struct cf {
-		u_int8_t	count;
-		u_int8_t	period;
-		u_int8_t	maxdur[2];
-		u_int8_t	dur[2];
-	} cf;
-	struct tim {
-		u_int8_t	count;
-		u_int8_t	period;
-		u_int8_t	bitctl;
-		/* u_int8_t	pvt[251]; The driver needs to use this. */
-	} tim;
-	struct ibss {
-		u_int16_t	atim;
-	} ibss;
-	struct challenge {
-		u_int8_t	*p;
-		u_int8_t	len;
-	} challenge;
-};
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
deleted file mode 100644
index 79db670..0000000
--- a/sys/dev/sr/if_sr.c
+++ /dev/null
@@ -1,2936 +0,0 @@
-/*-
- * Copyright (c) 1996 - 2001 John Hay.
- * Copyright (c) 1996 SDL Communications, Inc.
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * Programming assumptions and other issues.
- *
- * Only a 16K window will be used.
- *
- * The descriptors of a DMA channel will fit in a 16K memory window.
- *
- * The buffers of a transmit DMA channel will fit in a 16K memory window.
- *
- * When interface is going up, handshaking is set and it is only cleared
- * when the interface is down'ed.
- *
- * There should be a way to set/reset Raw HDLC/PPP, Loopback, DCE/DTE,
- * internal/external clock, etc.....
- *
- */
-
-#include "opt_netgraph.h"
-#ifdef NETGRAPH
-#include <dev/sr/if_sr.h>
-#endif	/* NETGRAPH */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/sockio.h>
-#include <sys/socket.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <net/if.h>
-#ifdef NETGRAPH
-#include <sys/syslog.h>
-#else /* NETGRAPH */
-#include <net/if_sppp.h>
-#include <net/if_types.h>
-
-#include <net/bpf.h>
-#endif	/* NETGRAPH */
-
-#include <machine/md_var.h>
-
-#include <dev/ic/hd64570.h>
-#include <dev/sr/if_srregs.h>
-
-#ifdef NETGRAPH
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#endif /* NETGRAPH */
-/* #define USE_MODEMCK */
-
-#ifndef BUGGY
-#define BUGGY		0
-#endif
-
-#ifndef NETGRAPH
-#define PPP_HEADER_LEN	4
-#endif /* NETGRAPH */
-
-static int	next_sc_unit = 0;
-#ifndef NETGRAPH
-#ifdef USE_MODEMCK
-static int	sr_watcher = 0;
-#endif
-#endif /* NETGRAPH */
-
-/*
- * Define the software interface for the card... There is one for
- * every channel (port).
- */
-struct sr_softc {
-#ifndef NETGRAPH
-	struct	ifnet *ifp;	/* PPP service w/in system */
-#endif /* NETGRAPH */
-	struct	sr_hardc *hc;	/* card-level information */
-
-	int	unit;		/* With regard to all sr devices */
-	int	subunit;	/* With regard to this card */
-
-	struct	buf_block {
-		u_int	txdesc;	/* DPRAM offset */
-		u_int	txstart;/* DPRAM offset */
-		u_int	txend;	/* DPRAM offset */
-		u_int	txtail;	/* # of 1st free gran */
-		u_int	txmax;	/* # of free grans */
-		u_int	txeda;	/* err descr addr */
-	} block[SR_TX_BLOCKS];
-
-	char	xmit_busy;	/* Transmitter is busy */
-	char	txb_inuse;	/* # of tx grans in use */
-	u_int	txb_new;	/* ndx to new buffer */
-	u_int	txb_next_tx;	/* ndx to next gran rdy tx */
-
-	u_int	rxdesc;		/* DPRAM offset */
-	u_int	rxstart;	/* DPRAM offset */
-	u_int	rxend;		/* DPRAM offset */
-	u_int	rxhind;		/* ndx to the hd of rx bufrs */
-	u_int	rxmax;		/* # of avail grans */
-
-	u_int	clk_cfg;	/* Clock configuration */
-
-	int	scachan;	/* channel # on card */
-#ifdef NETGRAPH
-	int	running;	/* something is attached so we are running */
-	int	dcd;		/* do we have dcd? */
-	/* ---netgraph bits --- */
-	char		nodename[NG_NODESIZ]; /* store our node name */
-	int		datahooks;	/* number of data hooks attached */
-	node_p		node;		/* netgraph node */
-	hook_p		hook;		/* data hook */
-	hook_p		debug_hook;
-	struct ifqueue	xmitq_hipri;	/* hi-priority transmit queue */
-	struct ifqueue	xmitq;		/* transmit queue */
-	int		flags;		/* state */
-#define	SCF_RUNNING	0x01		/* board is active */
-#define	SCF_OACTIVE	0x02		/* output is active */
-	int		out_dog;	/* watchdog cycles output count-down */
-	struct callout_handle handle;	/* timeout(9) handle */
-	u_long		inbytes, outbytes;	/* stats */
-	u_long		lastinbytes, lastoutbytes; /* a second ago */
-	u_long		inrate, outrate;	/* highest rate seen */
-	u_long		inlast;		/* last input N secs ago */
-	u_long		out_deficit;	/* output since last input */
-	u_long		oerrors, ierrors[6];
-	u_long		opackets, ipackets;
-#endif /* NETGRAPH */
-};
-#define SC2IFP(sc)	sc->ifp
-
-#ifdef NETGRAPH
-#define	DOG_HOLDOFF	6	/* dog holds off for 6 secs */
-#define	QUITE_A_WHILE	300	/* 5 MINUTES */
-#define	LOTS_OF_PACKETS	100	
-#endif /* NETGRAPH */
-
-/*
- * Baud Rate table for Sync Mode.
- * Each entry consists of 3 elements:
- * Baud Rate (x100) , TMC, BR
- *
- * Baud Rate = FCLK / TMC / 2^BR
- * Baud table for Crystal freq. of 9.8304 Mhz
- */
-#ifdef N2_TEST_SPEED
-struct rate_line {
-	int	target;		/* target rate/100 */
-	int	tmc_reg;	/* TMC register value */
-	int	br_reg;		/* BR (BaudRateClk) selector */
-} n2_rates[] = {
-	/* Baudx100	TMC		BR */
-	{ 3,		128,		8 },
-	{ 6,		128,		7 },
-	{ 12,		128,		6 },
-	{ 24,		128,		5 },
-	{ 48,		128,		4 },
-	{ 96,		128,		3 },
-	{ 192,		128,		2 },
-	{ 384,		128,		1 },
-	{ 560,		88,		1 },
-	{ 640,		77,		1 },
-	{ 1280,		38,		1 },
-	{ 2560,		19,		1 },
-	{ 5120,		10,		1 },
-	{ 10000,	5,		1 },
-	{ 15000,	3,		1 },
-	{ 25000,	2,		1 },
-	{ 50000,	1,		1 },
-	{ 0,		0,		0 }
-};
-
-int	sr_test_speed[] = {
-	N2_TEST_SPEED,
-	N2_TEST_SPEED
-};
-
-int	etc0vals[] = {
-	SR_MCR_ETC0,		/* ISA channel 0 */
-	SR_MCR_ETC1,		/* ISA channel 1 */
-	SR_FECR_ETC0,		/* PCI channel 0 */
-	SR_FECR_ETC1		/* PCI channel 1 */
-};
-#endif
-
-devclass_t sr_devclass;
-#ifndef NETGRAPH
-MODULE_DEPEND(if_sr, sppp, 1, 1, 1);
-#endif
-
-static void	srintr(void *arg);
-static void	sr_xmit(struct sr_softc *sc);
-#ifndef NETGRAPH
-static void	srstart(struct ifnet *ifp);
-static int	srioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
-static void	srwatchdog(struct ifnet *ifp);
-#else
-static void	srstart(struct sr_softc *sc);
-static void	srwatchdog(struct sr_softc *sc);
-#endif /* NETGRAPH */
-static int	sr_packet_avail(struct sr_softc *sc, int *len, u_char *rxstat);
-static void	sr_copy_rxbuf(struct mbuf *m, struct sr_softc *sc, int len);
-static void	sr_eat_packet(struct sr_softc *sc, int single);
-static void	sr_get_packets(struct sr_softc *sc);
-
-static void	sr_up(struct sr_softc *sc);
-static void	sr_down(struct sr_softc *sc);
-static void	src_init(struct sr_hardc *hc);
-static void	sr_init_sca(struct sr_hardc *hc);
-static void	sr_init_msci(struct sr_softc *sc);
-static void	sr_init_rx_dmac(struct sr_softc *sc);
-static void	sr_init_tx_dmac(struct sr_softc *sc);
-static void	sr_dmac_intr(struct sr_hardc *hc, u_char isr);
-static void	sr_msci_intr(struct sr_hardc *hc, u_char isr);
-static void	sr_timer_intr(struct sr_hardc *hc, u_char isr);
-#ifndef NETGRAPH
-#ifdef USE_MODEMCK
-static void	sr_modemck(void *x);
-#endif
-#else
-static void	sr_modemck(struct sr_softc *x);
-#endif /* NETGRAPH */
-
-#ifdef NETGRAPH
-static	void	ngsr_watchdog_frame(void * arg);
-
-static ng_constructor_t	ngsr_constructor;
-static ng_rcvmsg_t	ngsr_rcvmsg;
-static ng_shutdown_t	ngsr_shutdown;
-static ng_newhook_t	ngsr_newhook;
-/*static ng_findhook_t	ngsr_findhook; */
-static ng_connect_t	ngsr_connect;
-static ng_rcvdata_t	ngsr_rcvdata;
-static ng_disconnect_t	ngsr_disconnect;
-
-static struct ng_type typestruct = {
-	.version =	NG_ABI_VERSION,
-	.name =		NG_SR_NODE_TYPE,
-	.constructor =	ngsr_constructor,
-	.rcvmsg =	ngsr_rcvmsg,
-	.shutdown =	ngsr_shutdown,
-	.newhook =	ngsr_newhook,
-	.connect =	ngsr_connect,
-	.rcvdata =	ngsr_rcvdata,
-	.disconnect =	ngsr_disconnect,
-};
-NETGRAPH_INIT_ORDERED(sync_sr, &typestruct, SI_SUB_DRIVERS, SI_ORDER_FIRST);
-#endif /* NETGRAPH */
-
-/*
- * Register the ports on the adapter.
- * Fill in the info for each port.
-#ifndef NETGRAPH
- * Attach each port to sppp and bpf.
-#endif
- */
-int
-sr_attach(device_t device)
-{
-	int intf_sw, pndx;
-	u_int32_t flags;
-	u_int fecr;
-	struct sr_hardc *hc;
-	struct sr_softc *sc;
-#ifndef NETGRAPH
-	struct ifnet *ifp;
-#endif /* NETGRAPH */
-	int unit;		/* index: channel w/in card */
-
-	hc = (struct sr_hardc *)device_get_softc(device);
-	sc = malloc(hc->numports * sizeof(struct sr_softc),
-		M_DEVBUF, M_WAITOK | M_ZERO);
-	if (sc == NULL)
-		goto errexit;
-	hc->sc = sc;
-
-	/*
-	 * Get the TX clock direction and configuration. The default is a
-	 * single external clock which is used by RX and TX.
-	 */
-	switch(hc->cardtype) {
-	case SR_CRD_N2:
-		flags = device_get_flags(device);
-#ifdef N2_TEST_SPEED
-		if (sr_test_speed[0] > 0)
-			hc->sc[0].clk_cfg = SR_FLAGS_INT_CLK;
-		else
-#endif
-		if (flags & SR_FLAGS_0_CLK_MSK)
-			hc->sc[0].clk_cfg =
-			    (flags & SR_FLAGS_0_CLK_MSK)
-			    >> SR_FLAGS_CLK_SHFT;
-
-		if (hc->numports == 2)
-#ifdef N2_TEST_SPEED
-			if (sr_test_speed[1] > 0)
-				hc->sc[0].clk_cfg = SR_FLAGS_INT_CLK;
-			else
-#endif
-			if (flags & SR_FLAGS_1_CLK_MSK)
-				hc->sc[1].clk_cfg = (flags & SR_FLAGS_1_CLK_MSK)
-				    >> (SR_FLAGS_CLK_SHFT +
-				    SR_FLAGS_CLK_CHAN_SHFT);
-		break;
-	case SR_CRD_N2PCI:
-		fecr = sr_read_fecr(hc);
-		for (pndx = 0; pndx < hc->numports; pndx++, sc++) {
-			switch (pndx) {
-			case 1:
-				intf_sw = fecr & SR_FECR_ID1 >> SR_FE_ID1_SHFT;
-				break;
-			case 0:
-			default:
-				intf_sw = fecr & SR_FECR_ID0 >> SR_FE_ID0_SHFT;
-			}
-
-#ifdef N2_TEST_SPEED
-			if (sr_test_speed[pndx] > 0)
-				sc->clk_cfg = SR_FLAGS_INT_CLK;
-			else
-#endif
-				switch (intf_sw) {
-				default:
-				case SR_FE_ID_RS232:
-				case SR_FE_ID_HSSI:
-				case SR_FE_ID_RS422:
-				case SR_FE_ID_TEST:
-					break;
-
-				case SR_FE_ID_V35:
-					sc->clk_cfg = SR_FLAGS_EXT_SEP_CLK;
-					break;
-
-				case SR_FE_ID_X21:
-					sc->clk_cfg = SR_FLAGS_EXT_CLK;
-					break;
-				}
-		}
-		sc = hc->sc;
-		break;
-	}
-
-	/*
-	 * Report Card configuration information before we start configuring
-	 * each channel on the card...
-	 */
-	printf("src%d: %uK RAM (%d mempages) @ %p-%p, %u ports.\n",
-	       hc->cunit, hc->memsize / 1024, hc->mempages,
-	       hc->mem_start, hc->mem_end, hc->numports);
-
-	src_init(hc);
-	sr_init_sca(hc);
-
-	if (bus_setup_intr(device, hc->res_irq,
-	    INTR_TYPE_NET, NULL, srintr, hc, &hc->intr_cookie) != 0)
-		goto errexit;
-
-	/*
-	 * Now configure each port on the card.
-	 */
-	for (unit = 0; unit < hc->numports; sc++, unit++) {
-		sc->hc = hc;
-		sc->subunit = unit;
-		sc->unit = next_sc_unit;
-		next_sc_unit++;
-		sc->scachan = unit % NCHAN;
-
-		sr_init_rx_dmac(sc);
-		sr_init_tx_dmac(sc);
-		sr_init_msci(sc);
-
-		printf("sr%d: Adapter %d, port %d.\n",
-		       sc->unit, hc->cunit, sc->subunit);
-
-#ifndef NETGRAPH
-		ifp = SC2IFP(sc) = if_alloc(IFT_PPP);
-		if (ifp == NULL) {
-			goto errexit;
-		}
-		ifp->if_softc = sc;
-		if_initname(ifp, device_get_name(device),
-		    device_get_unit(device));
-		ifp->if_mtu = PP_MTU;
-		ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST |
-		    IFF_NEEDSGIANT;
-		ifp->if_ioctl = srioctl;
-		ifp->if_start = srstart;
-		ifp->if_watchdog = srwatchdog;
-
-		IFP2SP(sc->ifp)->pp_flags = PP_KEEPALIVE;
-		sppp_attach(sc->ifp);
-		if_attach(ifp);
-
-		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
-#else	/* NETGRAPH */
-		if (ng_make_node_common(&typestruct, &sc->node) != 0)
-			goto errexit;
-		sprintf(sc->nodename, "%s%d", NG_SR_NODE_TYPE, sc->unit);
-		if (ng_name_node(sc->node, sc->nodename)) {
-			NG_NODE_UNREF(sc->node); /* make it go away again */
-			goto errexit;
-		}
-		NG_NODE_SET_PRIVATE(sc->node, sc);
-		callout_handle_init(&sc->handle);
-		sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
-		sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
-		mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", NULL, MTX_DEF);
-		mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", NULL,
-		    MTX_DEF);
-		sc->running = 0;
-#endif	/* NETGRAPH */
-	}
-
-	if (hc->mempages)
-		SRC_SET_OFF(hc);
-
-	return (0);
-
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-sr_detach(device_t device)
-{
-	struct sr_hardc *hc = device_get_softc(device);
-
-	if (hc->intr_cookie != NULL) {
-		if (bus_teardown_intr(device,
-			hc->res_irq, hc->intr_cookie) != 0) {
-				printf("intr teardown failed.. continuing\n");
-		}
-		hc->intr_cookie = NULL;
-	}
-
-	/* XXX Stop the DMA. */
-
-	/*
-	 * deallocate any system resources we may have
-	 * allocated on behalf of this driver.
-	 */
-	free(hc->sc, M_DEVBUF);
-	hc->sc = NULL;
-	hc->mem_start = NULL;
-	return (sr_deallocate_resources(device));
-}
-
-int
-sr_allocate_ioport(device_t device, int rid, u_long size)
-{
-	struct sr_hardc *hc = device_get_softc(device);
-
-	hc->rid_ioport = rid;
-	hc->res_ioport = bus_alloc_resource(device, SYS_RES_IOPORT,
-			&hc->rid_ioport, 0ul, ~0ul, size, RF_ACTIVE);
-	if (hc->res_ioport == NULL) {
-		goto errexit;
-	}
-	hc->bt_ioport = rman_get_bustag(hc->res_ioport);
-	hc->bh_ioport = rman_get_bushandle(hc->res_ioport);
-
-	return (0);
-
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-sr_allocate_irq(device_t device, int rid, u_long size)
-{
-	struct sr_hardc *hc = device_get_softc(device);
-
-	hc->rid_irq = rid;
-	hc->res_irq = bus_alloc_resource_any(device, SYS_RES_IRQ,
-			&hc->rid_irq, RF_SHAREABLE|RF_ACTIVE);
-	if (hc->res_irq == NULL) {
-		goto errexit;
-	}
-	return (0);
-
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-sr_allocate_memory(device_t device, int rid, u_long size)
-{
-	struct sr_hardc *hc = device_get_softc(device);
-
-	hc->rid_memory = rid;
-	hc->res_memory = bus_alloc_resource(device, SYS_RES_MEMORY,
-			&hc->rid_memory, 0ul, ~0ul, size, RF_ACTIVE);
-	if (hc->res_memory == NULL) {
-		goto errexit;
-	}
-	hc->bt_memory = rman_get_bustag(hc->res_memory);
-	hc->bh_memory = rman_get_bushandle(hc->res_memory);
-
-	return (0);
-
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-sr_allocate_plx_memory(device_t device, int rid, u_long size)
-{
-	struct sr_hardc *hc = device_get_softc(device);
-
-	hc->rid_plx_memory = rid;
-	hc->res_plx_memory = bus_alloc_resource(device, SYS_RES_MEMORY,
-			&hc->rid_plx_memory, 0ul, ~0ul, size, RF_ACTIVE);
-	if (hc->res_plx_memory == NULL) {
-		goto errexit;
-	}
-	return (0);
-
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-int
-sr_deallocate_resources(device_t device)
-{
-	struct sr_hardc *hc = device_get_softc(device);
-
-	if (hc->res_irq != 0) {
-		bus_release_resource(device, SYS_RES_IRQ,
-			hc->rid_irq, hc->res_irq);
-		hc->res_irq = 0;
-	}
-	if (hc->res_ioport != 0) {
-		bus_release_resource(device, SYS_RES_IOPORT,
-			hc->rid_ioport, hc->res_ioport);
-		hc->res_ioport = 0;
-	}
-	if (hc->res_memory != 0) {
-		bus_release_resource(device, SYS_RES_MEMORY,
-			hc->rid_memory, hc->res_memory);
-		hc->res_memory = 0;
-	}
-	if (hc->res_plx_memory != 0) {
-		bus_release_resource(device, SYS_RES_MEMORY,
-			hc->rid_plx_memory, hc->res_plx_memory);
-		hc->res_plx_memory = 0;
-	}
-	return (0);
-}
-
-/*
- * N2 Interrupt Service Routine
- *
- * First figure out which SCA gave the interrupt.
- * Process it.
- * See if there is other interrupts pending.
- * Repeat until there no interrupts remain.
- */
-static void
-srintr(void *arg)
-{
-	struct sr_hardc *hc = (struct sr_hardc *)arg;
-	sca_regs *sca = hc->sca;	/* MSCI register tree */
-	u_char  isr0, isr1, isr2;	/* interrupt statii captured */
-
-#if BUGGY > 1
-	printf("sr: srintr_hc(hc=%08x)\n", hc);
-#endif
-
-	/*
-	 * Since multiple interfaces may share this interrupt, we must loop
-	 * until no interrupts are still pending service.
-	 */
-	while (1) {
-		/*
-		 * Read all three interrupt status registers from the N2
-		 * card...
-		 */
-		isr0 = SRC_GET8(hc, sca->isr0);
-		isr1 = SRC_GET8(hc, sca->isr1);
-		isr2 = SRC_GET8(hc, sca->isr2);
-
-		/*
-		 * If all three registers returned 0, we've finished
-		 * processing interrupts from this device, so we can quit
-		 * this loop...
-		 */
-		if ((isr0 | isr1 | isr2) == 0)
-			break;
-
-#if BUGGY > 2
-		printf("src%d: srintr_hc isr0 %x, isr1 %x, isr2 %x\n",
-#ifndef NETGRAPH
-			unit, isr0, isr1, isr2);
-#else
-			hc->cunit, isr0, isr1, isr2);
-#endif /* NETGRAPH */
-#endif
-
-		/*
-		 * Now we can dispatch the interrupts. Since we don't expect
-		 * either MSCI or timer interrupts, we'll test for DMA
-		 * interrupts first...
-		 */
-		if (isr1)	/* DMA-initiated interrupt */
-			sr_dmac_intr(hc, isr1);
-
-		if (isr0)	/* serial part IRQ? */
-			sr_msci_intr(hc, isr0);
-
-		if (isr2)	/* timer-initiated interrupt */
-			sr_timer_intr(hc, isr2);
-	}
-}
-
-/*
- * This will only start the transmitter. It is assumed that the data
- * is already there.
- * It is normally called from srstart() or sr_dmac_intr().
- */
-static void
-sr_xmit(struct sr_softc *sc)
-{
-	u_short cda_value;	/* starting descriptor */
-	u_short eda_value;	/* ending descriptor */
-	struct sr_hardc *hc;
-#ifndef NETGRAPH
-	struct ifnet *ifp;	/* O/S Network Services */
-#endif /* NETGRAPH */
-	dmac_channel *dmac;	/* DMA channel registers */
-
-#if BUGGY > 0
-	printf("sr: sr_xmit( sc=%08x)\n", sc);
-#endif
-
-	hc = sc->hc;
-#ifndef NETGRAPH
-	ifp = SC2IFP(sc);
-#endif /* NETGRAPH */
-	dmac = &hc->sca->dmac[DMAC_TXCH(sc->scachan)];
-
-	/*
-	 * Get the starting and ending addresses of the chain to be
-	 * transmitted and pass these on to the DMA engine on-chip.
-	 */
-	cda_value = sc->block[sc->txb_next_tx].txdesc + hc->mem_pstart;
-	cda_value &= 0x00ffff;
-	eda_value = sc->block[sc->txb_next_tx].txeda + hc->mem_pstart;
-	eda_value &= 0x00ffff;
-
-	SRC_PUT16(hc, dmac->cda, cda_value);
-	SRC_PUT16(hc, dmac->eda, eda_value);
-
-	/*
-	 * Now we'll let the DMA status register know about this change
-	 */
-	SRC_PUT8(hc, dmac->dsr, SCA_DSR_DE);
-
-	sc->xmit_busy = 1;	/* mark transmitter busy */
-
-#if BUGGY > 2
-	printf("sr%d: XMIT  cda=%04x, eda=%4x, rcda=%08lx\n",
-	       sc->unit, cda_value, eda_value,
-	       sc->block[sc->txb_next_tx].txdesc + hc->mem_pstart);
-#endif
-
-	sc->txb_next_tx++;	/* update next transmit seq# */
-
-	if (sc->txb_next_tx == SR_TX_BLOCKS)	/* handle wrap... */
-		sc->txb_next_tx = 0;
-
-#ifndef NETGRAPH
-	/*
-	 * Finally, we'll set a timout (which will start srwatchdog())
-	 * within the O/S network services layer...
-	 */
-	ifp->if_timer = 2;	/* Value in seconds. */
-#else
-	/*
-	 * Don't time out for a while.
-	 */
-	sc->out_dog = DOG_HOLDOFF;	/* give ourself some breathing space*/
-#endif /* NETGRAPH */
-}
-
-/*
- * This function will be called from the upper level when a user add a
- * packet to be send, and from the interrupt handler after a finished
- * transmit.
- *
- * NOTE: it should run at spl_imp().
- *
- * This function only place the data in the oncard buffers. It does not
- * start the transmition. sr_xmit() does that.
- *
- * Transmitter idle state is indicated by the IFF_DRV_OACTIVE flag.
- * The function that clears that should ensure that the transmitter
- * and its DMA is in a "good" idle state.
- */
-#ifndef NETGRAPH
-static void
-srstart(struct ifnet *ifp)
-{
-	struct sr_softc *sc;	/* channel control structure */
-#else
-static void
-srstart(struct sr_softc *sc)
-{
-#endif /* NETGRAPH */
-	struct sr_hardc *hc;	/* card control/config block */
-	int len;		/* total length of a packet */
-	int pkts;		/* packets placed in DPRAM */
-	int tlen;		/* working length of pkt */
-	u_int i;
-	struct mbuf *mtx;	/* message buffer from O/S */
-	u_char *txdata;		/* buffer address in DPRAM */
-	sca_descriptor *txdesc;	/* working descriptor pointr */
-	struct buf_block *blkp;
-
-#ifndef NETGRAPH
-#if BUGGY > 0
-	printf("sr: srstart( ifp=%08x)\n", ifp);
-#endif
-	sc = ifp->if_softc;
-	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
-		return;
-#endif /* NETGRAPH */
-	hc = sc->hc;
-	/*
-	 * It is OK to set the memory window outside the loop because all tx
-	 * buffers and descriptors are assumed to be in the same 16K window.
-	 */
-	if (hc->mempages) {
-		SRC_SET_ON(hc);
-		SRC_SET_MEM(hc, sc->block[0].txdesc);
-	}
-
-	/*
-	 * Loop to place packets into DPRAM.
-	 *
-	 * We stay in this loop until there is nothing in
-	 * the TX queue left or the tx buffers are full.
-	 */
-top_srstart:
-
-	/*
-	 * See if we have space for more packets.
-	 */
-	if (sc->txb_inuse == SR_TX_BLOCKS) {	/* out of space? */
-#ifndef NETGRAPH
-		ifp->if_drv_flags |= IFF_DRV_OACTIVE;	/* yes, mark active */
-#else
-		/*ifp->if_drv_flags |= IFF_DRV_OACTIVE;*/	/* yes, mark active */
-#endif /* NETGRAPH */
-
-		if (hc->mempages)
-			SRC_SET_OFF(hc);
-
-#if BUGGY > 9
-		printf("sr%d.srstart: sc->txb_inuse=%d; DPRAM full...\n",
-		       sc->unit, sc->txb_inuse);
-#endif
-		return;
-	}
-	/*
-	 * OK, the card can take more traffic.  Let's see if there's any
-	 * pending from the system...
-	 *
-	 * NOTE:
-	 * The architecture of the networking interface doesn't
-	 * actually call us like 'write()', providing an address.  We get
-	 * started, a lot like a disk strategy routine, and we actually call
-	 * back out to the system to get traffic to send...
-	 *
-	 * NOTE:
-	 * If we were gonna run through another layer, we would use a
-	 * dispatch table to select the service we're getting a packet
-	 * from...
-	 */
-#ifndef NETGRAPH
-	mtx = sppp_dequeue(ifp);
-#else /* NETGRAPH */
-	IF_DEQUEUE(&sc->xmitq_hipri, mtx);
-	if (mtx == NULL) {
-		IF_DEQUEUE(&sc->xmitq, mtx);
-	}
-#endif /* NETGRAPH */
-	if (!mtx) {
-		if (hc->mempages)
-			SRC_SET_OFF(hc);
-		return;
-	}
-	/*
-	 * OK, we got a packet from the network services of the O/S. Now we
-	 * can move it into the DPRAM (under control of the descriptors) and
-	 * fire it off...
-	 */
-	pkts = 0;
-	i = 0;			/* counts # of granules used */
-
-	blkp = &sc->block[sc->txb_new];	/* address of free granule */
-	txdesc = (sca_descriptor *)
-	    (hc->mem_start + (blkp->txdesc & hc->winmsk));
-
-	txdata = (u_char *)(hc->mem_start
-			    + (blkp->txstart & hc->winmsk));
-
-	/*
-	 * Now we'll try to install as many packets as possible into the
-	 * card's DP RAM buffers.
-	 */
-	for (;;) {		/* perform actual copy of packet */
-		len = mtx->m_pkthdr.len;	/* length of message */
-
-#if BUGGY > 1
-		printf("sr%d.srstart: mbuf @ %08lx, %d bytes\n",
-			   sc->unit, mtx, len);
-#endif
-
-#ifndef NETGRAPH
-		BPF_MTAP(ifp, mtx);
-#else	/* NETGRAPH */
-		sc->outbytes += len;
-#endif	/* NETGRAPH */
-
-		/*
-		 * We can perform a straight copy because the tranmit
-		 * buffers won't wrap.
-		 */
-		m_copydata(mtx, 0, len, txdata);
-
-		/*
-		 * Now we know how big the message is gonna be.  We must now
-		 * construct the descriptors to drive this message out...
-		 */
-		tlen = len;
-		while (tlen > SR_BUF_SIZ) {	/* loop for full granules */
-			txdesc->stat = 0;	/* reset bits */
-			txdesc->len = SR_BUF_SIZ;	/* size of granule */
-			tlen -= SR_BUF_SIZ;
-
-			txdesc++;	/* move to next dscr */
-			txdata += SR_BUF_SIZ;	/* adjust data addr */
-			i++;
-		}
-
-		/*
-		 * This section handles the setting of the final piece of a
-		 * message.
-		 */
-		txdesc->stat = SCA_DESC_EOM;
-		txdesc->len = tlen;
-		pkts++;
-
-		/*
-		 * prepare for subsequent packets (if any)
-		 */
-		txdesc++;
-		txdata += SR_BUF_SIZ;	/* next mem granule */
-		i++;		/* count of granules */
-
-		/*
-		 * OK, we've now placed the message into the DPRAM where it
-		 * can be transmitted.  We'll now release the message memory
-		 * and update the statistics...
-		 */
-		m_freem(mtx);
-#ifndef NETGRAPH
-		++SC2IFP(sc)->if_opackets;
-#else	/* NETGRAPH */
-		sc->opackets++;
-#endif /* NETGRAPH */
-
-		/*
-		 * Check if we have space for another packet. XXX This is
-		 * hardcoded.  A packet can't be larger than 3 buffers (3 x
-		 * 512).
-		 */
-		if ((i + 3) >= blkp->txmax) {	/* enough remains? */
-#if BUGGY > 9
-			printf("sr%d.srstart: i=%d (%d pkts); card full.\n",
-			       sc->unit, i, pkts);
-#endif
-			break;
-		}
-		/*
-		 * We'll pull the next message to be sent (if any)
-		 */
-#ifndef NETGRAPH
-		mtx = sppp_dequeue(ifp);
-#else /* NETGRAPH */
-		IF_DEQUEUE(&sc->xmitq_hipri, mtx);
-		if (mtx == NULL) {
-			IF_DEQUEUE(&sc->xmitq, mtx);
-		}
-#endif /* NETGRAPH */
-		if (!mtx) {	/* no message?  We're done! */
-#if BUGGY > 9
-			printf("sr%d.srstart: pending=0, pkts=%d\n",
-			       sc->unit, pkts);
-#endif
-			break;
-		}
-	}
-
-	blkp->txtail = i;	/* record next free granule */
-
-	/*
-	 * Mark the last descriptor, so that the SCA know where to stop.
-	 */
-	txdesc--;		/* back up to last descriptor in list */
-	txdesc->stat |= SCA_DESC_EOT;	/* mark as end of list */
-
-	/*
-	 * Now we'll reset the transmit granule's descriptor address so we
-	 * can record this in the structure and fire it off w/ the DMA
-	 * processor of the serial chip...
-	 */
-	txdesc = (sca_descriptor *)(uintptr_t)blkp->txdesc;
-	blkp->txeda = (u_short)((uintptr_t)&txdesc[i]);
-
-	sc->txb_inuse++;	/* update inuse status */
-	sc->txb_new++;		/* new traffic wuz added */
-
-	if (sc->txb_new == SR_TX_BLOCKS)
-		sc->txb_new = 0;
-
-	/*
-	 * If the tranmitter wasn't marked as "busy" we will force it to be
-	 * started...
-	 */
-	if (sc->xmit_busy == 0) {
-		sr_xmit(sc);
-#if BUGGY > 9
-		printf("sr%d.srstart: called sr_xmit()\n", sc->unit);
-#endif
-	}
-	goto top_srstart;
-}
-
-#ifndef NETGRAPH
-/*
- * Handle ioctl's at the device level, though we *will* call up
- * a layer...
- */
-#if BUGGY > 2
-static int bug_splats[] = {0, 0, 0, 0, 0, 0, 0, 0};
-#endif
-
-static int
-srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
-{
-	int s, error, was_up, should_be_up;
-	struct sr_softc *sc = ifp->if_softc;
-
-#if BUGGY > 0
-	if_printf(ifp, "srioctl(ifp=%08x, cmd=%08x, data=%08x)\n",
-	       ifp, cmd, data);
-#endif
-
-	was_up = ifp->if_drv_flags & IFF_DRV_RUNNING;
-
-	error = sppp_ioctl(ifp, cmd, data);
-
-#if BUGGY > 1
-	if_printf(ifp, "ioctl: ifsppp.pp_flags = %08x, if_flags %08x.\n",
-	      ((struct sppp *)ifp)->pp_flags, ifp->if_flags);
-#endif
-
-	if (error)
-		return error;
-
-	if ((cmd != SIOCSIFFLAGS) && (cmd != SIOCSIFADDR)) {
-#if BUGGY > 2
-		if (bug_splats[sc->unit]++ < 2) {
-			printf("sr(%d).if_addrlist = %08x\n",
-			       sc->unit, ifp->if_addrlist);
-			printf("sr(%d).if_bpf = %08x\n",
-			       sc->unit, ifp->if_bpf);
-			printf("sr(%d).if_init = %08x\n",
-			       sc->unit, ifp->if_init);
-			printf("sr(%d).if_output = %08x\n",
-			       sc->unit, ifp->if_output);
-			printf("sr(%d).if_start = %08x\n",
-			       sc->unit, ifp->if_start);
-			printf("sr(%d).if_done = %08x\n",
-			       sc->unit, ifp->if_done);
-			printf("sr(%d).if_ioctl = %08x\n",
-			       sc->unit, ifp->if_ioctl);
-			printf("sr(%d).if_reset = %08x\n",
-			       sc->unit, ifp->if_reset);
-			printf("sr(%d).if_watchdog = %08x\n",
-			       sc->unit, ifp->if_watchdog);
-		}
-#endif
-		return 0;
-	}
-
-	s = splimp();
-	should_be_up = ifp->if_drv_flags & IFF_DRV_RUNNING;
-
-	if (!was_up && should_be_up) {
-		/*
-		 * Interface should be up -- start it.
-		 */
-		sr_up(sc);
-		srstart(ifp);
-
-		/*
-		 * XXX Clear the IFF_UP flag so that the link will only go
-		 * up after sppp lcp and ipcp negotiation.
-		 */
-		/* ifp->if_flags &= ~IFF_UP; */
-	} else if (was_up && !should_be_up) {
-		/*
-		 * Interface should be down -- stop it.
-		 */
-		sr_down(sc);
-		sppp_flush(ifp);
-	}
-	splx(s);
-	return 0;
-}
-#endif /* NETGRAPH */
-
-/*
- * This is to catch lost tx interrupts.
- */
-static void
-#ifndef NETGRAPH
-srwatchdog(struct ifnet *ifp)
-#else
-srwatchdog(struct sr_softc *sc)
-#endif /* NETGRAPH */
-{
-	int     got_st0, got_st1, got_st3, got_dsr;
-#ifndef NETGRAPH
-	struct sr_softc *sc = ifp->if_softc;
-#endif /* NETGRAPH */
-	struct sr_hardc *hc = sc->hc;
-	msci_channel *msci = &hc->sca->msci[sc->scachan];
-	dmac_channel *dmac = &sc->hc->sca->dmac[sc->scachan];
-
-#if BUGGY > 0
-#ifndef NETGRAPH
-	printf("srwatchdog(unit=%d)\n", unit);
-#else
-	printf("srwatchdog(unit=%d)\n", sc->unit);
-#endif /* NETGRAPH */
-#endif
-
-#ifndef NETGRAPH
-	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
-		return;
-
-	ifp->if_oerrors++;	/* update output error count */
-#else	/* NETGRAPH */
-	sc->oerrors++;	/* update output error count */
-#endif /* NETGRAPH */
-
-	got_st0 = SRC_GET8(hc, msci->st0);
-	got_st1 = SRC_GET8(hc, msci->st1);
-	got_st3 = SRC_GET8(hc, msci->st3);
-	got_dsr = SRC_GET8(hc, dmac->dsr);
-
-#ifndef NETGRAPH
-#if	0
-	if (ifp->if_flags & IFF_DEBUG)
-#endif
-		printf("sr%d: transmit failed, "
-#else	/* NETGRAPH */
-	printf("sr%d: transmit failed, "
-#endif /* NETGRAPH */
-		       "ST0 %02x, ST1 %02x, ST3 %02x, DSR %02x.\n",
-		       sc->unit,
-		       got_st0, got_st1, got_st3, got_dsr);
-
-	if (SRC_GET8(hc, msci->st1) & SCA_ST1_UDRN) {
-		SRC_PUT8(hc, msci->cmd, SCA_CMD_TXABORT);
-		SRC_PUT8(hc, msci->cmd, SCA_CMD_TXENABLE);
-		SRC_PUT8(hc, msci->st1, SCA_ST1_UDRN);
-	}
-	sc->xmit_busy = 0;
-#ifndef NETGRAPH
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-#else
-	/*ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; */
-#endif /* NETGRAPH */
-
-	if (sc->txb_inuse && --sc->txb_inuse)
-		sr_xmit(sc);
-
-#ifndef NETGRAPH
-	srstart(ifp);	/* restart transmitter */
-#else
-	srstart(sc);	/* restart transmitter */
-#endif /* NETGRAPH */
-}
-
-static void
-sr_up(struct sr_softc *sc)
-{
-	struct sr_hardc *hc = sc->hc;
-	sca_regs *sca = hc->sca;
-	msci_channel *msci = &sca->msci[sc->scachan];
-
-#if BUGGY > 0
-	printf("sr_up(sc=%08x)\n", sc);
-#endif
-
-	/*
-	 * Enable transmitter and receiver. Raise DTR and RTS. Enable
-	 * interrupts.
-	 *
-	 * XXX What about using AUTO mode in msci->md0 ???
-	 */
-	SRC_PUT8(hc, msci->ctl, SRC_GET8(hc, msci->ctl) & ~SCA_CTL_RTS);
-
-	if (sc->scachan == 0)
-		switch (hc->cardtype) {
-		case SR_CRD_N2:
-			sr_outb(hc, SR_MCR,
-			    (sr_inb(hc, SR_MCR) & ~SR_MCR_DTR0));
-			break;
-		case SR_CRD_N2PCI:
-			sr_write_fecr(hc, sr_read_fecr(hc) & ~SR_FECR_DTR0);
-			break;
-		}
-	else
-		switch (hc->cardtype) {
-		case SR_CRD_N2:
-			sr_outb(hc, SR_MCR,
-			    (sr_inb(hc, SR_MCR) & ~SR_MCR_DTR1));
-			break;
-		case SR_CRD_N2PCI:
-			sr_write_fecr(hc, sr_read_fecr(hc) & ~SR_FECR_DTR1);
-			break;
-		}
-
-	if (sc->scachan == 0) {
-		SRC_PUT8(hc, sca->ier0, SRC_GET8(hc, sca->ier0) | 0x000F);
-		SRC_PUT8(hc, sca->ier1, SRC_GET8(hc, sca->ier1) | 0x000F);
-	} else {
-		SRC_PUT8(hc, sca->ier0, SRC_GET8(hc, sca->ier0) | 0x00F0);
-		SRC_PUT8(hc, sca->ier1, SRC_GET8(hc, sca->ier1) | 0x00F0);
-	}
-
-	SRC_PUT8(hc, msci->cmd, SCA_CMD_RXENABLE);
-	sr_inb(hc, 0);	/* XXX slow it down a bit. */
-	SRC_PUT8(hc, msci->cmd, SCA_CMD_TXENABLE);
-
-#ifndef NETGRAPH
-#ifdef USE_MODEMCK
-	if (sr_watcher == 0)
-		sr_modemck(NULL);
-#endif
-#else	/* NETGRAPH */
-	untimeout(ngsr_watchdog_frame, sc, sc->handle);
-	sc->handle = timeout(ngsr_watchdog_frame, sc, hz);
-	sc->running = 1;
-#endif /* NETGRAPH */
-}
-
-static void
-sr_down(struct sr_softc *sc)
-{
-	struct sr_hardc *hc = sc->hc;
-	sca_regs *sca = hc->sca;
-	msci_channel *msci = &sca->msci[sc->scachan];
-
-#if BUGGY > 0
-	printf("sr_down(sc=%08x)\n", sc);
-#endif
-#ifdef NETGRAPH
-	untimeout(ngsr_watchdog_frame, sc, sc->handle);
-	sc->running = 0;
-#endif /* NETGRAPH */
-
-	/*
-	 * Disable transmitter and receiver. Lower DTR and RTS. Disable
-	 * interrupts.
-	 */
-	SRC_PUT8(hc, msci->cmd, SCA_CMD_RXDISABLE);
-	sr_inb(hc, 0);	/* XXX slow it down a bit. */
-	SRC_PUT8(hc, msci->cmd, SCA_CMD_TXDISABLE);
-
-	SRC_PUT8(hc, msci->ctl, SRC_GET8(hc, msci->ctl) | SCA_CTL_RTS);
-
-	if (sc->scachan == 0)
-		switch (hc->cardtype) {
-		case SR_CRD_N2:
-			sr_outb(hc, SR_MCR, sr_inb(hc, SR_MCR) | SR_MCR_DTR0);
-			break;
-		case SR_CRD_N2PCI:
-			sr_write_fecr(hc, sr_read_fecr(hc) | SR_FECR_DTR0);
-			break;
-		}
-	else
-		switch (hc->cardtype) {
-		case SR_CRD_N2:
-			sr_outb(hc, SR_MCR, sr_inb(hc, SR_MCR) | SR_MCR_DTR1);
-			break;
-		case SR_CRD_N2PCI:
-			sr_write_fecr(hc, sr_read_fecr(hc) | SR_FECR_DTR1);
-			break;
-		}
-
-	if (sc->scachan == 0) {
-		SRC_PUT8(hc, sca->ier0, SRC_GET8(hc, sca->ier0) & ~0x0F);
-		SRC_PUT8(hc, sca->ier1, SRC_GET8(hc, sca->ier1) & ~0x0F);
-	} else {
-		SRC_PUT8(hc, sca->ier0, SRC_GET8(hc, sca->ier0) & ~0xF0);
-		SRC_PUT8(hc, sca->ier1, SRC_GET8(hc, sca->ier1) & ~0xF0);
-	}
-}
-
-/*
- * Initialize the card, allocate memory for the sr_softc structures
- * and fill in the pointers.
- */
-static void
-src_init(struct sr_hardc *hc)
-{
-	struct sr_softc *sc = hc->sc;
-	int x;
-	u_int chanmem;
-	u_int bufmem;
-	u_int next;
-	u_int descneeded;
-
-#if BUGGY > 0
-	printf("src_init(hc=%08x)\n", hc);
-#endif
-
-	chanmem = hc->memsize / hc->numports;
-	next = 0;
-
-	for (x = 0; x < hc->numports; x++, sc++) {
-		int blk;
-
-		for (blk = 0; blk < SR_TX_BLOCKS; blk++) {
-			sc->block[blk].txdesc = next;
-			bufmem = (16 * 1024) / SR_TX_BLOCKS;
-			descneeded = bufmem / SR_BUF_SIZ;
-
-			sc->block[blk].txstart = sc->block[blk].txdesc
-			    + ((((descneeded * sizeof(sca_descriptor))
-				 / SR_BUF_SIZ) + 1)
-			       * SR_BUF_SIZ);
-
-			sc->block[blk].txend = next + bufmem;
-			sc->block[blk].txmax =
-			    (sc->block[blk].txend - sc->block[blk].txstart)
-			    / SR_BUF_SIZ;
-			next += bufmem;
-
-#if BUGGY > 2
-			printf("sr%d: blk %d: txdesc %08x, txstart %08x\n",
-			       sc->unit, blk,
-			       sc->block[blk].txdesc, sc->block[blk].txstart);
-#endif
-		}
-
-		sc->rxdesc = next;
-		bufmem = chanmem - (bufmem * SR_TX_BLOCKS);
-		descneeded = bufmem / SR_BUF_SIZ;
-		sc->rxstart = sc->rxdesc +
-		    ((((descneeded * sizeof(sca_descriptor)) /
-		       SR_BUF_SIZ) + 1) * SR_BUF_SIZ);
-		sc->rxend = next + bufmem;
-		sc->rxmax = (sc->rxend - sc->rxstart) / SR_BUF_SIZ;
-		next += bufmem;
-	}
-}
-
-/*
- * The things done here are channel independent.
- *
- * Configure the sca waitstates.
- * Configure the global interrupt registers.
- * Enable master dma enable.
- */
-static void
-sr_init_sca(struct sr_hardc *hc)
-{
-	sca_regs *sca = hc->sca;
-
-#if BUGGY > 0
-	printf("sr_init_sca(hc=%08x)\n", hc);
-#endif
-
-	/*
-	 * Do the wait registers. Set everything to 0 wait states.
-	 */
-	SRC_PUT8(hc, sca->pabr0, 0);
-	SRC_PUT8(hc, sca->pabr1, 0);
-	SRC_PUT8(hc, sca->wcrl, 0);
-	SRC_PUT8(hc, sca->wcrm, 0);
-	SRC_PUT8(hc, sca->wcrh, 0);
-
-	/*
-	 * Configure the interrupt registers. Most are cleared until the
-	 * interface is configured.
-	 */
-	SRC_PUT8(hc, sca->ier0, 0x00);		/* MSCI interrupts. */
-	SRC_PUT8(hc, sca->ier1, 0x00);		/* DMAC interrupts */
-	SRC_PUT8(hc, sca->ier2, 0x00);		/* TIMER interrupts. */
-	SRC_PUT8(hc, sca->itcr, 0x00);		/* Use ivr and no intr ack */
-	SRC_PUT8(hc, sca->ivr, 0x40);		/* Interrupt vector. */
-	SRC_PUT8(hc, sca->imvr, 0x40);
-
-	/*
-	 * Configure the timers. XXX Later
-	 */
-
-	/*
-	 * Set the DMA channel priority to rotate between all four channels.
-	 *
-	 * Enable all dma channels.
-	 */
-	SRC_PUT8(hc, sca->pcr, SCA_PCR_PR2);
-	SRC_PUT8(hc, sca->dmer, SCA_DMER_EN);
-}
-
-/*
- * Configure the msci
- *
- * NOTE: The serial port configuration is hardcoded at the moment.
- */
-static void
-sr_init_msci(struct sr_softc *sc)
-{
-	int portndx;		/* on-board port number */
-	u_int mcr_v;		/* contents of modem control */
-	struct sr_hardc *hc = sc->hc;
-	msci_channel *msci = &hc->sca->msci[sc->scachan];
-#ifdef N2_TEST_SPEED
-	int br_v;		/* contents for BR divisor */
-	int etcndx;		/* index into ETC table */
-	int fifo_v, gotspeed;	/* final tabled speed found */
-	int tmc_v;		/* timer control register */
-	int wanted;		/* speed (bitrate) wanted... */
-	struct rate_line *rtp;
-#endif
-
-	portndx = sc->scachan;
-
-#if BUGGY > 0
-	printf("sr: sr_init_msci( sc=%08x)\n", sc);
-#endif
-
-	SRC_PUT8(hc, msci->cmd, SCA_CMD_RESET);
-	SRC_PUT8(hc, msci->md0, SCA_MD0_CRC_1 | SCA_MD0_CRC_CCITT |
-	    SCA_MD0_CRC_ENABLE | SCA_MD0_MODE_HDLC);
-	SRC_PUT8(hc, msci->md1, SCA_MD1_NOADDRCHK);
-	SRC_PUT8(hc, msci->md2, SCA_MD2_DUPLEX | SCA_MD2_NRZ);
-
-	/*
-	 * According to the manual I should give a reset after changing the
-	 * mode registers.
-	 */
-	SRC_PUT8(hc, msci->cmd, SCA_CMD_RXRESET);
-	SRC_PUT8(hc, msci->ctl, SCA_CTL_IDLPAT | SCA_CTL_UDRNC | SCA_CTL_RTS);
-
-	/*
-	 * XXX Later we will have to support different clock settings.
-	 */
-	switch (sc->clk_cfg) {
-	default:
-#if BUGGY > 0
-		printf("sr%: clk_cfg=%08x, selected default clock.\n",
-		       portndx, sc->clk_cfg);
-#endif
-		/* FALLTHROUGH */
-	case SR_FLAGS_EXT_CLK:
-		/*
-		 * For now all interfaces are programmed to use the RX clock
-		 * for the TX clock.
-		 */
-
-#if BUGGY > 0
-		printf("sr%d: External Clock Selected.\n", portndx);
-#endif
-
-		SRC_PUT8(hc, msci->rxs, SCA_RXS_CLK_RXC0 | SCA_RXS_DIV1);
-		SRC_PUT8(hc, msci->txs, SCA_TXS_CLK_RX | SCA_TXS_DIV1);
-		break;
-
-	case SR_FLAGS_EXT_SEP_CLK:
-#if BUGGY > 0
-		printf("sr%d: Split Clocking Selected.\n", portndx);
-#endif
-
-		SRC_PUT8(hc, msci->rxs, SCA_RXS_CLK_RXC0 | SCA_RXS_DIV1);
-		SRC_PUT8(hc, msci->txs, SCA_TXS_CLK_TXC | SCA_TXS_DIV1);
-		break;
-
-	case SR_FLAGS_INT_CLK:
-#if BUGGY > 0
-		printf("sr%d: Internal Clocking selected.\n", portndx);
-#endif
-
-		/*
-		 * XXX I do need some code to set the baud rate here!
-		 */
-#ifdef N2_TEST_SPEED
-		switch (hc->cardtype) {
-		case SR_CRD_N2PCI:
-			mcr_v = sr_read_fecr(hc);
-			etcndx = 2;
-			break;
-		case SR_CRD_N2:
-		default:
-			mcr_v = sr_inb(hc, SR_MCR);
-			etcndx = 0;
-		}
-
-		fifo_v = 0x10;	/* stolen from Linux version */
-
-		/*
-		 * search for appropriate speed in table, don't calc it:
-		 */
-		wanted = sr_test_speed[portndx];
-		rtp = &n2_rates[0];	/* point to first table item */
-
-		while ((rtp->target > 0)	/* search table for speed */
-		       &&(rtp->target != wanted))
-			rtp++;
-
-		/*
-		 * We've searched the table for a matching speed.  If we've
-		 * found the correct rate line, we'll get the pre-calc'd
-		 * values for the TMC and baud rate divisor for subsequent
-		 * use...
-		 */
-		if (rtp->target > 0) {	/* use table-provided values */
-			gotspeed = wanted;
-			tmc_v = rtp->tmc_reg;
-			br_v = rtp->br_reg;
-		} else {	/* otherwise assume 1MBit comm rate */
-			gotspeed = 10000;
-			tmc_v = 5;
-			br_v = 1;
-		}
-
-		/*
-		 * Now we mask in the enable clock output for the MCR:
-		 */
-		mcr_v |= etc0vals[etcndx + portndx];
-
-		/*
-		 * Now we'll program the registers with these speed- related
-		 * contents...
-		 */
-		SRC_PUT8(hc, msci->tmc, tmc_v);
-		SRC_PUT8(hc, msci->trc0, fifo_v);
-		SRC_PUT8(hc, msci->rxs, SCA_RXS_CLK_INT + br_v);
-		SRC_PUT8(hc, msci->txs, SCA_TXS_CLK_INT + br_v);
-
-		switch (hc->cardtype) {
-		case SR_CRD_N2PCI:
-			sr_write_fecr(hc, mcr_v);
-			break;
-		case SR_CRD_N2:
-		default:
-			sr_outb(hc, SR_MCR, mcr_v);
-		}
-
-#if BUGGY > 0
-		if (wanted != gotspeed)
-			printf("sr%d: Speed wanted=%d, found=%d\n",
-			       wanted, gotspeed);
-
-		printf("sr%d: Internal Clock %dx100 BPS, tmc=%d, div=%d\n",
-		       portndx, gotspeed, tmc_v, br_v);
-#endif
-#else
-		SRC_PUT8(hc, msci->rxs, SCA_RXS_CLK_INT | SCA_RXS_DIV1);
-		SRC_PUT8(hc, msci->txs, SCA_TXS_CLK_INT | SCA_TXS_DIV1);
-
-		SRC_PUT8(hc, msci->tmc, 5);
-
-		if (portndx == 0)
-			switch (hc->cardtype) {
-			case SR_CRD_N2PCI:
-				sr_write_fecr(hc,
-				    sr_read_fecr(hc) | SR_FECR_ETC0);
-				break;
-			case SR_CRD_N2:
-			default:
-				mcr_v = sr_inb(hc, SR_MCR);
-				mcr_v |= SR_MCR_ETC0;
-				sr_outb(hc, SR_MCR, mcr_v);
-			}
-		else
-			switch (hc->cardtype) {
-			case SR_CRD_N2:
-				mcr_v = sr_inb(hc, SR_MCR);
-				mcr_v |= SR_MCR_ETC1;
-				sr_outb(hc, SR_MCR, mcr_v);
-				break;
-			case SR_CRD_N2PCI:
-				sr_write_fecr(hc,
-				    sr_read_fecr(hc) | SR_FECR_ETC1);
-				break;
-			}
-#endif
-	}
-
-	/*
-	 * XXX Disable all interrupts for now. I think if you are using the
-	 * dmac you don't use these interrupts.
-	 */
-	SRC_PUT8(hc, msci->ie0, 0);
-	SRC_PUT8(hc, msci->ie1, 0x0C);
-	SRC_PUT8(hc, msci->ie2, 0);
-	SRC_PUT8(hc, msci->fie, 0);
-
-	SRC_PUT8(hc, msci->sa0, 0);
-	SRC_PUT8(hc, msci->sa1, 0);
-
-	SRC_PUT8(hc, msci->idl, 0x7E);	/* set flags value */
-
-	SRC_PUT8(hc, msci->rrc, 0x0E);
-	SRC_PUT8(hc, msci->trc0, 0x10);
-	SRC_PUT8(hc, msci->trc1, 0x1F);
-}
-
-/*
- * Configure the rx dma controller.
- */
-static void
-sr_init_rx_dmac(struct sr_softc *sc)
-{
-	struct sr_hardc *hc;
-	dmac_channel *dmac;
-	sca_descriptor *rxd;
-	u_int cda_v, sarb_v, rxbuf, rxda, rxda_d;
-
-#if BUGGY > 0
-	printf("sr_init_rx_dmac(sc=%08x)\n", sc);
-#endif
-
-	hc = sc->hc;
-	dmac = &hc->sca->dmac[DMAC_RXCH(sc->scachan)];
-
-	if (hc->mempages)
-		SRC_SET_MEM(hc, sc->rxdesc);
-
-	/*
-	 * This phase initializes the contents of the descriptor table
-	 * needed to construct a circular buffer...
-	 */
-	rxd = (sca_descriptor *)(hc->mem_start + (sc->rxdesc & hc->winmsk));
-	rxda_d = (uintptr_t) hc->mem_start - (sc->rxdesc & ~hc->winmsk);
-
-	for (rxbuf = sc->rxstart;
-	     rxbuf < sc->rxend;
-	     rxbuf += SR_BUF_SIZ, rxd++) {
-		/*
-		 * construct the circular chain...
-		 */
-		rxda = (uintptr_t) &rxd[1] - rxda_d + hc->mem_pstart;
-		rxd->cp = (u_short)(rxda & 0xffff);
-
-		/*
-		 * set the on-card buffer address...
-		 */
-		rxd->bp = (u_short)((rxbuf + hc->mem_pstart) & 0xffff);
-		rxd->bpb = (u_char)(((rxbuf + hc->mem_pstart) >> 16) & 0xff);
-
-		rxd->len = 0;	/* bytes resident w/in granule */
-		rxd->stat = 0xff;	/* The sca write here when finished */
-	}
-
-	/*
-	 * heal the chain so that the last entry points to the first...
-	 */
-	rxd--;
-	rxd->cp = (u_short)((sc->rxdesc + hc->mem_pstart) & 0xffff);
-
-	/*
-	 * reset the reception handler's index...
-	 */
-	sc->rxhind = 0;
-
-	/*
-	 * We'll now configure the receiver's DMA logic...
-	 */
-	SRC_PUT8(hc, dmac->dsr, 0);	/* Disable DMA transfer */
-	SRC_PUT8(hc, dmac->dcr, SCA_DCR_ABRT);
-
-	/* XXX maybe also SCA_DMR_CNTE */
-	SRC_PUT8(hc, dmac->dmr, SCA_DMR_TMOD | SCA_DMR_NF);
-	SRC_PUT16(hc, dmac->bfl, SR_BUF_SIZ);
-
-	cda_v = (u_short)((sc->rxdesc + hc->mem_pstart) & 0xffff);
-	sarb_v = (u_char)(((sc->rxdesc + hc->mem_pstart) >> 16) & 0xff);
-
-	SRC_PUT16(hc, dmac->cda, cda_v);
-	SRC_PUT8(hc, dmac->sarb, sarb_v);
-
-	rxd = (sca_descriptor *)(uintptr_t)sc->rxstart;
-
-	SRC_PUT16(hc, dmac->eda,
-	    (u_short)((uintptr_t)&rxd[sc->rxmax - 1] & 0xffff));
-
-	SRC_PUT8(hc, dmac->dir, 0xF0);
-
-	SRC_PUT8(hc, dmac->dsr, SCA_DSR_DE);	/* Enable DMA */
-}
-
-/*
- * Configure the TX DMA descriptors.
- * Initialize the needed values and chain the descriptors.
- */
-static void
-sr_init_tx_dmac(struct sr_softc *sc)
-{
-	int blk;
-	u_int txbuf, txda, txda_d;
-	struct sr_hardc *hc;
-	sca_descriptor *txd;
-	dmac_channel *dmac;
-	struct buf_block *blkp;
-	u_int x;
-	u_int sarb_v;
-
-#if BUGGY > 0
-	printf("sr_init_tx_dmac(sc=%08x)\n", sc);
-#endif
-
-	hc = sc->hc;
-	dmac = &hc->sca->dmac[DMAC_TXCH(sc->scachan)];
-
-	if (hc->mempages)
-		SRC_SET_MEM(hc, sc->block[0].txdesc);
-
-	/*
-	 * Initialize the array of descriptors for transmission
-	 */
-	for (blk = 0; blk < SR_TX_BLOCKS; blk++) {
-		blkp = &sc->block[blk];
-		txd = (sca_descriptor *)(hc->mem_start
-					 + (blkp->txdesc & hc->winmsk));
-		txda_d = (uintptr_t) hc->mem_start
-		    - (blkp->txdesc & ~hc->winmsk);
-
-		x = 0;
-		txbuf = blkp->txstart;
-		for (; txbuf < blkp->txend; txbuf += SR_BUF_SIZ, txd++) {
-			txda = (uintptr_t) &txd[1] - txda_d + hc->mem_pstart;
-			txd->cp = (u_short)(txda & 0xffff);
-
-			txd->bp = (u_short)((txbuf + hc->mem_pstart)
-					    & 0xffff);
-			txd->bpb = (u_char)(((txbuf + hc->mem_pstart) >> 16)
-					    & 0xff);
-			txd->len = 0;
-			txd->stat = 0;
-			x++;
-		}
-
-		txd--;
-		txd->cp = (u_short)((blkp->txdesc + hc->mem_pstart)
-				    & 0xffff);
-
-		blkp->txtail = (uintptr_t)txd - (uintptr_t)hc->mem_start;
-	}
-
-	SRC_PUT8(hc, dmac->dsr, 0);	/* Disable DMA */
-	SRC_PUT8(hc, dmac->dcr, SCA_DCR_ABRT);
-	SRC_PUT8(hc, dmac->dmr, SCA_DMR_TMOD | SCA_DMR_NF);
-	SRC_PUT8(hc, dmac->dir, SCA_DIR_EOT | SCA_DIR_BOF | SCA_DIR_COF);
-
-	sarb_v = (sc->block[0].txdesc + hc->mem_pstart) >> 16;
-	sarb_v &= 0x00ff;
-
-	SRC_PUT8(hc, dmac->sarb, (u_char) sarb_v);
-}
-
-/*
- * Look through the descriptors to see if there is a complete packet
- * available. Stop if we get to where the sca is busy.
- *
- * Return the length and status of the packet.
- * Return nonzero if there is a packet available.
- *
- * NOTE:
- * It seems that we get the interrupt a bit early. The updateing of
- * descriptor values is not always completed when this is called.
- */
-static int
-sr_packet_avail(struct sr_softc *sc, int *len, u_char *rxstat)
-{
-	int granules;	/* count of granules in pkt */
-	int wki, wko;
-	struct sr_hardc *hc;
-	sca_descriptor *rxdesc;	/* current descriptor */
-	sca_descriptor *endp;	/* ending descriptor */
-	sca_descriptor *cda;	/* starting descriptor */
-
-	hc = sc->hc;		/* get card's information */
-
-	/*
-	 * set up starting descriptor by pulling that info from the DMA half
-	 * of the HD chip...
-	 */
-	wki = DMAC_RXCH(sc->scachan);
-	wko = SRC_GET16(hc, hc->sca->dmac[wki].cda);
-
-	cda = (sca_descriptor *)(hc->mem_start + (wko & hc->winmsk));
-
-#if BUGGY > 1
-	printf("sr_packet_avail(): wki=%d, wko=%04x, cda=%08x\n",
-	       wki, wko, cda);
-#endif
-
-	/*
-	 * open the appropriate memory window and set our expectations...
-	 */
-	if (hc->mempages) {
-		SRC_SET_MEM(hc, sc->rxdesc);
-		SRC_SET_ON(hc);
-	}
-	rxdesc = (sca_descriptor *)
-	    (hc->mem_start + (sc->rxdesc & hc->winmsk));
-	endp = rxdesc;
-	rxdesc = &rxdesc[sc->rxhind];
-	endp = &endp[sc->rxmax];
-
-	*len = 0;		/* reset result total length */
-	granules = 0;		/* reset count of granules */
-
-	/*
-	 * This loop will scan descriptors, but it *will* puke up if we wrap
-	 * around to our starting point...
-	 */
-	while (rxdesc != cda) {
-		*len += rxdesc->len;	/* increment result length */
-		granules++;
-
-		/*
-		 * If we hit a valid packet's completion we'll know we've
-		 * got a live one, and that we can deliver the packet.
-		 * Since we're only allowed to report a packet available,
-		 * somebody else does that...
-		 */
-		if (rxdesc->stat & SCA_DESC_EOM) {	/* End Of Message */
-			*rxstat = rxdesc->stat;	/* return closing */
-#if BUGGY > 0
-			printf("sr%d: PKT AVAIL len %d, %x, bufs %u.\n",
-			       sc->unit, *len, *rxstat, granules);
-#endif
-			return 1;	/* indicate success */
-		}
-		/*
-		 * OK, this packet take up multiple granules.  Move on to
-		 * the next descriptor so we can consider it...
-		 */
-		rxdesc++;
-
-		if (rxdesc == endp)	/* recognize & act on wrap point */
-			rxdesc = (sca_descriptor *)
-			    (hc->mem_start + (sc->rxdesc & hc->winmsk));
-	}
-
-	/*
-	 * Nothing found in the DPRAM.  Let the caller know...
-	 */
-	*len = 0;
-	*rxstat = 0;
-
-	return 0;
-}
-
-/*
- * Copy a packet from the on card memory into a provided mbuf.
- * Take into account that buffers wrap and that a packet may
- * be larger than a buffer.
- */
-static void
-sr_copy_rxbuf(struct mbuf *m, struct sr_softc *sc, int len)
-{
-	struct sr_hardc *hc;
-	sca_descriptor *rxdesc;
-	u_int rxdata;
-	u_int rxmax;
-	u_int off = 0;
-	u_int tlen;
-
-#if BUGGY > 0
-	printf("sr_copy_rxbuf(m=%08x,sc=%08x,len=%d)\n",
-	       m, sc, len);
-#endif
-
-	hc = sc->hc;
-
-	rxdata = sc->rxstart + (sc->rxhind * SR_BUF_SIZ);
-	rxmax = sc->rxstart + (sc->rxmax * SR_BUF_SIZ);
-
-	rxdesc = (sca_descriptor *)
-	    (hc->mem_start + (sc->rxdesc & hc->winmsk));
-	rxdesc = &rxdesc[sc->rxhind];
-
-	/*
-	 * Using the count of bytes in the received packet, we decrement it
-	 * for each granule (controller by an SCA descriptor) to control the
-	 * looping...
-	 */
-	while (len) {
-		/*
-		 * tlen gets the length of *this* granule... ...which is
-		 * then copied to the target buffer.
-		 */
-		tlen = (len < SR_BUF_SIZ) ? len : SR_BUF_SIZ;
-
-		if (hc->mempages)
-			SRC_SET_MEM(hc, rxdata);
-
-		bcopy(hc->mem_start + (rxdata & hc->winmsk),
-		      mtod(m, caddr_t) +off,
-		      tlen);
-
-		off += tlen;
-		len -= tlen;
-
-		/*
-		 * now, return to the descriptor's window in DPRAM and reset
-		 * the descriptor we've just suctioned...
-		 */
-		if (hc->mempages)
-			SRC_SET_MEM(hc, sc->rxdesc);
-
-		rxdesc->len = 0;
-		rxdesc->stat = 0xff;
-
-		/*
-		 * Move on to the next granule.  If we've any remaining
-		 * bytes to process we'll just continue in our loop...
-		 */
-		rxdata += SR_BUF_SIZ;
-		rxdesc++;
-
-		if (rxdata == rxmax) {	/* handle the wrap point */
-			rxdata = sc->rxstart;
-			rxdesc = (sca_descriptor *)
-			    (hc->mem_start + (sc->rxdesc & hc->winmsk));
-		}
-	}
-}
-
-/*
- * If single is set, just eat a packet. Otherwise eat everything up to
- * where cda points. Update pointers to point to the next packet.
- *
- * This handles "flushing" of a packet as received...
- *
- * If the "single" parameter is zero, all pending reeceive traffic will
- * be flushed out of existence.  A non-zero value will only drop the
- * *next* (currently) pending packet...
- */
-static void
-sr_eat_packet(struct sr_softc *sc, int single)
-{
-	struct sr_hardc *hc;
-	sca_descriptor *rxdesc;	/* current descriptor being eval'd */
-	sca_descriptor *endp;	/* last descriptor in chain */
-	sca_descriptor *cda;	/* current start point */
-	u_int loopcnt = 0;	/* count of packets flushed ??? */
-	u_char stat;		/* captured status byte from descr */
-
-	hc = sc->hc;
-	cda = (sca_descriptor *)(hc->mem_start + (SRC_GET16(hc,
-	    hc->sca->dmac[DMAC_RXCH(sc->scachan)].cda) & hc->winmsk));
-
-	/*
-	 * loop until desc->stat == (0xff || EOM) Clear the status and
-	 * length in the descriptor. Increment the descriptor.
-	 */
-	if (hc->mempages)
-		SRC_SET_MEM(hc, sc->rxdesc);
-
-	rxdesc = (sca_descriptor *)
-	    (hc->mem_start + (sc->rxdesc & hc->winmsk));
-	endp = rxdesc;
-	rxdesc = &rxdesc[sc->rxhind];
-	endp = &endp[sc->rxmax];
-
-	/*
-	 * allow loop, but abort it if we wrap completely...
-	 */
-	while (rxdesc != cda) {
-		loopcnt++;
-
-		if (loopcnt > sc->rxmax) {
-			printf("sr%d: eat pkt %d loop, cda %p, "
-			       "rxdesc %p, stat %x.\n",
-			       sc->unit, loopcnt, cda, rxdesc,
-			       rxdesc->stat);
-			break;
-		}
-		stat = rxdesc->stat;
-
-		rxdesc->len = 0;
-		rxdesc->stat = 0xff;
-
-		rxdesc++;
-		sc->rxhind++;
-
-		if (rxdesc == endp) {
-			rxdesc = (sca_descriptor *)
-			    (hc->mem_start + (sc->rxdesc & hc->winmsk));
-			sc->rxhind = 0;
-		}
-		if (single && (stat == SCA_DESC_EOM))
-			break;
-	}
-
-	/*
-	 * Update the eda to the previous descriptor.
-	 */
-	rxdesc = (sca_descriptor *)(uintptr_t)sc->rxdesc;
-	rxdesc = &rxdesc[(sc->rxhind + sc->rxmax - 2) % sc->rxmax];
-
-	SRC_PUT16(hc, hc->sca->dmac[DMAC_RXCH(sc->scachan)].eda,
-	    (u_short)(((uintptr_t)rxdesc + hc->mem_pstart) & 0xffff));
-}
-
-/*
- * While there is packets available in the rx buffer, read them out
- * into mbufs and ship them off.
- */
-static void
-sr_get_packets(struct sr_softc *sc)
-{
-	u_char rxstat;		/* acquired status byte */
-	int i;
-	int pkts;		/* count of packets found */
-	int rxndx;		/* rcv buffer index */
-	int tries;		/* settling time counter */
-	u_int len;		/* length of pending packet */
-	struct sr_hardc *hc;	/* card-level information */
-	sca_descriptor *rxdesc;	/* descriptor in memory */
-#ifndef NETGRAPH
-	struct ifnet *ifp;	/* network intf ctl table */
-#else
-	int error;
-#endif /* NETGRAPH */
-	struct mbuf *m = NULL;	/* message buffer */
-
-#if BUGGY > 0
-	printf("sr_get_packets(sc=%08x)\n", sc);
-#endif
-
-	hc = sc->hc;
-#ifndef NETGRAPH
-	ifp = SC2IFP(sc);
-#endif /* NETGRAPH */
-
-	if (hc->mempages) {
-		SRC_SET_MEM(hc, sc->rxdesc);
-		SRC_SET_ON(hc);	/* enable shared memory */
-	}
-	pkts = 0;		/* reset count of found packets */
-
-	/*
-	 * for each complete packet in the receiving pool, process each
-	 * packet...
-	 */
-	while (sr_packet_avail(sc, &len, &rxstat)) {	/* packet pending? */
-		/*
-		 * I have seen situations where we got the interrupt but the
-		 * status value wasn't deposited.  This code should allow
-		 * the status byte's value to settle...
-		 */
-
-		tries = 5;
-
-		while ((rxstat == 0x00ff)
-		       && --tries)
-			sr_packet_avail(sc, &len, &rxstat);
-
-#if BUGGY > 1
-		printf("sr_packet_avail() returned len=%d, rxstat=%02ux\n",
-		       len, rxstat);
-#endif
-
-		pkts++;
-#ifdef NETGRAPH
-		sc->inbytes += len;
-		sc->inlast = 0;
-#endif /* NETGRAPH */
-
-		/*
-		 * OK, we've settled the incoming message status. We can now
-		 * process it...
-		 */
-		if (((rxstat & SCA_DESC_ERRORS) == 0) && (len < MCLBYTES)) {
-#if BUGGY > 1
-			printf("sr%d: sr_get_packet() rxstat=%02x, len=%d\n",
-			       sc->unit, rxstat, len);
-#endif
-
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
-			if (m == NULL) {
-				/*
-				 * eat (flush) packet if get mbuf fail!!
-				 */
-				sr_eat_packet(sc, 1);
-				continue;
-			}
-			/*
-			 * construct control information for pass-off
-			 */
-#ifndef NETGRAPH
-			m->m_pkthdr.rcvif = ifp;
-#else
-			m->m_pkthdr.rcvif = NULL;
-#endif /* NETGRAPH */
-			m->m_pkthdr.len = m->m_len = len;
-			if (len > MHLEN) {
-				MCLGET(m, M_DONTWAIT);
-				if ((m->m_flags & M_EXT) == 0) {
-					/*
-					 * We couldn't get a big enough
-					 * message packet, so we'll send the
-					 * packet to /dev/null...
-					 */
-					m_freem(m);
-					sr_eat_packet(sc, 1);
-					continue;
-				}
-			}
-			/*
-			 * OK, we've got a good message buffer.  Now we can
-			 * copy the received message into it
-			 */
-			sr_copy_rxbuf(m, sc, len);	/* copy from DPRAM */
-
-#ifndef NETGRAPH
-			BPF_MTAP(ifp, m);
-
-#if BUGGY > 3
-			{
-				u_char *bp;
-
-				bp = (u_char *)m;
-				printf("sr%d: rcvd=%02x%02x%02x%02x%02x%02x\n",
-				       sc->unit,
-				       bp[0], bp[1], bp[2],
-				       bp[4], bp[5], bp[6]);
-			}
-#endif
-			sppp_input(ifp, m);
-			ifp->if_ipackets++;
-
-#else	/* NETGRAPH */
-#if BUGGY > 3
-			{
-				u_char *bp;
-
-				bp = mtod(m,u_char *);
-				printf("sr%d: rd=%02x:%02x:%02x:%02x:%02x:%02x",
-				       sc->unit,
-				       bp[0], bp[1], bp[2],
-				       bp[4], bp[5], bp[6]);
-				printf(":%02x:%02x:%02x:%02x:%02x:%02x\n",
-				       bp[6], bp[7], bp[8],
-				       bp[9], bp[10], bp[11]);
-			}
-#endif
-			NG_SEND_DATA_ONLY(error, sc->hook, m);
-			sc->ipackets++;
-#endif /* NETGRAPH */
-			/*
-			 * Update the eda to the previous descriptor.
-			 */
-			i = (len + SR_BUF_SIZ - 1) / SR_BUF_SIZ;
-			sc->rxhind = (sc->rxhind + i) % sc->rxmax;
-
-			rxdesc = (sca_descriptor *)(uintptr_t)sc->rxdesc;
-			rxndx = (sc->rxhind + sc->rxmax - 2) % sc->rxmax;
-			rxdesc = &rxdesc[rxndx];
-
-			SRC_PUT16(hc, hc->sca->dmac[DMAC_RXCH(sc->scachan)].eda,
-			    (u_short)(((uintptr_t)rxdesc + hc->mem_pstart)
-			    & 0xffff));
-
-		} else {
-			int got_st3, got_cda, got_eda;
-			int tries = 5;
-
-			while ((rxstat == 0xff) && --tries)
-				sr_packet_avail(sc, &len, &rxstat);
-
-			/*
-			 * It look like we get an interrupt early
-			 * sometimes and then the status is not
-			 * filled in yet.
-			 */
-			if (tries && (tries != 5))
-				continue;
-
-			/*
-			 * This chunk of code handles the error packets.
-			 * We'll log them for posterity...
-			 */
-			sr_eat_packet(sc, 1);
-
-#ifndef NETGRAPH
-			ifp->if_ierrors++;
-#else
-			sc->ierrors[0]++;
-#endif /* NETGRAPH */
-
-			got_st3 = SRC_GET8(hc,
-				  hc->sca->msci[sc->scachan].st3);
-			got_cda = SRC_GET16(hc,
-				  hc->sca->dmac[DMAC_RXCH(sc->scachan)].cda);
-			got_eda = SRC_GET16(hc,
-				  hc->sca->dmac[DMAC_RXCH(sc->scachan)].eda);
-
-#if BUGGY > 0
-			printf("sr%d: Receive error chan %d, "
-			       "stat %02x, msci st3 %02x,"
-			       "rxhind %d, cda %04x, eda %04x.\n",
-			       sc->unit, sc->scachan, rxstat,
-			       got_st3, sc->rxhind, got_cda, got_eda);
-#endif
-		}
-	}
-
-#if BUGGY > 0
-	printf("sr%d: sr_get_packets() found %d packet(s)\n",
-	       sc->unit, pkts);
-#endif
-
-	if (hc->mempages)
-		SRC_SET_OFF(hc);
-}
-
-/*
- * All DMA interrupts come here.
- *
- * Each channel has two interrupts.
- * Interrupt A for errors and Interrupt B for normal stuff like end
- * of transmit or receive dmas.
- */
-static void
-sr_dmac_intr(struct sr_hardc *hc, u_char isr1)
-{
-	u_char dsr;		/* contents of DMA Stat Reg */
-	u_char dotxstart;	/* enables for tranmit part */
-	int mch;		/* channel being processed */
-	struct sr_softc *sc;	/* channel's softc structure */
-	sca_regs *sca = hc->sca;
-	dmac_channel *dmac;	/* dma structure of chip */
-
-#if BUGGY > 0
-	printf("sr_dmac_intr(hc=%08x,isr1=%04x)\n", hc, isr1);
-#endif
-
-	mch = 0;		/* assume chan0 on card */
-	dotxstart = isr1;	/* copy for xmitter starts */
-
-	/*
-	 * Shortcut if there is no interrupts for dma channel 0 or 1.
-	 * Skip processing for channel 0 if no incoming hit
-	 */
-	if ((isr1 & 0x0F) == 0) {
-		mch = 1;
-		isr1 >>= 4;
-	}
-	do {
-		sc = &hc->sc[mch];
-
-		/*
-		 * Transmit channel - DMA Status Register Evaluation
-		 */
-		if (isr1 & 0x0C) {
-			dmac = &sca->dmac[DMAC_TXCH(mch)];
-
-			/*
-			 * get the DMA Status Register contents and write
-			 * back to reset interrupt...
-			 */
-			dsr = SRC_GET8(hc, dmac->dsr);
-			SRC_PUT8(hc, dmac->dsr, dsr);
-
-			/*
-			 * Check for (& process) a Counter overflow
-			 */
-			if (dsr & SCA_DSR_COF) {
-				printf("sr%d: TX DMA Counter overflow, "
-				       "txpacket no %lu.\n",
-#ifndef NETGRAPH
-				       sc->unit, SC2IFP(sc)->if_opackets);
-				SC2IFP(sc)->if_oerrors++;
-#else
-				       sc->unit, sc->opackets);
-				sc->oerrors++;
-#endif /* NETGRAPH */
-			}
-			/*
-			 * Check for (& process) a Buffer overflow
-			 */
-			if (dsr & SCA_DSR_BOF) {
-				printf("sr%d: TX DMA Buffer overflow, "
-				       "txpacket no %lu, dsr %02x, "
-				       "cda %04x, eda %04x.\n",
-#ifndef NETGRAPH
-				       sc->unit, SC2IFP(sc)->if_opackets,
-#else
-				       sc->unit, sc->opackets,
-#endif /* NETGRAPH */
-				       dsr,
-				       SRC_GET16(hc, dmac->cda),
-				       SRC_GET16(hc, dmac->eda));
-#ifndef NETGRAPH
-				SC2IFP(sc)->if_oerrors++;
-#else
-				sc->oerrors++;
-#endif /* NETGRAPH */
-			}
-			/*
-			 * Check for (& process) an End of Transfer (OK)
-			 */
-			if (dsr & SCA_DSR_EOT) {
-				/*
-				 * This should be the most common case.
-				 *
-				 * Clear the IFF_DRV_OACTIVE flag.
-				 *
-				 * Call srstart to start a new transmit if
-				 * there is data to transmit.
-				 */
-#if BUGGY > 0
-				printf("sr%d: TX Completed OK\n", sc->unit);
-#endif
-				sc->xmit_busy = 0;
-#ifndef NETGRAPH
-				SC2IFP(sc)->if_drv_flags &= ~IFF_DRV_OACTIVE;
-				SC2IFP(sc)->if_timer = 0;
-#else
-				/* XXX may need to mark tx inactive? */
-				sc->out_deficit++;
-				sc->out_dog = DOG_HOLDOFF;
-#endif /* NETGRAPH */
-
-				if (sc->txb_inuse && --sc->txb_inuse)
-					sr_xmit(sc);
-			}
-		}
-		/*
-		 * Receive channel processing of DMA Status Register
-		 */
-		if (isr1 & 0x03) {
-			dmac = &sca->dmac[DMAC_RXCH(mch)];
-
-			dsr = SRC_GET8(hc, dmac->dsr);
-			SRC_PUT8(hc, dmac->dsr, dsr);
-
-			/*
-			 * End of frame processing (MSG OK?)
-			 */
-			if (dsr & SCA_DSR_EOM) {
-#if BUGGY > 0
-				int tt, ind;
-
-#ifndef NETGRAPH
-				tt = SC2IFP(sc)->if_ipackets;
-#else	/* NETGRAPH */
-				tt = sc->ipackets;
-#endif /* NETGRAPH */
-				ind = sc->rxhind;
-#endif
-
-				sr_get_packets(sc);
-#if BUGGY > 0
-#ifndef NETGRAPH
-				if (tt == SC2IFP(sc)->if_ipackets)
-#else	/* NETGRAPH */
-				if (tt == sc->ipackets)
-#endif /* NETGRAPH */
-				{
-					sca_descriptor *rxdesc;
-					int i;
-
-					printf("SR: RXINTR isr1 %x, dsr %x, "
-					       "no data %d pkts, orxind %d.\n",
-					       dotxstart, dsr, tt, ind);
-					printf("SR: rxdesc %x, rxstart %x, "
-					       "rxend %x, rxhind %d, "
-					       "rxmax %d.\n",
-					       sc->rxdesc, sc->rxstart,
-					       sc->rxend, sc->rxhind,
-					       sc->rxmax);
-					printf("SR: cda %x, eda %x.\n",
-					    SRC_GET16(hc, dmac->cda),
-					    SRC_GET16(hc, dmac->eda));
-
-					if (hc->mempages) {
-						SRC_SET_ON(hc);
-						SRC_SET_MEM(hc, sc->rxdesc);
-					}
-					rxdesc = (sca_descriptor *)
-					         (hc->mem_start +
-					          (sc->rxdesc & hc->winmsk));
-					rxdesc = &rxdesc[sc->rxhind];
-
-					for (i = 0; i < 3; i++, rxdesc++)
-						printf("SR: rxdesc->stat %x, "
-						       "len %d.\n",
-						       rxdesc->stat,
-						       rxdesc->len);
-
-					if (hc->mempages)
-						SRC_SET_OFF(hc);
-				}
-#endif /* BUGGY */
-			}
-			/*
-			 * Check for Counter overflow
-			 */
-			if (dsr & SCA_DSR_COF) {
-				printf("sr%d: RX DMA Counter overflow, "
-				       "rxpkts %lu.\n",
-#ifndef NETGRAPH
-				       sc->unit, SC2IFP(sc)->if_ipackets);
-				SC2IFP(sc)->if_ierrors++;
-#else	/* NETGRAPH */
-				       sc->unit, sc->ipackets);
-				sc->ierrors[1]++;
-#endif /* NETGRAPH */
-			}
-			/*
-			 * Check for Buffer overflow
-			 */
-			if (dsr & SCA_DSR_BOF) {
-				printf("sr%d: RX DMA Buffer overflow, "
-				       "rxpkts %lu, rxind %d, "
-				       "cda %x, eda %x, dsr %x.\n",
-#ifndef NETGRAPH
-				       sc->unit, SC2IFP(sc)->if_ipackets,
-#else	/* NETGRAPH */
-				       sc->unit, sc->ipackets,
-#endif /* NETGRAPH */
-				       sc->rxhind,
-				       SRC_GET16(hc, dmac->cda),
-				       SRC_GET16(hc, dmac->eda),
-				       dsr);
-
-				/*
-				 * Make sure we eat as many as possible.
-				 * Then get the system running again.
-				 */
-				if (hc->mempages)
-					SRC_SET_ON(hc);
-
-				sr_eat_packet(sc, 0);
-#ifndef NETGRAPH
-				SC2IFP(sc)->if_ierrors++;
-#else	/* NETGRAPH */
-				sc->ierrors[2]++;
-#endif /* NETGRAPH */
-
-				SRC_PUT8(hc, sca->msci[mch].cmd,
-				    SCA_CMD_RXMSGREJ);
-
-				SRC_PUT8(hc, dmac->dsr, SCA_DSR_DE);
-
-#if BUGGY > 0
-				printf("sr%d: RX DMA Buffer overflow, "
-				       "rxpkts %lu, rxind %d, "
-				       "cda %x, eda %x, dsr %x. After\n",
-				       sc->unit,
-#ifndef NETGRAPH
-				       sc->ipackets,
-#else	/* NETGRAPH */
-				       SC2IFP(sc)->if_ipackets,
-#endif /* NETGRAPH */
-				       sc->rxhind,
-				       SRC_GET16(hc, dmac->cda),
-				       SRC_GET16(hc, dmac->eda),
-				       SRC_GET8(hc, dmac->dsr));
-#endif
-
-				if (hc->mempages)
-					SRC_SET_OFF(hc);
-			}
-			/*
-			 * End of Transfer
-			 */
-			if (dsr & SCA_DSR_EOT) {
-				/*
-				 * If this happen, it means that we are
-				 * receiving faster than what the processor
-				 * can handle.
-				 * 
-				 * XXX We should enable the dma again.
-				 */
-				printf("sr%d: RX End of xfer, rxpkts %lu.\n",
-				       sc->unit,
-#ifndef NETGRAPH
-				       SC2IFP(sc)->if_ipackets);
-				SC2IFP(sc)->if_ierrors++;
-#else
-				       sc->ipackets);
-				sc->ierrors[3]++;
-#endif /* NETGRAPH */
-			}
-		}
-		isr1 >>= 4;	/* process next half of ISR */
-		mch++;		/* and move to next channel */
-	} while ((mch < NCHAN) && isr1);	/* loop for each chn */
-
-	/*
-	 * Now that we have done all the urgent things, see if we can fill
-	 * the transmit buffers.
-	 */
-	for (mch = 0; mch < NCHAN; mch++) {
-		if (dotxstart & 0x0C) {	/* TX initiation enabled? */
-			sc = &hc->sc[mch];
-#ifndef NETGRAPH
-			srstart(SC2IFP(sc));
-#else
-			srstart(sc);
-#endif /* NETGRAPH */
-		}
-		dotxstart >>= 4;/* shift for next channel */
-	}
-}
-#ifndef NETGRAPH
-#ifdef USE_MODEMCK
-/*
- * Perform timeout on an FR channel 
- *
- * Establish a periodic check of open N2 ports;  If
- * a port is open/active, its DCD state is checked
- * and a loss of DCD is recognized (and eventually
- * processed).
- */
-static void
-sr_modemck(void *arg)
-{
-	u_int s;
-	int card;		/* card index in table */
-	int cards;		/* card list index */
-	int mch;		/* channel on card */
-	u_char dcd_v;		/* Data Carrier Detect */
-	u_char got_st0;		/* contents of ST0 */
-	u_char got_st1;		/* contents of ST1 */
-	u_char got_st2;		/* contents of ST2 */
-	u_char got_st3;		/* contents of ST3 */
-	struct sr_hardc *hc;	/* card's configuration */
-	struct sr_hardc *Card[16];/* up to 16 cards in system */
-	struct sr_softc *sc;	/* channel's softc structure */
-	struct ifnet *ifp;	/* interface control table */
-	msci_channel *msci;	/* regs specific to channel */
-
-	s = splimp();
-
-#if	0
-	if (sr_opens == 0) {	/* count of "up" channels */
-		sr_watcher = 0;	/* indicate no watcher */
-		splx(s);
-		return;
-	}
-#endif
-
-	sr_watcher = 1;		/* mark that we're online */
-
-	/*
-	 * Now we'll need a list of cards to process.  Since we can handle
-	 * both ISA and PCI cards (and I didn't think of making this logic
-	 * global YET) we'll generate a single table of card table
-	 * addresses.
-	 */
-	cards = 0;
-
-	for (card = 0; card < NSR; card++) {
-		hc = &sr_hardc[card];
-
-		if (hc->sc == (void *)0)
-			continue;
-
-		Card[cards++] = hc;
-	}
-
-	hc = sr_hardc_pci;
-
-	while (hc) {
-		Card[cards++] = hc;
-		hc = hc->next;
-	}
-
-	/*
-	 * OK, we've got work we can do.  Let's do it... (Please note that
-	 * this code _only_ deals w/ ISA cards)
-	 */
-	for (card = 0; card < cards; card++) {
-		hc = Card[card];/* get card table */
-
-		for (mch = 0; mch < hc->numports; mch++) {
-			sc = &hc->sc[mch];
-
-			ifp = SC2IFP(sc);
-
-			/*
-			 * if this channel isn't "up", skip it
-			 */
-			if ((ifp->if_flags & IFF_UP) == 0)
-				continue;
-
-			/*
-			 * OK, now we can go looking at this channel's
-			 * actual register contents...
-			 */
-			msci = &hc->sca->msci[sc->scachan];
-
-			/*
-			 * OK, now we'll look into the actual status of this
-			 * channel...
-			 * 
-			 * I suck in more registers than strictly needed
-			 */
-			got_st0 = SRC_GET8(hc, msci->st0);
-			got_st1 = SRC_GET8(hc, msci->st1);
-			got_st2 = SRC_GET8(hc, msci->st2);
-			got_st3 = SRC_GET8(hc, msci->st3);
-
-			/*
-			 * We want to see if the DCD signal is up (DCD is
-			 * true if zero)
-			 */
-			dcd_v = (got_st3 & SCA_ST3_DCD) == 0;
-
-			if (dcd_v == 0)
-				printf("sr%d: DCD lost\n", sc->unit);
-		}
-	}
-
-	/*
-	 * OK, now set up for the next modem signal checking pass...
-	 */
-	timeout(sr_modemck, NULL, hz);
-
-	splx(s);
-}
-#endif
-#else	/* NETGRAPH */
-/*
- * If a port is open/active, it's DCD state is checked
- * and a loss of DCD is recognized (and eventually processed?).
- */
-static void
-sr_modemck(struct sr_softc *sc )
-{
-	u_int s;
-	u_char got_st3;			/* contents of ST3 */
-	struct sr_hardc *hc = sc->hc;	/* card's configuration */
-	msci_channel *msci;		/* regs specific to channel */
-
-	s = splimp();
-
-
-	if (sc->running == 0)
-		return;
-	/*
-	 * OK, now we can go looking at this channel's register contents...
-	 */
-	msci = &hc->sca->msci[sc->scachan];
-	got_st3 = SRC_GET8(hc, msci->st3);
-
-	/*
-	 * We want to see if the DCD signal is up (DCD is true if zero)
-	 */
-	sc->dcd = (got_st3 & SCA_ST3_DCD) == 0;
-	splx(s);
-}
-
-#endif	/* NETGRAPH */
-static void
-sr_msci_intr(struct sr_hardc *hc, u_char isr0)
-{
-	printf("src%d: SRINTR: MSCI\n", hc->cunit);
-}
-
-static void
-sr_timer_intr(struct sr_hardc *hc, u_char isr2)
-{
-	printf("src%d: SRINTR: TIMER\n", hc->cunit);
-}
-
-#ifdef	NETGRAPH
-/*****************************************
- * Device timeout/watchdog routine.
- * called once per second.
- * checks to see that if activity was expected, that it hapenned.
- * At present we only look to see if expected output was completed.
- */
-static void
-ngsr_watchdog_frame(void * arg)
-{
-	struct sr_softc * sc = arg;
-	int s;
-	int	speed;
-
-	if (sc->running == 0)
-		return; /* if we are not running let timeouts die */
-	/*
-	 * calculate the apparent throughputs 
-	 *  XXX a real hack
-	 */
-	s = splimp();
-	speed = sc->inbytes - sc->lastinbytes;
-	sc->lastinbytes = sc->inbytes;
-	if ( sc->inrate < speed )
-		sc->inrate = speed;
-	speed = sc->outbytes - sc->lastoutbytes;
-	sc->lastoutbytes = sc->outbytes;
-	if ( sc->outrate < speed )
-		sc->outrate = speed;
-	sc->inlast++;
-	splx(s);
-
-	if ((sc->inlast > QUITE_A_WHILE)
-	&& (sc->out_deficit > LOTS_OF_PACKETS)) {
-		log(LOG_ERR, "sr%d: No response from remote end\n", sc->unit);
-		s = splimp();
-		sr_down(sc);
-		sr_up(sc);
-		sc->inlast = sc->out_deficit = 0;
-		splx(s);
-	} else if ( sc->xmit_busy ) { /* no TX -> no TX timeouts */
-		if (sc->out_dog == 0) { 
-			log(LOG_ERR, "sr%d: Transmit failure.. no clock?\n",
-					sc->unit);
-			s = splimp();
-			srwatchdog(sc);
-#if 0
-			sr_down(sc);
-			sr_up(sc);
-#endif
-			splx(s);
-			sc->inlast = sc->out_deficit = 0;
-		} else {
-			sc->out_dog--;
-		}
-	}
-	sr_modemck(sc); 	/* update the DCD status */
-	sc->handle = timeout(ngsr_watchdog_frame, sc, hz);
-}
-
-/***********************************************************************
- * This section contains the methods for the Netgraph interface
- ***********************************************************************/
-/*
- * It is not possible or allowable to create a node of this type.
- * If the hardware exists, it will already have created it.
- */
-static	int
-ngsr_constructor(node_p node)
-{
-	return (EINVAL);
-}
-
-/*
- * give our ok for a hook to be added...
- * If we are not running this should kick the device into life.
- * The hook's private info points to our stash of info about that
- * channel.
- */
-static int
-ngsr_newhook(node_p node, hook_p hook, const char *name)
-{
-	struct sr_softc *	sc = NG_NODE_PRIVATE(node);
-
-	/*
-	 * check if it's our friend the debug hook
-	 */
-	if (strcmp(name, NG_SR_HOOK_DEBUG) == 0) {
-		NG_HOOK_SET_PRIVATE(hook, NULL); /* paranoid */
-		sc->debug_hook = hook;
-		return (0);
-	}
-
-	/*
-	 * Check for raw mode hook.
-	 */
-	if (strcmp(name, NG_SR_HOOK_RAW) != 0) {
-		return (EINVAL);
-	}
-	NG_HOOK_SET_PRIVATE(hook, sc);
-	sc->hook = hook;
-	sc->datahooks++;
-	sr_up(sc);
-	return (0);
-}
-
-/*
- * incoming messages.
- * Just respond to the generic TEXT_STATUS message
- */
-static	int
-ngsr_rcvmsg(node_p node, item_p item, hook_p lasthook)
-{
-	struct sr_softc *	sc;
-	struct ng_mesg *resp = NULL;
-	int error = 0;
-	struct ng_mesg *msg;
-
-	NGI_GET_MSG(item,msg);
-	sc = NG_NODE_PRIVATE(node);
-	switch (msg->header.typecookie) {
-	case	NG_SR_COOKIE: 
-		error = EINVAL;
-		break;
-	case	NGM_GENERIC_COOKIE: 
-		switch(msg->header.cmd) {
-		case NGM_TEXT_STATUS: {
-			char        *arg;
-			int pos = 0;
-
-			int resplen = sizeof(struct ng_mesg) + 512;
-			NG_MKRESPONSE(resp, msg, resplen, M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			arg = (resp)->data;
-			pos = sprintf(arg, "%ld bytes in, %ld bytes out\n"
-			    "highest rate seen: %ld B/S in, %ld B/S out\n",
-			sc->inbytes, sc->outbytes,
-			sc->inrate, sc->outrate);
-			pos += sprintf(arg + pos,
-				"%ld output errors\n",
-			    	sc->oerrors);
-			pos += sprintf(arg + pos,
-				"ierrors = %ld, %ld, %ld, %ld, %ld, %ld\n",
-			    	sc->ierrors[0],
-			    	sc->ierrors[1],
-			    	sc->ierrors[2],
-			    	sc->ierrors[3],
-			    	sc->ierrors[4],
-			    	sc->ierrors[5]);
-
-			resp->header.arglen = pos + 1;
-			break;
-		      }
-	    	default:
-		 	error = EINVAL;
-		 	break;
-		}
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	/* Take care of synchronous response, if any */
-	NG_RESPOND_MSG(error, node, item, resp);
-	NG_FREE_MSG(msg);
-	return (error);
-}
-
-/*
- * get data from another node and transmit it to the correct channel
- */
-static	int
-ngsr_rcvdata(hook_p hook, item_p item)
-{
-	int s;
-	int error = 0;
-	struct sr_softc * sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-	struct ifqueue	*xmitq_p;
-	struct mbuf *m;
-	struct ng_tag_prio *ptag;
-	
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-	/*
-	 * data doesn't come in from just anywhere (e.g control hook)
-	 */
-	if ( NG_HOOK_PRIVATE(hook) == NULL) {
-		error = ENETDOWN;
-		goto bad;
-	}
-
-	/* 
-	 * Now queue the data for when it can be sent
-	 */
-	if ((ptag = (struct ng_tag_prio *)m_tag_locate(m, NGM_GENERIC_COOKIE,
-	    NG_TAG_PRIO, NULL)) != NULL && (ptag->priority > NG_PRIO_CUTOFF) )
-		xmitq_p = (&sc->xmitq_hipri);
-	else
-		xmitq_p = (&sc->xmitq);
-
-	s = splimp();
-	IF_LOCK(xmitq_p);
-	if (_IF_QFULL(xmitq_p)) {
-		_IF_DROP(xmitq_p);
-		IF_UNLOCK(xmitq_p);
-		splx(s);
-		error = ENOBUFS;
-		goto bad;
-	}
-	_IF_ENQUEUE(xmitq_p, m);
-	IF_UNLOCK(xmitq_p);
-	srstart(sc);
-	splx(s);
-	return (0);
-
-bad:
-	/* 
-	 * It was an error case.
-	 * check if we need to free the mbuf, and then return the error
-	 */
-	NG_FREE_M(m);
-	return (error);
-}
-
-/*
- * do local shutdown processing..
- * this node will refuse to go away, unless the hardware says to..
- * don't unref the node, or remove our name. just clear our links up.
- */
-static	int
-ngsr_shutdown(node_p node)
-{
-	struct sr_softc * sc = NG_NODE_PRIVATE(node);
-
-	sr_down(sc);
-	NG_NODE_UNREF(node);
-/* XXX should drain queues! */
-	if (ng_make_node_common(&typestruct, &sc->node) != 0)
-		return (0);
-	sprintf(sc->nodename, "%s%d", NG_SR_NODE_TYPE, sc->unit);
-	if (ng_name_node(sc->node, sc->nodename)) {
-		printf("node naming failed\n");
-		sc->node = NULL;
-		NG_NODE_UNREF(sc->node); /* drop it again */
-		return (0);
-	}
-	NG_NODE_SET_PRIVATE(sc->node, sc);
-	callout_handle_init(&sc->handle); /* should kill timeout */
-	sc->running = 0;
-	return (0);
-}
-
-/* already linked */
-static	int
-ngsr_connect(hook_p hook)
-{
-	/* probably not at splnet, force outward queueing */
-	NG_HOOK_FORCE_QUEUE(NG_HOOK_PEER(hook));
-	/* be really amiable and just say "YUP that's OK by me! " */
-	return (0);
-}
-
-/*
- * notify on hook disconnection (destruction)
- *
- * Invalidate the private data associated with this dlci.
- * For this type, removal of the last link resets tries to destroy the node.
- * As the device still exists, the shutdown method will not actually
- * destroy the node, but reset the device and leave it 'fresh' :)
- *
- * The node removal code will remove all references except that owned by the
- * driver. 
- */
-static	int
-ngsr_disconnect(hook_p hook)
-{
-	struct sr_softc * sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-	int	s;
-	/*
-	 * If it's the data hook, then free resources etc.
-	 */
-	if (NG_HOOK_PRIVATE(hook)) {
-		s = splimp();
-		sc->datahooks--;
-		if (sc->datahooks == 0)
-			sr_down(sc);
-		splx(s);
-	} else {
-		sc->debug_hook = NULL;
-	}
-	return (0);
-}
-#endif /* NETGRAPH */
-
-/*
- ********************************* END ************************************
- */
diff --git a/sys/dev/sr/if_sr.h b/sys/dev/sr/if_sr.h
deleted file mode 100644
index c66f667..0000000
--- a/sys/dev/sr/if_sr.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * if_sr.h
- *
- * Copyright (C) 1997-1999 Whistle Communications Inc.
- * All rights reserved.
- *
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
-
- * $FreeBSD$
- */
-
-#ifndef _I386_ISA_IF_SR_H_
-#define _I386_ISA_IF_SR_H_
-
-/* Node type name and type cookie */
-#define NG_SR_NODE_TYPE		"sync_sr"
-#define NG_SR_COOKIE		860552148
-
-/* Netgraph hooks */
-#define NG_SR_HOOK_DEBUG	"debug"
-#define NG_SR_HOOK_RAW		"rawdata"
-
-#endif /* _I386_ISA_IF_SR_H_ */
-
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
deleted file mode 100644
index 3f68e00..0000000
--- a/sys/dev/sr/if_sr_isa.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/*-
- * Copyright (c) 1996 - 2001 John Hay.
- * Copyright (c) 1996 SDL Communications, Inc.
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>		/* cdevsw stuff */
-#include <sys/kernel.h>		/* SYSINIT stuff */
-#include <sys/uio.h>		/* SYSINIT stuff */
-#include <sys/malloc.h>		/* malloc region definitions */
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-#include <sys/time.h>
-
-#include <isa/isavar.h>
-#include "isa_if.h"
-
-#include <dev/ic/hd64570.h>
-#include <dev/sr/if_srregs.h>
-
-/*
- * List of valid interrupt numbers for the N2 ISA card.
- */
-static int sr_irqtable[16] = {
-	0,	/*  0 */
-	0,	/*  1 */
-	0,	/*  2 */
-	1,	/*  3 */
-	1,	/*  4 */
-	1,	/*  5 */
-	0,	/*  6 */
-	1,	/*  7 */
-	0,	/*  8 */
-	0,	/*  9 */
-	1,	/* 10 */
-	1,	/* 11 */
-	1,	/* 12 */
-	0,	/* 13 */
-	0,	/* 14 */
-	1	/* 15 */
-};
-
-static int sr_isa_probe (device_t);
-static int sr_isa_attach (device_t);
-
-static struct isa_pnp_id sr_ids[] = {
-	{0,		NULL}
-};
-
-static device_method_t sr_methods[] = {
-	DEVMETHOD(device_probe,		sr_isa_probe),
-	DEVMETHOD(device_attach,	sr_isa_attach),
-	DEVMETHOD(device_detach,	sr_detach),
-	{ 0, 0 }
-};
-
-static driver_t sr_isa_driver = {
-	"sr",
-	sr_methods,
-	sizeof (struct sr_hardc)
-};
-
-DRIVER_MODULE(sr, isa, sr_isa_driver, sr_devclass, 0, 0);
-MODULE_DEPEND(sr, isa, 1, 1, 1);
-
-static u_int	src_get8_io(struct sr_hardc *hc, u_int off);
-static u_int	src_get16_io(struct sr_hardc *hc, u_int off);
-static void	src_put8_io(struct sr_hardc *hc, u_int off, u_int val);
-static void	src_put16_io(struct sr_hardc *hc, u_int off, u_int val);
-static u_int	src_dpram_size(device_t device);
-
-/*
- * Probe for an ISA card. If it is there, size its memory. Then get the
- * rest of its information and fill it in.
- */
-static int
-sr_isa_probe (device_t device)
-{
-	struct sr_hardc *hc;
-	int error;
-	u_int32_t flags;
-	u_int i, tmp;
-	u_long irq, junk, membase, memsize;
-	sca_regs *sca = 0;
-
-	error = ISA_PNP_PROBE(device_get_parent(device), device, sr_ids);
-	if (error == ENXIO || error == 0)
-		return (error);
-
-	hc = device_get_softc(device);
-	bzero(hc, sizeof(struct sr_hardc));
-
-	if (sr_allocate_ioport(device, 0, SRC_IO_SIZ)) {
-		return (ENXIO);
-	}
-
-	/*
-	 * Now see if the card is realy there.
-	 */
-	hc->cardtype = SR_CRD_N2;
-	hc->cunit = device_get_unit(device);
-	/*
-	 * We have to fill these in early because the SRC_PUT* and SRC_GET*
-	 * macros use them.
-	 */
-	hc->src_get8 = src_get8_io;
-	hc->src_get16 = src_get16_io;
-	hc->src_put8 = src_put8_io;
-	hc->src_put16 = src_put16_io;
-
-	hc->sca = 0;
-	hc->numports = NCHAN;	/* assumed # of channels on the card */
-
-	flags = device_get_flags(device);
-	if (flags & SR_FLAGS_NCHAN_MSK)
-		hc->numports = flags & SR_FLAGS_NCHAN_MSK;
-
-	sr_outb(hc, SR_PCR, 0);	/* turn off the card */
-
-	/*
-	 * Next, we'll test the Base Address Register to retension of
-	 * data... ... seeing if we're *really* talking to an N2.
-	 */
-	for (i = 0; i < 0x100; i++) {
-		sr_outb(hc, SR_BAR, i);
-		sr_inb(hc, SR_PCR);
-		tmp = sr_inb(hc, SR_BAR);
-		if (tmp != i) {
-			printf("sr%d: probe failed BAR %x, %x.\n",
-			       hc->cunit, i, tmp);
-			goto errexit;
-		}
-	}
-
-	/*
-	 * Now see if we can see the SCA.
-	 */
-	sr_outb(hc, SR_PCR, SR_PCR_SCARUN | sr_inb(hc, SR_PCR));
-	SRC_PUT8(hc, sca->wcrl, 0);
-	SRC_PUT8(hc, sca->wcrm, 0);
-	SRC_PUT8(hc, sca->wcrh, 0);
-	SRC_PUT8(hc, sca->pcr, 0);
-	SRC_PUT8(hc, sca->msci[0].tmc, 0);
-	sr_inb(hc, 0);
-
-	tmp = SRC_GET8(hc, sca->msci[0].tmc);
-	if (tmp != 0) {
-		printf("sr%d: Error reading SCA 0, %x\n", hc->cunit, tmp);
-		goto errexit;
-	}
-	SRC_PUT8(hc, sca->msci[0].tmc, 0x5A);
-	sr_inb(hc, 0);
-
-	tmp = SRC_GET8(hc, sca->msci[0].tmc);
-	if (tmp != 0x5A) {
-		printf("sr%d: Error reading SCA 0x5A, %x\n", hc->cunit, tmp);
-		goto errexit;
-	}
-	SRC_PUT16(hc, sca->dmac[0].cda, 0);
-	sr_inb(hc, 0);
-
-	tmp = SRC_GET16(hc, sca->dmac[0].cda);
-	if (tmp != 0) {
-		printf("sr%d: Error reading SCA 0, %x\n", hc->cunit, tmp);
-		goto errexit;
-	}
-	SRC_PUT16(hc, sca->dmac[0].cda, 0x55AA);
-	sr_inb(hc, 0);
-
-	tmp = SRC_GET16(hc, sca->dmac[0].cda);
-	if (tmp != 0x55AA) {
-		printf("sr%d: Error reading SCA 0x55AA, %x\n",
-		       hc->cunit, tmp);
-		goto errexit;
-	}
-
-	membase = bus_get_resource_start(device, SYS_RES_MEMORY, 0);
-	memsize = SRC_WIN_SIZ;
-	if (bus_set_resource(device, SYS_RES_MEMORY, 0, membase, memsize))
-		goto errexit;
-
-	if (sr_allocate_memory(device, 0, SRC_WIN_SIZ))
-		goto errexit;
-
-	if (src_dpram_size(device) < 4)
-		goto errexit;
-
-	if (sr_allocate_irq(device, 0, 1))
-		goto errexit;
-
-	if (bus_get_resource(device, SYS_RES_IRQ, 0, &irq, &junk)) {
-		goto errexit;
-	}
-	/*
-	 * Do a little sanity check.
-	 */
-	if (sr_irqtable[irq] == 0)
-		printf("sr%d: Warning: illegal interrupt %ld chosen.\n",
-		       hc->cunit, irq);
-
-	/*
-	 * Bogus card configuration
-	 */
-	if ((hc->numports > NCHAN)	/* only 2 ports/card */
-	    ||(hc->memsize > (512 * 1024)))	/* no more than 256K */
-		goto errexit;
-
-	sr_deallocate_resources(device);
-	return (0);
-
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-/*
- * srattach_isa and srattach_pci allocate memory for hardc, softc and
- * data buffers. It also does any initialization that is bus specific.
- * At the end they call the common srattach() function.
- */
-static int
-sr_isa_attach (device_t device)
-{
-	u_char mar;
-	u_int32_t flags;
-	struct sr_hardc *hc;
-
-	hc = device_get_softc(device);
-	bzero(hc, sizeof(struct sr_hardc));
-
-	if (sr_allocate_ioport(device, 0, SRC_IO_SIZ))
-		goto errexit;
-	if (sr_allocate_memory(device, 0, SRC_WIN_SIZ))
-		goto errexit;
-	if (sr_allocate_irq(device, 0, 1))
-		goto errexit;
-
-	/*
-	 * We have to fill these in early because the SRC_PUT* and SRC_GET*
-	 * macros use them.
-	 */
-	hc->src_get8 = src_get8_io;
-	hc->src_get16 = src_get16_io;
-	hc->src_put8 = src_put8_io;
-	hc->src_put16 = src_put16_io;
-
-	hc->cardtype = SR_CRD_N2;
-	hc->cunit = device_get_unit(device);
-	hc->sca = 0;
-	hc->numports = NCHAN;	/* assumed # of channels on the card */
-	flags = device_get_flags(device);
-	if (flags & SR_FLAGS_NCHAN_MSK)
-		hc->numports = flags & SR_FLAGS_NCHAN_MSK;
-
-	hc->mem_start = (caddr_t)rman_get_virtual(hc->res_memory);
-	hc->mem_end = hc->mem_start + SRC_WIN_SIZ;
-	hc->mem_pstart = 0;
-	hc->winmsk = SRC_WIN_MSK;
-
-	hc->mempages = src_dpram_size(device);
-	hc->memsize = hc->mempages * SRC_WIN_SIZ;
-
-	sr_outb(hc, SR_PCR, sr_inb(hc, SR_PCR) | SR_PCR_SCARUN);
-	sr_outb(hc, SR_PSR, sr_inb(hc, SR_PSR) | SR_PSR_EN_SCA_DMA);
-	sr_outb(hc, SR_MCR,
-	     SR_MCR_DTR0 | SR_MCR_DTR1 | SR_MCR_TE0 | SR_MCR_TE1);
-
-	SRC_SET_ON(hc);
-
-	/*
-	 * Configure the card. Mem address, irq,
-	 */
-	mar = (rman_get_start(hc->res_memory) >> 16) & SR_PCR_16M_SEL;
-	sr_outb(hc, SR_PCR, mar | (sr_inb(hc, SR_PCR) & ~SR_PCR_16M_SEL));
-	mar = rman_get_start(hc->res_memory) >> 12;
-	sr_outb(hc, SR_BAR, mar);
-
-	return sr_attach(device);
-
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-/*
- * I/O for ISA N2 card(s)
- */
-#define SRC_REG(y)	((((y) & 0xf) + (((y) & 0xf0) << 6)) | 0x8000)
-
-static u_int
-src_get8_io(struct sr_hardc *hc, u_int off)
-{
-	return bus_space_read_1(hc->bt_ioport, hc->bh_ioport, SRC_REG(off));
-}
-
-static u_int
-src_get16_io(struct sr_hardc *hc, u_int off)
-{
-	return bus_space_read_2(hc->bt_ioport, hc->bh_ioport, SRC_REG(off));
-}
-
-static void
-src_put8_io(struct sr_hardc *hc, u_int off, u_int val)
-{
-	bus_space_write_1(hc->bt_ioport, hc->bh_ioport, SRC_REG(off), val);
-}
-
-static void
-src_put16_io(struct sr_hardc *hc, u_int off, u_int val)
-{
-	bus_space_write_2(hc->bt_ioport, hc->bh_ioport, SRC_REG(off), val);
-}
-
-static u_int
-src_dpram_size(device_t device)
-{
-	u_int pgs, i;
-	u_short *smem;
-	u_char mar;
-	u_long membase;
-	struct sr_hardc *hc;
-
-	hc = device_get_softc(device);
-
-	/*
-	 * OK, the board's interface registers seem to work. Now we'll see
-	 * if the Dual-Ported RAM is fully accessible...
-	 */
-	sr_outb(hc, SR_PCR, SR_PCR_EN_VPM | SR_PCR_ISA16);
-	sr_outb(hc, SR_PSR, SR_PSR_WIN_16K);
-
-	/*
-	 * Take the kernel "virtual" address supplied to us and convert
-	 * it to a "real" address. Then program the card to use that.
-	 */
-	membase = rman_get_start(hc->res_memory);
-	mar = (membase >> 16) & SR_PCR_16M_SEL;
-	sr_outb(hc, SR_PCR, mar | sr_inb(hc, SR_PCR));
-	mar = membase >> 12;
-	sr_outb(hc, SR_BAR, mar);
-	sr_outb(hc, SR_PCR, sr_inb(hc, SR_PCR) | SR_PCR_MEM_WIN);
-	smem = (u_short *)rman_get_virtual(hc->res_memory);/* DP RAM Address */
-	/*
-	 * Here we will perform the memory scan to size the device.
-	 *
-	 * This is done by marking each potential page with a magic number.
-	 * We then loop through the pages looking for that magic number. As
-	 * soon as we no longer see that magic number, we'll quit the scan,
-	 * knowing that no more memory is present. This provides the number
-	 * of pages present on the card.
-	 *
-	 * Note: We're sizing 16K memory granules.
-	 */
-	for (i = 0; i <= SR_PSR_PG_SEL; i++) {
-		sr_outb(hc, SR_PSR, (sr_inb(hc, SR_PSR) & ~SR_PSR_PG_SEL) | i);
-		*smem = 0xAA55;
-	}
-
-	for (i = 0; i <= SR_PSR_PG_SEL; i++) {
-		sr_outb(hc, SR_PSR, (sr_inb(hc, SR_PSR) & ~SR_PSR_PG_SEL) | i);
-		if (*smem != 0xAA55) {
-			/*
-			 * If we have less than 64k of memory, give up. That
-			 * is 4 x 16k pages.
-			 */
-			if (i < 4) {
-				printf("sr%d: Bad mem page %d, mem %x, %x.\n",
-				       hc->cunit, i, 0xAA55, *smem);
-				return 0;
-			}
-			break;
-		}
-		*smem = i;
-	}
-
-	hc->mempages = i;
-	hc->memsize = i * SRC_WIN_SIZ;
-	hc->winmsk = SRC_WIN_MSK;
-	pgs = i;		/* final count of 16K pages */
-
-	/*
-	 * This next loop erases the contents of that page in DPRAM
-	 */
-	for (i = 0; i <= pgs; i++) {
-		sr_outb(hc, SR_PSR, (sr_inb(hc, SR_PSR) & ~SR_PSR_PG_SEL) | i);
-		bzero(smem, SRC_WIN_SIZ);
-	}
-
-	SRC_SET_OFF(hc);
-	return (pgs);
-}
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
deleted file mode 100644
index 8f62513..0000000
--- a/sys/dev/sr/if_sr_pci.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*-
- * Copyright (c) 1996 - 2001 John Hay.
- * Copyright (c) 1996 SDL Communications, Inc.
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <dev/pci/pcivar.h>
-#include <machine/md_var.h>
-
-#include <dev/ic/hd64570.h>
-#include <dev/sr/if_srregs.h>
-
-#ifndef BUGGY
-#define BUGGY		0
-#endif
-
-static int	sr_pci_probe(device_t);
-static int	sr_pci_attach(device_t);
-
-static device_method_t sr_pci_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		sr_pci_probe),
-	DEVMETHOD(device_attach,	sr_pci_attach),
-	DEVMETHOD(device_detach,	sr_detach),
-	{ 0, 0 }
-};
-
-static driver_t sr_pci_driver = {
-	"sr",
-	sr_pci_methods,
-	sizeof(struct sr_hardc),
-};
-
-DRIVER_MODULE(sr, pci, sr_pci_driver, sr_devclass, 0, 0);
-MODULE_DEPEND(sr, pci, 1, 1, 1);
-
-static u_int	src_get8_mem(struct sr_hardc *hc, u_int off);
-static u_int	src_get16_mem(struct sr_hardc *hc, u_int off);
-static void	src_put8_mem(struct sr_hardc *hc, u_int off, u_int val);
-static void	src_put16_mem(struct sr_hardc *hc, u_int off, u_int val);
-
-static int
-sr_pci_probe(device_t device)
-{
-	u_int32_t	type = pci_get_devid(device);
-
-	switch(type) {
-	case 0x556812aa:
-		device_set_desc(device, "RISCom/N2pci");
-		return (BUS_PROBE_DEFAULT);
-		break;
-	case 0x55684778:
-	case 0x55684877:
-		/*
-		 * XXX This can probably be removed sometime.
-		 */
-		device_set_desc(device, "RISCom/N2pci (old id)");
-		return (BUS_PROBE_DEFAULT);
-		break;
-	default:
-		break;
-	}
-	return (ENXIO);
-}
-
-static int
-sr_pci_attach(device_t device)
-{
-	int numports;
-	u_int fecr;
-	struct sr_hardc *hc;
-	bus_space_tag_t bt_plx;
-	bus_space_handle_t bh_plx;
-
-	hc = (struct sr_hardc *)device_get_softc(device);
-	bzero(hc, sizeof(struct sr_hardc));
-
-	if (sr_allocate_plx_memory(device, 0x10, 1))
-		goto errexit;
-	bt_plx = rman_get_bustag(hc->res_plx_memory);
-	bh_plx = rman_get_bushandle(hc->res_plx_memory);
-
-	if (sr_allocate_memory(device, 0x18, 1))
-		goto errexit;
-
-	if (sr_allocate_irq(device, 0, 1))
-		goto errexit;
-
-	hc->cunit = device_get_unit(device);
-
-	/*
-	 * Configure the PLX. This is magic. I'm doing it just like I'm told
-	 * to. :-)
-	 * 
-	 * offset
-	 *  0x00 - Map Range    - Mem-mapped to locate anywhere
-	 *  0x04 - Re-Map       - PCI address decode enable
-	 *  0x18 - Bus Region   - 32-bit bus, ready enable
-	 *  0x1c - Master Range - include all 16 MB
-	 *  0x20 - Master RAM   - Map SCA Base at 0
-	 *  0x28 - Master Remap - direct master memory enable
-	 *  0x68 - Interrupt    - Enable interrupt (0 to disable)
-	 * 
-	 * Note: This is "cargo cult" stuff.  - jrc
-	 */
-	bus_space_write_4(bt_plx, bh_plx, 0x00, 0xfffff000);
-	bus_space_write_4(bt_plx, bh_plx, 0x04, 0x00000001);
-	bus_space_write_4(bt_plx, bh_plx, 0x18, 0x40030043);
-	bus_space_write_4(bt_plx, bh_plx, 0x1c, 0xff000000);
-	bus_space_write_4(bt_plx, bh_plx, 0x20, 0x00000000);
-	bus_space_write_4(bt_plx, bh_plx, 0x28, 0x000000e9);
-	bus_space_write_4(bt_plx, bh_plx, 0x68, 0x00010900);
-
-	/*
-	 * Get info from card.
-	 *
-	 * Only look for the second port if the first exists. Too many things
-	 * will break if we have only a second port.
-	 */
-	fecr = sr_read_fecr(hc);
-	numports = 0;
-
-	if (((fecr & SR_FECR_ID0) >> SR_FE_ID0_SHFT) != SR_FE_ID_NONE) {
-		numports++;
-		if (((fecr & SR_FECR_ID1) >> SR_FE_ID1_SHFT) != SR_FE_ID_NONE)
-			numports++;
-	}
-	if (numports == 0)
-		goto errexit;
-
-	hc->numports = numports;
-	hc->cardtype = SR_CRD_N2PCI;
-
-	hc->src_put8 = src_put8_mem;
-	hc->src_put16 = src_put16_mem;
-	hc->src_get8 = src_get8_mem;
-	hc->src_get16 = src_get16_mem;
-
-	/*
-	 * Malloc area for tx and rx buffers. For now allocate SRC_WIN_SIZ
-	 * (16k) for each buffer.
-	 *
-	 * Allocate the block below 16M because the N2pci card can only access
-	 * 16M memory at a time.
-	 *
-	 * (We could actually allocate a contiguous block above the 16MB limit,
-	 * but this would complicate card programming more than we want to
-	 * right now -jrc)
-	 */
-	hc->memsize = 2 * hc->numports * SRC_WIN_SIZ;
-	hc->mem_start = contigmalloc(hc->memsize,
-				     M_DEVBUF,
-				     M_NOWAIT,
-				     0ul,
-				     0xfffffful,
-				     0x10000,
-				     0x1000000);
-
-	if (hc->mem_start == NULL) {
-		printf("src%d: pci: failed to allocate buffer space.\n",
-		    hc->cunit);
-		goto errexit;
-	}
-	hc->winmsk = 0xffffffff;
-	hc->mem_end = (caddr_t)((u_int)hc->mem_start + hc->memsize);
-	hc->mem_pstart = kvtop(hc->mem_start);
-	bzero(hc->mem_start, hc->memsize);
-
-	sr_write_fecr(hc,
-	    SR_FECR_DTR0 | SR_FECR_DTR1 | SR_FECR_TE0 | SR_FECR_TE1);
-
-	if (sr_attach(device))
-		goto errexit;
-
-	return (0);
-errexit:
-	sr_deallocate_resources(device);
-	return (ENXIO);
-}
-
-/*
- * I/O for PCI N2 card(s)
- */
-#define SRC_PCI_SCA_REG(y)	((y & 2) ? ((y & 0xfd) + 0x100) : y)
-
-static u_int
-src_get8_mem(struct sr_hardc *hc, u_int off)
-{
-	return bus_space_read_1(hc->bt_memory, hc->bh_memory,
-	    SRC_PCI_SCA_REG(off));
-}
-
-static u_int
-src_get16_mem(struct sr_hardc *hc, u_int off)
-{
-	return bus_space_read_2(hc->bt_memory, hc->bh_memory,
-	    SRC_PCI_SCA_REG(off));
-}
-
-static void
-src_put8_mem(struct sr_hardc *hc, u_int off, u_int val)
-{
-	bus_space_write_1(hc->bt_memory, hc->bh_memory,
-	    SRC_PCI_SCA_REG(off), val);
-}
-
-static void
-src_put16_mem(struct sr_hardc *hc, u_int off, u_int val)
-{
-	bus_space_write_2(hc->bt_memory, hc->bh_memory,
-	    SRC_PCI_SCA_REG(off), val);
-}
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
deleted file mode 100644
index 16925e6..0000000
--- a/sys/dev/sr/if_srregs.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*-
- * Copyright (c) 1995 - 2001 John Hay.
- * Copyright (c) 1996 SDL Communications, Inc.
- * 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. 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 author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-#ifndef _IF_SRREGS_H_
-#define _IF_SRREGS_H_
-
-#define NCHAN			2    /* A HD64570 chip have 2 channels */
-
-#define SR_BUF_SIZ		512
-#define SR_TX_BLOCKS		2    /* Sepperate sets of tx buffers */
-
-#define SR_CRD_N2		1
-#define SR_CRD_N2PCI		2
-
-/*
- * RISCom/N2 ISA card.
- */
-#define SRC_IO_SIZ		0x10 /* Actually a lie. It uses a lot more. */
-#define SRC_WIN_SIZ		0x00004000
-#define SRC_WIN_MSK		(SRC_WIN_SIZ - 1)
-#define SRC_WIN_SHFT		14
-
-#define SR_FLAGS_NCHAN_MSK	0x0000000F
-#define SR_FLAGS_0_CLK_MSK	0x00000030
-#define SR_FLAGS_0_EXT_CLK	0x00000000 /* External RX clock shared by TX */
-#define SR_FLAGS_0_EXT_SEP_CLK	0x00000010 /* Sepperate external clocks */
-#define SR_FLAGS_0_INT_CLK	0x00000020 /* Internal clock */
-#define SR_FLAGS_1_CLK_MSK	0x000000C0
-#define SR_FLAGS_1_EXT_CLK	0x00000000 /* External RX clock shared by TX */
-#define SR_FLAGS_1_EXT_SEP_CLK	0x00000040 /* Sepperate external clocks */
-#define SR_FLAGS_1_INT_CLK	0x00000080 /* Internal clock */
-
-#define SR_FLAGS_CLK_SHFT	4
-#define SR_FLAGS_CLK_CHAN_SHFT  2
-#define SR_FLAGS_EXT_CLK	0x00000000 /* External RX clock shared by TX */
-#define SR_FLAGS_EXT_SEP_CLK	0x00000001 /* Sepperate external clocks */
-#define SR_FLAGS_INT_CLK	0x00000002 /* Internal clock */
-
-#define SR_PCR			0x00 /* RW, PC Control Register */
-#define SR_BAR			0x02 /* RW, Base Address Register */
-#define SR_PSR			0x04 /* RW, Page Scan Register */
-#define SR_MCR			0x06 /* RW, Modem Control Register */
-
-#define SR_PCR_SCARUN		0x01 /* !Reset */
-#define SR_PCR_EN_VPM		0x02 /* Running above 1M */
-#define SR_PCR_MEM_WIN		0x04 /* Open memory window */
-#define SR_PCR_ISA16		0x08 /* 16 bit ISA mode */
-#define SR_PCR_16M_SEL		0xF0 /* A20-A23 Addresses */
-
-#define SR_PSR_PG_SEL		0x1F /* Page 0 - 31 select */
-#define SR_PG_MSK		0x1F
-#define SR_PSR_WIN_SIZ		0x60 /* Window size select */
-#define SR_PSR_WIN_16K		0x00
-#define SR_PSR_WIN_32K		0x20
-#define SR_PSR_WIN_64K		0x40
-#define SR_PSR_WIN_128K		0x60
-#define SR_PSR_EN_SCA_DMA	0x80 /* Enable the SCA DMA */
-
-#define SR_MCR_DTR0		0x01 /* Deactivate DTR0 */
-#define SR_MCR_DTR1		0x02 /* Deactivate DTR1 */
-#define SR_MCR_DSR0		0x04 /* DSR0 Status */
-#define SR_MCR_DSR1		0x08 /* DSR1 Status */
-#define SR_MCR_TE0		0x10 /* Enable RS422 TXD */
-#define SR_MCR_TE1		0x20 /* Enable RS422 TXD */
-#define SR_MCR_ETC0		0x40 /* Enable Ext Clock out */
-#define SR_MCR_ETC1		0x80 /* Enable Ext Clock out */
-
-/*
- * RISCom/N2 PCI card.
- */
-#define SR_FECR			0x0200 /* Front End Control Register */
-#define SR_FECR_ETC0		0x0001 /* Enable Ext Clock out */
-#define SR_FECR_ETC1		0x0002 /* Enable Ext Clock out */
-#define SR_FECR_TE0		0x0004 /* Enable RS422 TXD */
-#define SR_FECR_TE1		0x0008 /* Enable RS422 TXD */
-#define SR_FECR_GPO0		0x0010 /* General Purpose Output */
-#define SR_FECR_GPO1		0x0020 /* General Purpose Output */
-#define SR_FECR_DTR0		0x0040 /* 0 for active, 1 for inactive */
-#define SR_FECR_DTR1		0x0080 /* 0 for active, 1 for inactive */
-#define SR_FECR_DSR0		0x0100 /* DSR0 Status */
-#define SR_FECR_ID0		0x0E00 /* ID of channel 0 */
-#define SR_FECR_DSR1		0x1000 /* DSR1 Status */
-#define SR_FECR_ID1		0xE000 /* ID of channel 1 */
-
-#define SR_FE_ID_V35		0x00   /* V.35 Interface */
-#define SR_FE_ID_RS232		0x01   /* RS232 Interface */
-#define SR_FE_ID_TEST		0x02   /* Test Board */
-#define SR_FE_ID_RS422		0x03   /* RS422 Interface */
-#define SR_FE_ID_HSSI		0x05   /* HSSI Interface */
-#define SR_FE_ID_X21		0x06   /* X.21 Interface */
-#define SR_FE_ID_NONE		0x07   /* No card present */
-#define SR_FE_ID0_SHFT		   9
-#define SR_FE_ID1_SHFT		  13
-
-/*
- * These macros are used to hide the difference between the way the
- * ISA N2 cards and the PCI N2 cards access the Hitachi 64570 SCA.
- */
-#define SRC_GET8(hc,off)	(*hc->src_get8)(hc,(uintptr_t)&off)
-#define SRC_GET16(hc,off)	(*hc->src_get16)(hc,(uintptr_t)&off)
-#define SRC_PUT8(hc,off,d)	(*hc->src_put8)(hc,(uintptr_t)&off,d)
-#define SRC_PUT16(hc,off,d)	(*hc->src_put16)(hc,(uintptr_t)&off,d)
-
-/*
- * These macros enable/disable the DPRAM and select the correct
- * DPRAM page.
- */
-#define SRC_GET_WIN(addr)	((addr >> SRC_WIN_SHFT) & SR_PG_MSK)
-
-#define SRC_SET_ON(hc)		sr_outb(hc, SR_PCR,			     \
-					SR_PCR_MEM_WIN | sr_inb(hc, SR_PCR))
-#define SRC_SET_MEM(hc,win)	sr_outb(hc, SR_PSR, SRC_GET_WIN(win) |	     \
-					(sr_inb(hc, SR_PSR) & ~SR_PG_MSK))
-#define SRC_SET_OFF(hc)		sr_outb(hc, SR_PCR,			     \
-					~SR_PCR_MEM_WIN & sr_inb(hc, SR_PCR))
-
-/*
- * Define the hardware (card information) structure needed to keep
- * track of the device itself... There is only one per card.
- */
-struct sr_hardc {
-	struct	sr_softc *sc;		/* software channels */
-	int	cunit;			/* card w/in system */
-
-	u_short	iobase;			/* I/O Base Address */
-	int	cardtype;
-	int	numports;		/* # of ports on cd */
-	int	mempages;
-	u_int	memsize;		/* DPRAM size: bytes */
-	u_int	winmsk;
-	vm_offset_t	mem_pstart;	/* start of buffer */
-	caddr_t	mem_start;		/* start of DP RAM */
-	caddr_t	mem_end;		/* end of DP RAM */
-
-	sca_regs	*sca;		/* register array */
-
-	bus_space_tag_t bt_ioport;
-	bus_space_tag_t bt_memory;
-	bus_space_handle_t bh_ioport;
-	bus_space_handle_t bh_memory;
-	int rid_ioport;
-	int rid_memory;
-	int rid_plx_memory;
-	int rid_irq;
-	struct resource* res_ioport;	/* resource for port range */
-	struct resource* res_memory;	/* resource for mem range */
-	struct resource* res_plx_memory;
-	struct resource* res_irq;	/* resource for irq range */
-	void	*intr_cookie;
-
-	/*
-	 * We vectorize the following functions to allow re-use between the
-	 * ISA card's needs and those of the PCI card.
-	 */
-	void    (*src_put8)(struct sr_hardc *hc, u_int off, u_int val);
-	void    (*src_put16)(struct sr_hardc *hc, u_int off, u_int val);
-	u_int	(*src_get8)(struct sr_hardc *hc, u_int off);
-	u_int	(*src_get16)(struct sr_hardc *hc, u_int off);
-};
-
-extern devclass_t sr_devclass;
-
-int sr_allocate_ioport(device_t device, int rid, u_long size);
-int sr_allocate_irq(device_t device, int rid, u_long size);
-int sr_allocate_memory(device_t device, int rid, u_long size);
-int sr_allocate_plx_memory(device_t device, int rid, u_long size);
-int sr_deallocate_resources(device_t device);
-int sr_attach(device_t device);
-int sr_detach(device_t device);
-
-#define sr_inb(hc, port) \
-	bus_space_read_1((hc)->bt_ioport, (hc)->bh_ioport, (port))
-
-#define sr_outb(hc, port, value) \
-	bus_space_write_1((hc)->bt_ioport, (hc)->bh_ioport, (port), (value))
-
-#define sr_read_fecr(hc) \
-	bus_space_read_4((hc)->bt_memory, (hc)->bh_memory, SR_FECR)
-
-#define sr_write_fecr(hc, value) \
-	bus_space_write_4((hc)->bt_memory, (hc)->bh_memory, SR_FECR, (value))
-
-#endif /* _IF_SRREGS_H_ */
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 969f704..6ae7209 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -539,7 +539,6 @@ _zfs=		zfs
 #	nsp s3 sbni stg vesa
 # acpi is not enabled because it is broken as a module on ia64
 _aic=		aic
-#_ar=		ar	not 64-bit clean
 _an=		an
 _arcnet=	arcnet
 _asr=		asr
@@ -564,7 +563,6 @@ _smbfs=		smbfs
 _sound=		sound
 _splash=	splash
 _sppp=		sppp
-#_sr=		sr		not 64bit clean
 _streams=	streams
 _wi=		wi
 _xe=		xe
diff --git a/sys/modules/ar/Makefile b/sys/modules/ar/Makefile
deleted file mode 100644
index 9350ac0..0000000
--- a/sys/modules/ar/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.PATH:  ${.CURDIR}/../../dev/ar
-KMOD    = if_ar
-SRCS    = if_ar.c if_ar_isa.c if_ar_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
-
-.if !defined(KERNBUILDDIR)
-NETGRAPH?=	0
-
-.if ${NETGRAPH} != 0
-opt_netgraph.h:
-	echo "#define NETGRAPH ${NETGRAPH}" > ${.TARGET}
-.endif
-.endif
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/sync_ar/Makefile b/sys/modules/netgraph/sync_ar/Makefile
deleted file mode 100644
index 0587896..0000000
--- a/sys/modules/netgraph/sync_ar/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-.PATH:  ${.CURDIR}/../../../dev/ar
-KMOD    = ng_sync_ar
-SRCS    = if_ar.c if_ar_isa.c if_ar_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
-
-.if !defined(KERNBUILDDIR)
-opt_netgraph.h:
-	echo "#define NETGRAPH" > ${.TARGET}
-.endif
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/sync_sr/Makefile b/sys/modules/netgraph/sync_sr/Makefile
deleted file mode 100644
index 5d35a79..0000000
--- a/sys/modules/netgraph/sync_sr/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-.PATH:  ${.CURDIR}/../../../dev/sr
-KMOD    = ng_sync_sr
-SRCS    = if_sr.c if_sr_isa.c if_sr_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
-
-.if !defined(KERNBUILDDIR)
-opt_netgraph.h:
-	echo "#define NETGRAPH" > ${.TARGET}
-.endif
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ray/Makefile b/sys/modules/ray/Makefile
deleted file mode 100644
index 84eb9d9..0000000
--- a/sys/modules/ray/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/ray
-
-KMOD=	if_ray
-SRCS=	if_ray.c
-SRCS+=	device_if.h bus_if.h card_if.h opt_inet.h pccarddevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/sr/Makefile b/sys/modules/sr/Makefile
deleted file mode 100644
index b65df09..0000000
--- a/sys/modules/sr/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
- 
-.PATH:  ${.CURDIR}/../../dev/sr
-KMOD    = if_sr
-SRCS    = if_sr.c if_sr_isa.c if_sr_pci.c
-SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
-
-.if !defined(KERNBUILDDIR)
-NETGRAPH?=    0
-
-.if ${NETGRAPH} != 0
-opt_netgraph.h:
-	echo "#define NETGRAPH ${NETGRAPH}" > ${.TARGET}
-.endif
-.endif
-
-.include <bsd.kmod.mk>