lint

SCCS-vsn: sys/kern/kern_clock.c 4.42
SCCS-vsn: sys/kern/kern_proc.c 4.43
SCCS-vsn: sys/sys/kernel.h 4.7
SCCS-vsn: sys/kern/kern_sig.c 5.10
SCCS-vsn: sys/kern/kern_synch.c 4.24
SCCS-vsn: sys/kern/subr_rmap.c 4.7
SCCS-vsn: sys/kern/subr_rmap.c.sav 4.7
SCCS-vsn: sys/kern/sys_generic.c 5.20
SCCS-vsn: sys/vax/vax/conf.c 4.59
SCCS-vsn: sys/kern/uipc_syscalls.c 4.35
SCCS-vsn: sys/vax/vax/flp.c 4.11
SCCS-vsn: sys/vax/vax/mem.c 4.9
SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 2.18
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 2.18
SCCS-vsn: sys/vax/vax/trap.c 4.21
SCCS-vsn: sys/ufs/ffs/ffs_subr.c 4.2
SCCS-vsn: sys/kern/uipc_mbuf.c 1.39
SCCS-vsn: sys/kern/uipc_socket.c 4.59
SCCS-vsn: sys/vm/vm_swap.c 4.10
SCCS-vsn: sys/kern/kern_physio.c 4.34
SCCS-vsn: sys/vax/if/if_acc.c 4.24
SCCS-vsn: sys/vax/if/if_ec.c 4.25
SCCS-vsn: sys/deprecated/netdecnet/nsp_output.c 1.4
SCCS-vsn: sys/deprecated/netdecnet/nsp_usrreq.c 1.4
SCCS-vsn: sys/netinet/in.c 4.9
SCCS-vsn: sys/netinet/ip_input.c 1.55
SCCS-vsn: sys/netinet/tcp_subr.c 4.33
SCCS-vsn: sys/netinet/udp_usrreq.c 4.38
SCCS-vsn: sys/vax/uba/dmf.c 4.13
SCCS-vsn: sys/vax/uba/dn.c 4.13
SCCS-vsn: sys/vax/uba/ikreg.h 4.3
SCCS-vsn: sys/vax/uba/uba.c 4.54
SCCS-vsn: sys/vax/uba/uda.c 4.14
SCCS-vsn: sys/deprecated/netimp/if_imp.c 4.42
SCCS-vsn: sys/deprecated/netimp/raw_imp.c 4.14

diff --git a/usr/src/sys/deprecated/netdecnet/nsp_output.c b/usr/src/sys/deprecated/netdecnet/nsp_output.c
index 42cb67a..8b1c560 100644 (file)
--- a/usr/src/sys/deprecated/netdecnet/nsp_output.c
+++ b/usr/src/sys/deprecated/netdecnet/nsp_output.c
@@ -1,4 +1,4 @@
-/*     nsp_output.c    1.3     82/10/09        */
+/*     nsp_output.c    1.4     82/10/21        */

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


@@ -50,13 +50,13 @@ top:
                if (len)
                        bcopy((char *)(n + 1), mtod(np->nb_xmt, char *), len);
                if (tp_output(m, np->n_node)) {
                if (len)
                        bcopy((char *)(n + 1), mtod(np->nb_xmt, char *), len);
                if (tp_output(m, np->n_node)) {

-                       m_free(m);
+                       (void) m_free(m);

                        return (0);
                }
                np->n_flags &= ~(NF_INTAVAIL|NF_OTHACK);
                np->n_flags |= NF_OTHSENT;
                if (len)
                        return (0);
                }
                np->n_flags &= ~(NF_INTAVAIL|NF_OTHACK);
                np->n_flags |= NF_OTHSENT;
                if (len)

-                       m_free(np->nb_xmt);
+                       (void) m_free(np->nb_xmt);

                nsp_insrtq(m, np->nt_oth);
                goto top;
        }
                nsp_insrtq(m, np->nt_oth);
                goto top;
        }


@@ -79,7 +79,7 @@ top:
                n->nsp_lsflags = NSPLS_INTREQ | NSPLS_ON;
                n->nsp_fcval = 1;
                if (tp_output(m, np->n_node)) {
                n->nsp_lsflags = NSPLS_INTREQ | NSPLS_ON;
                n->nsp_fcval = 1;
                if (tp_output(m, np->n_node)) {

-                       m_free(m);
+                       (void) m_free(m);

                        return (0);
                }
                np->n_flags &= ~NF_OTHACK;
                        return (0);
                }
                np->n_flags &= ~NF_OTHACK;


@@ -106,7 +106,7 @@ top:
                n->nsp_lsflags = NSPLS_DATREQ | NSPLS_ON;
                n->nsp_fcval = np->nf_locdat;
                if (tp_output(m, np->n_node)) {
                n->nsp_lsflags = NSPLS_DATREQ | NSPLS_ON;
                n->nsp_fcval = np->nf_locdat;
                if (tp_output(m, np->n_node)) {

-                       m_free(m);
+                       (void) m_free(m);

                        return (0);
                }
                np->n_flags &= ~NF_OTHACK;
                        return (0);
                }
                np->n_flags &= ~NF_OTHACK;


@@ -130,11 +130,11 @@ top:
                n->nsp_srcaddr = np->n_loc;
                n->nsp_acknum = NSPA_ACK | np->na_xmtoth;
                if (tp_output(m, np->n_node)) {
                n->nsp_srcaddr = np->n_loc;
                n->nsp_acknum = NSPA_ACK | np->na_xmtoth;
                if (tp_output(m, np->n_node)) {

-                       m_free(m);
+                       (void) m_free(m);

                        return (0);
                }
                np->n_flags &= ~NF_OTHACK;
                        return (0);
                }
                np->n_flags &= ~NF_OTHACK;

-               m_free(m);
+               (void) m_free(m);

                goto top;
        }
 
                goto top;
        }
 


@@ -169,11 +169,11 @@ top:
                n->nsp_srcaddr = np->n_loc;
                n->nsp_acknum = NSPA_ACK | np->na_xmtdat;
                if (tp_output(m, np->n_node)) {
                n->nsp_srcaddr = np->n_loc;
                n->nsp_acknum = NSPA_ACK | np->na_xmtdat;
                if (tp_output(m, np->n_node)) {

-                       m_free(m);
+                       (void) m_free(m);

                        return (0);
                }
                np->n_flags &= ~NF_DATACK;
                        return (0);
                }
                np->n_flags &= ~NF_DATACK;

-               m_free(m);
+               (void) m_free(m);

                goto top;
        }
 
                goto top;
        }
 

diff --git a/usr/src/sys/deprecated/netdecnet/nsp_usrreq.c b/usr/src/sys/deprecated/netdecnet/nsp_usrreq.c
index 7bf2ba7..a69cbb1 100644 (file)
--- a/usr/src/sys/deprecated/netdecnet/nsp_usrreq.c
+++ b/usr/src/sys/deprecated/netdecnet/nsp_usrreq.c
@@ -1,4 +1,4 @@
-/*     nsp_usrreq.c    1.3     82/10/09        */
+/*     nsp_usrreq.c    1.4     82/10/21        */

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


@@ -245,7 +245,7 @@ nsp_attach(so, sa)
                return (ENOBUFS);
        if (sbreserve(&so->so_snd, 1024) == 0) {
 bad:
                return (ENOBUFS);
        if (sbreserve(&so->so_snd, 1024) == 0) {
 bad:

-               m_free(m);
+               (void) m_free(m);

                return (ENOBUFS);
        }
        if (sbreserve(&so->so_rcv, 1024) == 0) {
                return (ENOBUFS);
        }
        if (sbreserve(&so->so_rcv, 1024) == 0) {

diff --git a/usr/src/sys/deprecated/netimp/if_imp.c b/usr/src/sys/deprecated/netimp/if_imp.c
index 80fa6c5..fb9f60d 100644 (file)
--- a/usr/src/sys/deprecated/netimp/if_imp.c
+++ b/usr/src/sys/deprecated/netimp/if_imp.c
@@ -1,4 +1,4 @@
-/*     if_imp.c        4.41    82/10/20        */
+/*     if_imp.c        4.42    82/10/21        */

 
 #include "imp.h"
 #if NIMP > 0
 
 #include "imp.h"
 #if NIMP > 0


@@ -19,8 +19,8 @@
 
 #include "../vax/cpu.h"
 #include "../vax/mtpr.h"
 
 #include "../vax/cpu.h"
 #include "../vax/mtpr.h"

-#include "../vax/ubareg.h"
-#include "../vax/ubavar.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"


@@ -406,7 +406,7 @@ impoutput(ifp, m0, dst)
 {
        register struct imp_leader *imp;
        register struct mbuf *m = m0;
 {
        register struct imp_leader *imp;
        register struct mbuf *m = m0;

-       int x, dhost, dimp, dlink, len, dnet;
+       int dhost, dimp, dlink, len, dnet;

        int error = 0;
 
        /*
        int error = 0;
 
        /*


@@ -566,7 +566,6 @@ impnoops(sc)
        register i;
        register struct mbuf *m;
        register struct control_leader *cp;
        register i;
        register struct mbuf *m;
        register struct control_leader *cp;

-       int x;

 
        sc->imp_dropcnt = IMP_DROPCNT;
        for (i = 0; i < IMP_DROPCNT + 1; i++ ) { 
 
        sc->imp_dropcnt = IMP_DROPCNT;
        for (i = 0; i < IMP_DROPCNT + 1; i++ ) { 

diff --git a/usr/src/sys/deprecated/netimp/raw_imp.c b/usr/src/sys/deprecated/netimp/raw_imp.c
index 02b7532..d62d002 100644 (file)
--- a/usr/src/sys/deprecated/netimp/raw_imp.c
+++ b/usr/src/sys/deprecated/netimp/raw_imp.c
@@ -1,4 +1,4 @@
-/*     raw_imp.c       4.13    82/10/09        */
+/*     raw_imp.c       4.14    82/10/21        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -81,7 +81,7 @@ rimp_output(m, so)
        ip->il_host = sin->sin_addr.s_host;
        ip->il_imp = sin->sin_addr.s_imp;
        /* no routing here */
        ip->il_host = sin->sin_addr.s_host;
        ip->il_imp = sin->sin_addr.s_imp;
        /* no routing here */

-       ifp = if_ifonnetof(sin->sin_addr.s_net);
+       ifp = if_ifonnetof((int)sin->sin_addr.s_net);

        if (ifp)
                return (impoutput(ifp, m, (struct sockaddr *)sin));
        error = ENETUNREACH;
        if (ifp)
                return (impoutput(ifp, m, (struct sockaddr *)sin));
        error = ENETUNREACH;

diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index 049d3b0..3ccf1df 100644 (file)
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*     kern_clock.c    4.41    82/10/17        */
+/*     kern_clock.c    4.42    82/10/21        */

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


@@ -58,7 +58,6 @@ hardclock(pc, ps)
        register struct callout *p1;
        register struct proc *p;
        register int s, cpstate;
        register struct callout *p1;
        register struct proc *p;
        register int s, cpstate;

-       extern double avenrun[];

 
        /*
         * Update real-time timeout queue.
 
        /*
         * Update real-time timeout queue.

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index 20ac9a0..2d36e09 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*     kern_physio.c   4.33    82/10/17        */
+/*     kern_physio.c   4.34    82/10/21        */

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


@@ -43,9 +43,9 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
        struct proc *p;
        swblk_t dblkno;
        caddr_t addr;
        struct proc *p;
        swblk_t dblkno;
        caddr_t addr;

-       int flag, nbytes;
+       int nbytes, rdflg, flag;

        dev_t dev;
        dev_t dev;

-       unsigned pfcent;
+       u_int pfcent;

 {
        register struct buf *bp;
        register int c;
 {
        register struct buf *bp;
        register int c;

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index d7a090a..f3b75ec 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*     kern_proc.c     4.42    82/10/17        */
+/*     kern_proc.c     4.43    82/10/21        */

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


@@ -221,7 +221,7 @@ execve()
        ne = 0;
        nc = 0;
        uap = (struct execa *)u.u_ap;
        ne = 0;
        nc = 0;
        uap = (struct execa *)u.u_ap;

-       if ((bno = rmalloc(argmap, ctod(clrnd((int) btoc(NCARGS))))) == 0) {
+       if ((bno = rmalloc(argmap, (long)ctod(clrnd((int)btoc(NCARGS))))) == 0) {

                swkill(u.u_procp, "exece");
                goto bad;
        }
                swkill(u.u_procp, "exece");
                goto bad;
        }


@@ -412,7 +412,7 @@ register struct inode *ip;
        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),
                    PG_FTEXT, u.u_procp->p_textp->x_iptr,
        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),
                    PG_FTEXT, u.u_procp->p_textp->x_iptr,

-                   1 + ts/CLSIZE, (int)btoc(u.u_exdata.ux_dsize));
+                   (long)(1 + ts/CLSIZE), (int)btoc(u.u_exdata.ux_dsize));

 
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
 #include "../vax/mtpr.h"               /* XXX */
 
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
 #include "../vax/mtpr.h"               /* XXX */


@@ -427,7 +427,7 @@ register struct inode *ip;
                u.u_uid = uid;
                u.u_procp->p_uid = uid;
                u.u_gid = gid;
                u.u_uid = uid;
                u.u_procp->p_uid = uid;
                u.u_gid = gid;

-               entergroup(gid);
+               (void) entergroup(gid);

        } else
                psignal(u.u_procp, SIGTRAP);
        u.u_tsize = ts;
        } else
                psignal(u.u_procp, SIGTRAP);
        u.u_tsize = ts;


@@ -689,7 +689,7 @@ loop:
                        if (ru)
                                *ru = *p->p_ru;
                        ruadd(&u.u_cru, p->p_ru);
                        if (ru)
                                *ru = *p->p_ru;
                        ruadd(&u.u_cru, p->p_ru);

-                       m_free(dtom(p->p_ru));
+                       (void) m_free(dtom(p->p_ru));

                        p->p_ru = 0;
                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ru = 0;
                        p->p_stat = NULL;
                        p->p_pid = 0;

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index e41d2ba..11e3446 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*     kern_sig.c      5.9     82/10/17        */
+/*     kern_sig.c      5.10    82/10/21        */

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


@@ -48,10 +48,12 @@ sigstack()
 
 }
 
 
 }
 

+#ifdef notdef

 kill()
 {
 
 }
 kill()
 {
 
 }

+#endif

 
 killpg()
 {
 
 killpg()
 {

diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index 4605c2e..3316273 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*     kern_synch.c    4.23    82/10/17        */
+/*     kern_synch.c    4.24    82/10/21        */

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


@@ -32,7 +32,6 @@ roundrobin()
 #undef ave
 #define        ave(a,b) ((int)(((int)(a*b))/(b+1)))
 int    nrscale = 2;
 #undef ave
 #define        ave(a,b) ((int)(((int)(a*b))/(b+1)))
 int    nrscale = 2;

-double avenrun[];

 double ccpu = 0.95122942450071400909;          /* exp(-1/20) */
 
 /*
 double ccpu = 0.95122942450071400909;          /* exp(-1/20) */
 
 /*

diff --git a/usr/src/sys/kern/subr_rmap.c b/usr/src/sys/kern/subr_rmap.c
index 5180070..2580341 100644 (file)
--- a/usr/src/sys/kern/subr_rmap.c
+++ b/usr/src/sys/kern/subr_rmap.c
@@ -1,4 +1,4 @@
-/*     subr_rmap.c     4.6     82/10/10        */
+/*     subr_rmap.c     4.7     82/10/21        */

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


@@ -7,6 +7,7 @@
 #include "../h/user.h"
 #include "../h/proc.h"
 #include "../h/text.h"
 #include "../h/user.h"
 #include "../h/proc.h"
 #include "../h/text.h"

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

 
 /*
  * Resource map handling routines.
 
 /*
  * Resource map handling routines.


@@ -78,8 +79,10 @@ rminit(mp, size, addr, name, mapsize)
  * This routine knows about the interleaving of the swapmap
  * and handles that.
  */
  * This routine knows about the interleaving of the swapmap
  * and handles that.
  */

+long

 rmalloc(mp, size)
        register struct map *mp;
 rmalloc(mp, size)
        register struct map *mp;

+       long size;

 {
        register struct mapent *ep = (struct mapent *)(mp+1);
        register int addr;
 {
        register struct mapent *ep = (struct mapent *)(mp+1);
        register int addr;


@@ -140,7 +143,7 @@ rmalloc(mp, size)
  */
 rmfree(mp, size, addr)
        struct map *mp;
  */
 rmfree(mp, size, addr)
        struct map *mp;

-       register int size, addr;
+       long size, addr;

 {
        struct mapent *firstbp;
        register struct mapent *bp;
 {
        struct mapent *firstbp;
        register struct mapent *bp;

diff --git a/usr/src/sys/kern/subr_rmap.c.sav b/usr/src/sys/kern/subr_rmap.c.sav
index 8e7c08d..9a04685 100644 (file)
--- a/usr/src/sys/kern/subr_rmap.c.sav
+++ b/usr/src/sys/kern/subr_rmap.c.sav
@@ -1,4 +1,4 @@
-/*     subr_rmap.c.sav 4.6     82/10/10        */
+/*     subr_rmap.c.sav 4.7     82/10/21        */

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


@@ -7,6 +7,7 @@
 #include "../h/user.h"
 #include "../h/proc.h"
 #include "../h/text.h"
 #include "../h/user.h"
 #include "../h/proc.h"
 #include "../h/text.h"

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

 
 /*
  * Resource map handling routines.
 
 /*
  * Resource map handling routines.


@@ -78,8 +79,10 @@ rminit(mp, size, addr, name, mapsize)
  * This routine knows about the interleaving of the swapmap
  * and handles that.
  */
  * This routine knows about the interleaving of the swapmap
  * and handles that.
  */

+long

 rmalloc(mp, size)
        register struct map *mp;
 rmalloc(mp, size)
        register struct map *mp;

+       long size;

 {
        register struct mapent *ep = (struct mapent *)(mp+1);
        register int addr;
 {
        register struct mapent *ep = (struct mapent *)(mp+1);
        register int addr;


@@ -140,7 +143,7 @@ rmalloc(mp, size)
  */
 rmfree(mp, size, addr)
        struct map *mp;
  */
 rmfree(mp, size, addr)
        struct map *mp;

-       register int size, addr;
+       long size, addr;

 {
        struct mapent *firstbp;
        register struct mapent *bp;
 {
        struct mapent *firstbp;
        register struct mapent *bp;

diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index f55f22b..a2a1024 100644 (file)
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*     sys_generic.c   5.19    82/10/19        */
+/*     sys_generic.c   5.20    82/10/21        */

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


@@ -293,7 +293,7 @@ rwip(ip, uio, rw)
                        goto bad;
                }
                u.u_error =
                        goto bad;
                }
                u.u_error =

-                   uiomove(bp->b_un.b_addr+on, n, rw, uio);
+                   (void) uiomove(bp->b_un.b_addr+on, n, rw, uio);

                if (rw == UIO_READ) {
                        if (n + on == bsize || uio->uio_offset == ip->i_size)
                                bp->b_flags |= B_AGE;
                if (rw == UIO_READ) {
                        if (n + on == bsize || uio->uio_offset == ip->i_size)
                                bp->b_flags |= B_AGE;


@@ -405,6 +405,7 @@ again:
        return (0);
 }
 
        return (0);
 }
 

+#ifdef notdef

 /*
  * Get next character written in by user from uio.
  */
 /*
  * Get next character written in by user from uio.
  */


@@ -445,6 +446,7 @@ again:
        uio->uio_offset++;
        return (c & 0377);
 }
        uio->uio_offset++;
        return (c & 0377);
 }

+#endif

 
 /*
  * Ioctl system call
 
 /*
  * Ioctl system call

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 323539d..cedc500 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*     uipc_mbuf.c     1.38    82/10/09        */
+/*     uipc_mbuf.c     1.39    82/10/21        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -9,6 +9,7 @@
 #include "../h/map.h"
 #include "../h/mbuf.h"
 #include "../h/vm.h"
 #include "../h/map.h"
 #include "../h/mbuf.h"
 #include "../h/vm.h"

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

 
 mbinit()
 {
 
 mbinit()
 {

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index c8c579f..5a907cd 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*     uipc_socket.c   4.58    82/10/20        */
+/*     uipc_socket.c   4.59    82/10/21        */

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


@@ -344,7 +344,7 @@ again:
 nopages:
                        len = MIN(MLEN, iov->iov_len);
                }
 nopages:
                        len = MIN(MLEN, iov->iov_len);
                }

-               uiomove(mtod(m, caddr_t), len, UIO_WRITE, uio);
+               (void) uiomove(mtod(m, caddr_t), len, UIO_WRITE, uio);

                m->m_len = len;
                *mp = m;
                mp = &m->m_next;
                m->m_len = len;
                *mp = m;
                mp = &m->m_next;


@@ -383,11 +383,11 @@ soreceive(so, aname, uio, flags)
                        if (len > m->m_len)
                                len = m->m_len;
                        error =
                        if (len > m->m_len)
                                len = m->m_len;
                        error =

-                           uiomove(mtod(m, caddr_t), (int)len, UIO_READ, uio);
+                           (void) uiomove(mtod(m, caddr_t), (int)len, UIO_READ, uio);

                        m = m_free(m);
                } while (uio->uio_resid && error == 0 && m);
                if (m)
                        m = m_free(m);
                } while (uio->uio_resid && error == 0 && m);
                if (m)

-                       (void) m_freem(m);
+                       m_freem(m);

                return (error);
        }
 
                return (error);
        }
 


@@ -460,7 +460,7 @@ SBCHECK(&so->so_snd, "soreceive afteraddr");
                        len = m->m_len - moff;
                splx(s);
                error =
                        len = m->m_len - moff;
                splx(s);
                error =

-                   uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio);
+                   (void) uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio);

                s = splnet();
                if (len == m->m_len) {
                        eor = (int)m->m_act;
                s = splnet();
                if (len == m->m_len) {
                        eor = (int)m->m_act;

diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index c4907f0..2b735cc 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*     uipc_syscalls.c 4.34    82/10/20        */
+/*     uipc_syscalls.c 4.35    82/10/21        */

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


@@ -44,7 +44,7 @@ socket()
        fp->f_socket = so;
 freeopt:
        if (uap->opt)
        fp->f_socket = so;
 freeopt:
        if (uap->opt)

-               m_free(dtom(aopt.so_optdata));
+               (void) m_free(dtom(aopt.so_optdata));

        return;
 bad:
        u.u_ofile[u.u_r.r_val1] = 0;
        return;
 bad:
        u.u_ofile[u.u_r.r_val1] = 0;


@@ -83,7 +83,7 @@ bind()
        m_freem(nam);
 freeopt:
        if (uap->opt)
        m_freem(nam);
 freeopt:
        if (uap->opt)

-               m_free(dtom(aopt.so_optdata));
+               (void) m_free(dtom(aopt.so_optdata));

 }
 
 listen()
 }
 
 listen()


@@ -207,7 +207,7 @@ ret:
        splx(s);
 bad:
        if (uap->opt)
        splx(s);
 bad:
        if (uap->opt)

-               m_free(dtom(aopt.so_optdata));
+               (void) m_free(dtom(aopt.so_optdata));

 }
 
 connect()
 }
 
 connect()


@@ -258,7 +258,7 @@ connect()
 bad:
        m_freem(nam);
        if (uap->opt)
 bad:
        m_freem(nam);
        if (uap->opt)

-               m_free(dtom(aopt.so_optdata));
+               (void) m_free(dtom(aopt.so_optdata));

        return;
 }
 
        return;
 }
 

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index cd5742b..b5703fc 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/*     in.c    4.8     82/10/20        */
+/*     in.c    4.9     82/10/21        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -21,7 +21,7 @@ inet_hash(sin, hp)
        hp->afh_hosthash = sin->sin_addr.s_addr;
 #if vax || pdp11 || ns16032
        hp->afh_hosthash = ntohl((u_long)hp->afh_hosthash);
        hp->afh_hosthash = sin->sin_addr.s_addr;
 #if vax || pdp11 || ns16032
        hp->afh_hosthash = ntohl((u_long)hp->afh_hosthash);

-#else
+#endif

 }
 
 inet_netmatch(sin1, sin2)
 }
 
 inet_netmatch(sin1, sin2)


@@ -72,7 +72,7 @@ in_netof(in)
                return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
 }
 
                return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
 }
 

-#ifndef notdef
+#ifdef notdef

 /*
  * Return the host portion of an internet address.
  */
 /*
  * Return the host portion of an internet address.
  */

diff --git a/usr/src/sys/netinet/ip_input.c b/usr/src/sys/netinet/ip_input.c
index fa45efa..7d11a2c 100644 (file)
--- a/usr/src/sys/netinet/ip_input.c
+++ b/usr/src/sys/netinet/ip_input.c
@@ -1,13 +1,13 @@
-/*     ip_input.c      1.54    82/10/20        */
+/*     ip_input.c      1.55    82/10/21        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"

-#include <time.h>

 #include "../h/kernel.h"
 #include <errno.h>
 #include "../h/kernel.h"
 #include <errno.h>

+#include <time.h>

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"


@@ -566,7 +566,7 @@ ip_ctlinput(cmd, arg)
        int cmd;
        caddr_t arg;
 {
        int cmd;
        caddr_t arg;
 {

-       struct in_addr *sin;
+       struct in_addr *in;

        int tcp_abort(), udp_abort();
        extern struct inpcb tcb, udb;
 
        int tcp_abort(), udp_abort();
        extern struct inpcb tcb, udb;
 


@@ -575,16 +575,14 @@ ip_ctlinput(cmd, arg)
        if (inetctlerrmap[cmd] == 0)
                return;         /* XXX */
        if (cmd == PRC_IFDOWN)
        if (inetctlerrmap[cmd] == 0)
                return;         /* XXX */
        if (cmd == PRC_IFDOWN)

-               sin = &((struct sockaddr_in *)arg)->sin_addr;
+               in = &((struct sockaddr_in *)arg)->sin_addr;

        else if (cmd == PRC_HOSTDEAD || cmd == PRC_HOSTUNREACH)
        else if (cmd == PRC_HOSTDEAD || cmd == PRC_HOSTUNREACH)

-               sin = (struct in_addr *)arg;
+               in = (struct in_addr *)arg;

        else
        else

-               sin = &((struct icmp *)arg)->icmp_ip.ip_dst;
+               in = &((struct icmp *)arg)->icmp_ip.ip_dst;

 /* THIS IS VERY QUESTIONABLE, SHOULD HIT ALL PROTOCOLS */
 /* THIS IS VERY QUESTIONABLE, SHOULD HIT ALL PROTOCOLS */

-       in_pcbnotify(&tcb, (struct in_addr *)&sin->sin_addr,
-           (int)inetctlerrmap[cmd], tcp_abort);
-       in_pcbnotify(&udb, (struct in_addr *)&sin->sin_addr,
-           (int)inetctlerrmap[cmd], udp_abort);
+       in_pcbnotify(&tcb, in, (int)inetctlerrmap[cmd], tcp_abort);
+       in_pcbnotify(&udb, in, (int)inetctlerrmap[cmd], udp_abort);

 }
 
 int    ipprintfs = 0;
 }
 
 int    ipprintfs = 0;

diff --git a/usr/src/sys/netinet/tcp_subr.c b/usr/src/sys/netinet/tcp_subr.c
index efe86cf..47b8e69 100644 (file)
--- a/usr/src/sys/netinet/tcp_subr.c
+++ b/usr/src/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*     tcp_subr.c      4.32    82/10/17        */
+/*     tcp_subr.c      4.33    82/10/21        */

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


@@ -181,7 +181,7 @@ tcp_drop(tp, errno)
 
        if (TCPS_HAVERCVDSYN(tp->t_state)) {
                tp->t_state = TCPS_CLOSED;
 
        if (TCPS_HAVERCVDSYN(tp->t_state)) {
                tp->t_state = TCPS_CLOSED;

-               tcp_output(tp);
+               (void) tcp_output(tp);

        }
        so->so_error = errno;
        tcp_close(tp);
        }
        so->so_error = errno;
        tcp_close(tp);

diff --git a/usr/src/sys/netinet/udp_usrreq.c b/usr/src/sys/netinet/udp_usrreq.c
index ece5206..b597610 100644 (file)
--- a/usr/src/sys/netinet/udp_usrreq.c
+++ b/usr/src/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*     udp_usrreq.c    4.37    82/10/20        */
+/*     udp_usrreq.c    4.38    82/10/21        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -92,7 +92,7 @@ udp_input(m0)
                struct in_addr broadcastaddr;
 
                broadcastaddr =
                struct in_addr broadcastaddr;
 
                broadcastaddr =

-                   if_makeaddr(in_netof((int)ui->ui_dst.s_net), INADDR_ANY);
+                   if_makeaddr(in_netof(ui->ui_dst.s_net), INADDR_ANY);

                if (ui->ui_dst.s_addr == broadcastaddr.s_addr)
                        goto bad;
                icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT);
                if (ui->ui_dst.s_addr == broadcastaddr.s_addr)
                        goto bad;
                icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT);

diff --git a/usr/src/sys/sys/kernel.h b/usr/src/sys/sys/kernel.h
index 79c9ef3..d3a40de 100644 (file)
--- a/usr/src/sys/sys/kernel.h
+++ b/usr/src/sys/sys/kernel.h
@@ -1,4 +1,4 @@
-/*     kernel.h        4.6     82/10/21        */
+/*     kernel.h        4.7     82/10/21        */

 
 /*
  * Global variables for the kernel
 
 /*
  * Global variables for the kernel


@@ -20,6 +20,8 @@ int   tick;
 int    lbolt;                          /* awoken once a second */
 int    realitexpire();
 
 int    lbolt;                          /* awoken once a second */
 int    realitexpire();
 

+double avenrun[3];
+

 #ifdef GPROF
 extern int profiling;
 extern char *s_lowpc;
 #ifdef GPROF
 extern int profiling;
 extern char *s_lowpc;

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 6eeec10..921eee1 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*     ffs_alloc.c     2.17    82/10/19        */
+/*     ffs_alloc.c     2.18    82/10/21        */

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


@@ -592,7 +592,7 @@ norot:
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:

-       clrblock(fs, cgp->cg_free, (int)(bno/fs->fs_frag));
+       clrblock(fs, cgp->cg_free, (long)(bno/fs->fs_frag));

        cgp->cg_cs.cs_nbfree--;
        fs->fs_cstotal.cs_nbfree--;
        fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;
        cgp->cg_cs.cs_nbfree--;
        fs->fs_cstotal.cs_nbfree--;
        fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;

diff --git a/usr/src/sys/ufs/ffs/ffs_subr.c b/usr/src/sys/ufs/ffs/ffs_subr.c
index 6a218ca..9e299f2 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_subr.c
+++ b/usr/src/sys/ufs/ffs/ffs_subr.c
@@ -1,4 +1,4 @@
-/*     ffs_subr.c      4.1     82/10/20        */
+/*     ffs_subr.c      4.2     82/10/21        */

 
 #ifdef KERNEL
 #include "../h/param.h"
 
 #ifdef KERNEL
 #include "../h/param.h"


@@ -99,7 +99,7 @@ isblock(fs, cp, h)
  */
 clrblock(fs, cp, h)
        struct fs *fs;
  */
 clrblock(fs, cp, h)
        struct fs *fs;

-       unsigned char *cp;
+       u_char *cp;

        daddr_t h;
 {
 
        daddr_t h;
 {
 

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index c1696c8..1866026 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -1,4 +1,4 @@
-/*     lfs_alloc.c     2.17    82/10/19        */
+/*     lfs_alloc.c     2.18    82/10/21        */

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


@@ -592,7 +592,7 @@ norot:
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:

-       clrblock(fs, cgp->cg_free, (int)(bno/fs->fs_frag));
+       clrblock(fs, cgp->cg_free, (long)(bno/fs->fs_frag));

        cgp->cg_cs.cs_nbfree--;
        fs->fs_cstotal.cs_nbfree--;
        fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;
        cgp->cg_cs.cs_nbfree--;
        fs->fs_cstotal.cs_nbfree--;
        fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;

diff --git a/usr/src/sys/vax/if/if_acc.c b/usr/src/sys/vax/if/if_acc.c
index 6bbc50f..aedcb15 100644 (file)
--- a/usr/src/sys/vax/if/if_acc.c
+++ b/usr/src/sys/vax/if/if_acc.c
@@ -1,4 +1,4 @@
-/*     if_acc.c        4.23    82/10/20        */
+/*     if_acc.c        4.24    82/10/21        */

 
 #include "acc.h"
 #ifdef NACC > 0
 
 #include "acc.h"
 #ifdef NACC > 0

diff --git a/usr/src/sys/vax/if/if_ec.c b/usr/src/sys/vax/if/if_ec.c
index e13e91f..c2ff253 100644 (file)
--- a/usr/src/sys/vax/if/if_ec.c
+++ b/usr/src/sys/vax/if/if_ec.c
@@ -1,4 +1,4 @@
-/*     if_ec.c 4.24    82/10/10        */
+/*     if_ec.c 4.25    82/10/21        */

 
 #include "ec.h"
 
 
 #include "ec.h"
 


@@ -45,7 +45,7 @@ u_char        ec_iltop[3] = { 0x02, 0x07, 0x01 };
 #define        ECUNIT(x)       minor(x)
 
 int    ecinit(),ecoutput(),ecreset();
 #define        ECUNIT(x)       minor(x)
 
 int    ecinit(),ecoutput(),ecreset();

-struct mbuf *ecget();
+struct mbuf *ecget();

 
 extern struct ifnet loif;
 
 
 extern struct ifnet loif;
 


@@ -66,7 +66,7 @@ struct        ec_softc {
        struct  ifuba es_ifuba;         /* UNIBUS resources */
        short   es_mask;                /* mask for current output delay */
        short   es_oactive;             /* is output active? */
        struct  ifuba es_ifuba;         /* UNIBUS resources */
        short   es_mask;                /* mask for current output delay */
        short   es_oactive;             /* is output active? */

-       caddr_t es_buf[16];             /* virtual addresses of buffers */
+       u_char  *es_buf[16];            /* virtual addresses of buffers */

        u_char  es_enaddr[6];           /* board's ethernet address */
 } ec_softc[NEC];
 
        u_char  es_enaddr[6];           /* board's ethernet address */
 } ec_softc[NEC];
 


@@ -93,15 +93,15 @@ ecprobe(reg)
         * Disable map registers for ec unibus space,
         * but don't allocate yet.
         */
         * Disable map registers for ec unibus space,
         * but don't allocate yet.
         */

-       ubamem(numuba, ECMEM, 32*2, 0);
+       (void) ubamem(numuba, ECMEM, 32*2, 0);

        /*
         * Check for existence of buffers on Unibus.
         */
        /*
         * Check for existence of buffers on Unibus.
         */

-       if (badaddr((caddr_t) ecbuf, 2)) {
+       if (badaddr((caddr_t)ecbuf, 2)) {

        bad1:
                printf("ec: buffer mem not found\n");
        bad2:
        bad1:
                printf("ec: buffer mem not found\n");
        bad2:

-               ubamem(numuba, 0, 0, 0);        /* reenable map (780 only) */
+               (void) ubamem(numuba, 0, 0, 0); /* reenable map (780 only) */

                addr->ec_rcr = EC_MDISAB;       /* disable memory */
                return (0);
        }
                addr->ec_rcr = EC_MDISAB;       /* disable memory */
                return (0);
        }


@@ -200,7 +200,7 @@ ecattach(ui)
        ifp->if_output = ecoutput;
        ifp->if_ubareset = ecreset;
        for (i=0; i<16; i++)
        ifp->if_output = ecoutput;
        ifp->if_ubareset = ecreset;
        for (i=0; i<16; i++)

-               es->es_buf[i] = &umem[ui->ui_ubanum][ECMEM+2048*i];
+               es->es_buf[i] = (u_char *)&umem[ui->ui_ubanum][ECMEM+2048*i];

        if_attach(ifp);
 }
 
        if_attach(ifp);
 }
 


@@ -217,7 +217,7 @@ ecreset(unit, uban)
            ui->ui_ubanum != uban)
                return;
        printf(" ec%d", unit);
            ui->ui_ubanum != uban)
                return;
        printf(" ec%d", unit);

-       ubamem(uban, ECMEM, 32*2, 0);   /* map register disable (no alloc) */
+       (void) ubamem(uban, ECMEM, 32*2, 0);    /* mr disable (no alloc) */

        ecinit(unit);
 }
 
        ecinit(unit);
 }
 


@@ -261,11 +261,10 @@ ecinit(unit)
 ecstart(dev)
        dev_t dev;
 {
 ecstart(dev)
        dev_t dev;
 {

-        int unit = ECUNIT(dev), dest;
+        int unit = ECUNIT(dev);

        struct ec_softc *es = &ec_softc[unit];
        struct ecdevice *addr;
        struct mbuf *m;
        struct ec_softc *es = &ec_softc[unit];
        struct ecdevice *addr;
        struct mbuf *m;

-       caddr_t ecbuf;

 
        if (es->es_oactive)
                goto restart;
 
        if (es->es_oactive)
                goto restart;


@@ -401,15 +400,15 @@ ecread(unit)
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;
        register struct ec_header *ec;
        struct mbuf *m;
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;
        register struct ec_header *ec;
        struct mbuf *m;

-       int len, off, resid, ecoff, buf;
+       int len, off, resid, ecoff, rbuf;

        register struct ifqueue *inq;
        register struct ifqueue *inq;

-       caddr_t ecbuf;
+       u_char *ecbuf;

 
        es->es_if.if_ipackets++;
 
        es->es_if.if_ipackets++;

-       buf = addr->ec_rcr & EC_RBN;
-       if (buf < ECRLBF || buf > ECRHBF)
+       rbuf = addr->ec_rcr & EC_RBN;
+       if (rbuf < ECRLBF || rbuf > ECRHBF)

                panic("ecrint");
                panic("ecrint");

-       ecbuf = es->es_buf[buf];
+       ecbuf = es->es_buf[rbuf];

        ecoff = *(short *)ecbuf;
        if (ecoff <= ECRDOFF || ecoff > 2046) {
                es->es_if.if_ierrors++;
        ecoff = *(short *)ecbuf;
        if (ecoff <= ECRDOFF || ecoff > 2046) {
                es->es_if.if_ierrors++;


@@ -482,7 +481,7 @@ setup:
        /*
         * Reset for next packet.
         */
        /*
         * Reset for next packet.
         */

-       addr->ec_rcr = EC_READ|EC_RCLR|buf;
+       addr->ec_rcr = EC_READ|EC_RCLR|rbuf;

 }
 
 /*
 }
 
 /*


@@ -512,7 +511,7 @@ ecoutput(ifp, m0, dst)
        case AF_INET:
                dest = ((struct sockaddr_in *)dst)->sin_addr.s_addr;
                if ((dest &~ 0xff) == 0)
        case AF_INET:
                dest = ((struct sockaddr_in *)dst)->sin_addr.s_addr;
                if ((dest &~ 0xff) == 0)

-                       mcopy = m_copy(m, 0, M_COPYALL);
+                       mcopy = m_copy(m, 0, (long)M_COPYALL);

                else if (dest == ((struct sockaddr_in *)&es->es_if.if_addr)->
                    sin_addr.s_addr) {
                        mcopy = m;
                else if (dest == ((struct sockaddr_in *)&es->es_if.if_addr)->
                    sin_addr.s_addr) {
                        mcopy = m;

diff --git a/usr/src/sys/vax/uba/dmf.c b/usr/src/sys/vax/uba/dmf.c
index c9a49f3..584e282 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.12    82/10/20        */
+/*     dmf.c   4.13    82/10/21        */

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


@@ -157,7 +157,9 @@ char        dmf_speeds[] =
 
 struct tty dmf_tty[NDMF*8];
 char   dmfsoftCAR[NDMF];
 
 struct tty dmf_tty[NDMF*8];
 char   dmfsoftCAR[NDMF];

-int    ndmf = NDMF*8;
+#ifndef lint
+int    ndmf = NDMF*8;                  /* used by iostat */
+#endif

 int    dmfact;                         /* mask of active dmf's */
 int    dmfstart(), ttrstrt();
 
 int    dmfact;                         /* mask of active dmf's */
 int    dmfstart(), ttrstrt();
 

diff --git a/usr/src/sys/vax/uba/dn.c b/usr/src/sys/vax/uba/dn.c
index 3af59de..e5d6248 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.12    82/10/20        */
+/*     dn.c    4.13    82/10/21        */

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


@@ -24,7 +24,7 @@ struct dndevice {
 };
 
 struct uba_device *dninfo[NDN];
 };
 
 struct uba_device *dninfo[NDN];

-int dnprobe(), dnattach();
+int dnprobe(), dnattach(), dnintr();

 u_short dnstd[] = { 0175200 };
 struct uba_driver dndriver =
        { dnprobe, 0, dnattach, 0, dnstd, "dn", dninfo };
 u_short dnstd[] = { 0175200 };
 struct uba_driver dndriver =
        { dnprobe, 0, dnattach, 0, dnstd, "dn", dninfo };


@@ -60,6 +60,7 @@ dnprobe(reg)
 
 #ifdef lint
        br = 0; cvec = 0; br = cvec; cvec = br;
 
 #ifdef lint
        br = 0; cvec = 0; br = cvec; cvec = br;

+       dnintr(0);

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

diff --git a/usr/src/sys/vax/uba/ikreg.h b/usr/src/sys/vax/uba/ikreg.h
index 4371560..e49d8f2 100644 (file)
--- a/usr/src/sys/vax/uba/ikreg.h
+++ b/usr/src/sys/vax/uba/ikreg.h
@@ -1,14 +1,14 @@
-/*     ikreg.h 4.2     82/08/01        */
+/*     ikreg.h 4.3     82/10/21        */

 
 struct ikdevice {
 
 struct ikdevice {

-       short int ik_wc;                        /* Unibus word count reg */
-       unsigned short int ik_ubaddr;           /* Unibus address register */
-       unsigned short int ik_ustat;            /* Unibus status/command reg */
-       unsigned short int ik_data;             /* Data register */
-       unsigned short int ik_xaddr;            /* X address in frame buffer */
-       unsigned short int ik_yaddr;            /* Y address in frame buffer */
-       unsigned short int ik_istat;            /* Ikonas status/command reg */
-       unsigned short int ik_dummy;
+       short   ik_wc;                  /* Unibus word count reg */
+       u_short ik_ubaddr;              /* Unibus address register */
+       u_short ik_ustat;               /* Unibus status/command reg */
+       u_short ik_data;                /* Data register */
+       u_short ik_xaddr;               /* X address in frame buffer */
+       u_short ik_yaddr;               /* Y address in frame buffer */
+       u_short ik_istat;               /* Ikonas status/command reg */
+       u_short ik_dummy;

 };
 
 #define IK_GETADDR     IKIOGETADDR
 };
 
 #define IK_GETADDR     IKIOGETADDR

diff --git a/usr/src/sys/vax/uba/uba.c b/usr/src/sys/vax/uba/uba.c
index e315fd2..eb07ffe 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.53    82/10/20        */
+/*     uba.c   4.54    82/10/21        */

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


@@ -370,53 +370,7 @@ ubainit(uba)
        }
 }
 
        }
 }
 

-#ifdef notdef
-#if VAX780
-/*
- * Check to make sure the UNIBUS adaptor is not hung,
- * with an interrupt in the register to be presented,
- * but not presenting it for an extended period (5 seconds).
- */
-unhang()
-{
-       register int uban;
-
-       for (uban = 0; uban < numuba; uban++) {
-               register struct uba_hd *uh = &uba_hd[uban];
-               register struct uba_regs *up = uh->uh_uba;
-
-               if (up->uba_sr == 0)
-                       return;
-               up->uba_sr = UBASR_CRD|UBASR_LEB;
-               uh->uh_hangcnt++;
-               if (uh->uh_hangcnt > 5*hz) {
-                       uh->uh_hangcnt = 0;
-                       printf("uba%d: hung\n", uban);
-                       ubareset(uban);
-               }
-       }
-}
-
-/*
- * This is a timeout routine which decrements the ``i forgot to
- * interrupt'' counts, on an 11/780.  This prevents slowly growing
- * counts from causing a UBA reset since we are interested only
- * in hang situations.
- */
-ubawatch()
-{
-       register struct uba_hd *uh;
-       register int uban;
-
-       if (panicstr)
-               return;
-       for (uban = 0; uban < numuba; uban++) {
-               uh = &uba_hd[uban];
-               if (uh->uh_hangcnt)
-                       uh->uh_hangcnt--;
-       }
-}
-
+#ifdef VAX780

 int    ubawedgecnt = 10;
 int    ubacrazy = 500;
 /*
 int    ubawedgecnt = 10;
 int    ubacrazy = 500;
 /*


@@ -471,72 +425,6 @@ ubaerror(uban, uh, xx, uvec, uba)
        return;
 }
 #endif
        return;
 }
 #endif

-#endif notdef
-
-#ifdef notdef
-/*
- * This routine allows remapping of previously
- * allocated UNIBUS bdp and map resources
- * onto different memory addresses.
- * It should only be used by routines which need
- * small fixed length mappings for long periods of time
- * (like the ARPANET ACC IMP interface).
- * It only maps kernel addresses.
- */
-ubaremap(uban, ubinfo, addr)
-       int uban;
-       register unsigned ubinfo;
-       caddr_t addr;
-{
-       register struct uba_hd *uh = &uba_hd[uban];
-       register struct pte *pte, *io;
-       register int temp, bdp;
-       int npf, o;
-
-       o = (int)addr & PGOFSET;
-       bdp = (ubinfo >> 28) & 0xf;
-       npf = (ubinfo >> 18) & 0x3ff;
-       io = &uh->uh_uba->uba_map[(ubinfo >> 9) & 0x1ff];
-       temp = (bdp << 21) | UBAMR_MRV;
-
-       /*
-        * If using buffered data path initiate purge
-        * of old data and set byte offset bit if next
-        * transfer will be from odd address.
-        */
-       if (bdp) {
-               switch (cpu) {
-#if VAX780
-               case VAX_780:
-                       uh->uh_uba->uba_dpr[bdp] |= UBADPR_BNE;
-                       break;
-#endif
-#if VAX750
-               case VAX_750:
-                       uh->uh_uba->uba_dpr[bdp] |=
-                           UBADPR_PURGE|UBADPR_NXM|UBADPR_UCE;
-                       break;
-#endif
-               }
-               if (o & 1)
-                       temp |= UBAMR_BO;
-       }
-
-       /*
-        * Set up the map registers, leaving an invalid reg
-        * at the end to guard against wild unibus transfers.
-        */
-       pte = &Sysmap[btop(((int)addr)&0x7fffffff)];
-       while (--npf != 0)
-               *(int *)io++ = pte++->pg_pfnum | temp;
-       *(int *)io = 0;
-
-       /*
-        * Return effective UNIBUS address.
-        */
-       return (ubinfo | o);
-}
-#endif

 
 /*
  * This routine is called by a driver for a device with on-board Unibus
 
 /*
  * This routine is called by a driver for a device with on-board Unibus


@@ -550,7 +438,6 @@ ubaremap(uban, ubinfo, addr)
  *
  * Returns > 0 if successful, 0 if not.
  */
  *
  * Returns > 0 if successful, 0 if not.
  */

-

 ubamem(uban, addr, size, doalloc)
        int uban, addr, size, doalloc;
 {
 ubamem(uban, addr, size, doalloc)
        int uban, addr, size, doalloc;
 {

diff --git a/usr/src/sys/vax/uba/uda.c b/usr/src/sys/vax/uba/uda.c
index b5c987d..6438439 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.13    82/10/17        */
+/*     uda.c   4.14    82/10/21        */

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


@@ -114,6 +114,7 @@ udprobe(reg, ctlr)
 
 #ifdef lint
        br = 0; cvec = br; br = cvec; reg = reg;
 
 #ifdef lint
        br = 0; cvec = br; br = cvec; reg = reg;

+       udintr(0);

 #endif
        /* SHOULD CHECK THAT IT REALLY IS A UDA */
        br = 0x15;
 #endif
        /* SHOULD CHECK THAT IT REALLY IS A UDA */
        br = 0x15;

diff --git a/usr/src/sys/vax/vax/conf.c b/usr/src/sys/vax/vax/conf.c
index 967e272..6ef448e 100644 (file)
--- a/usr/src/sys/vax/vax/conf.c
+++ b/usr/src/sys/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*     conf.c  4.58    82/10/20        */
+/*     conf.c  4.59    82/10/21        */

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


@@ -453,10 +453,10 @@ struct cdevsw     cdevsw[] =
        seltrue,
        ctopen,         ctclose,        nodev,          ctwrite,        /*18*/
        nodev,          nodev,          nulldev,        0,
        seltrue,
        ctopen,         ctclose,        nodev,          ctwrite,        /*18*/
        nodev,          nodev,          nulldev,        0,

+       seltrue,

        mtopen,         mtclose,        mtread,         mtwrite,        /*19*/
        mtioctl,        nodev,          nodev,          0,
        seltrue,
        mtopen,         mtclose,        mtread,         mtwrite,        /*19*/
        mtioctl,        nodev,          nodev,          0,
        seltrue,

-       nodev,

        ptsopen,        ptsclose,       ptsread,        ptswrite,       /*20*/
        ptyioctl,       ptsstop,        nodev,          pt_tty,
        ttselect,
        ptsopen,        ptsclose,       ptsread,        ptswrite,       /*20*/
        ptyioctl,       ptsstop,        nodev,          pt_tty,
        ttselect,

diff --git a/usr/src/sys/vax/vax/flp.c b/usr/src/sys/vax/vax/flp.c
index 6dbd37d..1c7ca74 100644 (file)
--- a/usr/src/sys/vax/vax/flp.c
+++ b/usr/src/sys/vax/vax/flp.c
@@ -1,4 +1,4 @@
-/*     flp.c   4.10    82/10/17        */
+/*     flp.c   4.11    82/10/21        */

 
 #if VAX780
 #include "../h/param.h"
 
 #if VAX780
 #include "../h/param.h"

diff --git a/usr/src/sys/vax/vax/mem.c b/usr/src/sys/vax/vax/mem.c
index c0366d7..48c795e 100644 (file)
--- a/usr/src/sys/vax/vax/mem.c
+++ b/usr/src/sys/vax/vax/mem.c
@@ -1,4 +1,4 @@
-/*     mem.c   4.8     82/10/20        */
+/*     mem.c   4.9     82/10/21        */

 
 /*
  * Memory special file
 
 /*
  * Memory special file


@@ -64,7 +64,7 @@ mmrw(dev, uio, rw)
                        o = (int)uio->uio_offset & PGOFSET;
                        c = min((u_int)(NBPG - o), (u_int)iov->iov_len);
                        c = min(c, (u_int)(NBPG - ((int)iov->iov_base&PGOFSET)));
                        o = (int)uio->uio_offset & PGOFSET;
                        c = min((u_int)(NBPG - o), (u_int)iov->iov_len);
                        c = min(c, (u_int)(NBPG - ((int)iov->iov_base&PGOFSET)));

-                       error = uiomove((caddr_t)&vmmap[o], c, rw, uio);
+                       error = uiomove((caddr_t)&vmmap[o], (int)c, rw, uio);

                        continue;
 
 /* minor device 1 is kernel memory */
                        continue;
 
 /* minor device 1 is kernel memory */


@@ -78,7 +78,7 @@ mmrw(dev, uio, rw)
                        c = iov->iov_len;
                        if (!kernacc((caddr_t)uio->uio_offset, c, rw == UIO_READ ? B_READ : B_WRITE))
                                goto fault;
                        c = iov->iov_len;
                        if (!kernacc((caddr_t)uio->uio_offset, c, rw == UIO_READ ? B_READ : B_WRITE))
                                goto fault;

-                       error = uiomove((caddr_t)uio->uio_offset, c, rw, uio);
+                       error = uiomove((caddr_t)uio->uio_offset, (int)c, rw, uio);

                        continue;
 
 /* minor device 2 is EOF/RATHOLE */
                        continue;
 
 /* minor device 2 is EOF/RATHOLE */

diff --git a/usr/src/sys/vax/vax/trap.c b/usr/src/sys/vax/vax/trap.c
index 49b3ac8..4952853 100644 (file)
--- a/usr/src/sys/vax/vax/trap.c
+++ b/usr/src/sys/vax/vax/trap.c
@@ -1,4 +1,4 @@
-/*     trap.c  4.20    82/10/20        */
+/*     trap.c  4.21    82/10/21        */

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


@@ -185,7 +185,7 @@ syscall(sp, type, code, pc, psl)
 asm("ok:");                                            /* GROT */
                asm("movc3 r9,(r10),_u+U_ARG");         /* GROT */
 #else
 asm("ok:");                                            /* GROT */
                asm("movc3 r9,(r10),_u+U_ARG");         /* GROT */
 #else

-               bcopy(params, u.u_arg, (u_int)i);
+               bcopy(params, (caddr_)u.u_arg, (u_int)i);

 #endif
        }
        u.u_ap = u.u_arg;
 #endif
        }
        u.u_ap = u.u_arg;

diff --git a/usr/src/sys/vm/vm_swap.c b/usr/src/sys/vm/vm_swap.c
index b6f9411..cac0dc3 100644 (file)
--- a/usr/src/sys/vm/vm_swap.c
+++ b/usr/src/sys/vm/vm_swap.c
@@ -1,4 +1,4 @@
-/*     vm_swap.c       4.9     82/09/06        */
+/*     vm_swap.c       4.10    82/10/21        */

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


@@ -115,7 +115,7 @@ swfree(index)
        int index;
 {
        register swblk_t vsbase;
        int index;
 {
        register swblk_t vsbase;

-       register int blk;
+       register long blk;

 
        swdevt[index].sw_freed = 1;
        for (vsbase = index*DMMAX; vsbase < nswap; vsbase += nswdev*DMMAX) {
 
        swdevt[index].sw_freed = 1;
        for (vsbase = index*DMMAX; vsbase < nswap; vsbase += nswdev*DMMAX) {