lint

SCCS-vsn: sys/vax/uba/dmf.c 4.11
SCCS-vsn: sys/vax/uba/dn.c 4.10
SCCS-vsn: sys/vax/uba/idc.c 4.8
SCCS-vsn: sys/vax/uba/rk.c 4.49
SCCS-vsn: sys/vax/uba/tm.c 4.57
SCCS-vsn: sys/vax/uba/ts.c 4.32
SCCS-vsn: sys/vax/uba/uba.c 4.52
SCCS-vsn: sys/vax/uba/uda.c 4.12

diff --git a/usr/src/sys/vax/uba/dmf.c b/usr/src/sys/vax/uba/dmf.c
index 9280b57..734297d 100644 (file)
--- a/usr/src/sys/vax/uba/dmf.c
+++ b/usr/src/sys/vax/uba/dmf.c
@@ -1,4 +1,4 @@
-/*     dmf.c   4.10    82/10/17        */
+/*     dmf.c   4.11    82/10/17        */

 
 #include "dmf.h"
 #if NDMF > 0
 
 #include "dmf.h"
 #if NDMF > 0


@@ -402,8 +402,6 @@ dmfioctl(dev, cmd, data, flag)
 {
        register struct tty *tp;
        register int unit = minor(dev);
 {
        register struct tty *tp;
        register int unit = minor(dev);

-       register int dmf = unit >> 3;
-       register struct device *dmfaddr;

        int error;
  
        tp = &dmf_tty[unit];
        int error;
  
        tp = &dmf_tty[unit];


@@ -581,11 +579,10 @@ dmfstart(tp)
        register struct tty *tp;
 {
        register struct dmfdevice *addr;
        register struct tty *tp;
 {
        register struct dmfdevice *addr;

-       register int car, dmf, unit, nch;
+       register int unit, nch;

        int s;
 
        unit = minor(tp->t_dev);
        int s;
 
        unit = minor(tp->t_dev);

-       dmf = unit >> 3;

        unit &= 07;
        addr = (struct dmfdevice *)tp->t_addr;
 
        unit &= 07;
        addr = (struct dmfdevice *)tp->t_addr;
 

diff --git a/usr/src/sys/vax/uba/dn.c b/usr/src/sys/vax/uba/dn.c
index 21e1fa4..062663d 100644 (file)
--- a/usr/src/sys/vax/uba/dn.c
+++ b/usr/src/sys/vax/uba/dn.c
@@ -1,4 +1,4 @@
-/*     dn.c    4.9     82/10/17        */
+/*     dn.c    4.10    82/10/17        */

 
 #include "dn.h"
 #if NDN > 0
 
 #include "dn.h"
 #if NDN > 0


@@ -15,6 +15,7 @@
 #include "../h/pte.h"
 #include "../h/conf.h"
 #include "../h/ioctl.h"
 #include "../h/pte.h"
 #include "../h/conf.h"
 #include "../h/ioctl.h"

+#include "../h/uio.h"

 
 #include "../vaxuba/ubavar.h"
 
 
 #include "../vaxuba/ubavar.h"
 


@@ -57,9 +58,12 @@ dnprobe(reg)
        register int br, cvec;  /* value-result, must be r11, r10 */
        register struct dndevice *dnaddr = (struct dndevice *)reg;
 
        register int br, cvec;  /* value-result, must be r11, r10 */
        register struct dndevice *dnaddr = (struct dndevice *)reg;
 

+#ifdef lint
+       br = 0; cvec = 0; br = cvec; cvec = br;
+#endif

        /*
         * If there's at least one dialer out there it better be
        /*
         * If there's at least one dialer out there it better be

-        *  at chassis 0.
+        * at chassis 0.

         */
        dnaddr->dn_reg[0] = MENABLE|IENABLE|DONE;
        DELAY(5);
         */
        dnaddr->dn_reg[0] = MENABLE|IENABLE|DONE;
        DELAY(5);


@@ -67,6 +71,7 @@ dnprobe(reg)
        return (sizeof (struct dndevice));
 }
 
        return (sizeof (struct dndevice));
 }
 

+/*ARGSUSED*/

 dnattach(ui)
        struct uba_device *ui;
 {
 dnattach(ui)
        struct uba_device *ui;
 {


@@ -114,7 +119,7 @@ dnwrite(dev, uio)
        register u_short *dnreg;
        register int cc;
        register struct dndevice *dp;
        register u_short *dnreg;
        register int cc;
        register struct dndevice *dp;

-       char buf[OBUFSIZ];
+       char obuf[OBUFSIZ];

        register char *cp;
        extern lbolt;
        int error;
        register char *cp;
        extern lbolt;
        int error;


@@ -122,7 +127,7 @@ dnwrite(dev, uio)
        dp = (struct dndevice *)dninfo[DNUNIT(dev)]->ui_addr;
        dnreg = &(dp->dn_reg[DNREG(dev)]);
        cc = MIN(uio->uio_resid, OBUFSIZ);
        dp = (struct dndevice *)dninfo[DNUNIT(dev)]->ui_addr;
        dnreg = &(dp->dn_reg[DNREG(dev)]);
        cc = MIN(uio->uio_resid, OBUFSIZ);

-       cp = buf;
+       cp = obuf;

        error = uiomove(cp, (unsigned)cc, UIO_WRITE, uio);
        if (error)
                return (error);
        error = uiomove(cp, (unsigned)cc, UIO_WRITE, uio);
        if (error)
                return (error);

diff --git a/usr/src/sys/vax/uba/idc.c b/usr/src/sys/vax/uba/idc.c
index f12ce25..5982cc0 100644 (file)
--- a/usr/src/sys/vax/uba/idc.c
+++ b/usr/src/sys/vax/uba/idc.c
@@ -1,4 +1,4 @@
-/*     idc.c   4.7     82/10/17        */
+/*     idc.c   4.8     82/10/17        */

 
 #include "rb.h"
 #if NIDC > 0
 
 #include "rb.h"
 #if NIDC > 0


@@ -6,7 +6,7 @@ int     idcdebug = 0;
 #define        printd if(idcdebug)printf
 int    idctrb[1000];
 int    *trp = idctrb;
 #define        printd if(idcdebug)printf
 int    idctrb[1000];
 int    *trp = idctrb;

-#define        trace(a,b) {*trp++ = (int)a; *trp++ = (int)b; if(trp>&idctrb[998])trp=idctrb;}
+#define        trace(a,b) {*trp++ = *(int*)a; *trp++ = (int)b; if(trp>&idctrb[998])trp=idctrb;}

 /*
  * IDC (RB730) disk driver
  *
 /*
  * IDC (RB730) disk driver
  *


@@ -117,6 +117,7 @@ daddr_t     dkblock();
 
 int    idcwstart, idcwticks, idcwatch();
 
 
 int    idcwstart, idcwticks, idcwatch();
 

+/*ARGSUSED*/

 idcprobe(reg)
        caddr_t reg;
 {
 idcprobe(reg)
        caddr_t reg;
 {


@@ -134,6 +135,7 @@ idcprobe(reg)
        return (sizeof (struct idcdevice));
 }
 
        return (sizeof (struct idcdevice));
 }
 

+/*ARGSUSED*/

 idcslave(ui, reg)
        struct uba_device *ui;
        caddr_t reg;
 idcslave(ui, reg)
        struct uba_device *ui;
        caddr_t reg;


@@ -156,6 +158,9 @@ idcslave(ui, reg)
                return (0);
        i = idcaddr->idcmpr;            /* read header word 1 */
        i = idcaddr->idcmpr;            /* read header word 2 */
                return (0);
        i = idcaddr->idcmpr;            /* read header word 1 */
        i = idcaddr->idcmpr;            /* read header word 2 */

+#ifdef lint
+       i = i;
+#endif

        if (idcaddr->idccsr&IDC_R80)
                ui->ui_type = 1;
        return (1);
        if (idcaddr->idccsr&IDC_R80)
                ui->ui_type = 1;
        return (1);


@@ -220,11 +225,11 @@ idcstrategy(bp)
                bn *= 2;
        bp->b_cylin = bn/st->nspc + st->sizes[xunit].cyloff;
        (void) spl5();
                bn *= 2;
        bp->b_cylin = bn/st->nspc + st->sizes[xunit].cyloff;
        (void) spl5();

-       trace('strt',bp);
+       trace("strt",bp);

        dp = &idcutab[ui->ui_unit];
        disksort(dp, bp);
        if (dp->b_active == 0) {
        dp = &idcutab[ui->ui_unit];
        disksort(dp, bp);
        if (dp->b_active == 0) {

-               trace('!act',dp);
+               trace("!act",dp);

                (void) idcustart(ui);
                bp = &ui->ui_mi->um_tab;
                if (bp->b_actf && bp->b_active == 0)
                (void) idcustart(ui);
                bp = &ui->ui_mi->um_tab;
                if (bp->b_actf && bp->b_active == 0)


@@ -256,25 +261,25 @@ idcustart(ui)
        dp = &idcutab[ui->ui_unit];
        um = ui->ui_mi;
        unit = ui->ui_slave;
        dp = &idcutab[ui->ui_unit];
        um = ui->ui_mi;
        unit = ui->ui_slave;

-       trace('ust', dp);
+       trace("ust", dp);

        idcaddr = (struct idcdevice *)um->um_addr;
        if (um->um_tab.b_active) {
                idc_softc.sc_softas |= 1<<unit;
        idcaddr = (struct idcdevice *)um->um_addr;
        if (um->um_tab.b_active) {
                idc_softc.sc_softas |= 1<<unit;

-               trace('umac',idc_softc.sc_softas);
+               trace("umac",idc_softc.sc_softas);

                return (0);
        }
        if ((bp = dp->b_actf) == NULL) {
                return (0);
        }
        if ((bp = dp->b_actf) == NULL) {

-               trace('!bp',0);
+               trace("!bp",0);

                return (0);
        }
        if (dp->b_active) {
                return (0);
        }
        if (dp->b_active) {

-               trace('dpac',dp->b_active);
+               trace("dpac",dp->b_active);

                goto done;
        }
        dp->b_active = 1;
        /* CHECK DRIVE READY? */
        bn = dkblock(bp);
                goto done;
        }
        dp->b_active = 1;
        /* CHECK DRIVE READY? */
        bn = dkblock(bp);

-       trace('seek', bn);
+       trace("seek", bn);

        if (ui->ui_type == 0)
                bn *= 2;
        st = &idcst[ui->ui_type];
        if (ui->ui_type == 0)
                bn *= 2;
        st = &idcst[ui->ui_type];


@@ -333,12 +338,12 @@ idcustart(ui)
        return (1);
 done:
        if (dp->b_active != 2) {
        return (1);
 done:
        if (dp->b_active != 2) {

-               trace('!=2',dp->b_active);
+               trace("!=2",dp->b_active);

                dp->b_forw = NULL;
                if (um->um_tab.b_actf == NULL)
                        um->um_tab.b_actf = dp;
                else {
                dp->b_forw = NULL;
                if (um->um_tab.b_actf == NULL)
                        um->um_tab.b_actf = dp;
                else {

-                       trace('!NUL',um->um_tab.b_actl);
+                       trace("!NUL",um->um_tab.b_actl);

                        um->um_tab.b_actl->b_forw = dp;
                }
                um->um_tab.b_actl = dp;
                        um->um_tab.b_actl->b_forw = dp;
                }
                um->um_tab.b_actl = dp;


@@ -360,18 +365,18 @@ idcstart(um)
 
 loop:
        if ((dp = um->um_tab.b_actf) == NULL) {
 
 loop:
        if ((dp = um->um_tab.b_actf) == NULL) {

-               trace('nodp',um);
+               trace("nodp",um);

                return (0);
        }
        if ((bp = dp->b_actf) == NULL) {
                return (0);
        }
        if ((bp = dp->b_actf) == NULL) {

-               trace('nobp', dp);
+               trace("nobp", dp);

                um->um_tab.b_actf = dp->b_forw;
                goto loop;
        }
        um->um_tab.b_active = 1;
        ui = idcdinfo[dkunit(bp)];
        bn = dkblock(bp);
                um->um_tab.b_actf = dp->b_forw;
                goto loop;
        }
        um->um_tab.b_active = 1;
        ui = idcdinfo[dkunit(bp)];
        bn = dkblock(bp);

-       trace('star',bp);
+       trace("star",bp);

        if (ui->ui_type == 0)
                bn *= 2;
        sc = &idc_softc;
        if (ui->ui_type == 0)
                bn *= 2;
        sc = &idc_softc;


@@ -427,7 +432,7 @@ idcdgo(um)
        idcaddr->idcdar = sc->sc_dar;
        printd("idcdgo, ubinfo 0x%x, cmd 0x%x\n", um->um_ubinfo, um->um_cmd);
        idcaddr->idccsr = um->um_cmd;
        idcaddr->idcdar = sc->sc_dar;
        printd("idcdgo, ubinfo 0x%x, cmd 0x%x\n", um->um_ubinfo, um->um_cmd);
        idcaddr->idccsr = um->um_cmd;

-       trace('go', um);
+       trace("go", um);

        um->um_tab.b_active = 2;
        /*** CLEAR SPURIOUS ATTN ON R80? ***/
 }
        um->um_tab.b_active = 2;
        /*** CLEAR SPURIOUS ATTN ON R80? ***/
 }


@@ -446,7 +451,7 @@ idcintr(idc)
        printd("idcintr, idccsr 0x%x", idcaddr->idccsr);
 top:
        idcwticks = 0;
        printd("idcintr, idccsr 0x%x", idcaddr->idccsr);
 top:
        idcwticks = 0;

-       trace('intr', um->um_tab.b_active);
+       trace("intr", um->um_tab.b_active);

        if (um->um_tab.b_active == 2) {
                /*
                 * Process a data transfer complete interrupt.
        if (um->um_tab.b_active == 2) {
                /*
                 * Process a data transfer complete interrupt.


@@ -569,7 +574,7 @@ cont:
                dp->b_active = 0;
                dp->b_errcnt = 0;
                dp->b_actf = bp->av_forw;
                dp->b_active = 0;
                dp->b_errcnt = 0;
                dp->b_actf = bp->av_forw;

-               trace('done', dp); trace(um->um_tab.b_actf, dp->b_actf);
+               trace("done", dp); trace(&um->um_tab.b_actf, dp->b_actf);

                bp->b_resid = sc->sc_resid;
                printd(", iodone, resid 0x%x\n", bp->b_resid);
                iodone(bp);
                bp->b_resid = sc->sc_resid;
                printd(", iodone, resid 0x%x\n", bp->b_resid);
                iodone(bp);


@@ -602,7 +607,7 @@ cont:
        idcaddr->idccsr = IDC_IE|IDC_CRDY|(as&IDC_ATTN);
        as = ((as >> 16) & 0xf) | sc->sc_softas;
        sc->sc_softas = 0;
        idcaddr->idccsr = IDC_IE|IDC_CRDY|(as&IDC_ATTN);
        as = ((as >> 16) & 0xf) | sc->sc_softas;
        sc->sc_softas = 0;

-       trace('as', as);
+       trace("as", as);

        printd(", as %o", as);
        for (unit = 0; unit < NRB; unit++)
                if (as & (1<<unit)) {
        printd(", as %o", as);
        for (unit = 0; unit < NRB; unit++)
                if (as & (1<<unit)) {


@@ -622,21 +627,21 @@ cont:
                }
        printd("\n");
        if (um->um_tab.b_actf && um->um_tab.b_active == 0) {
                }
        printd("\n");
        if (um->um_tab.b_actf && um->um_tab.b_active == 0) {

-               trace('stum',um->um_tab.b_actf);
+               trace("stum",um->um_tab.b_actf);

                idcstart(um);
        }
 }
 
                idcstart(um);
        }
 }
 

-idcwait(addr, cnt)
+idcwait(addr, n)

        register struct idcdevice *addr;
        register struct idcdevice *addr;

-       register int cnt;
+       register int n;

 {
        register int i;
 
 {
        register int i;
 

-       while (--cnt && (addr->idccsr & IDC_CRDY) == 0)
+       while (--n && (addr->idccsr & IDC_CRDY) == 0)

                for (i = 10; i; i--)
                        ;
                for (i = 10; i; i--)
                        ;

-       return (cnt);
+       return (n);

 }
 
 idcread(dev, uio)
 }
 
 idcread(dev, uio)


@@ -756,6 +761,7 @@ active:
        }
 }
 
        }
 }
 

+/*ARGSUSED*/

 idcdump(dev)
        dev_t dev;
 {
 idcdump(dev)
        dev_t dev;
 {

diff --git a/usr/src/sys/vax/uba/rk.c b/usr/src/sys/vax/uba/rk.c
index 0425cce..c7ae3d2 100644 (file)
--- a/usr/src/sys/vax/uba/rk.c
+++ b/usr/src/sys/vax/uba/rk.c
@@ -1,4 +1,4 @@
-/*     rk.c    4.48    82/10/17        */
+/*     rk.c    4.49    82/10/17        */

 
 #include "rk.h"
 #if NHK > 0
 
 #include "rk.h"
 #if NHK > 0


@@ -383,7 +383,6 @@ rkintr(rk11)
        int unit;
        struct rk_softc *sc = &rk_softc[um->um_ctlr];
        int as = (rkaddr->rkatt >> 8) | sc->sc_softas;
        int unit;
        struct rk_softc *sc = &rk_softc[um->um_ctlr];
        int as = (rkaddr->rkatt >> 8) | sc->sc_softas;

-       int needie = 1;

 
        sc->sc_wticks = 0;
        sc->sc_softas = 0;
 
        sc->sc_wticks = 0;
        sc->sc_softas = 0;


@@ -511,7 +510,7 @@ retry:
                }
        if (um->um_tab.b_actf && um->um_tab.b_active == 0)
                rkstart(um);
                }
        if (um->um_tab.b_actf && um->um_tab.b_active == 0)
                rkstart(um);

-       if (((needie = rkaddr->rkcs1) & RK_IE) == 0)
+       if (((rkaddr->rkcs1) & RK_IE) == 0)

                rkaddr->rkcs1 = RK_IE;
 }
 
                rkaddr->rkcs1 = RK_IE;
 }
 

diff --git a/usr/src/sys/vax/uba/tm.c b/usr/src/sys/vax/uba/tm.c
index ef92cb4..1a6f937 100644 (file)
--- a/usr/src/sys/vax/uba/tm.c
+++ b/usr/src/sys/vax/uba/tm.c
@@ -1,4 +1,4 @@
-/*     tm.c    4.56    82/10/17        */
+/*     tm.c    4.57    82/10/17        */

 
 #include "te.h"
 #include "ts.h"
 
 #include "te.h"
 #include "ts.h"


@@ -27,6 +27,7 @@
 #include "../h/mtio.h"
 #include "../h/cmap.h"
 #include "../h/uio.h"
 #include "../h/mtio.h"
 #include "../h/cmap.h"
 #include "../h/uio.h"

+#include "../h/kernel.h"

 
 #include "../vax/cpu.h"
 #include "../vaxuba/ubareg.h"
 
 #include "../vax/cpu.h"
 #include "../vaxuba/ubareg.h"

diff --git a/usr/src/sys/vax/uba/ts.c b/usr/src/sys/vax/uba/ts.c
index 4dea820..ed89e76 100644 (file)
--- a/usr/src/sys/vax/uba/ts.c
+++ b/usr/src/sys/vax/uba/ts.c
@@ -1,4 +1,4 @@
-/*     ts.c    4.31    82/10/17        */
+/*     ts.c    4.32    82/10/17        */

 
 #include "ts.h"
 #if NTS > 0
 
 #include "ts.h"
 #if NTS > 0


@@ -814,7 +814,7 @@ tsioctl(dev, cmd, data, flag)
                while (--callcount >= 0) {
                        tscommand(dev, tsops[mtop->mt_op], fcount);
                        if ((mtop->mt_op == MTFSR || mtop->mt_op == MTBSR) &&
                while (--callcount >= 0) {
                        tscommand(dev, tsops[mtop->mt_op], fcount);
                        if ((mtop->mt_op == MTFSR || mtop->mt_op == MTBSR) &&

-                           bp->b_resid) {
+                           bp->b_resid)

                                return (EIO);
                        if ((bp->b_flags&B_ERROR) || sc->sc_sts.s_xs0&TS_BOT)
                                break;
                                return (EIO);
                        if ((bp->b_flags&B_ERROR) || sc->sc_sts.s_xs0&TS_BOT)
                                break;

diff --git a/usr/src/sys/vax/uba/uba.c b/usr/src/sys/vax/uba/uba.c
index 9f66c11..8c3e7d4 100644 (file)
--- a/usr/src/sys/vax/uba/uba.c
+++ b/usr/src/sys/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/*     uba.c   4.51    82/10/17        */
+/*     uba.c   4.52    82/10/17        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -103,7 +103,7 @@ ubasetup(uban, bp, flags)
        struct buf *bp;
 {
        register struct uba_hd *uh = &uba_hd[uban];
        struct buf *bp;
 {
        register struct uba_hd *uh = &uba_hd[uban];

-       register int temp, i;
+       register int temp;

        int npf, reg, bdp;
        unsigned v;
        register struct pte *pte, *io;
        int npf, reg, bdp;
        unsigned v;
        register struct pte *pte, *io;


@@ -549,13 +549,14 @@ ubaremap(uban, ubinfo, addr)
  * Returns > 0 if successful, 0 if not.
  */
 
  * Returns > 0 if successful, 0 if not.
  */
 

-ubamem(uban, addr, size, alloc)
+ubamem(uban, addr, size, doalloc)
+       int uban, addr, size, doalloc;

 {
        register struct uba_hd *uh = &uba_hd[uban];
        register int *m;
        register int i, a, s;
 
 {
        register struct uba_hd *uh = &uba_hd[uban];
        register int *m;
        register int i, a, s;
 

-       if (alloc) {
+       if (doalloc) {

                s = spl6();
                a = rmget(uh->uh_map, size, (addr>>9)+1); /* starts at ONE! */
                splx(s);
                s = spl6();
                a = rmget(uh->uh_map, size, (addr>>9)+1); /* starts at ONE! */
                splx(s);

diff --git a/usr/src/sys/vax/uba/uda.c b/usr/src/sys/vax/uba/uda.c
index 9a0d298..7c006c0 100644 (file)
--- a/usr/src/sys/vax/uba/uda.c
+++ b/usr/src/sys/vax/uba/uda.c
@@ -1,4 +1,4 @@
-/*     uda.c   4.11    82/10/17        */
+/*     uda.c   4.12    82/10/17        */

 
 #include "ra.h"
 #if NUDA > 0
 
 #include "ra.h"
 #if NUDA > 0


@@ -29,6 +29,12 @@
 #include "../vax/cpu.h"
 #include "../vaxuba/ubareg.h"
 #include "../vaxuba/ubavar.h"
 #include "../vax/cpu.h"
 #include "../vaxuba/ubareg.h"
 #include "../vaxuba/ubavar.h"

+
+#define        NRSPL2  3               /* log2 number of response packets */
+#define        NCMDL2  3               /* log2 number of command packets */
+#define        NRSP    (1<<NRSPL2)
+#define        NCMD    (1<<NCMDL2)
+

 #include "../vaxuba/udareg.h"
 
 int udadebug;
 #include "../vaxuba/udareg.h"
 
 int udadebug;


@@ -36,15 +42,6 @@ int udadebug;
 
 int udaerror = 0;      /* set to cause hex dump of error log packets */
 
 
 int udaerror = 0;      /* set to cause hex dump of error log packets */
 

-/*
- * Parameters for the communications area
- */
-
-#define        NRSPL2  3               /* log2 number of response packets */
-#define        NCMDL2  3               /* log2 number of command packets */
-#define        NRSP    (1<<NRSPL2)
-#define        NCMD    (1<<NCMDL2)
-

 #include "../vax/mscp.h"
 
 struct uda_softc {
 #include "../vax/mscp.h"
 
 struct uda_softc {