lint

SCCS-vsn: sys/vax/uba/dhu.c 4.9
SCCS-vsn: sys/vax/uba/tm.c 6.9
SCCS-vsn: sys/vax/uba/tmscp.c 5.2
SCCS-vsn: sys/vax/uba/ts.c 6.9
SCCS-vsn: sys/vax/uba/uda.c 6.18
SCCS-vsn: sys/vax/uba/ut.c 6.7
SCCS-vsn: sys/vax/uba/vp.c 6.7
SCCS-vsn: sys/vax/if/if_vv.c 6.16

diff --git a/usr/src/sys/vax/if/if_vv.c b/usr/src/sys/vax/if/if_vv.c
index 05614f6..92c6e6e 100644 (file)
--- a/usr/src/sys/vax/if/if_vv.c
+++ b/usr/src/sys/vax/if/if_vv.c
@@ -133,7 +133,7 @@ extern struct ifnet loif;
 struct vv_softc {
        struct  ifnet vs_if;            /* network-visible interface */
        struct  ifuba vs_ifuba;         /* UNIBUS resources */
 struct vv_softc {
        struct  ifnet vs_if;            /* network-visible interface */
        struct  ifuba vs_ifuba;         /* UNIBUS resources */

-       int     vs_host;
+       u_short vs_host;                /* this interface address */

        short   vs_oactive;             /* is output active */
        short   vs_olen;                /* length of last output */
        u_short vs_lastx;               /* address of last packet sent */
        short   vs_oactive;             /* is output active */
        short   vs_olen;                /* length of last output */
        u_short vs_lastx;               /* address of last packet sent */


@@ -321,7 +321,7 @@ vvidentify(unit)
        register struct vv_header *v;
        register int ubainfo;
        register int i, successes, failures, waitcount;
        register struct vv_header *v;
        register int ubainfo;
        register int i, successes, failures, waitcount;

-       u_short shost = -1;
+       u_short shost = 0xffff;

 
        vs = &vv_softc[unit];
        ui = vvinfo[unit];
 
        vs = &vv_softc[unit];
        ui = vvinfo[unit];


@@ -429,7 +429,7 @@ gotit:                      /* we got something--is it any good? */
 
                        /* check message type, catch our node address */
                        if ((v->vh_type & 0xff) == RING_DIAGNOSTICS) {
 
                        /* check message type, catch our node address */
                        if ((v->vh_type & 0xff) == RING_DIAGNOSTICS) {

-                               if (shost == -1) {
+                               if (shost == 0xffff) {

                                        shost = v->vh_shost & 0xff;
                                        /* send to ourself now */
                                        ((struct vv_header *)
                                        shost = v->vh_shost & 0xff;
                                        /* send to ourself now */
                                        ((struct vv_header *)


@@ -452,7 +452,7 @@ in %s mode\n",
                            0xffff & addr->vvocsr, VV_OBITS);
                        addr->vvicsr = VV_RST;  /* kill the sick board */
                        addr->vvocsr = VV_RST;
                            0xffff & addr->vvocsr, VV_OBITS);
                        addr->vvicsr = VV_RST;  /* kill the sick board */
                        addr->vvocsr = VV_RST;

-                       shost = -1;
+                       shost = 0xffff;

                        goto done;
                }
        }
                        goto done;
                }
        }

diff --git a/usr/src/sys/vax/uba/dhu.c b/usr/src/sys/vax/uba/dhu.c
index 13e223a..4dec499 100644 (file)
--- a/usr/src/sys/vax/uba/dhu.c
+++ b/usr/src/sys/vax/uba/dhu.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)dhu.c       4.8 (Berkeley) %G%
+ *     @(#)dhu.c       4.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -376,8 +376,6 @@ dhuioctl(dev, cmd, data, flag)
 {
        register struct tty *tp;
        register int unit = UNIT(dev);
 {
        register struct tty *tp;
        register int unit = UNIT(dev);

-       register dhu = unit>>4;
-       register bit = (1<<(unit&0xf));

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


@@ -662,7 +660,7 @@ dhumctl(dev, bits, how)
        int bits, how;
 {
        register struct dhudevice *dhuaddr;
        int bits, how;
 {
        register struct dhudevice *dhuaddr;

-       register int unit, mbits, lcr;
+       register int unit, mbits;

        int s;
 
        unit = UNIT(dev);
        int s;
 
        unit = UNIT(dev);


@@ -711,7 +709,6 @@ dhureset(uban)
        register struct uba_device *ui;
        register struct dhudevice *addr;
        int i;
        register struct uba_device *ui;
        register struct dhudevice *addr;
        int i;

-       register int s;

 
        for (dhu = 0; dhu < NDHU; dhu++) {
                ui = dhuinfo[dhu];
 
        for (dhu = 0; dhu < NDHU; dhu++) {
                ui = dhuinfo[dhu];

diff --git a/usr/src/sys/vax/uba/tm.c b/usr/src/sys/vax/uba/tm.c
index 40d4c78..0cc4164 100644 (file)
--- a/usr/src/sys/vax/uba/tm.c
+++ b/usr/src/sys/vax/uba/tm.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)tm.c        6.8 (Berkeley) %G%
+ *     @(#)tm.c        6.9 (Berkeley) %G%

  */
 
 #include "te.h"
  */
 
 #include "te.h"


@@ -690,7 +690,7 @@ ignoreerr:
                 * For forward/backward space record update current position.
                 */
                if (bp == &ctmbuf[TMUNIT(bp->b_dev)])
                 * For forward/backward space record update current position.
                 */
                if (bp == &ctmbuf[TMUNIT(bp->b_dev)])

-               switch (bp->b_command) {
+               switch ((int)bp->b_command) {

 
                case TM_SFORW:
                        sc->sc_blkno -= bp->b_repcnt;
 
                case TM_SFORW:
                        sc->sc_blkno -= bp->b_repcnt;

diff --git a/usr/src/sys/vax/uba/tmscp.c b/usr/src/sys/vax/uba/tmscp.c
index afc537a..f35e2e3 100644 (file)
--- a/usr/src/sys/vax/uba/tmscp.c
+++ b/usr/src/sys/vax/uba/tmscp.c
@@ -1,4 +1,4 @@
-/*     @(#)tmscp.c     5.1 (Berkeley) %G% */
+/*     @(#)tmscp.c     5.2 (Berkeley) %G% */

 
 #ifndef lint
 static char    *sccsid = "@(#)tmscp.c  1.24    (ULTRIX)        1/21/86";
 
 #ifndef lint
 static char    *sccsid = "@(#)tmscp.c  1.24    (ULTRIX)        1/21/86";


@@ -281,7 +281,6 @@ tmscpprobe(reg, ctlr)
        register struct tmscp_softc *sc = &tmscp_softc[ctlr];
                                /* ptr to software controller structure */
        struct tmscpdevice *tmscpaddr; /* ptr to tmscpdevice struct (IP & SA) */
        register struct tmscp_softc *sc = &tmscp_softc[ctlr];
                                /* ptr to software controller structure */
        struct tmscpdevice *tmscpaddr; /* ptr to tmscpdevice struct (IP & SA) */

-       struct uba_ctlr *um;    /* UNUSED ptr to uba_ctlr (controller) struct */

        int count;              /* for probe delay time out */
 
 #      ifdef lint
        int count;              /* for probe delay time out */
 
 #      ifdef lint


@@ -343,7 +342,7 @@ tmscpslave (ui, reg)
                                        /* the tmscp polling */
 
 #      ifdef lint
                                        /* the tmscp polling */
 
 #      ifdef lint

-       ui = ui; reg = reg; i = i;
+       reg = reg;

 #      endif
        tmscpaddr = (struct tmscpdevice *)um->um_addr;
        /* 
 #      endif
        tmscpaddr = (struct tmscpdevice *)um->um_addr;
        /* 


@@ -394,6 +393,9 @@ tmscpslave (ui, reg)
        tmscpip[ui->ui_ctlr][ui->ui_slave] = ui;
        *((long *) mp->mscp_dscptr ) |= TMSCP_OWN | TMSCP_INT;/* maybe we should poll*/
        i = tmscpaddr->tmscpip;
        tmscpip[ui->ui_ctlr][ui->ui_slave] = ui;
        *((long *) mp->mscp_dscptr ) |= TMSCP_OWN | TMSCP_INT;/* maybe we should poll*/
        i = tmscpaddr->tmscpip;

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

        while(!tms->tms_status)
                ;                               /* Wait for some status */
 #      ifdef DEBUG
        while(!tms->tms_status)
                ;                               /* Wait for some status */
 #      ifdef DEBUG


@@ -416,13 +418,7 @@ tmscpattach (ui)
        register struct uba_device *ui;         /* ptr to unibus dev struct */
 {
        register struct uba_ctlr *um = ui->ui_mi; /* ptr to controller struct */
        register struct uba_device *ui;         /* ptr to unibus dev struct */
 {
        register struct uba_ctlr *um = ui->ui_mi; /* ptr to controller struct */

-       struct tmscpdevice *tmscpaddr = (struct tmscpdevice *) um->um_addr; /* IP & SA */
-       struct mscp *mp;
-       int i;          /* Assign to here to start the tmscp-dev polling */

 
 

-#      ifdef lint
-       i = i;
-#      endif lint

        ui->ui_flags = 0;
        tmscpip[ui->ui_ctlr][ui->ui_slave] = ui;
 #      ifdef DEBUG
        ui->ui_flags = 0;
        tmscpip[ui->ui_ctlr][ui->ui_slave] = ui;
 #      ifdef DEBUG


@@ -683,6 +679,7 @@ tmscpintr (d)
  * in the run state, call init to initialize the tmscp controller first.
  */
 
  * in the run state, call init to initialize the tmscp controller first.
  */
 

+/* ARGSUSED */

 tmscpopen(dev, flag)
        dev_t dev;
        int flag;
 tmscpopen(dev, flag)
        dev_t dev;
        int flag;


@@ -697,9 +694,6 @@ tmscpopen(dev, flag)
        int s,i;
        extern quota;
        
        int s,i;
        extern quota;
        

-#      ifdef lint
-       flag = flag; i = i;
-#      endif

        unit = TMSUNIT(dev);
 #      ifdef DEBUG
        printd("tmscpopen unit %d\n",unit);
        unit = TMSUNIT(dev);
 #      ifdef DEBUG
        printd("tmscpopen unit %d\n",unit);


@@ -761,6 +755,9 @@ tmscpopen(dev, flag)
 #              endif   
                *((long *) mp->mscp_dscptr ) |= TMSCP_OWN | TMSCP_INT;
                i = tmscpaddr->tmscpip;
 #              endif   
                *((long *) mp->mscp_dscptr ) |= TMSCP_OWN | TMSCP_INT;
                i = tmscpaddr->tmscpip;

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

                /* 
                 * To make sure we wake up, timeout in 240 seconds.
                 * Wakeup in tmscprsp routine.
                /* 
                 * To make sure we wake up, timeout in 240 seconds.
                 * Wakeup in tmscprsp routine.


@@ -808,7 +805,6 @@ tmscpclose(dev, flag)
        register dev_t dev;
        register flag;
 {
        register dev_t dev;
        register flag;
 {

-       register struct tmscp_softc *sc = &tmscp_softc[TMSCPCTLR(dev)];

        register struct tms_info *tms;
        register struct uba_device *ui;
 
        register struct tms_info *tms;
        register struct uba_device *ui;
 


@@ -862,8 +858,6 @@ tmscpcommand (dev, com, count)
        register int s;
        int unit = TMSUNIT(dev);
 
        register int s;
        int unit = TMSUNIT(dev);
 

-       if (unit >= NTMS)
-               return (ENXIO);

        ui = tmsdinfo[unit];
        bp = &ctmscpbuf[ui->ui_ctlr];
 
        ui = tmsdinfo[unit];
        bp = &ctmscpbuf[ui->ui_ctlr];
 


@@ -1154,7 +1148,7 @@ tmscpstart(um)
                 * tmkcnt are only modified here if they need to be set to
                 * a non-zero value.
                 */
                 * tmkcnt are only modified here if they need to be set to
                 * a non-zero value.
                 */

-               switch (bp->b_resid) {
+               switch ((int)bp->b_resid) {

 
                case TMS_WRITM:
                        mp->mscp_opcode = M_OP_WRITM;
 
                case TMS_WRITM:
                        mp->mscp_opcode = M_OP_WRITM;


@@ -1335,7 +1329,7 @@ tmscprsp(um, tm, sc, i)
        register struct mscp *mp;
        register struct tms_info *tms;
        struct uba_device *ui;
        register struct mscp *mp;
        register struct tms_info *tms;
        struct uba_device *ui;

-       struct buf *dp, *bp, nullbp;
+       struct buf *dp, *bp;

        int st;
 
        mp = &tm->tmscp_rsp[i];
        int st;
 
        mp = &tm->tmscp_rsp[i];


@@ -1430,14 +1424,14 @@ tmscprsp(um, tm, sc, i)
                        }       /* end if st == M_ST_SUCC */
                else 
                        {
                        }       /* end if st == M_ST_SUCC */
                else 
                        {

-                       if(dp->b_actf)
+                       if (bp = dp->b_actf)

                                tprintf(tms->tms_ttyp,
                                    "tms%d: hard error bn%d: OFFLINE\n",
                                    minor(bp->b_dev)&03, bp->b_blkno);
                        else
                                tprintf(tms->tms_ttyp,
                                    "tms%d: hard error: OFFLINE\n",
                                tprintf(tms->tms_ttyp,
                                    "tms%d: hard error bn%d: OFFLINE\n",
                                    minor(bp->b_dev)&03, bp->b_blkno);
                        else
                                tprintf(tms->tms_ttyp,
                                    "tms%d: hard error: OFFLINE\n",

-                                   minor(bp->b_dev)&03);
+                                   ui->ui_unit);

                        while (bp = dp->b_actf)
                                {
                                dp->b_actf = bp->av_forw;
                        while (bp = dp->b_actf)
                                {
                                dp->b_actf = bp->av_forw;


@@ -1865,9 +1859,6 @@ tmscpcmd(op, tmscpp, tmscpaddr)
 {
        int i;
 
 {
        int i;
 

-#      ifdef lint
-       i = i;
-#      endif

 
        tmscpp->tmscp_Cmd.mscp_opcode = op;
        tmscpp->tmscp_Rsp.mscp_header.tmscp_msglen = mscp_msglen;
 
        tmscpp->tmscp_Cmd.mscp_opcode = op;
        tmscpp->tmscp_Rsp.mscp_header.tmscp_msglen = mscp_msglen;


@@ -1877,6 +1868,9 @@ tmscpcmd(op, tmscpp, tmscpaddr)
        if (tmscpaddr->tmscpsa&TMSCP_ERR)
                printf("tmscp fatal error (0%o)\n", tmscpaddr->tmscpsa&0xffff);
        i = tmscpaddr->tmscpip;
        if (tmscpaddr->tmscpsa&TMSCP_ERR)
                printf("tmscp fatal error (0%o)\n", tmscpaddr->tmscpsa&0xffff);
        i = tmscpaddr->tmscpip;

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

        for (;;)
                {
                if (tmscpp->tmscp_ca.ca_cmdint)
        for (;;)
                {
                if (tmscpp->tmscp_ca.ca_cmdint)


@@ -1932,20 +1926,20 @@ tmscpwrite(dev, uio)
  * Catch ioctl commands, and call the "command" routine to do them.
  */
 
  * Catch ioctl commands, and call the "command" routine to do them.
  */
 

+/* ARGSUSED */

 tmscpioctl(dev, cmd, data, flag)
        dev_t dev;
        int cmd;
        caddr_t data;
        int flag;
 {
 tmscpioctl(dev, cmd, data, flag)
        dev_t dev;
        int cmd;
        caddr_t data;
        int flag;
 {

-       register struct tmscp_softc *sc = &tmscp_softc[TMSCPCTLR(dev)];

        register struct buf *bp = &ctmscpbuf[TMSCPCTLR(dev)];
        register callcount;     /* number of times to call cmd routine */
        register struct uba_device *ui;
        register struct tms_info *tms;
        int fcount;             /* number of files (or records) to space */
        register struct buf *bp = &ctmscpbuf[TMSCPCTLR(dev)];
        register callcount;     /* number of times to call cmd routine */
        register struct uba_device *ui;
        register struct tms_info *tms;
        int fcount;             /* number of files (or records) to space */

-       struct mtop *mtop;      /* mag tape cmd op to perform */
-       struct mtget *mtget;    /* mag tape struct to get info in */
+       register struct mtop *mtop;     /* mag tape cmd op to perform */
+       register struct mtget *mtget;   /* mag tape struct to get info in */

 
        /* we depend of the values and order of the TMS ioctl codes here */
        static tmsops[] =
 
        /* we depend of the values and order of the TMS ioctl codes here */
        static tmsops[] =

diff --git a/usr/src/sys/vax/uba/ts.c b/usr/src/sys/vax/uba/ts.c
index 9be97a6..a2eb634 100644 (file)
--- a/usr/src/sys/vax/uba/ts.c
+++ b/usr/src/sys/vax/uba/ts.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)ts.c        6.8 (Berkeley) %G%
+ *     @(#)ts.c        6.9 (Berkeley) %G%

  */
 
 #include "ts.h"
  */
 
 #include "ts.h"


@@ -650,7 +650,7 @@ ignoreerr:
                 * For forward/backward space record update current position.
                 */
                if (bp == &ctsbuf[TSUNIT(bp->b_dev)])
                 * For forward/backward space record update current position.
                 */
                if (bp == &ctsbuf[TSUNIT(bp->b_dev)])

-               switch (bp->b_command) {
+               switch ((int)bp->b_command) {

 
                case TS_SFORW:
                        sc->sc_blkno += bp->b_repcnt;
 
                case TS_SFORW:
                        sc->sc_blkno += bp->b_repcnt;

diff --git a/usr/src/sys/vax/uba/uda.c b/usr/src/sys/vax/uba/uda.c
index 4a2325f..d1f8403 100644 (file)
--- a/usr/src/sys/vax/uba/uda.c
+++ b/usr/src/sys/vax/uba/uda.c
@@ -1,5 +1,5 @@
 /*
 /*

- *     @(#)uda.c       6.17 (Berkeley) %G%
+ *     @(#)uda.c       6.18 (Berkeley) %G%

  */
 
 /************************************************************************
  */
 
 /************************************************************************


@@ -237,6 +237,7 @@ udprobe(reg, ctlr)
        return(sizeof (struct udadevice));
 }
 
        return(sizeof (struct udadevice));
 }
 

+/* ARGSUSED */

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


@@ -249,9 +250,6 @@ udslave(ui, reg)
                                        /* the uda polling */
 
 
                                        /* the uda polling */
 
 

-#ifdef lint
-       ui = ui; reg = reg; i = i;
-#endif

        udaddr = (struct udadevice *)um->um_addr;
        if(sc->sc_state != S_RUN){
                if(!udinit(ui->ui_ctlr))
        udaddr = (struct udadevice *)um->um_addr;
        if(sc->sc_state != S_RUN){
                if(!udinit(ui->ui_ctlr))


@@ -280,6 +278,9 @@ udslave(ui, reg)
        udip[ui->ui_ctlr][ui->ui_slave] = ui;
        *((long *) mp->mscp_dscptr ) |= UDA_OWN | UDA_INT;/* maybe we should poll*/
        i = udaddr->udaip;
        udip[ui->ui_ctlr][ui->ui_slave] = ui;
        *((long *) mp->mscp_dscptr ) |= UDA_OWN | UDA_INT;/* maybe we should poll*/
        i = udaddr->udaip;

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

        while(!ra_info[ui->ui_unit].rastatus);  /* Wait for some status */
        udip[ui->ui_ctlr][ui->ui_slave] = 0;
        if(!ra_info[ui->ui_unit].ratype)        /* packet from a GTUNT */
        while(!ra_info[ui->ui_unit].rastatus);  /* Wait for some status */
        udip[ui->ui_ctlr][ui->ui_slave] = 0;
        if(!ra_info[ui->ui_unit].ratype)        /* packet from a GTUNT */


@@ -296,9 +297,6 @@ udattach(ui)
        struct  mscp    *mp;
        int     i;                      /* Something to write into to start */
                                        /* the uda polling */
        struct  mscp    *mp;
        int     i;                      /* Something to write into to start */
                                        /* the uda polling */

-#ifdef lint
-       i = i;
-#endif

        if (ui->ui_dk >= 0)
                dk_mspw[ui->ui_dk] = 1.0 / (60 * 31 * 256);     /* approx */
        ui->ui_flags = 0;
        if (ui->ui_dk >= 0)
                dk_mspw[ui->ui_dk] = 1.0 / (60 * 31 * 256);     /* approx */
        ui->ui_flags = 0;


@@ -319,6 +317,9 @@ udattach(ui)
 #endif 
        *((long *) mp->mscp_dscptr ) |= UDA_OWN | UDA_INT;
        i = udaddr->udaip;
 #endif 
        *((long *) mp->mscp_dscptr ) |= UDA_OWN | UDA_INT;
        i = udaddr->udaip;

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

        while(ui->ui_flags == 0 && ra_info[ui->ui_unit].ratype != 0);
 }
 
        while(ui->ui_flags == 0 && ra_info[ui->ui_unit].ratype != 0);
 }
 


@@ -326,6 +327,7 @@ udattach(ui)
  * Open a UDA.  Initialize the device and
  * set the unit online.
  */
  * Open a UDA.  Initialize the device and
  * set the unit online.
  */

+/* ARGSUSED */

 udopen(dev, flag)
        dev_t dev;
        int flag;
 udopen(dev, flag)
        dev_t dev;
        int flag;


@@ -339,9 +341,6 @@ udopen(dev, flag)
        int s,i;
        extern quota;
        
        int s,i;
        extern quota;
        

-#ifdef lint
-       flag = flag; i = i;
-#endif

        unit = udunit(dev);
        if (unit >= nNRA || (ui = uddinfo[unit]) == 0 || ui->ui_alive == 0)
                return (ENXIO);
        unit = udunit(dev);
        if (unit >= nNRA || (ui = uddinfo[unit]) == 0 || ui->ui_alive == 0)
                return (ENXIO);


@@ -384,6 +383,9 @@ udopen(dev, flag)
 #endif 
                *((long *) mp->mscp_dscptr ) |= UDA_OWN | UDA_INT ;
                i = udaddr->udaip;
 #endif 
                *((long *) mp->mscp_dscptr ) |= UDA_OWN | UDA_INT ;
                i = udaddr->udaip;

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

                timeout(wakeup,(caddr_t) mp->mscp_cmdref,10 * hz);
                        /* make sure we wake up */
                sleep((caddr_t) mp->mscp_cmdref,PSWP+1); /*wakeup in udrsp() */
                timeout(wakeup,(caddr_t) mp->mscp_cmdref,10 * hz);
                        /* make sure we wake up */
                sleep((caddr_t) mp->mscp_cmdref,PSWP+1); /*wakeup in udrsp() */


@@ -913,7 +915,7 @@ udrsp(um, ud, sc, i)
                                ,F_to_C(mp,1),F_to_C(mp,0)
                                ,mp->mscp_mediaid & 0x7f);
 #endif                         
                                ,F_to_C(mp,1),F_to_C(mp,0)
                                ,mp->mscp_mediaid & 0x7f);
 #endif                         

-                       switch(mp->mscp_mediaid & 0x7f){
+                       switch((int)(mp->mscp_mediaid & 0x7f)){

                        case    25:
                                ra_info[ui->ui_unit].ra_sizes = ra25_sizes;
                                break;
                        case    25:
                                ra_info[ui->ui_unit].ra_sizes = ra25_sizes;
                                break;


@@ -1354,10 +1356,6 @@ udcmd(op, udp, udaddr)
 {
        int i;
 
 {
        int i;
 

-#ifdef lint
-       i = i;
-#endif
-

        udp->uda_Cmd.mscp_opcode = op;
        udp->uda_Rsp.mscp_header.uda_msglen = mscp_msglen;
        udp->uda_Cmd.mscp_header.uda_msglen = mscp_msglen;
        udp->uda_Cmd.mscp_opcode = op;
        udp->uda_Rsp.mscp_header.uda_msglen = mscp_msglen;
        udp->uda_Cmd.mscp_header.uda_msglen = mscp_msglen;


@@ -1366,6 +1364,9 @@ udcmd(op, udp, udaddr)
        if (udaddr->udasa&UDA_ERR)
                printf("Udaerror udasa (%x)\n", udaddr->udasa&0xffff);
        i = udaddr->udaip;
        if (udaddr->udasa&UDA_ERR)
                printf("Udaerror udasa (%x)\n", udaddr->udasa&0xffff);
        i = udaddr->udaip;

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

        for (;;) {
                if (udp->uda_ca.ca_cmdint)
                        udp->uda_ca.ca_cmdint = 0;
        for (;;) {
                if (udp->uda_ca.ca_cmdint)
                        udp->uda_ca.ca_cmdint = 0;

diff --git a/usr/src/sys/vax/uba/ut.c b/usr/src/sys/vax/uba/ut.c
index 2167096..9ff6059 100644 (file)
--- a/usr/src/sys/vax/uba/ut.c
+++ b/usr/src/sys/vax/uba/ut.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)ut.c        6.6 (Berkeley) %G%
+ *     @(#)ut.c        6.7 (Berkeley) %G%

  */
 
 #include "tj.h"
  */
 
 #include "tj.h"


@@ -586,7 +586,7 @@ ignoreerr:
 
        case SCOM:              /* motion commands update current position */
                if (bp == &cutbuf[UTUNIT(bp->b_dev)])
 
        case SCOM:              /* motion commands update current position */
                if (bp == &cutbuf[UTUNIT(bp->b_dev)])

-               switch (bp->b_command) {
+               switch ((int)bp->b_command) {

 
                case UT_SFORW:
                        sc->sc_blkno -= bp->b_repcnt;
 
                case UT_SFORW:
                        sc->sc_blkno -= bp->b_repcnt;

diff --git a/usr/src/sys/vax/uba/vp.c b/usr/src/sys/vax/uba/vp.c
index 4378b2b..4421e0e 100644 (file)
--- a/usr/src/sys/vax/uba/vp.c
+++ b/usr/src/sys/vax/uba/vp.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)vp.c        6.6 (Berkeley) %G%
+ *     @(#)vp.c        6.7 (Berkeley) %G%

  */
 
 #include "vp.h"
  */
 
 #include "vp.h"


@@ -258,7 +258,6 @@ vpioctl(dev, cmd, data, flag)
        register caddr_t data;
        int flag;
 {
        register caddr_t data;
        int flag;
 {

-       register int m;

        register struct vp_softc *sc = &vp_softc[VPUNIT(dev)];
        register struct vpdevice *vpaddr =
            (struct vpdevice *)vpdinfo[VPUNIT(dev)]->ui_addr;
        register struct vp_softc *sc = &vp_softc[VPUNIT(dev)];
        register struct vpdevice *vpaddr =
            (struct vpdevice *)vpdinfo[VPUNIT(dev)]->ui_addr;