BSD 4_3_Net_2 release
[unix-history] / usr / src / sys / vax / if / if_dmc.c
index 0f1fd7c..0e252ce 100644 (file)
@@ -1,4 +1,37 @@
-/*     if_dmc.c        6.5     85/05/01        */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)if_dmc.c    7.10 (Berkeley) 12/16/90
+ */
 
 #include "dmc.h"
 #if NDMC > 0
 
 #include "dmc.h"
 #if NDMC > 0
 
 /* #define DEBUG       /* for base table dump on fatal error */
 
 
 /* #define DEBUG       /* for base table dump on fatal error */
 
-#include "../machine/pte.h"
-
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "buf.h"
-#include "ioctl.h"             /* must precede tty.h */
-#include "tty.h"
-#include "protosw.h"
-#include "socket.h"
-#include "vmmac.h"
-#include "errno.h"
-
-#include "../net/if.h"
-#include "../net/netisr.h"
-#include "../net/route.h"
-#include "../netinet/in.h"
-#include "../netinet/in_systm.h"
-#include "../netinet/ip.h"
-#include "../netinet/ip_var.h"
-
-#include "../vax/cpu.h"
-#include "../vax/mtpr.h"
+#include "../include/pte.h"
+
+#include "sys/param.h"
+#include "sys/systm.h"
+#include "sys/mbuf.h"
+#include "sys/buf.h"
+#include "sys/ioctl.h"         /* must precede tty.h */
+#include "sys/tty.h"
+#include "sys/protosw.h"
+#include "sys/socket.h"
+#include "sys/syslog.h"
+#include "sys/vmmac.h"
+#include "sys/errno.h"
+#include "sys/time.h"
+#include "sys/kernel.h"
+
+#include "net/if.h"
+#include "net/netisr.h"
+#include "net/route.h"
+
+#ifdef INET
+#include "netinet/in.h"
+#include "netinet/in_systm.h"
+#include "netinet/in_var.h"
+#include "netinet/ip.h"
+#endif
+
+#include "../include/cpu.h"
+#include "../include/mtpr.h"
 #include "if_uba.h"
 #include "if_dmc.h"
 #include "if_uba.h"
 #include "if_dmc.h"
-#include "../vaxuba/ubareg.h"
-#include "../vaxuba/ubavar.h"
+#include "../uba/ubareg.h"
+#include "../uba/ubavar.h"
 
 
-#include "../h/time.h"
-#include "../h/kernel.h"
 
 
-int    dmctimer;                       /* timer started? */
-int    dmc_timeout = 8;                /* timeout value */
-int    dmcwatch();
+/*
+ * output timeout value, sec.; should depend on line speed.
+ */
+int    dmc_timeout = 20;
 
 /*
  * Driver information for auto-configuration stuff.
  */
 int    dmcprobe(), dmcattach(), dmcinit(), dmcioctl();
 
 /*
  * Driver information for auto-configuration stuff.
  */
 int    dmcprobe(), dmcattach(), dmcinit(), dmcioctl();
-int    dmcoutput(), dmcreset();
+int    dmcoutput(), dmcreset(), dmctimeout();
 struct uba_device *dmcinfo[NDMC];
 u_short        dmcstd[] = { 0 };
 struct uba_driver dmcdriver =
 struct uba_device *dmcinfo[NDMC];
 u_short        dmcstd[] = { 0 };
 struct uba_driver dmcdriver =
@@ -62,8 +100,7 @@ struct       uba_driver dmcdriver =
 
 #define NRCV 7
 #define NXMT 3 
 
 #define NRCV 7
 #define NXMT 3 
-#define NTOT (NRCV + NXMT)
-#define NCMDS  (NTOT+4)        /* size of command queue */
+#define NCMDS  (NRCV+NXMT+4)   /* size of command queue */
 
 #define printd if(dmcdebug)printf
 int dmcdebug = 0;
 
 #define printd if(dmcdebug)printf
 int dmcdebug = 0;
@@ -81,27 +118,6 @@ struct  dmc_command {
        struct  dmc_command *qp_next;   /* next command on queue */
 };
 
        struct  dmc_command *qp_next;   /* next command on queue */
 };
 
-/*
- * The dmcuba structures generalize the ifuba structure
- * to an arbitrary number of receive and transmit buffers.
- */
-struct ifxmt {
-       struct  ifrw x_ifrw;            /* mapping info */
-       struct  pte x_map[IF_MAXNUBAMR];        /* output base pages */
-       short   x_xswapd;               /* mask of clusters swapped */
-       struct  mbuf *x_xtofree;        /* pages being dma'd out */
-};
-
-struct dmcuba {
-       short   ifu_uban;               /* uba number */
-       short   ifu_hlen;               /* local net header length */
-       struct  uba_regs *ifu_uba;      /* uba regs, in vm */
-       struct  ifrw ifu_r[NRCV];       /* receive information */
-       struct  ifxmt ifu_w[NXMT];      /* transmit information */
-                               /* these should only be pointers */
-       short   ifu_flags;              /* used during uballoc's */
-};
-
 struct dmcbufs {
        int     ubinfo;         /* from uballoc */
        short   cc;             /* buffer size */
 struct dmcbufs {
        int     ubinfo;         /* from uballoc */
        short   cc;             /* buffer size */
@@ -112,7 +128,6 @@ struct dmcbufs {
 #define        DBUF_XMIT       4       /* transmit buffer */
 #define        DBUF_RCV        8       /* receive buffer */
 
 #define        DBUF_XMIT       4       /* transmit buffer */
 #define        DBUF_RCV        8       /* receive buffer */
 
-struct mbuf *dmc_get();
 
 /*
  * DMC software status per interface.
 
 /*
  * DMC software status per interface.
@@ -128,20 +143,21 @@ struct mbuf *dmc_get();
  * efficiently.
  */
 struct dmc_softc {
  * efficiently.
  */
 struct dmc_softc {
+       struct  ifnet sc_if;            /* network-visible interface */
        short   sc_oused;               /* output buffers currently in use */
        short   sc_iused;               /* input buffers given to DMC */
        short   sc_flag;                /* flags */
        short   sc_oused;               /* output buffers currently in use */
        short   sc_iused;               /* input buffers given to DMC */
        short   sc_flag;                /* flags */
-       int     sc_nticks;              /* seconds since last interrupt */
-       struct  ifnet sc_if;            /* network-visible interface */
-       struct  dmcbufs sc_rbufs[NRCV]; /* receive buffer info */
-       struct  dmcbufs sc_xbufs[NXMT]; /* transmit buffer info */
-       struct  dmcuba sc_ifuba;        /* UNIBUS resources */
        int     sc_ubinfo;              /* UBA mapping info for base table */
        int     sc_errors[4];           /* non-fatal error counters */
 #define sc_datck sc_errors[0]
 #define sc_timeo sc_errors[1]
 #define sc_nobuf sc_errors[2]
 #define sc_disc  sc_errors[3]
        int     sc_ubinfo;              /* UBA mapping info for base table */
        int     sc_errors[4];           /* non-fatal error counters */
 #define sc_datck sc_errors[0]
 #define sc_timeo sc_errors[1]
 #define sc_nobuf sc_errors[2]
 #define sc_disc  sc_errors[3]
+       struct  dmcbufs sc_rbufs[NRCV]; /* receive buffer info */
+       struct  dmcbufs sc_xbufs[NXMT]; /* transmit buffer info */
+       struct  ifubinfo sc_ifuba;      /* UNIBUS resources */
+       struct  ifrw sc_ifr[NRCV];      /* UNIBUS receive buffer maps */
+       struct  ifxmt sc_ifw[NXMT];     /* UNIBUS receive buffer maps */
        /* command queue stuff */
        struct  dmc_command sc_cmdbuf[NCMDS];
        struct  dmc_command *sc_qhead;  /* head of command queue */
        /* command queue stuff */
        struct  dmc_command sc_cmdbuf[NCMDS];
        struct  dmc_command *sc_qhead;  /* head of command queue */
@@ -153,10 +169,10 @@ struct dmc_softc {
 } dmc_softc[NDMC];
 
 /* flags */
 } dmc_softc[NDMC];
 
 /* flags */
-#define DMC_ALLOC      01              /* unibus resources allocated */
-#define DMC_BMAPPED    02              /* base table mapped */
-#define DMC_RESTART    04              /* software restart in progress */
-#define DMC_ACTIVE     08              /* device active */
+#define DMC_RUNNING    0x01            /* device initialized */
+#define DMC_BMAPPED    0x02            /* base table mapped */
+#define DMC_RESTART    0x04            /* software restart in progress */
+#define DMC_ONLINE     0x08            /* device running (had a RDYO) */
 
 struct dmc_base {
        short   d_base[128];            /* DMC base table */
 
 struct dmc_base {
        short   d_base[128];            /* DMC base table */
@@ -227,14 +243,11 @@ dmcattach(ui)
        sc->sc_if.if_output = dmcoutput;
        sc->sc_if.if_ioctl = dmcioctl;
        sc->sc_if.if_reset = dmcreset;
        sc->sc_if.if_output = dmcoutput;
        sc->sc_if.if_ioctl = dmcioctl;
        sc->sc_if.if_reset = dmcreset;
+       sc->sc_if.if_watchdog = dmctimeout;
        sc->sc_if.if_flags = IFF_POINTOPOINT;
        sc->sc_if.if_flags = IFF_POINTOPOINT;
-       sc->sc_ifuba.ifu_flags = UBA_CANTWAIT;
+       sc->sc_ifuba.iff_flags = UBA_CANTWAIT;
 
        if_attach(&sc->sc_if);
 
        if_attach(&sc->sc_if);
-       if (dmctimer == 0) {
-               dmctimer = 1;
-               timeout(dmcwatch, (caddr_t) 0, hz);
-       }
 }
 
 /*
 }
 
 /*
@@ -281,7 +294,7 @@ dmcinit(unit)
         * (both local and destination for an address family).
         */
        for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
         * (both local and destination for an address family).
         */
        for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-               if (ifa->ifa_addr.sa_family && ifa->ifa_dstaddr.sa_family)
+               if (ifa->ifa_addr->sa_family && ifa->ifa_dstaddr->sa_family)
                        break;
        if (ifa == (struct ifaddr *) 0)
                return;
                        break;
        if (ifa == (struct ifaddr *) 0)
                return;
@@ -300,28 +313,35 @@ dmcinit(unit)
        /* initialize UNIBUS resources */
        sc->sc_iused = sc->sc_oused = 0;
        if ((ifp->if_flags & IFF_RUNNING) == 0) {
        /* initialize UNIBUS resources */
        sc->sc_iused = sc->sc_oused = 0;
        if ((ifp->if_flags & IFF_RUNNING) == 0) {
-               if (dmc_ubainit(&sc->sc_ifuba, ui->ui_ubanum,
-                   sizeof(struct dmc_header), (int)btoc(DMCMTU)) == 0) {
+               if (if_ubaminit(&sc->sc_ifuba, ui->ui_ubanum,
+                   sizeof(struct dmc_header), (int)btoc(DMCMTU),
+                   sc->sc_ifr, NRCV, sc->sc_ifw, NXMT) == 0) {
                        printf("dmc%d: can't allocate uba resources\n", unit);
                        ifp->if_flags &= ~IFF_UP;
                        return;
                }
                ifp->if_flags |= IFF_RUNNING;
        }
                        printf("dmc%d: can't allocate uba resources\n", unit);
                        ifp->if_flags &= ~IFF_UP;
                        return;
                }
                ifp->if_flags |= IFF_RUNNING;
        }
+       sc->sc_flag &= ~DMC_ONLINE;
+       sc->sc_flag |= DMC_RUNNING;
+       /*
+        * Limit packets enqueued until we see if we're on the air.
+        */
+       ifp->if_snd.ifq_maxlen = 3;
 
        /* initialize buffer pool */
        /* receives */
 
        /* initialize buffer pool */
        /* receives */
-       ifrw = &sc->sc_ifuba.ifu_r[0];
+       ifrw = &sc->sc_ifr[0];
        for (rp = &sc->sc_rbufs[0]; rp < &sc->sc_rbufs[NRCV]; rp++) {
        for (rp = &sc->sc_rbufs[0]; rp < &sc->sc_rbufs[NRCV]; rp++) {
-               rp->ubinfo = ifrw->ifrw_info & 0x3ffff;
+               rp->ubinfo = UBAI_ADDR(ifrw->ifrw_info);
                rp->cc = DMCMTU + sizeof (struct dmc_header);
                rp->flags = DBUF_OURS|DBUF_RCV;
                ifrw++; 
        }
        /* transmits */
                rp->cc = DMCMTU + sizeof (struct dmc_header);
                rp->flags = DBUF_OURS|DBUF_RCV;
                ifrw++; 
        }
        /* transmits */
-       ifxp = &sc->sc_ifuba.ifu_w[0];
+       ifxp = &sc->sc_ifw[0];
        for (rp = &sc->sc_xbufs[0]; rp < &sc->sc_xbufs[NXMT]; rp++) {
        for (rp = &sc->sc_xbufs[0]; rp < &sc->sc_xbufs[NXMT]; rp++) {
-               rp->ubinfo = ifxp->x_ifrw.ifrw_info & 0x3ffff;
+               rp->ubinfo = UBAI_ADDR(ifxp->ifw_info);
                rp->cc = 0;
                rp->flags = DBUF_OURS|DBUF_XMIT;
                ifxp++; 
                rp->cc = 0;
                rp->flags = DBUF_OURS|DBUF_XMIT;
                ifxp++; 
@@ -337,12 +357,12 @@ dmcinit(unit)
        }
 
        /* base in */
        }
 
        /* base in */
-       base = sc->sc_ubinfo & 0x3ffff;
-       dmcload(sc, DMC_BASEI, base, (base>>2) & DMC_XMEM);
+       base = UBAI_ADDR(sc->sc_ubinfo);
+       dmcload(sc, DMC_BASEI, (u_short)base, (base>>2) & DMC_XMEM);
        /* specify half duplex operation, flags tell if primary */
        /* or secondary station */
        if (ui->ui_flags == 0)
        /* specify half duplex operation, flags tell if primary */
        /* or secondary station */
        if (ui->ui_flags == 0)
-               /* use DDMCP mode in full duplex */
+               /* use DDCMP mode in full duplex */
                dmcload(sc, DMC_CNTLI, 0, 0);
        else if (ui->ui_flags == 1)
                /* use MAINTENENCE mode */
                dmcload(sc, DMC_CNTLI, 0, 0);
        else if (ui->ui_flags == 1)
                /* use MAINTENENCE mode */
@@ -355,7 +375,6 @@ dmcinit(unit)
                dmcload(sc, DMC_CNTLI, 0, DMC_HDPLX | DMC_SEC);
 
        /* enable operation done interrupts */
                dmcload(sc, DMC_CNTLI, 0, DMC_HDPLX | DMC_SEC);
 
        /* enable operation done interrupts */
-       sc->sc_flag &= ~DMC_ACTIVE;
        while ((addr->bsel2 & DMC_IEO) == 0)
                addr->bsel2 |= DMC_IEO;
        s = spl5();
        while ((addr->bsel2 & DMC_IEO) == 0)
                addr->bsel2 |= DMC_IEO;
        s = spl5();
@@ -376,10 +395,9 @@ dmcinit(unit)
  *
  * Must be called at spl 5
  */
  *
  * Must be called at spl 5
  */
-dmcstart(dev)
-       dev_t dev;
+dmcstart(unit)
+       int unit;
 {
 {
-       int unit = minor(dev);
        register struct dmc_softc *sc = &dmc_softc[unit];
        struct mbuf *m;
        register struct dmcbufs *rp;
        register struct dmc_softc *sc = &dmc_softc[unit];
        struct mbuf *m;
        register struct dmcbufs *rp;
@@ -402,9 +420,10 @@ dmcstart(dev)
                         * Have request mapped to UNIBUS for transmission
                         * and start the output.
                         */
                         * Have request mapped to UNIBUS for transmission
                         * and start the output.
                         */
-                       rp->cc = dmcput(&sc->sc_ifuba, n, m);
+                       rp->cc = if_ubaput(&sc->sc_ifuba, &sc->sc_ifw[n], m);
                        rp->cc &= DMC_CCOUNT;
                        rp->cc &= DMC_CCOUNT;
-                       sc->sc_oused++;
+                       if (++sc->sc_oused == 1)
+                               sc->sc_if.if_timer = dmc_timeout;
                        dmcload(sc, DMC_WRITE, rp->ubinfo, 
                                rp->cc | ((rp->ubinfo>>2)&DMC_XMEM));
                }
                        dmcload(sc, DMC_WRITE, rp->ubinfo, 
                                rp->cc | ((rp->ubinfo>>2)&DMC_XMEM));
                }
@@ -417,7 +436,8 @@ dmcstart(dev)
  */
 dmcload(sc, type, w0, w1)
        register struct dmc_softc *sc;
  */
 dmcload(sc, type, w0, w1)
        register struct dmc_softc *sc;
-       int type, w0, w1;
+       int type;
+       u_short w0, w1;
 {
        register struct dmcdevice *addr;
        register int unit, sps;
 {
        register struct dmcdevice *addr;
        register int unit, sps;
@@ -518,7 +538,7 @@ dmcxint(unit)
        struct dmcdevice *addr;
        struct mbuf *m;
        struct ifqueue *inq;
        struct dmcdevice *addr;
        struct mbuf *m;
        struct ifqueue *inq;
-       int arg, pkaddr, cmd, len;
+       int arg, pkaddr, cmd, len, s;
        register struct ifrw *ifrw;
        register struct dmcbufs *rp;
        register struct ifxmt *ifxp;
        register struct ifrw *ifrw;
        register struct dmcbufs *rp;
        register struct ifxmt *ifxp;
@@ -547,7 +567,7 @@ dmcxint(unit)
                         */
                        ifp->if_ipackets++;
                        /* find location in dmcuba struct */
                         */
                        ifp->if_ipackets++;
                        /* find location in dmcuba struct */
-                       ifrw= &sc->sc_ifuba.ifu_r[0];
+                       ifrw= &sc->sc_ifr[0];
                        for (rp = &sc->sc_rbufs[0]; rp < &sc->sc_rbufs[NRCV]; rp++) {
                                if(rp->ubinfo == pkaddr)
                                        break;
                        for (rp = &sc->sc_rbufs[0]; rp < &sc->sc_rbufs[NRCV]; rp++) {
                                if(rp->ubinfo == pkaddr)
                                        break;
@@ -595,13 +615,9 @@ dmcxint(unit)
                         * but we still have to drop the type and length
                         * which are at the front of any trailer data.
                         */
                         * but we still have to drop the type and length
                         * which are at the front of any trailer data.
                         */
-                       m = dmc_get(&sc->sc_ifuba, ifrw, len, off);
+                       m = if_ubaget(&sc->sc_ifuba, ifrw, len, off, ifp);
                        if (m == 0)
                                goto setup;
                        if (m == 0)
                                goto setup;
-                       if (off) {
-                               m->m_off += 2 * sizeof (u_short);
-                               m->m_len -= 2 * sizeof (u_short);
-                       }
                        switch (dh->dmc_type) {
 
 #ifdef INET
                        switch (dh->dmc_type) {
 
 #ifdef INET
@@ -615,15 +631,17 @@ dmcxint(unit)
                                goto setup;
                        }
 
                                goto setup;
                        }
 
+                       s = splimp();
                        if (IF_QFULL(inq)) {
                                IF_DROP(inq);
                                m_freem(m);
                        } else
                                IF_ENQUEUE(inq, m);
                        if (IF_QFULL(inq)) {
                                IF_DROP(inq);
                                m_freem(m);
                        } else
                                IF_ENQUEUE(inq, m);
+                       splx(s);
 
        setup:
                        /* is this needed? */
 
        setup:
                        /* is this needed? */
-                       rp->ubinfo = ifrw->ifrw_info & 0x3ffff;
+                       rp->ubinfo = UBAI_ADDR(ifrw->ifrw_info);
 
                        dmcload(sc, DMC_READ, rp->ubinfo, 
                            ((rp->ubinfo >> 2) & DMC_XMEM) | rp->cc);
 
                        dmcload(sc, DMC_READ, rp->ubinfo, 
                            ((rp->ubinfo >> 2) & DMC_XMEM) | rp->cc);
@@ -636,7 +654,7 @@ dmcxint(unit)
                         */
                        ifp->if_opackets++;
                        /* find associated dmcbuf structure */
                         */
                        ifp->if_opackets++;
                        /* find associated dmcbuf structure */
-                       ifxp = &sc->sc_ifuba.ifu_w[0];
+                       ifxp = &sc->sc_ifw[0];
                        for (rp = &sc->sc_xbufs[0]; rp < &sc->sc_xbufs[NXMT]; rp++) {
                                if(rp->ubinfo == pkaddr)
                                        break;
                        for (rp = &sc->sc_xbufs[0]; rp < &sc->sc_xbufs[NXMT]; rp++) {
                                if(rp->ubinfo == pkaddr)
                                        break;
@@ -651,21 +669,34 @@ dmcxint(unit)
                                printf("dmc%d: unallocated packet 0x%x\n",
                                    unit, pkaddr);
                        /* mark buffer free */
                                printf("dmc%d: unallocated packet 0x%x\n",
                                    unit, pkaddr);
                        /* mark buffer free */
-                       if (ifxp->x_xtofree) {
-                               (void)m_freem(ifxp->x_xtofree);
-                               ifxp->x_xtofree = 0;
+                       if (ifxp->ifw_xtofree) {
+                               (void)m_freem(ifxp->ifw_xtofree);
+                               ifxp->ifw_xtofree = 0;
                        }
                        rp->flags &= ~DBUF_DMCS;
                        }
                        rp->flags &= ~DBUF_DMCS;
-                       sc->sc_oused--;
-                       sc->sc_nticks = 0;
-                       sc->sc_flag |= DMC_ACTIVE;
+                       if (--sc->sc_oused == 0)
+                               sc->sc_if.if_timer = 0;
+                       else
+                               sc->sc_if.if_timer = dmc_timeout;
+                       if ((sc->sc_flag & DMC_ONLINE) == 0) {
+                               extern int ifqmaxlen;
+
+                               /*
+                                * We're on the air.
+                                * Open the queue to the usual value.
+                                */
+                               sc->sc_flag |= DMC_ONLINE;
+                               ifp->if_snd.ifq_maxlen = ifqmaxlen;
+                       }
                        break;
 
                case DMC_CNTLO:
                        arg &= DMC_CNTMASK;
                        if (arg & DMC_FATAL) {
                        break;
 
                case DMC_CNTLO:
                        arg &= DMC_CNTMASK;
                        if (arg & DMC_FATAL) {
-                               printd("dmc%d: fatal error, flags=%b\n",
-                                   unit, arg, CNTLO_BITS);
+                               if (arg != DMC_START)
+                                       log(LOG_ERR,
+                                           "dmc%d: fatal error, flags=%b\n",
+                                           unit, arg, CNTLO_BITS);
                                dmcrestart(unit);
                                break;
                        }
                                dmcrestart(unit);
                                break;
                        }
@@ -703,7 +734,7 @@ dmcxint(unit)
                                 * procedure error
                                 */
                                sc->sc_flag |= DMC_RESTART;
                                 * procedure error
                                 */
                                sc->sc_flag |= DMC_RESTART;
-                               arg = sc->sc_ubinfo & 0x3ffff;
+                               arg = UBAI_ADDR(sc->sc_ubinfo);
                                dmcload(sc, DMC_BASEI, arg, (arg>>2)&DMC_XMEM);
                        }
                        break;
                                dmcload(sc, DMC_BASEI, arg, (arg>>2)&DMC_XMEM);
                        }
                        break;
@@ -733,15 +764,21 @@ dmcoutput(ifp, m0, dst)
        register struct dmc_header *dh;
        register int off;
 
        register struct dmc_header *dh;
        register int off;
 
+       if ((ifp->if_flags & IFF_UP) == 0) {
+               error = ENETDOWN;
+               goto bad;
+       }
+
        switch (dst->sa_family) {
 #ifdef INET
        case AF_INET:
        switch (dst->sa_family) {
 #ifdef INET
        case AF_INET:
-               off = ntohs((u_short)mtod(m, struct ip *)->ip_len) - m->m_len;
+               off = m->m_pkthdr.len - m->m_len;
                if ((ifp->if_flags & IFF_NOTRAILERS) == 0)
                if (off > 0 && (off & 0x1ff) == 0 &&
                if ((ifp->if_flags & IFF_NOTRAILERS) == 0)
                if (off > 0 && (off & 0x1ff) == 0 &&
-                   m->m_off >= MMINOFF + 2 * sizeof (u_short)) {
+                   (m->m_flags & M_EXT) == 0 &&
+                   m->m_data >= m->m_pktdat + 2 * sizeof (u_short)) {
                        type = DMC_TRAILER + (off>>9);
                        type = DMC_TRAILER + (off>>9);
-                       m->m_off -= 2 * sizeof (u_short);
+                       m->m_data -= 2 * sizeof (u_short);
                        m->m_len += 2 * sizeof (u_short);
                        *mtod(m, u_short *) = htons((u_short)DMC_IPTYPE);
                        *(mtod(m, u_short *) + 1) = htons((u_short)m->m_len);
                        m->m_len += 2 * sizeof (u_short);
                        *mtod(m, u_short *) = htons((u_short)DMC_IPTYPE);
                        *(mtod(m, u_short *) + 1) = htons((u_short)m->m_len);
@@ -781,19 +818,10 @@ gottype:
         * Add local network header
         * (there is space for a uba on a vax to step on)
         */
         * Add local network header
         * (there is space for a uba on a vax to step on)
         */
-       if (m->m_off > MMAXOFF ||
-           MMINOFF + sizeof(struct dmc_header) > m->m_off) {
-               m = m_get(M_DONTWAIT, MT_HEADER);
-               if (m == 0) {
-                       error = ENOBUFS;
-                       goto bad;
-               }
-               m->m_next = m0;
-               m->m_off = MMINOFF;
-               m->m_len = sizeof (struct dmc_header);
-       } else {
-               m->m_off -= sizeof (struct dmc_header);
-               m->m_len += sizeof (struct dmc_header);
+       M_PREPEND(m, sizeof(struct dmc_header), M_DONTWAIT);
+       if (m == 0) {
+               error = ENOBUFS;
+               goto bad;
        }
        dh = mtod(m, struct dmc_header *);
        dh->dmc_type = htons((u_short)type);
        }
        dh = mtod(m, struct dmc_header *);
        dh->dmc_type = htons((u_short)type);
@@ -823,12 +851,14 @@ bad:
 /*
  * Process an ioctl request.
  */
 /*
  * Process an ioctl request.
  */
+/* ARGSUSED */
 dmcioctl(ifp, cmd, data)
        register struct ifnet *ifp;
        int cmd;
        caddr_t data;
 {
        int s = splimp(), error = 0;
 dmcioctl(ifp, cmd, data)
        register struct ifnet *ifp;
        int cmd;
        caddr_t data;
 {
        int s = splimp(), error = 0;
+       register struct dmc_softc *sc = &dmc_softc[ifp->if_unit];
 
        switch (cmd) {
 
 
        switch (cmd) {
 
@@ -843,6 +873,15 @@ dmcioctl(ifp, cmd, data)
                        dmcinit(ifp->if_unit); 
                break;
                
                        dmcinit(ifp->if_unit); 
                break;
                
+       case SIOCSIFFLAGS:
+               if ((ifp->if_flags & IFF_UP) == 0 &&
+                   sc->sc_flag & DMC_RUNNING)
+                       dmcdown(ifp->if_unit);
+               else if (ifp->if_flags & IFF_UP &&
+                   (sc->sc_flag & DMC_RUNNING) == 0)
+                       dmcrestart(ifp->if_unit);
+               break;
+
        default:
                error = EINVAL;
        }
        default:
                error = EINVAL;
        }
@@ -850,270 +889,6 @@ dmcioctl(ifp, cmd, data)
        return (error);
 }
 
        return (error);
 }
 
-
-/*
- * Routines supporting UNIBUS network interfaces.
- */
-
-/*
- * Init UNIBUS for interface on uban whose headers of size hlen are to
- * end on a page boundary.  We allocate a UNIBUS map register for the page
- * with the header, and nmr more UNIBUS map registers for i/o on the adapter,
- * doing this for each receive and transmit buffer.  We also
- * allocate page frames in the mbuffer pool for these pages.
- */
-dmc_ubainit(ifu, uban, hlen, nmr)
-       register struct dmcuba *ifu;
-       int uban, hlen, nmr;
-{
-       register caddr_t cp, dp;
-       register struct ifrw *ifrw;
-       register struct ifxmt *ifxp;
-       int i, ncl;
-
-       ncl = clrnd(nmr + CLSIZE) / CLSIZE;
-       if (ifu->ifu_r[0].ifrw_addr)
-               /*
-                * If the first read buffer has a non-zero
-                * address, it means we have already allocated core
-                */
-               cp = ifu->ifu_r[0].ifrw_addr - (CLBYTES - hlen);
-       else {
-               cp = m_clalloc(NTOT * ncl, MPG_SPACE);
-               if (cp == 0)
-                       return (0);
-               ifu->ifu_hlen = hlen;
-               ifu->ifu_uban = uban;
-               ifu->ifu_uba = uba_hd[uban].uh_uba;
-               dp = cp + CLBYTES - hlen;
-               for (ifrw = ifu->ifu_r; ifrw < &ifu->ifu_r[NRCV]; ifrw++) {
-                       ifrw->ifrw_addr = dp;
-                       dp += ncl * CLBYTES;
-               }
-               for (ifxp = ifu->ifu_w; ifxp < &ifu->ifu_w[NXMT]; ifxp++) {
-                       ifxp->x_ifrw.ifrw_addr = dp;
-                       dp += ncl * CLBYTES;
-               }
-       }
-       /* allocate for receive ring */
-       for (ifrw = ifu->ifu_r; ifrw < &ifu->ifu_r[NRCV]; ifrw++) {
-               if (dmc_ubaalloc(ifu, ifrw, nmr) == 0) {
-                       struct ifrw *rw;
-
-                       for (rw = ifu->ifu_r; rw < ifrw; rw++)
-                               ubarelse(ifu->ifu_uban, &rw->ifrw_info);
-                       goto bad;
-               }
-       }
-       /* and now transmit ring */
-       for (ifxp = ifu->ifu_w; ifxp < &ifu->ifu_w[NXMT]; ifxp++) {
-               ifrw = &ifxp->x_ifrw;
-               if (dmc_ubaalloc(ifu, ifrw, nmr) == 0) {
-                       struct ifxmt *xp;
-
-                       for (xp = ifu->ifu_w; xp < ifxp; xp++)
-                               ubarelse(ifu->ifu_uban, &xp->x_ifrw.ifrw_info);
-                       for (ifrw = ifu->ifu_r; ifrw < &ifu->ifu_r[NRCV]; ifrw++)
-                               ubarelse(ifu->ifu_uban, &ifrw->ifrw_info);
-                       goto bad;
-               }
-               for (i = 0; i < nmr; i++)
-                       ifxp->x_map[i] = ifrw->ifrw_mr[i];
-               ifxp->x_xswapd = 0;
-       }
-       return (1);
-bad:
-       m_pgfree(cp, NTOT * ncl);
-       ifu->ifu_r[0].ifrw_addr = 0;
-       return (0);
-}
-
-/*
- * Setup either a ifrw structure by allocating UNIBUS map registers,
- * possibly a buffered data path, and initializing the fields of
- * the ifrw structure to minimize run-time overhead.
- */
-static
-dmc_ubaalloc(ifu, ifrw, nmr)
-       struct dmcuba *ifu;
-       register struct ifrw *ifrw;
-       int nmr;
-{
-       register int info;
-
-       info =
-           uballoc(ifu->ifu_uban, ifrw->ifrw_addr, nmr*NBPG + ifu->ifu_hlen,
-               ifu->ifu_flags);
-       if (info == 0)
-               return (0);
-       ifrw->ifrw_info = info;
-       ifrw->ifrw_bdp = UBAI_BDP(info);
-       ifrw->ifrw_proto = UBAMR_MRV | (UBAI_BDP(info) << UBAMR_DPSHIFT);
-       ifrw->ifrw_mr = &ifu->ifu_uba->uba_map[UBAI_MR(info) + 1];
-       return (1);
-}
-
-/*
- * Pull read data off a interface.
- * Len is length of data, with local net header stripped.
- * Off is non-zero if a trailer protocol was used, and
- * gives the offset of the trailer information.
- * We copy the trailer information and then all the normal
- * data into mbufs.  When full cluster sized units are present
- * on the interface on cluster boundaries we can get them more
- * easily by remapping, and take advantage of this here.
- */
-struct mbuf *
-dmc_get(ifu, ifrw, totlen, off0)
-       register struct dmcuba *ifu;
-       register struct ifrw *ifrw;
-       int totlen, off0;
-{
-       struct mbuf *top, **mp, *m;
-       int off = off0, len;
-       register caddr_t cp = ifrw->ifrw_addr + ifu->ifu_hlen;
-
-       top = 0;
-       mp = &top;
-       while (totlen > 0) {
-               MGET(m, M_DONTWAIT, MT_DATA);
-               if (m == 0)
-                       goto bad;
-               if (off) {
-                       len = totlen - off;
-                       cp = ifrw->ifrw_addr + ifu->ifu_hlen + off;
-               } else
-                       len = totlen;
-               if (len >= CLBYTES) {
-                       struct mbuf *p;
-                       struct pte *cpte, *ppte;
-                       int x, *ip, i;
-
-                       MCLGET(p, 1);
-                       if (p == 0)
-                               goto nopage;
-                       len = m->m_len = CLBYTES;
-                       m->m_off = (int)p - (int)m;
-                       if (!claligned(cp))
-                               goto copy;
-
-                       /*
-                        * Switch pages mapped to UNIBUS with new page p,
-                        * as quick form of copy.  Remap UNIBUS and invalidate.
-                        */
-                       cpte = &Mbmap[mtocl(cp)*CLSIZE];
-                       ppte = &Mbmap[mtocl(p)*CLSIZE];
-                       x = btop(cp - ifrw->ifrw_addr);
-                       ip = (int *)&ifrw->ifrw_mr[x];
-                       for (i = 0; i < CLSIZE; i++) {
-                               struct pte t;
-                               t = *ppte; *ppte++ = *cpte; *cpte = t;
-                               *ip++ =
-                                   cpte++->pg_pfnum|ifrw->ifrw_proto;
-                               mtpr(TBIS, cp);
-                               cp += NBPG;
-                               mtpr(TBIS, (caddr_t)p);
-                               p += NBPG / sizeof (*p);
-                       }
-                       goto nocopy;
-               }
-nopage:
-               m->m_len = MIN(MLEN, len);
-               m->m_off = MMINOFF;
-copy:
-               bcopy(cp, mtod(m, caddr_t), (unsigned)m->m_len);
-               cp += m->m_len;
-nocopy:
-               *mp = m;
-               mp = &m->m_next;
-               if (off) {
-                       /* sort of an ALGOL-W style for statement... */
-                       off += m->m_len;
-                       if (off == totlen) {
-                               cp = ifrw->ifrw_addr + ifu->ifu_hlen;
-                               off = 0;
-                               totlen = off0;
-                       }
-               } else
-                       totlen -= m->m_len;
-       }
-       return (top);
-bad:
-       m_freem(top);
-       return (0);
-}
-
-/*
- * Map a chain of mbufs onto a network interface
- * in preparation for an i/o operation.
- * The argument chain of mbufs includes the local network
- * header which is copied to be in the mapped, aligned
- * i/o space.
- */
-dmcput(ifu, n, m)
-       struct dmcuba *ifu;
-       int n;
-       register struct mbuf *m;
-{
-       register struct mbuf *mp;
-       register caddr_t cp;
-       register struct ifxmt *ifxp;
-       register struct ifrw *ifrw;
-       register int i;
-       int xswapd = 0;
-       int x, cc, t;
-       caddr_t dp;
-
-       ifxp = &ifu->ifu_w[n];
-       ifrw = &ifxp->x_ifrw;
-       cp = ifrw->ifrw_addr;
-       while (m) {
-               dp = mtod(m, char *);
-               if (claligned(cp) && claligned(dp) && m->m_len == CLBYTES) {
-                       struct pte *pte; int *ip;
-                       pte = &Mbmap[mtocl(dp)*CLSIZE];
-                       x = btop(cp - ifrw->ifrw_addr);
-                       ip = (int *)&ifrw->ifrw_mr[x];
-                       for (i = 0; i < CLSIZE; i++)
-                               *ip++ = ifrw->ifrw_proto | pte++->pg_pfnum;
-                       xswapd |= 1 << (x>>(CLSHIFT-PGSHIFT));
-                       mp = m->m_next;
-                       m->m_next = ifxp->x_xtofree;
-                       ifxp->x_xtofree = m;
-                       cp += m->m_len;
-               } else {
-                       bcopy(mtod(m, caddr_t), cp, (unsigned)m->m_len);
-                       cp += m->m_len;
-                       MFREE(m, mp);
-               }
-               m = mp;
-       }
-
-       /*
-        * Xswapd is the set of clusters we just mapped out.  Ifxp->x_xswapd
-        * is the set of clusters mapped out from before.  We compute
-        * the number of clusters involved in this operation in x.
-        * Clusters mapped out before and involved in this operation
-        * should be unmapped so original pages will be accessed by the device.
-        */
-       cc = cp - ifrw->ifrw_addr;
-       x = ((cc - ifu->ifu_hlen) + CLBYTES - 1) >> CLSHIFT;
-       ifxp->x_xswapd &= ~xswapd;
-       while (i = ffs(ifxp->x_xswapd)) {
-               i--;
-               if (i >= x)
-                       break;
-               ifxp->x_xswapd &= ~(1<<i);
-               i *= CLSIZE;
-               for (t = 0; t < CLSIZE; t++) {
-                       ifrw->ifrw_mr[i] = ifxp->x_map[i];
-                       i++;
-               }
-       }
-       ifxp->x_xswapd |= xswapd;
-       return (cc);
-}
-
 /*
  * Restart after a fatal error.
  * Clear device and reinitialize.
 /*
  * Restart after a fatal error.
  * Clear device and reinitialize.
@@ -1122,84 +897,81 @@ dmcrestart(unit)
        int unit;
 {
        register struct dmc_softc *sc = &dmc_softc[unit];
        int unit;
 {
        register struct dmc_softc *sc = &dmc_softc[unit];
-       register struct uba_device *ui = dmcinfo[unit];
        register struct dmcdevice *addr;
        register struct dmcdevice *addr;
-       register struct ifxmt *ifxp;
        register int i;
        register int i;
-       register struct mbuf *m;
-       struct dmcuba *ifu;
+       int s;
        
        
-       addr = (struct dmcdevice *)ui->ui_addr;
-       ifu = &sc->sc_ifuba;
 #ifdef DEBUG
        /* dump base table */
        printf("dmc%d base table:\n", unit);
        for (i = 0; i < sizeof (struct dmc_base); i++)
                printf("%o\n" ,dmc_base[unit].d_base[i]);
 #endif
 #ifdef DEBUG
        /* dump base table */
        printf("dmc%d base table:\n", unit);
        for (i = 0; i < sizeof (struct dmc_base); i++)
                printf("%o\n" ,dmc_base[unit].d_base[i]);
 #endif
+
+       dmcdown(unit);
+
        /*
         * Let the DMR finish the MCLR.  At 1 Mbit, it should do so
         * in about a max of 6.4 milliseconds with diagnostics enabled.
         */
        /*
         * Let the DMR finish the MCLR.  At 1 Mbit, it should do so
         * in about a max of 6.4 milliseconds with diagnostics enabled.
         */
-       addr->bsel1 = DMC_MCLR;
+       addr = (struct dmcdevice *)(dmcinfo[unit]->ui_addr);
        for (i = 100000; i && (addr->bsel1 & DMC_RUN) == 0; i--)
                ;
        /* Did the timer expire or did the DMR finish? */
        if ((addr->bsel1 & DMC_RUN) == 0) {
        for (i = 100000; i && (addr->bsel1 & DMC_RUN) == 0; i--)
                ;
        /* Did the timer expire or did the DMR finish? */
        if ((addr->bsel1 & DMC_RUN) == 0) {
-               printf("dmc%d: M820 Test Failed\n", unit);
+               log(LOG_ERR, "dmc%d: M820 Test Failed\n", unit);
                return;
        }
 
                return;
        }
 
-#ifdef notdef  /* tef sez why throw these packets away??? */
-       /* purge send queue */
-       IF_DEQUEUE(&sc->sc_if.if_snd, m);
-       while (m) {
-               m_freem(m);
-               IF_DEQUEUE(&sc->sc_if.if_snd, m);
-       }
-#endif
-       for (ifxp = ifu->ifu_w; ifxp < &ifu->ifu_w[NXMT]; ifxp++) {
-               if (ifxp->x_xtofree) {
-                       (void) m_freem(ifxp->x_xtofree);
-                       ifxp->x_xtofree = 0;
-               }
-       }
-
        /* restart DMC */
        dmcinit(unit);
        sc->sc_flag &= ~DMC_RESTART;
        /* restart DMC */
        dmcinit(unit);
        sc->sc_flag &= ~DMC_RESTART;
+       s = spl5();
+       dmcstart(unit);
+       splx(s);
        sc->sc_if.if_collisions++;      /* why not? */
 }
 
 /*
        sc->sc_if.if_collisions++;      /* why not? */
 }
 
 /*
- * Check to see that transmitted packets don't
- * lose interrupts.  The device has to be active.
+ * Reset a device and mark down.
+ * Flush output queue and drop queue limit.
+ */
+dmcdown(unit)
+       int unit;
+{
+       register struct dmc_softc *sc = &dmc_softc[unit];
+       register struct ifxmt *ifxp;
+
+       ((struct dmcdevice *)(dmcinfo[unit]->ui_addr))->bsel1 = DMC_MCLR;
+       sc->sc_flag &= ~(DMC_RUNNING | DMC_ONLINE);
+
+       for (ifxp = sc->sc_ifw; ifxp < &sc->sc_ifw[NXMT]; ifxp++) {
+               if (ifxp->ifw_xtofree) {
+                       (void) m_freem(ifxp->ifw_xtofree);
+                       ifxp->ifw_xtofree = 0;
+               }
+       }
+       if_qflush(&sc->sc_if.if_snd);
+}
+
+/*
+ * Watchdog timeout to see that transmitted packets don't
+ * lose interrupts.  The device has to be online (the first
+ * transmission may block until the other side comes up).
  */
  */
-dmcwatch()
+dmctimeout(unit)
+       int unit;
 {
 {
-       register struct uba_device *ui;
        register struct dmc_softc *sc;
        struct dmcdevice *addr;
        register struct dmc_softc *sc;
        struct dmcdevice *addr;
-       register int i;
 
 
-       for (i = 0; i < NDMC; i++) {
-               sc = &dmc_softc[i];
-               if ((sc->sc_flag & DMC_ACTIVE) == 0)
-                       continue;
-               if ((ui = dmcinfo[i]) == 0 || ui->ui_alive == 0)
-                       continue;
-               if (sc->sc_oused) {
-                       sc->sc_nticks++;
-                       if (sc->sc_nticks > dmc_timeout) {
-                               sc->sc_nticks = 0;
-                               addr = (struct dmcdevice *)ui->ui_addr;
-                               printd("dmc%d hung: bsel0=%b bsel2=%b\n", i,
-                                   addr->bsel0 & 0xff, DMC0BITS,
-                                   addr->bsel2 & 0xff, DMC2BITS);
-                               dmcrestart(i);
-                       }
-               }
+       sc = &dmc_softc[unit];
+       if (sc->sc_flag & DMC_ONLINE) {
+               addr = (struct dmcdevice *)(dmcinfo[unit]->ui_addr);
+               log(LOG_ERR, "dmc%d: output timeout, bsel0=%b bsel2=%b\n",
+                   unit, addr->bsel0 & 0xff, DMC0BITS,
+                   addr->bsel2 & 0xff, DMC2BITS);
+               dmcrestart(unit);
        }
        }
-       timeout(dmcwatch, (caddr_t) 0, hz);
 }
 #endif
 }
 #endif