lint

SCCS-vsn: sys/sys/acct.h 4.3
SCCS-vsn: sys/sys/buf.h 4.12
SCCS-vsn: sys/sys/callout.h 4.5
SCCS-vsn: sys/sys/clist.h 4.4
SCCS-vsn: sys/sys/conf.h 4.6
SCCS-vsn: sys/sys/file.h 4.5
SCCS-vsn: sys/vax/mba/hpreg.h 4.5
SCCS-vsn: sys/ufs/ffs/dinode.h 4.5
SCCS-vsn: sys/ufs/ffs/inode.h 4.5
SCCS-vsn: sys/ufs/ufs/dinode.h 4.5
SCCS-vsn: sys/ufs/ufs/inode.h 4.5
SCCS-vsn: sys/vax/mba/mbareg.h 4.14
SCCS-vsn: sys/vax/mba/mbavar.h 4.14
SCCS-vsn: sys/vax/vax/nexus.h 4.6
SCCS-vsn: sys/sys/proc.h 4.6
SCCS-vsn: sys/vax/include/pte.h 4.8
SCCS-vsn: sys/sys/systm.h 4.14
SCCS-vsn: sys/vax/uba/tmreg.h 4.5
SCCS-vsn: sys/vax/uba/ubareg.h 4.18
SCCS-vsn: sys/vax/uba/ubavar.h 4.18
SCCS-vsn: sys/vax/vax/Locore.c 4.7
SCCS-vsn: sys/kern/kern_resource.c 4.3
SCCS-vsn: sys/vax/vax/autoconf.c 4.25
SCCS-vsn: sys/vax/vax/locore.s 4.35
SCCS-vsn: sys/kern/kern_physio.c 4.16
SCCS-vsn: sys/kern/vfs_bio.c 4.16
SCCS-vsn: sys/kern/vfs_cluster.c 4.16
SCCS-vsn: sys/vax/vax/conf.c 4.25
SCCS-vsn: sys/vax/vax/machdep.c 4.24
SCCS-vsn: sys/vax/vax/cons.c 4.6
SCCS-vsn: sys/kern/subr_prf.c 4.14
SCCS-vsn: sys/vax/uba/ct.c 4.2
SCCS-vsn: sys/vax/uba/dh.c 4.29
SCCS-vsn: sys/kern/tty_subr.c 4.9
SCCS-vsn: sys/kern/subr_xxx.c 4.4
SCCS-vsn: sys/vax/uba/dz.c 4.22
SCCS-vsn: sys/vax/vax/trap.c 4.7
SCCS-vsn: sys/vax/mba/hp.c 4.26
SCCS-vsn: sys/vax/mba/ht.c 4.10
SCCS-vsn: sys/vax/uba/lp.c 4.12
SCCS-vsn: sys/vax/uba/rk.c 4.25
SCCS-vsn: sys/vax/uba/tm.c 4.25
SCCS-vsn: sys/kern/tty.c 4.4
SCCS-vsn: sys/vax/uba/uba.c 4.21
SCCS-vsn: sys/vax/uba/up.c 4.31
SCCS-vsn: sys/vax/uba/va.c 4.7

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index a01def7..cc7c6a7 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.15    %G%     */
+/*     kern_physio.c   4.16    %G%     */

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


@@ -34,6 +34,9 @@
  *     brelse
  */
 
  *     brelse
  */
 

+struct buf bfreelist[BQUEUES];
+struct buf bswlist, *bclnlist;
+

 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 #define        BUFHASH(dev, dblkno)    \
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 #define        BUFHASH(dev, dblkno)    \

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index f348846..f114605 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*     kern_resource.c 4.2     %G%     */
+/*     kern_resource.c 4.3     %G%     */

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


@@ -9,10 +9,11 @@
 #include "../h/proc.h"
 #include "../h/seg.h"
 
 #include "../h/proc.h"
 #include "../h/seg.h"
 

+struct inode *acctp;
+

 /*
  * Perform process accounting functions.
  */
 /*
  * Perform process accounting functions.
  */

-

 sysacct()
 {
        register struct inode *ip;
 sysacct()
 {
        register struct inode *ip;


@@ -47,6 +48,7 @@ sysacct()
        }
 }
 
        }
 }
 

+struct acct acctbuf;

 /*
  * On exit, write a record on the accounting file.
  */
 /*
  * On exit, write a record on the accounting file.
  */


@@ -55,27 +57,28 @@ acct()
        register i;
        register struct inode *ip;
        off_t siz;
        register i;
        register struct inode *ip;
        off_t siz;

+       register struct acct *ap = &acctbuf;

 
        if ((ip=acctp)==NULL)
                return;
        plock(ip);
 
        if ((ip=acctp)==NULL)
                return;
        plock(ip);

-       for (i=0; i<sizeof(acctbuf.ac_comm); i++)
-               acctbuf.ac_comm[i] = u.u_comm[i];
-       acctbuf.ac_utime = compress((long)u.u_vm.vm_utime);
-       acctbuf.ac_stime = compress((long)u.u_vm.vm_stime);
-       acctbuf.ac_etime = compress((long)(time - u.u_start));
-       acctbuf.ac_btime = u.u_start;
-       acctbuf.ac_uid = u.u_ruid;
-       acctbuf.ac_gid = u.u_rgid;
-       acctbuf.ac_mem = 0;
+       for (i=0; i<sizeof(ap->ac_comm); i++)
+               ap->ac_comm[i] = u.u_comm[i];
+       ap->ac_utime = compress((long)u.u_vm.vm_utime);
+       ap->ac_stime = compress((long)u.u_vm.vm_stime);
+       ap->ac_etime = compress((long)(time - u.u_start));
+       ap->ac_btime = u.u_start;
+       ap->ac_uid = u.u_ruid;
+       ap->ac_gid = u.u_rgid;
+       ap->ac_mem = 0;

        if (i = u.u_vm.vm_utime + u.u_vm.vm_stime)
        if (i = u.u_vm.vm_utime + u.u_vm.vm_stime)

-               acctbuf.ac_mem = (u.u_vm.vm_ixrss + u.u_vm.vm_idsrss) / i;
-       acctbuf.ac_io = compress((long)(u.u_vm.vm_inblk + u.u_vm.vm_oublk));
-       acctbuf.ac_tty = u.u_ttyd;
-       acctbuf.ac_flag = u.u_acflag;
+               ap->ac_mem = (u.u_vm.vm_ixrss + u.u_vm.vm_idsrss) / i;
+       ap->ac_io = compress((long)(u.u_vm.vm_inblk + u.u_vm.vm_oublk));
+       ap->ac_tty = u.u_ttyd;
+       ap->ac_flag = u.u_acflag;

        siz = ip->i_size;
        u.u_offset = siz;
        siz = ip->i_size;
        u.u_offset = siz;

-       u.u_base = (caddr_t)&acctbuf;
+       u.u_base = (caddr_t)ap;

        u.u_count = sizeof(acctbuf);
        u.u_segflg = 1;
        u.u_error = 0;
        u.u_count = sizeof(acctbuf);
        u.u_segflg = 1;
        u.u_error = 0;

diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c
index 62f1d4d..b76f0d5 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*     subr_prf.c      4.13    %G%     */
+/*     subr_prf.c      4.14    %G%     */

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


@@ -92,7 +92,7 @@ again:
        case 'o': case 'O':
                b = 8;
 number:
        case 'o': case 'O':
                b = 8;
 number:

-               printn(*adx, b, touser);
+               printn((u_long)*adx, b, touser);

                break;
        case 'c':
                b = *adx;
                break;
        case 'c':
                b = *adx;


@@ -103,7 +103,7 @@ number:
        case 'b':
                b = *adx++;
                s = (char *)*adx;
        case 'b':
                b = *adx++;
                s = (char *)*adx;

-               printn(b, *s++, touser);
+               printn((u_long)b, *s++, touser);

                any = 0;
                if (b) {
                        putchar('<', touser);
                any = 0;
                if (b) {
                        putchar('<', touser);


@@ -137,7 +137,7 @@ number:
  * We don't use recursion to avoid deep kernel stacks.
  */
 printn(n, b, touser)
  * We don't use recursion to avoid deep kernel stacks.
  */
 printn(n, b, touser)

-       unsigned long n;
+       u_long n;

 {
        char prbuf[11];
        register char *cp;
 {
        char prbuf[11];
        register char *cp;


@@ -168,7 +168,6 @@ panic(s)
        int bootopt = panicstr ? RB_AUTOBOOT : RB_AUTOBOOT|RB_NOSYNC;
 
        panicstr = s;
        int bootopt = panicstr ? RB_AUTOBOOT : RB_AUTOBOOT|RB_NOSYNC;
 
        panicstr = s;

-       printf("panic: %s\n", s);

        (void) spl0();
        boot(RB_PANIC, bootopt);
 }
        (void) spl0();
        boot(RB_PANIC, bootopt);
 }

diff --git a/usr/src/sys/kern/subr_xxx.c b/usr/src/sys/kern/subr_xxx.c
index 301ff97..31d8cae 100644 (file)
--- a/usr/src/sys/kern/subr_xxx.c
+++ b/usr/src/sys/kern/subr_xxx.c
@@ -1,4 +1,4 @@
-/*     subr_xxx.c      4.3     %G%     */
+/*     subr_xxx.c      4.4     %G%     */

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


@@ -166,6 +166,7 @@ register c;
        return(u.u_count == 0? -1: 0);
 }
 
        return(u.u_count == 0? -1: 0);
 }
 

+#ifdef unneeded

 /*
  * Pick up and return the next character from the user's
  * write call at location u_base;
 /*
  * Pick up and return the next character from the user's
  * write call at location u_base;


@@ -191,6 +192,7 @@ cpass()
        u.u_base++;
        return(c&0377);
 }
        u.u_base++;
        return(c&0377);
 }

+#endif

 
 /*
  * Routine which sets a user error; placed in
 
 /*
  * Routine which sets a user error; placed in

diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index 2d61be7..c582de0 100644 (file)
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*     tty.c   4.3     %G%     */
+/*     tty.c   4.4     %G%     */

 
 /*
  * TTY subroutines common to more than one line discipline
 
 /*
  * TTY subroutines common to more than one line discipline


@@ -19,18 +19,6 @@
 
 char   partab[];
 
 
 char   partab[];
 

-/*
- * When running dz's using only SAE (silo alarm) on input
- * it is necessary to call dzrint() at clock interrupt time.
- * This is unsafe unless spl5()s in tty code are changed to
- * spl6()s to block clock interrupts.  Note that the dh driver
- * currently in use works the same way as the dz, even though
- * we could try to more intelligently manage its silo.
- * Thus don't take this out if you have no dz's unless you
- * change clock.c and dhtimer().
- */
-#define        spl5    spl6
-

 /*
  * Input mapping table-- if an entry is non-zero, when the
  * corresponding character is typed preceded by "\" the escape
 /*
  * Input mapping table-- if an entry is non-zero, when the
  * corresponding character is typed preceded by "\" the escape

diff --git a/usr/src/sys/kern/tty_subr.c b/usr/src/sys/kern/tty_subr.c
index 7b8312c..412bcb9 100644 (file)
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/*     tty_subr.c      4.8     %G%     */
+/*     tty_subr.c      4.9     %G%     */

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


@@ -302,33 +302,6 @@ out:
        return(cc);
 }
 
        return(cc);
 }
 

-char *
-wb_to_q(cp, cc, q)
-register char *cp;
-register struct clist *q;
-register cc;
-{
-char *f;
-register s;
-
-       s = spl6();
-       while (cc > cfreecount) {
-               cwaiting = 1;
-               sleep(&cwaiting, TTOPRI);
-       }
-       if (q->c_cc==0) {
-               b_to_q(cp, cc, q);
-               f = q->c_cf;
-       } else {
-               (void) putc(*cp++, q);
-               f = q->c_cl;
-               f--;
-               b_to_q(cp, --cc, q);
-       }
-       splx(s);
-       return(f);
-}
-

 /*
  * Given a non-NULL pointter into the list (like c_cf which
  * always points to a real character if non-NULL) return the pointer
 /*
  * Given a non-NULL pointter into the list (like c_cf which
  * always points to a real character if non-NULL) return the pointer


@@ -411,6 +384,7 @@ struct clist *from, *to;
  * integer (2-byte) get/put
  * using clists
  */
  * integer (2-byte) get/put
  * using clists
  */

+#ifdef unneeded

 getw(p)
 register struct clist *p;
 {
 getw(p)
 register struct clist *p;
 {


@@ -421,6 +395,7 @@ register struct clist *p;
        s = getc(p);
        return(s | (getc(p)<<8));
 }
        s = getc(p);
        return(s | (getc(p)<<8));
 }

+#endif

 
 putw(c, p)
 register struct clist *p;
 
 putw(c, p)
 register struct clist *p;

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 599b840..b64af59 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*     vfs_bio.c       4.15    %G%     */
+/*     vfs_bio.c       4.16    %G%     */

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


@@ -34,6 +34,9 @@
  *     brelse
  */
 
  *     brelse
  */
 

+struct buf bfreelist[BQUEUES];
+struct buf bswlist, *bclnlist;
+

 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 #define        BUFHASH(dev, dblkno)    \
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 #define        BUFHASH(dev, dblkno)    \

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 1fe9775..db31623 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*     vfs_cluster.c   4.15    %G%     */
+/*     vfs_cluster.c   4.16    %G%     */

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


@@ -34,6 +34,9 @@
  *     brelse
  */
 
  *     brelse
  */
 

+struct buf bfreelist[BQUEUES];
+struct buf bswlist, *bclnlist;
+

 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 #define        BUFHASH(dev, dblkno)    \
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 #define        BUFHASH(dev, dblkno)    \

diff --git a/usr/src/sys/sys/acct.h b/usr/src/sys/sys/acct.h
index 764b743..694906d 100644 (file)
--- a/usr/src/sys/sys/acct.h
+++ b/usr/src/sys/sys/acct.h
@@ -1,10 +1,12 @@
-/*     acct.h  4.2     81/02/19        */
+/*     acct.h  4.3     81/03/09        */

 
 /*
 
 /*

- * Accounting structures
+ * Accounting structures;
+ * these use a comp_t type which is a 3 bits base 8
+ * exponent, 13 bit fraction ``floating point'' number.

  */
  */

+typedef        u_short comp_t;

 
 

-typedef        unsigned short comp_t;  /* "floating pt": 3 bits base 8 exp, 13 bits fraction */

 struct acct
 {
        char    ac_comm[10];            /* Accounting command name */
 struct acct
 {
        char    ac_comm[10];            /* Accounting command name */


@@ -20,8 +22,5 @@ struct        acct
        char    ac_flag;                /* Accounting flag */
 };
 
        char    ac_flag;                /* Accounting flag */
 };
 

-extern struct  acct    acctbuf;
-extern struct  inode   *acctp;         /* inode of accounting file */
-

 #define        AFORK   01              /* has executed fork, but no exec */
 #define        ASU     02              /* used super-user privileges */
 #define        AFORK   01              /* has executed fork, but no exec */
 #define        ASU     02              /* used super-user privileges */

diff --git a/usr/src/sys/sys/buf.h b/usr/src/sys/sys/buf.h
index 52e8dfd..2b6132c 100644 (file)
--- a/usr/src/sys/sys/buf.h
+++ b/usr/src/sys/sys/buf.h
@@ -1,4 +1,4 @@
-/*     buf.h   4.11    81/02/27        */
+/*     buf.h   4.12    81/03/09        */

 
 /*
  * The header for buffers in the buffer pool and otherwise used
 
 /*
  * The header for buffers in the buffer pool and otherwise used


@@ -62,16 +62,16 @@ struct buf
 #define        BQ_AGE          2               /* rubbish */
 
 #ifdef KERNEL
 #define        BQ_AGE          2               /* rubbish */
 
 #ifdef KERNEL

-extern struct buf *buf;                /* the buffer pool itself */
-extern char *buffers;
-extern int nbuf;
-extern struct buf *swbuf;              /* swap I/O headers */
-extern int nswbuf;
-extern short *swsize;
-extern int *swpf;
-extern struct buf bfreelist[BQUEUES];  /* heads of available lists */
-extern struct buf bswlist;             /* head of free swap header list */
-extern struct buf *bclnlist;           /* head of cleaned page list */
+struct buf *buf;               /* the buffer pool itself */
+char   *buffers;
+int    nbuf;
+struct buf *swbuf;             /* swap I/O headers */
+int    nswbuf;
+short  *swsize;
+int    *swpf;
+struct buf bfreelist[BQUEUES]; /* heads of available lists */
+struct buf bswlist;            /* head of free swap header list */
+struct buf *bclnlist;          /* head of cleaned page list */

 
 struct buf *alloc();
 struct buf *baddr();
 
 struct buf *alloc();
 struct buf *baddr();

diff --git a/usr/src/sys/sys/callout.h b/usr/src/sys/sys/callout.h
index 8ac103b..cd3ea61 100644 (file)
--- a/usr/src/sys/sys/callout.h
+++ b/usr/src/sys/sys/callout.h
@@ -1,4 +1,4 @@
-/*     callout.h       4.4     81/02/27        */
+/*     callout.h       4.5     81/03/09        */

 
 /*
  * The callout structure is for
 
 /*
  * The callout structure is for


@@ -17,6 +17,6 @@ struct        callout
        int     (*c_func)();    /* routine */
 };
 #ifdef KERNEL
        int     (*c_func)();    /* routine */
 };
 #ifdef KERNEL

-extern struct callout *callout;
-extern int ncallout;
+struct callout *callout;
+int    ncallout;

 #endif
 #endif

diff --git a/usr/src/sys/sys/clist.h b/usr/src/sys/sys/clist.h
index e87d6b3..21d98bd 100644 (file)
--- a/usr/src/sys/sys/clist.h
+++ b/usr/src/sys/sys/clist.h
@@ -1,4 +1,4 @@
-/*     clist.h 4.3     81/02/27        */
+/*     clist.h 4.4     81/03/09        */

 
 /*
  * Raw structures for the character list routines.
 
 /*
  * Raw structures for the character list routines.


@@ -8,8 +8,8 @@ struct cblock {
        char    c_info[CBSIZE];
 };
 #ifdef KERNEL
        char    c_info[CBSIZE];
 };
 #ifdef KERNEL

-extern struct  cblock *cfree;
-extern int nclist;
+struct cblock *cfree;
+int    nclist;

 struct cblock *cfreelist;
 int    cfreecount;
 #endif
 struct cblock *cfreelist;
 int    cfreecount;
 #endif

diff --git a/usr/src/sys/sys/conf.h b/usr/src/sys/sys/conf.h
index 7d98eff..ba19cfe 100644 (file)
--- a/usr/src/sys/sys/conf.h
+++ b/usr/src/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*     conf.h  4.5     81/02/19        */
+/*     conf.h  4.6     81/03/09        */

 
 /*
  * Declaration of block device
 
 /*
  * Declaration of block device


@@ -9,19 +9,22 @@
  * device switches is in the
  * file conf.c.
  */
  * device switches is in the
  * file conf.c.
  */

-extern struct bdevsw
+struct bdevsw

 {
        int     (*d_open)();
        int     (*d_close)();
        int     (*d_strategy)();
        int     (*d_dump)();
        int     d_flags;
 {
        int     (*d_open)();
        int     (*d_close)();
        int     (*d_strategy)();
        int     (*d_dump)();
        int     d_flags;

-} bdevsw[];
+};
+#ifdef KERNEL
+struct bdevsw bdevsw[];
+#endif

 
 /*
  * Character device switch.
  */
 
 /*
  * Character device switch.
  */

-extern struct cdevsw
+struct cdevsw

 {
        int     (*d_open)();
        int     (*d_close)();
 {
        int     (*d_open)();
        int     (*d_close)();


@@ -31,12 +34,15 @@ extern struct cdevsw
        int     (*d_stop)();
        int     (*d_reset)();
        struct tty *d_ttys;
        int     (*d_stop)();
        int     (*d_reset)();
        struct tty *d_ttys;

-} cdevsw[];
+};
+#ifdef KERNEL
+struct cdevsw cdevsw[];
+#endif

 
 /*
  * tty line control switch.
  */
 
 /*
  * tty line control switch.
  */

-extern struct linesw
+struct linesw

 {
        int     (*l_open)();
        int     (*l_close)();
 {
        int     (*l_open)();
        int     (*l_close)();


@@ -48,17 +54,19 @@ extern struct linesw
        int     (*l_meta)();
        int     (*l_start)();
        int     (*l_modem)();
        int     (*l_meta)();
        int     (*l_start)();
        int     (*l_modem)();

-} linesw[];
+};
+#ifdef KERNEL
+struct linesw linesw[];
+#endif

 
 /*
  * Swap device information
  */
 
 /*
  * Swap device information
  */

-extern struct swdevt
+struct swdevt

 {
        dev_t   sw_dev;
        int     sw_freed;
 } swdevt[];
 {
        dev_t   sw_dev;
        int     sw_freed;
 } swdevt[];

-
-#ifdef CHAOS
-extern int cdevpath;
+#ifdef KERNEL
+struct swdevt swdevt[];

 #endif
 #endif

diff --git a/usr/src/sys/sys/file.h b/usr/src/sys/sys/file.h
index d63c40c..9546c6b 100644 (file)
--- a/usr/src/sys/sys/file.h
+++ b/usr/src/sys/sys/file.h
@@ -1,4 +1,4 @@
-/*     file.h  4.4     81/02/27        */
+/*     file.h  4.5     81/03/09        */

 
 /*
  * One file structure is allocated
 
 /*
  * One file structure is allocated


@@ -19,8 +19,8 @@ struct        file
 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-extern struct file *file, *fileNFILE;  /* the file table itself */
-extern int nfile;
+struct file *file, *fileNFILE; /* the file table itself */
+int    nfile;

 
 struct file *getf();
 struct file *falloc();
 
 struct file *getf();
 struct file *falloc();

diff --git a/usr/src/sys/sys/proc.h b/usr/src/sys/sys/proc.h
index 5a7e1a0..51cccc9 100644 (file)
--- a/usr/src/sys/sys/proc.h
+++ b/usr/src/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*     proc.h  4.5     81/02/27        */
+/*     proc.h  4.6     81/03/09        */

 
 /*
  * One structure allocated per active
 
 /*
  * One structure allocated per active


@@ -60,8 +60,8 @@ struct        proc *pfind();
 #endif
 
 #ifdef KERNEL
 #endif
 
 #ifdef KERNEL

-extern struct proc *proc, *procNPROC;  /* the proc table itself */
-extern int nproc;
+struct proc *proc, *procNPROC; /* the proc table itself */
+int    nproc;

 
 #define        NQS     32              /* 32 run queues */
 struct prochd {
 
 #define        NQS     32              /* 32 run queues */
 struct prochd {

diff --git a/usr/src/sys/sys/systm.h b/usr/src/sys/sys/systm.h
index 87b0fc9..a5e73f7 100644 (file)
--- a/usr/src/sys/sys/systm.h
+++ b/usr/src/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*     systm.h 4.13    81/02/28        */
+/*     systm.h 4.14    81/03/09        */

 
 /*
  * Random set of variables
 
 /*
  * Random set of variables


@@ -57,9 +57,6 @@ dev_t pipedev;                /* pipe device */
 extern int icode[];            /* user init code */
 extern int szicode;            /* its size */
 
 extern int icode[];            /* user init code */
 extern int szicode;            /* its size */
 

-extern int printsw;            /* debug print switch */
-extern int coresw;             /* switch to force action on core dumps */
-

 dev_t  getmdev();
 daddr_t        bmap();
 caddr_t        calloc();
 dev_t  getmdev();
 daddr_t        bmap();
 caddr_t        calloc();

diff --git a/usr/src/sys/ufs/ffs/dinode.h b/usr/src/sys/ufs/ffs/dinode.h
index aab0314..db0341f 100644 (file)
--- a/usr/src/sys/ufs/ffs/dinode.h
+++ b/usr/src/sys/ufs/ffs/dinode.h
@@ -1,4 +1,4 @@
-/*     dinode.h        4.4     81/02/27        */
+/*     dinode.h        4.5     81/03/09        */

 
 /*
  * The I node is the focus of all
 
 /*
  * The I node is the focus of all


@@ -56,8 +56,8 @@ struct        inode
 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-extern struct inode *inode, *inodeNINODE;/* The inode table itself */
-extern int ninode;
+struct inode *inode, *inodeNINODE;
+int    ninode;

 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */
 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */

diff --git a/usr/src/sys/ufs/ffs/inode.h b/usr/src/sys/ufs/ffs/inode.h
index 84e6b2e..fd2163f 100644 (file)
--- a/usr/src/sys/ufs/ffs/inode.h
+++ b/usr/src/sys/ufs/ffs/inode.h
@@ -1,4 +1,4 @@
-/*     inode.h 4.4     81/02/27        */
+/*     inode.h 4.5     81/03/09        */

 
 /*
  * The I node is the focus of all
 
 /*
  * The I node is the focus of all


@@ -56,8 +56,8 @@ struct        inode
 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-extern struct inode *inode, *inodeNINODE;/* The inode table itself */
-extern int ninode;
+struct inode *inode, *inodeNINODE;
+int    ninode;

 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */
 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */

diff --git a/usr/src/sys/ufs/ufs/dinode.h b/usr/src/sys/ufs/ufs/dinode.h
index aab0314..db0341f 100644 (file)
--- a/usr/src/sys/ufs/ufs/dinode.h
+++ b/usr/src/sys/ufs/ufs/dinode.h
@@ -1,4 +1,4 @@
-/*     dinode.h        4.4     81/02/27        */
+/*     dinode.h        4.5     81/03/09        */

 
 /*
  * The I node is the focus of all
 
 /*
  * The I node is the focus of all


@@ -56,8 +56,8 @@ struct        inode
 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-extern struct inode *inode, *inodeNINODE;/* The inode table itself */
-extern int ninode;
+struct inode *inode, *inodeNINODE;
+int    ninode;

 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */
 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */

diff --git a/usr/src/sys/ufs/ufs/inode.h b/usr/src/sys/ufs/ufs/inode.h
index 84e6b2e..fd2163f 100644 (file)
--- a/usr/src/sys/ufs/ufs/inode.h
+++ b/usr/src/sys/ufs/ufs/inode.h
@@ -1,4 +1,4 @@
-/*     inode.h 4.4     81/02/27        */
+/*     inode.h 4.5     81/03/09        */

 
 /*
  * The I node is the focus of all
 
 /*
  * The I node is the focus of all


@@ -56,8 +56,8 @@ struct        inode
 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-extern struct inode *inode, *inodeNINODE;/* The inode table itself */
-extern int ninode;
+struct inode *inode, *inodeNINODE;
+int    ninode;

 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */
 
 struct inode *rootdir;         /* pointer to inode of root directory */
 struct inode *mpxip;           /* mpx virtual inode */

diff --git a/usr/src/sys/vax/include/pte.h b/usr/src/sys/vax/include/pte.h
index 0a1ce20..05d1254 100644 (file)
--- a/usr/src/sys/vax/include/pte.h
+++ b/usr/src/sys/vax/include/pte.h
@@ -1,4 +1,4 @@
-/*     pte.h   4.7     81/02/27        */
+/*     pte.h   4.8     81/03/09        */

 
 /*
  * VAX page table entry
 
 /*
  * VAX page table entry


@@ -77,8 +77,6 @@ extern        struct pte Xswap2map[];
 extern struct pte Pushmap[];
 extern struct pte Vfmap[];
 extern struct pte mmap[];
 extern struct pte Pushmap[];
 extern struct pte Vfmap[];
 extern struct pte mmap[];

-extern struct pte mcrmap[];
-extern struct pte bufmap[];

 extern struct pte msgbufmap[];
 extern struct pte camap[];
 extern struct pte Nexmap[][16];
 extern struct pte msgbufmap[];
 extern struct pte camap[];
 extern struct pte Nexmap[][16];

diff --git a/usr/src/sys/vax/mba/hp.c b/usr/src/sys/vax/mba/hp.c
index 722ab09..29166b4 100644 (file)
--- a/usr/src/sys/vax/mba/hp.c
+++ b/usr/src/sys/vax/mba/hp.c
@@ -1,4 +1,4 @@
-/*     hp.c    4.25    81/03/08        */
+/*     hp.c    4.26    81/03/09        */

 
 #include "hp.h"
 #if NHP > 0
 
 #include "hp.h"
 #if NHP > 0


@@ -172,7 +172,7 @@ hpustart(mi)
        register struct buf *bp = mi->mi_tab.b_actf;
        register struct hpst *st;
        daddr_t bn;
        register struct buf *bp = mi->mi_tab.b_actf;
        register struct hpst *st;
        daddr_t bn;

-       int sn, dist, flags;
+       int sn, dist;

 
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);
 
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);


@@ -225,33 +225,31 @@ hpstart(mi)
        hpaddr->hpda = (tn << 8) + sn;
 }
 
        hpaddr->hpda = (tn << 8) + sn;
 }
 

-hpdtint(mi, mbasr)
+hpdtint(mi, mbsr)

        register struct mba_device *mi;
        register struct mba_device *mi;

-       int mbasr;
+       int mbsr;

 {
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
        int retry = 0;
 
 {
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
        int retry = 0;
 

-       if (hpaddr->hpds&HPDS_ERR || mbasr&MBAEBITS) {
+       if (hpaddr->hpds&HPDS_ERR || mbsr&MBSR_EBITS) {

                if (hpaddr->hper1&HPER1_WLE) {
                        printf("hp%d: write locked\n", dkunit(bp));
                        bp->b_flags |= B_ERROR;
                } else if (++mi->mi_tab.b_errcnt > 27 ||
                if (hpaddr->hper1&HPER1_WLE) {
                        printf("hp%d: write locked\n", dkunit(bp));
                        bp->b_flags |= B_ERROR;
                } else if (++mi->mi_tab.b_errcnt > 27 ||

-                   mbasr & MBASR_HARD ||
+                   mbsr & MBSR_HARD ||

                    hpaddr->hper1 & HPER1_HARD ||
                    hpaddr->hper2 & HPER2_HARD) {
                        harderr(bp, "hp");
                    hpaddr->hper1 & HPER1_HARD ||
                    hpaddr->hper2 & HPER2_HARD) {
                        harderr(bp, "hp");

-                       printf("mbasr=%b er1=%b er2=%b\n",
-                           mbasr, mbasr_bits,
+                       printf("mbsr=%b er1=%b er2=%b\n",
+                           mbsr, mbsr_bits,

                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                        bp->b_flags |= B_ERROR;
                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                        bp->b_flags |= B_ERROR;

-#ifdef notdef

                } else if (hpaddr->hper2&HPER2_SSE) {
                        hpecc(mi, 1);
                        return (MBD_RESTARTED);
                } else if (hpaddr->hper2&HPER2_SSE) {
                        hpecc(mi, 1);
                        return (MBD_RESTARTED);

-#endif

                } else if ((hpaddr->hper1&(HPER1_DCK|HPER1_ECH))==HPER1_DCK) {
                        if (hpecc(mi, 0))
                                return (MBD_RESTARTED);
                } else if ((hpaddr->hper1&(HPER1_DCK|HPER1_ECH))==HPER1_DCK) {
                        if (hpecc(mi, 0))
                                return (MBD_RESTARTED);


@@ -324,6 +322,7 @@ hpwrite(dev)
                physio(hpstrategy, &rhpbuf[unit], dev, B_WRITE, minphys);
 }
 
                physio(hpstrategy, &rhpbuf[unit], dev, B_WRITE, minphys);
 }
 

+/*ARGSUSED*/

 hpecc(mi, rm80sse)
        register struct mba_device *mi;
        int rm80sse;
 hpecc(mi, rm80sse)
        register struct mba_device *mi;
        int rm80sse;


@@ -344,13 +343,11 @@ hpecc(mi, rm80sse)
                bcr |= 0xffff0000;              /* sxt */
        npf = btop(bcr + bp->b_bcount) - 1;
        reg = npf;
                bcr |= 0xffff0000;              /* sxt */
        npf = btop(bcr + bp->b_bcount) - 1;
        reg = npf;

-#ifdef notdef

        if (rm80sse) {
                rp->hpof |= HPOF_SSEI;
        if (rm80sse) {
                rp->hpof |= HPOF_SSEI;

-               reg--;          /* compensate in advance for reg-- below */
+               reg--;          /* compensate in advance for reg+1 below */

                goto sse;
        }
                goto sse;
        }

-#endif

        o = (int)bp->b_un.b_addr & PGOFSET;
        printf("hp%d%c: soft ecc sn%d\n", dkunit(bp),
            'a'+(minor(bp->b_dev)&07), bp->b_blkno + npf);
        o = (int)bp->b_un.b_addr & PGOFSET;
        printf("hp%d%c: soft ecc sn%d\n", dkunit(bp),
            'a'+(minor(bp->b_dev)&07), bp->b_blkno + npf);


@@ -421,7 +418,7 @@ hpdump(dev)
        if (mi == 0 || mi->mi_alive == 0)
                return (ENXIO);
        mba = phys(mi->mi_hd, struct mba_hd *)->mh_physmba;
        if (mi == 0 || mi->mi_alive == 0)
                return (ENXIO);
        mba = phys(mi->mi_hd, struct mba_hd *)->mh_physmba;

-       mba->mba_cr = MBAINIT;
+       mba->mba_cr = MBCR_INIT;

        hpaddr = (struct hpdevice *)&mba->mba_drv[mi->mi_drive];
        if ((hpaddr->hpds & HPDS_VV) == 0) {
                hpaddr->hpcs1 = HP_DCLR|HP_GO;
        hpaddr = (struct hpdevice *)&mba->mba_drv[mi->mi_drive];
        if ((hpaddr->hpds & HPDS_VV) == 0) {
                hpaddr->hpcs1 = HP_DCLR|HP_GO;

diff --git a/usr/src/sys/vax/mba/hpreg.h b/usr/src/sys/vax/mba/hpreg.h
index d9e193b..e91038c 100644 (file)
--- a/usr/src/sys/vax/mba/hpreg.h
+++ b/usr/src/sys/vax/mba/hpreg.h
@@ -1,4 +1,4 @@
-/*     hpreg.h 4.4     81/02/25        */
+/*     hpreg.h 4.5     81/03/09        */

 
 struct hpdevice
 {
 
 struct hpdevice
 {


@@ -52,72 +52,74 @@ struct hpdevice
 #define        HP_RTRACKD      074             /* read track descriptor */
        
 /* hpds */
 #define        HP_RTRACKD      074             /* read track descriptor */
        
 /* hpds */

-#define        HP_ATA          0100000         /* attention active */
-#define        HP_ERR          0040000         /* composite drive error */
-#define        HP_PIP          0020000         /* positioning in progress */
-#define        HP_MOL          0010000         /* medium on line */
-#define        HP_WRL          0004000         /* write locked */
-#define        HP_LST          0002000         /* last sector transferred */
-#define        HP_PGM          0001000         /* programmable */
-#define        HP_DPR          0000400         /* drive present */
-#define        HP_DRY          0000200         /* drive ready */
-#define        HP_VV           0000100         /* volume valid */
+#define        HPDS_ATA        0100000         /* attention active */
+#define        HPDS_ERR        0040000         /* composite drive error */
+#define        HPDS_PIP        0020000         /* positioning in progress */
+#define        HPDS_MOL        0010000         /* medium on line */
+#define        HPDS_WRL        0004000         /* write locked */
+#define        HPDS_LST        0002000         /* last sector transferred */
+#define        HPDS_PGM        0001000         /* programmable */
+#define        HPDS_DPR        0000400         /* drive present */
+#define        HPDS_DRY        0000200         /* drive ready */
+#define        HPDS_VV         0000100         /* volume valid */

 /* bits 1-5 are spare */
 /* bits 1-5 are spare */

-#define        HP_OM           0000001         /* offset mode */
+#define        HPDS_OM         0000001         /* offset mode */

 
 

-#define        HP_DREADY       (HP_DPR|HP_DRY|HP_MOL|HP_VV)
+#define        HPDS_DREADY     (HPDS_DPR|HPDS_DRY|HPDS_MOL|HPDS_VV)

 #define        HPDS_BITS \
 "\10\20ATA\17ERR\16PIP\15MOL\14WRL\13LST\12PGM\11DPR\10DRY\7VV\1OM"
 
 /* hper1 */
 #define        HPDS_BITS \
 "\10\20ATA\17ERR\16PIP\15MOL\14WRL\13LST\12PGM\11DPR\10DRY\7VV\1OM"
 
 /* hper1 */

-#define        HP_DCK          0100000         /* data check */
-#define        HP_UNS          0040000         /* drive unsafe */
-#define        HP_OPI          0020000         /* operation incomplete */
-#define        HP_DTE          0010000         /* drive timing error */
-#define        HP_WLE          0004000         /* write lock error */
-#define        HP_IAE          0002000         /* invalid address error */
-#define        HP_AOE          0001000         /* address overflow error */
-#define        HP_HCRC         0000400         /* header crc error */
-#define        HP_HCE          0000200         /* header compare error */
-#define        HP_ECH          0000100         /* ecc hard error */
-#define HP_WCF         0000040         /* write clock fail */
-#define        HP_FER          0000020         /* format error */
-#define        HP_PAR          0000010         /* parity error */
-#define        HP_RMR          0000004         /* register modification refused */
-#define        HP_ILR          0000002         /* illegal register */
-#define        HP_ILF          0000001         /* illegal function */
+#define        HPER1_DCK       0100000         /* data check */
+#define        HPER1_UNS       0040000         /* drive unsafe */
+#define        HPER1_OPI       0020000         /* operation incomplete */
+#define        HPER1_DTE       0010000         /* drive timing error */
+#define        HPER1_WLE       0004000         /* write lock error */
+#define        HPER1_IAE       0002000         /* invalid address error */
+#define        HPER1_AOE       0001000         /* address overflow error */
+#define        HPER1_HCRC      0000400         /* header crc error */
+#define        HPER1_HCE       0000200         /* header compare error */
+#define        HPER1_ECH       0000100         /* ecc hard error */
+#define HPER1_WCF      0000040         /* write clock fail */
+#define        HPER1_FER       0000020         /* format error */
+#define        HPER1_PAR       0000010         /* parity error */
+#define        HPER1_RMR       0000004         /* register modification refused */
+#define        HPER1_ILR       0000002         /* illegal register */
+#define        HPER1_ILF       0000001         /* illegal function */

 
 #define        HPER1_BITS \
 "\10\20DCK\17UNS\16OPI\15DTE\14WLE\13IAE\12AOE\11HCRC\10HCE\
 \7ECH\6WCF\5FER\4PAR\3RMR\2ILR\1ILF"
 
 #define        HPER1_BITS \
 "\10\20DCK\17UNS\16OPI\15DTE\14WLE\13IAE\12AOE\11HCRC\10HCE\
 \7ECH\6WCF\5FER\4PAR\3RMR\2ILR\1ILF"

-/* THIS NEEDS TO BE DOUBLE CHECKED... */
-#define        HPER1_HARD    (HP_UNS|HP_WLE|HP_IAE|HP_AOE|HP_FER|HP_RMR|HP_ILR|HP_ILF)
+#define        HPER1_HARD    \
+       (HPER1_UNS|HPER1_WLE|HPER1_IAE|HPER1_AOE|\
+        HPER1_FER|HPER1_RMR|HPER1_ILR|HPER1_ILF)

 
 /* hper2 */
 
 /* hper2 */

-#define        HP_BSE          0100000         /* bad sector error */
-#define        HP_SKI          0040000         /* seek incomplete */
-#define        HP_OPE          0020000         /* operator plug error */
-#define        HP_IVC          0010000         /* invalid command */
-#define        HP_LSC          0004000         /* loss of system clock */
-#define        HP_LBC          0002000         /* loss of bit check */
-#define        HP_DVC          0000200         /* device check */
-#define        HP_DPE          0000010         /* data parity error */
+#define        HPER2_BSE       0100000         /* bad sector error */
+#define        HPER2_SKI       0040000         /* seek incomplete */
+#define        HPER2_OPE       0020000         /* operator plug error */
+#define        HPER2_IVC       0010000         /* invalid command */
+#define        HPER2_LSC       0004000         /* loss of system clock */
+#define        HPER2_LBC       0002000         /* loss of bit check */
+#define        HPER2_DVC       0000200         /* device check */
+#define        HPER2_SSE       0000020         /* skip sector error (rm80) */
+#define        HPER2_DPE       0000010         /* data parity error */

 
 #define        HPER2_BITS \
 
 #define        HPER2_BITS \

-"\10\20BSE\17SKI\16OPE\15IVC\14LSC\13LBC\10DVC\4DPE"
-#define        HPER2_HARD    (HP_BSE|HP_OPE)
+"\10\20BSE\17SKI\16OPE\15IVC\14LSC\13LBC\10DVC\5SSE\4DPE"
+#define        HPER2_HARD    (HPER2_BSE|HPER2_OPE)

 
 /* hpof */
 
 /* hpof */

-#define        HP_CMO          0100000         /* command modifier */
-#define        HP_MTD          0040000         /* move track descriptor */
-#define        HP_FMT22        0010000         /* 16 bit format */
-#define        HP_ECI          0004000         /* ecc inhibit */
-#define        HP_HCI          0002000         /* header compare inhibit */
-#define        HP_SSEI         0001000         /* skip sector inhibit */
+#define        HPOF_CMO        0100000         /* command modifier */
+#define        HPOF_MTD        0040000         /* move track descriptor */
+#define        HPOF_FMT22      0010000         /* 16 bit format */
+#define        HPOF_ECI        0004000         /* ecc inhibit */
+#define        HPOF_HCI        0002000         /* header compare inhibit */
+#define        HPOF_SSEI       0001000         /* skip sector inhibit */

 
 

-#define        HP_P400         020             /*  +400 uinches */
-#define        HP_M400         0220            /*  -400 uinches */
-#define        HP_P800         040             /*  +800 uinches */
-#define        HP_M800         0240            /*  -800 uinches */
-#define        HP_P1200        060             /* +1200 uinches */
-#define        HP_M1200        0260            /* -1200 uinches */
+#define        HPOF_P400       020             /*  +400 uinches */
+#define        HPOF_M400       0220            /*  -400 uinches */
+#define        HPOF_P800       040             /*  +800 uinches */
+#define        HPOF_M800       0240            /*  -800 uinches */
+#define        HPOF_P1200      060             /* +1200 uinches */
+#define        HPOF_M1200      0260            /* -1200 uinches */

diff --git a/usr/src/sys/vax/mba/ht.c b/usr/src/sys/vax/mba/ht.c
index bb34f84..63b307e 100644 (file)
--- a/usr/src/sys/vax/mba/ht.c
+++ b/usr/src/sys/vax/mba/ht.c
@@ -1,4 +1,4 @@
-/*     ht.c    4.9     81/03/08        */
+/*     ht.c    4.10    81/03/09        */

 
 #include "tu.h"
 #if NHT > 0
 
 #include "tu.h"
 #if NHT > 0


@@ -39,7 +39,7 @@ struct        buf     chtbuf[NHT];
 short  httypes[] =
        { MBDT_TE16, MBDT_TU45, MBDT_TU77, 0 };
 struct mba_device *htinfo[NHT];
 short  httypes[] =
        { MBDT_TE16, MBDT_TU45, MBDT_TU77, 0 };
 struct mba_device *htinfo[NHT];

-int    htdkinit(), htattach(), htslave(), htustart(), htndtint(), htdtint();
+int    htattach(), htslave(), htustart(), htndtint(), htdtint();

 struct mba_driver htdriver =
     { htattach, htslave, htustart, 0, htdtint, htndtint,
       httypes, "ht", "tu", htinfo };
 struct mba_driver htdriver =
     { htattach, htslave, htustart, 0, htdtint, htndtint,
       httypes, "ht", "tu", htinfo };


@@ -522,6 +522,7 @@ htdump()
        htaddr->htcs1 = HT_REW|HT_GO;
        hteof(htaddr);
        hteof(htaddr);
        htaddr->htcs1 = HT_REW|HT_GO;
        hteof(htaddr);
        hteof(htaddr);

+       return (0);

 }
 
 htdwrite(dbuf, num, htaddr, mp)
 }
 
 htdwrite(dbuf, num, htaddr, mp)

diff --git a/usr/src/sys/vax/mba/mbareg.h b/usr/src/sys/vax/mba/mbareg.h
index 92cf1b4..6a3fe48 100644 (file)
--- a/usr/src/sys/vax/mba/mbareg.h
+++ b/usr/src/sys/vax/mba/mbareg.h
@@ -1,4 +1,4 @@
-/*     mbareg.h        4.13    81/03/08        */
+/*     mbareg.h        4.14    81/03/09        */

 
 /*
  * VAX MASSBUS adapter registers
 
 /*
  * VAX MASSBUS adapter registers


@@ -36,61 +36,65 @@ struct mba_regs
 /*
  * Bits in mba_cr
  */
 /*
  * Bits in mba_cr
  */

-#define        MBAINIT         0x1             /* init mba */
-#define        MBAIE           0x4             /* enable mba interrupts */
+#define        MBCR_INIT       0x1             /* init mba */
+#define        MBCR_IE         0x4             /* enable mba interrupts */

 
 /*
  * Bits in mba_sr
  */
 
 /*
  * Bits in mba_sr
  */

-#define        MBS_DTBUSY      0x80000000      /* data transfer busy */
-#define        MBS_NRCONF      0x40000000      /* no response confirmation */
-#define        MBS_CRD         0x20000000      /* corrected read data */
-#define        MBS_CBHUNG      0x00800000      /* control bus hung */
-#define        MBS_PGE         0x00080000      /* programming error */
-#define        MBS_NED         0x00040000      /* non-existant drive */
-#define        MBS_MCPE        0x00020000      /* massbus control parity error */
-#define        MBS_ATTN        0x00010000      /* attention from massbus */
-#define        MBS_SPE         0x00004000      /* silo parity error */
-#define        MBS_DTCMP       0x00002000      /* data transfer completed */
-#define        MBS_DTABT       0x00001000      /* data transfer aborted */
-#define        MBS_DLT         0x00000800      /* data late */
-#define        MBS_WCKUP       0x00000400      /* write check upper */
-#define        MBS_WCKLWR      0x00000200      /* write check lower */
-#define        MBS_MXF         0x00000100      /* miss transfer error */
-#define        MBS_MBEXC       0x00000080      /* massbus exception */
-#define        MBS_MDPE        0x00000040      /* massbus data parity error */
-#define        MBS_MAPPE       0x00000020      /* page frame map parity error */
-#define        MBS_INVMAP      0x00000010      /* invalid map */
-#define        MBS_ERRCONF     0x00000008      /* error confirmation */
-#define        MBS_RDS         0x00000004      /* read data substitute */
-#define        MBS_ISTIMO      0x00000002      /* interface sequence timeout */
-#define        MBS_RDTIMO      0x00000001      /* read data timeout */
+#define        MBSR_DTBUSY     0x80000000      /* data transfer busy */
+#define        MBSR_NRCONF     0x40000000      /* no response confirmation */
+#define        MBSR_CRD        0x20000000      /* corrected read data */
+#define        MBSR_CBHUNG     0x00800000      /* control bus hung */
+#define        MBSR_PGE        0x00080000      /* programming error */
+#define        MBSR_NED        0x00040000      /* non-existant drive */
+#define        MBSR_MCPE       0x00020000      /* massbus control parity error */
+#define        MBSR_ATTN       0x00010000      /* attention from massbus */
+#define        MBSR_SPE        0x00004000      /* silo parity error */
+#define        MBSR_DTCMP      0x00002000      /* data transfer completed */
+#define        MBSR_DTABT      0x00001000      /* data transfer aborted */
+#define        MBSR_DLT        0x00000800      /* data late */
+#define        MBSR_WCKUP      0x00000400      /* write check upper */
+#define        MBSR_WCKLWR     0x00000200      /* write check lower */
+#define        MBSR_MXF        0x00000100      /* miss transfer error */
+#define        MBSR_MBEXC      0x00000080      /* massbus exception */
+#define        MBSR_MDPE       0x00000040      /* massbus data parity error */
+#define        MBSR_MAPPE      0x00000020      /* page frame map parity error */
+#define        MBSR_INVMAP     0x00000010      /* invalid map */
+#define        MBSR_ERRCONF    0x00000008      /* error confirmation */
+#define        MBSR_RDS        0x00000004      /* read data substitute */
+#define        MBSR_ISTIMO     0x00000002      /* interface sequence timeout */
+#define        MBSR_RDTIMO     0x00000001      /* read data timeout */

 
 

-#define MBASR_BITS \
+#define MBSR_BITS \

 "\20\40DTBUSY\37NRCONF\36CRD\30CBHUNG\24PGE\23NED\22MCPE\21ATTN\
 \17SPE\16DTCMP\15DTABT\14DLT\13WCKUP\12WCKLWR\11MXF\10MBEXC\7MDPE\
 \6MAPPE\5INVMAP\4ERRCONF\3RDS\2ISTIMO\1RDTIMO"
 
 "\20\40DTBUSY\37NRCONF\36CRD\30CBHUNG\24PGE\23NED\22MCPE\21ATTN\
 \17SPE\16DTCMP\15DTABT\14DLT\13WCKUP\12WCKLWR\11MXF\10MBEXC\7MDPE\
 \6MAPPE\5INVMAP\4ERRCONF\3RDS\2ISTIMO\1RDTIMO"
 

-#define        MBASR_HARD      (MBS_PGE|MBS_ERRCONF|MBS_ISTIMO|MBS_RDTIMO)
+#define        MBSR_HARD       (MBSR_PGE|MBSR_ERRCONF|MBSR_ISTIMO|MBSR_RDTIMO)

 
 

-#define MBAEBITS       (~(MBS_DTBUSY|MBS_CRD|MBS_ATTN|MBS_DTCMP))
+#define MBSR_EBITS     (~(MBSR_DTBUSY|MBSR_CRD|MBSR_ATTN|MBSR_DTCMP))

 
 

-extern char    mbasr_bits[];
+#ifdef KERNEL
+extern char    mbsr_bits[];
+#endif

 
 /*
  * Commands for mbd_cs1
  */
 
 /*
  * Commands for mbd_cs1
  */

-#define        MBD_WCOM        0x30
-#define        MBD_RCOM        0x38
-#define        MBD_GO          0x1
+#define        MB_WCOM         0x30
+#define        MB_RCOM         0x38
+#define        MB_GO           0x1

 
 /*
  * Bits in mbd_ds.
  */
 
 /*
  * Bits in mbd_ds.
  */

-#define        MBD_DRY         0x80            /* drive ready */
-#define        MBD_MOL         0x1000          /* medium on line */
-#define        MBD_DPR         0x100           /* drive present */
-#define        MBD_ERR         0x4000          /* error in drive */
+#define        MBDS_ERR        0x00004000      /* error in drive */
+#define        MBDS_MOL        0x00001000      /* medium on line */
+#define        MBDS_DPR        0x00000100      /* drive present */
+#define        MBDS_DRY        0x00000080      /* drive ready */
+
+#define        MBDS_DREADY     (MBDS_MOL|MBDS_DPR|MBDS_DRY)

 
 /*
  * Bits in mbd_dt
 
 /*
  * Bits in mbd_dt

diff --git a/usr/src/sys/vax/mba/mbavar.h b/usr/src/sys/vax/mba/mbavar.h
index b4733f1..308b0a1 100644 (file)
--- a/usr/src/sys/vax/mba/mbavar.h
+++ b/usr/src/sys/vax/mba/mbavar.h
@@ -1,4 +1,4 @@
-/*     mbavar.h        4.13    81/03/08        */
+/*     mbavar.h        4.14    81/03/09        */

 
 /*
  * This file contains definitions related to the kernel structures
 
 /*
  * This file contains definitions related to the kernel structures


@@ -115,7 +115,6 @@ struct mba_driver {
 #define        MBN_DONE        0               /* non-data transfer complete */
 #define        MBN_RETRY       1               /* failed; retry the operation */
 #define        MBN_SKIP        2               /* don't do anything */
 #define        MBN_DONE        0               /* non-data transfer complete */
 #define        MBN_RETRY       1               /* failed; retry the operation */
 #define        MBN_SKIP        2               /* don't do anything */

-#define        MBN_CONT        3               /* operation continues */

 
 /*
  * Clear attention status for specified device.
 
 /*
  * Clear attention status for specified device.

diff --git a/usr/src/sys/vax/uba/ct.c b/usr/src/sys/vax/uba/ct.c
index 8b292eb..189a0e4 100644 (file)
--- a/usr/src/sys/vax/uba/ct.c
+++ b/usr/src/sys/vax/uba/ct.c
@@ -1,4 +1,4 @@
-/*     ct.c    4.1     81/02/23        */
+/*     ct.c    4.2     81/03/09        */

 
 #include "cat.h"
 #if NCT > 0
 
 #include "cat.h"
 #if NCT > 0


@@ -53,13 +53,13 @@ ctwrite(dev)
        extern lbolt;
 
        while ((c=cpass()) >= 0) {
        extern lbolt;
 
        while ((c=cpass()) >= 0) {

-               spl5();
+               (void) spl5();

                while (cat.oq.c_cc > CATHIWAT)
                        sleep((caddr_t)&cat.oq, PCAT);
                while (putc(c, &cat.oq) < 0)
                        sleep((caddr_t)&lbolt, PCAT);
                ctintr();
                while (cat.oq.c_cc > CATHIWAT)
                        sleep((caddr_t)&cat.oq, PCAT);
                while (putc(c, &cat.oq) < 0)
                        sleep((caddr_t)&lbolt, PCAT);
                ctintr();

-               spl0();
+               (void) spl0();

        }
 }
 
        }
 }
 

diff --git a/usr/src/sys/vax/uba/dh.c b/usr/src/sys/vax/uba/dh.c
index 468a67d..61e1f8f 100644 (file)
--- a/usr/src/sys/vax/uba/dh.c
+++ b/usr/src/sys/vax/uba/dh.c
@@ -1,8 +1,7 @@
-/*     dh.c    4.28    81/03/07        */
+/*     dh.c    4.29    81/03/09        */

 
 #include "dh.h"
 #if NDH > 0
 
 #include "dh.h"
 #if NDH > 0

-#define        DELAY(i)        { register int j = i; while (--j > 0); }

 /*
  * DH-11/DM-11 driver
  */
 /*
  * DH-11/DM-11 driver
  */


@@ -190,7 +189,7 @@ dmprobe(reg)
        register struct dmdevice *dmaddr = (struct dmdevice *)reg;
 
 #ifdef lint
        register struct dmdevice *dmaddr = (struct dmdevice *)reg;
 
 #ifdef lint

-       br = 0; cvec = br; br = cvec;
+       br = 0; vec = br; br = vec;

 #endif
        dmaddr->dmcsr = DM_DONE|DM_IE;
        DELAY(20);
 #endif
        dmaddr->dmcsr = DM_DONE|DM_IE;
        DELAY(20);


@@ -484,7 +483,7 @@ dhxint(dh)
                                 */
                                cntr = addr->dhcar -
                                    UBACVT(tp->t_outq.c_cf, ui->ui_ubanum);
                                 */
                                cntr = addr->dhcar -
                                    UBACVT(tp->t_outq.c_cf, ui->ui_ubanum);

-                               ndflush(&tp->t_outq, cntr);
+                               ndflush(&tp->t_outq, (int)cntr);

                        }
                        if (tp->t_line)
                                (*linesw[tp->t_line].l_start)(tp);
                        }
                        if (tp->t_line)
                                (*linesw[tp->t_line].l_start)(tp);


@@ -674,7 +673,7 @@ dmopen(dev)
                return;
        }
        addr = (struct dmdevice *)ui->ui_addr;
                return;
        }
        addr = (struct dmdevice *)ui->ui_addr;

-       spl5();
+       (void) spl5();

        addr->dmcsr &= ~DM_SE;
        while (addr->dmcsr & DM_BUSY)
                ;
        addr->dmcsr &= ~DM_SE;
        while (addr->dmcsr & DM_BUSY)
                ;


@@ -685,7 +684,7 @@ dmopen(dev)
        addr->dmcsr = DH_IE|DM_SE;
        while ((tp->t_state&CARR_ON)==0)
                sleep((caddr_t)&tp->t_rawq, TTIPRI);
        addr->dmcsr = DH_IE|DM_SE;
        while ((tp->t_state&CARR_ON)==0)
                sleep((caddr_t)&tp->t_rawq, TTIPRI);

-       spl0();
+       (void) spl0();

 }
 
 /*
 }
 
 /*

diff --git a/usr/src/sys/vax/uba/dz.c b/usr/src/sys/vax/uba/dz.c
index f035e16..703eeb5 100644 (file)
--- a/usr/src/sys/vax/uba/dz.c
+++ b/usr/src/sys/vax/uba/dz.c
@@ -1,8 +1,7 @@
-/*     dz.c    4.21    %G%     */
+/*     dz.c    4.22    %G%     */

 
 #include "dz.h"
 #if NDZ > 0
 
 #include "dz.h"
 #if NDZ > 0

-#define        DELAY(i)        { register int j = i; while (--j > 0); }

 /*
  *  DZ-11 Driver
  *
 /*
  *  DZ-11 Driver
  *


@@ -107,7 +106,7 @@ dzprobe(reg)
        register struct device *dzaddr = (struct device *)reg;
 
 #ifdef lint
        register struct device *dzaddr = (struct device *)reg;
 
 #ifdef lint

-       br = 0; br = cvec; cvec = br;
+       br = 0; cvec = br; br = cvec;

 #endif
        dzaddr->dzcsr = DZ_TIE|DZ_MSE;
        dzaddr->dztcr = 1;              /* enable any line */
 #endif
        dzaddr->dzcsr = DZ_TIE|DZ_MSE;
        dzaddr->dztcr = 1;              /* enable any line */

diff --git a/usr/src/sys/vax/uba/lp.c b/usr/src/sys/vax/uba/lp.c
index e35216e..47014cc 100644 (file)
--- a/usr/src/sys/vax/uba/lp.c
+++ b/usr/src/sys/vax/uba/lp.c
@@ -1,4 +1,4 @@
-/*     lp.c    4.11    81/03/07        */
+/*     lp.c    4.12    81/03/09        */

 
 #include "lp.h"
 #if NLP > 0
 
 #include "lp.h"
 #if NLP > 0


@@ -92,12 +92,12 @@ dev_t dev;
        sc->sc_state |= OPEN;
        sc->sc_inbuf = geteblk();
        sc->sc_flags = minor(dev) & 07;
        sc->sc_state |= OPEN;
        sc->sc_inbuf = geteblk();
        sc->sc_flags = minor(dev) & 07;

-       spl4();
+       (void) spl4();

        if ((sc->sc_state&TOUT) == 0) {
                sc->sc_state |= TOUT;
                timeout(lptout, dev, 10*hz);
        }
        if ((sc->sc_state&TOUT) == 0) {
                sc->sc_state |= TOUT;
                timeout(lptout, dev, 10*hz);
        }

-       spl0();
+       (void) spl0();

        lpcanon('\f');
 }
 
        lpcanon('\f');
 }
 


@@ -196,9 +196,9 @@ register dev_t dev;
 
        case '\r':
                logcol = 0;
 
        case '\r':
                logcol = 0;

-               spl4();
+               (void) spl4();

                lpintr(dev);
                lpintr(dev);

-               spl0();
+               (void) spl0();

                break;
 
        case '\b':
                break;
 
        case '\b':


@@ -234,13 +234,13 @@ dev_t dev;
 
        sc = &lp_softc[LPUNIT(dev)];
        if (sc->sc_outq.c_cc >= LPHWAT) {
 
        sc = &lp_softc[LPUNIT(dev)];
        if (sc->sc_outq.c_cc >= LPHWAT) {

-               spl4();
+               (void) spl4();

                lpintr(dev);                            /* unchoke */
                while (sc->sc_outq.c_cc >= LPHWAT) {
                        sc->sc_state |= ASLP;           /* must be ERROR */
                        sleep((caddr_t)sc, LPPRI);
                }
                lpintr(dev);                            /* unchoke */
                while (sc->sc_outq.c_cc >= LPHWAT) {
                        sc->sc_state |= ASLP;           /* must be ERROR */
                        sleep((caddr_t)sc, LPPRI);
                }

-               spl0();
+               (void) spl0();

        }
        while (putc(c, &sc->sc_outq))
                sleep((caddr_t)&lbolt, LPPRI);
        }
        while (putc(c, &sc->sc_outq))
                sleep((caddr_t)&lbolt, LPPRI);

diff --git a/usr/src/sys/vax/uba/rk.c b/usr/src/sys/vax/uba/rk.c
index 07cac8c..5f49fb3 100644 (file)
--- a/usr/src/sys/vax/uba/rk.c
+++ b/usr/src/sys/vax/uba/rk.c
@@ -1,9 +1,9 @@
-/*     rk.c    4.24    %G%     */
+/*     rk.c    4.25    %G%     */

 
 

-int    rkpip;
-int    rknosval;

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

+int    rkpip;          /* DEBUG */
+int    rknosval;       /* DEBUG */

 /*
  * RK11/RK07 disk driver
  *
 /*
  * RK11/RK07 disk driver
  *


@@ -14,7 +14,6 @@ int   rknosval;
  *     Add bad sector forwarding code
  *     Why do we lose an interrupt sometime when spinning drives down?
  */
  *     Add bad sector forwarding code
  *     Why do we lose an interrupt sometime when spinning drives down?
  */

-#define        DELAY(i)                { register int j; j = i; while (--j > 0); }

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


@@ -182,9 +181,6 @@ rkustart(ui)
        register struct buf *bp, *dp;
        register struct uba_ctlr *um;
        register struct rkdevice *rkaddr;
        register struct buf *bp, *dp;
        register struct uba_ctlr *um;
        register struct rkdevice *rkaddr;

-       register struct rkst *st;
-       daddr_t bn;
-       int sn, csn;

        int didie = 0;
 
        if (ui == 0)
        int didie = 0;
 
        if (ui == 0)


@@ -309,7 +305,7 @@ nosval:
        else
                cmd = RK_CDT|RK_IE|RK_WRITE|RK_GO;
        um->um_cmd = cmd;
        else
                cmd = RK_CDT|RK_IE|RK_WRITE|RK_GO;
        um->um_cmd = cmd;

-       ubago(ui);
+       (void) ubago(ui);

        return (1);
 }
 
        return (1);
 }
 

diff --git a/usr/src/sys/vax/uba/tm.c b/usr/src/sys/vax/uba/tm.c
index eead0b3..d9a62f1 100644 (file)
--- a/usr/src/sys/vax/uba/tm.c
+++ b/usr/src/sys/vax/uba/tm.c
@@ -1,8 +1,7 @@
-/*     tm.c    4.24    %G%     */
+/*     tm.c    4.25    %G%     */

 
 #include "te.h"
 #if NTM > 0
 
 #include "te.h"
 #if NTM > 0

-int    tmgapsdcnt;             /* DEBUG */

 /*
  * TM11/TE10 tape driver
  *
 /*
  * TM11/TE10 tape driver
  *


@@ -94,11 +93,14 @@ struct      te_softc {
        u_short sc_erreg;       /* copy of last erreg */
        u_short sc_dsreg;       /* copy of last dsreg */
        short   sc_resid;       /* copy of last bc */
        u_short sc_erreg;       /* copy of last erreg */
        u_short sc_dsreg;       /* copy of last dsreg */
        short   sc_resid;       /* copy of last bc */

-#ifdef notdef
+#ifdef unneeded

        short   sc_lastcmd;     /* last command to handle direction changes */
 #endif
        u_short sc_dens;        /* prototype command with density info */
 } te_softc[NTM];
        short   sc_lastcmd;     /* last command to handle direction changes */
 #endif
        u_short sc_dens;        /* prototype command with density info */
 } te_softc[NTM];

+#ifdef unneeded
+int    tmgapsdcnt;             /* DEBUG */
+#endif

 
 /*
  * States for um->um_tab.b_active, the per controller state flag.
 
 /*
  * States for um->um_tab.b_active, the per controller state flag.


@@ -120,7 +122,7 @@ tmprobe(reg)
        register int br, cvec;          /* must be r11,r10; value-result */
 
 #ifdef lint
        register int br, cvec;          /* must be r11,r10; value-result */
 
 #ifdef lint

-       br = 0; br = cvec; cvec = br;
+       br = 0; cvec = br; br = cvec;

 #endif
        ((struct device *)reg)->tmcs = TM_IE;
        /*
 #endif
        ((struct device *)reg)->tmcs = TM_IE;
        /*


@@ -135,7 +137,7 @@ tmprobe(reg)
         * a uba error for a ts; but our caller will notice that
         * so we won't check for it.
         */
         * a uba error for a ts; but our caller will notice that
         * so we won't check for it.
         */

-       if (badaddr(&((struct device *)reg)->tmrd, 2))
+       if (badaddr((caddr_t)&((struct device *)reg)->tmrd, 2))

                return (0);
        return (1);
 }
                return (0);
        return (1);
 }


@@ -294,7 +296,6 @@ tmstrategy(bp)
        int teunit = TEUNIT(bp->b_dev);
        register struct uba_ctlr *um;
        register struct buf *dp;
        int teunit = TEUNIT(bp->b_dev);
        register struct uba_ctlr *um;
        register struct buf *dp;

-       register struct te_softc *sc = &te_softc[teunit];

 
        /*
         * Put transfer at end of unit queue
 
        /*
         * Put transfer at end of unit queue


@@ -438,7 +439,7 @@ loop:
                                tmgapsdcnt++;
                sc->sc_lastcmd = TM_RCOM;               /* will serve */
 #endif
                                tmgapsdcnt++;
                sc->sc_lastcmd = TM_RCOM;               /* will serve */
 #endif

-               ubago(ui);
+               (void) ubago(ui);

                return;
        }
        /*
                return;
        }
        /*

diff --git a/usr/src/sys/vax/uba/tmreg.h b/usr/src/sys/vax/uba/tmreg.h
index d6c7452..ca4b38b 100644 (file)
--- a/usr/src/sys/vax/uba/tmreg.h
+++ b/usr/src/sys/vax/uba/tmreg.h
@@ -1,4 +1,4 @@
-/*     tmreg.h 4.4     81/02/25        */
+/*     tmreg.h 4.5     81/03/09        */

 
 /*
  * TM11 controller registers
 
 /*
  * TM11 controller registers


@@ -38,26 +38,26 @@ struct device {
 #define        TM_ERR          0100000         /* drive error summary */
 
 /* bits in tmer */
 #define        TM_ERR          0100000         /* drive error summary */
 
 /* bits in tmer */

-#define        TM_TUR          0000001         /* tape unit ready */
-#define        TM_RWS          0000002         /* tape unit rewinding */
-#define        TM_WRL          0000004         /* tape unit write protected */
-#define        TM_SDWN         0000010         /* gap settling down */
-#define        TM_CH7          0000020         /* 7 channel tape */
-#define        TM_BOT          0000040         /* at beginning of tape */
-#define        TM_SELR         0000100         /* tape unit properly selected */
-#define        TM_NXM          0000200         /* non-existant memory */
-#define        TM_BTE          0000400         /* bad tape error */
-#define        TM_RLE          0001000         /* record length error */
-#define        TM_EOT          0002000         /* at end of tape */
-#define        TM_BGL          0004000         /* bus grant late */
-#define        TM_PAE          0010000         /* parity error */
-#define        TM_CRE          0020000         /* cyclic redundancy error */
-#define        TM_EOF          0040000         /* end of file */
-#define        TM_ILC          0100000         /* illegal command */
-
-#define        TMEREG_BITS     \
+#define        TMER_ILC        0100000         /* illegal command */
+#define        TMER_EOF        0040000         /* end of file */
+#define        TMER_CRE        0020000         /* cyclic redundancy error */
+#define        TMER_PAE        0010000         /* parity error */
+#define        TMER_BGL        0004000         /* bus grant late */
+#define        TMER_EOT        0002000         /* at end of tape */
+#define        TMER_RLE        0001000         /* record length error */
+#define        TMER_BTE        0000400         /* bad tape error */
+#define        TMER_NXM        0000200         /* non-existant memory */
+#define        TMER_SELR       0000100         /* tape unit properly selected */
+#define        TMER_BOT        0000040         /* at beginning of tape */
+#define        TMER_CH7        0000020         /* 7 channel tape */
+#define        TMER_SDWN       0000010         /* gap settling down */
+#define        TMER_WRL        0000004         /* tape unit write protected */
+#define        TMER_RWS        0000002         /* tape unit rewinding */
+#define        TMER_TUR        0000001         /* tape unit ready */
+
+#define        TMER_BITS       \

 "\10\20ILC\17EOF\16CRE\15PAE\14BGL\13EOT\12RLE\11BTE\10NXM\
 \7SELR\6BOT\5CH7\4SDWN\3WRL\2RWS\1TUR"
 
 "\10\20ILC\17EOF\16CRE\15PAE\14BGL\13EOT\12RLE\11BTE\10NXM\
 \7SELR\6BOT\5CH7\4SDWN\3WRL\2RWS\1TUR"
 

-#define        TM_HARD         (TM_ILC|TM_EOT)
-#define        TM_SOFT         (TM_CRE|TM_PAE|TM_BGL|TM_RLE|TM_BTE|TM_NXM)
+#define        TMER_HARD       (TMER_ILC|TMER_EOT)
+#define        TMER_SOFT       (TMER_CRE|TMER_PAE|TMER_BGL|TMER_RLE|TMER_BTE|TMER_NXM)

diff --git a/usr/src/sys/vax/uba/uba.c b/usr/src/sys/vax/uba/uba.c
index c24933e..7040bfa 100644 (file)
--- a/usr/src/sys/vax/uba/uba.c
+++ b/usr/src/sys/vax/uba/uba.c
@@ -1,6 +1,4 @@
-/*     uba.c   4.20    %G%     */
-
-#define        DELAY(N)        { register int d; d = N; while (--d > 0); }
+/*     uba.c   4.21    %G%     */

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


@@ -172,8 +170,9 @@ ubasetup(uban, bp, flags)
  * Non buffer setup interface... set up a buffer and call ubasetup.
  */
 uballoc(uban, addr, bcnt, flags)
  * Non buffer setup interface... set up a buffer and call ubasetup.
  */
 uballoc(uban, addr, bcnt, flags)

+       int uban;

        caddr_t addr;
        caddr_t addr;

-       unsigned short bcnt;
+       int bcnt, flags;

 {
        struct buf ubabuf;
 
 {
        struct buf ubabuf;
 

diff --git a/usr/src/sys/vax/uba/ubareg.h b/usr/src/sys/vax/uba/ubareg.h
index 49164d1..8c8f14d 100644 (file)
--- a/usr/src/sys/vax/uba/ubareg.h
+++ b/usr/src/sys/vax/uba/ubareg.h
@@ -1,4 +1,4 @@
-/*     ubareg.h        4.17    81/03/08        */
+/*     ubareg.h        4.18    81/03/09        */

 
 /*
  * VAX UNIBUS adapter registers
 
 /*
  * VAX UNIBUS adapter registers

diff --git a/usr/src/sys/vax/uba/ubavar.h b/usr/src/sys/vax/uba/ubavar.h
index 8de4c0f..3523bd5 100644 (file)
--- a/usr/src/sys/vax/uba/ubavar.h
+++ b/usr/src/sys/vax/uba/ubavar.h
@@ -1,4 +1,4 @@
-/*     ubavar.h        4.17    81/03/08        */
+/*     ubavar.h        4.18    81/03/09        */

 
 /*
  * This file contains definitions related to the kernel structures
 
 /*
  * This file contains definitions related to the kernel structures

diff --git a/usr/src/sys/vax/uba/up.c b/usr/src/sys/vax/uba/up.c
index bdc6524..7e23c1f 100644 (file)
--- a/usr/src/sys/vax/uba/up.c
+++ b/usr/src/sys/vax/uba/up.c
@@ -1,4 +1,4 @@
-/*     up.c    4.30    81/03/07        */
+/*     up.c    4.31    81/03/09        */

 
 #include "up.h"
 #if NSC > 0
 
 #include "up.h"
 #if NSC > 0


@@ -12,7 +12,6 @@
  *     Check unibus reset code
  *     Check that offset recovery code, etc works
  */
  *     Check unibus reset code
  *     Check that offset recovery code, etc works
  */

-#define        DELAY(N)                { register int d; d = N; while (--d > 0); }

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


@@ -429,7 +428,7 @@ loop:
        else
                cmd = UP_IE|UP_WCOM|UP_GO;
        um->um_cmd = cmd;
        else
                cmd = UP_IE|UP_WCOM|UP_GO;
        um->um_cmd = cmd;

-       ubago(ui);
+       (void) ubago(ui);

        return (1);
 }
 
        return (1);
 }
 


@@ -796,7 +795,7 @@ updump(dev)
 {
        struct updevice *upaddr;
        char *start;
 {
        struct updevice *upaddr;
        char *start;

-       int num, blk, unit, i;
+       int num, blk, unit;

        struct size *sizes;
        register struct uba_regs *uba;
        register struct uba_device *ui;
        struct size *sizes;
        register struct uba_regs *uba;
        register struct uba_device *ui;

diff --git a/usr/src/sys/vax/uba/va.c b/usr/src/sys/vax/uba/va.c
index 729a3d4..946e877 100644 (file)
--- a/usr/src/sys/vax/uba/va.c
+++ b/usr/src/sys/vax/uba/va.c
@@ -1,4 +1,4 @@
-/*     va.c    4.6     %G%     */
+/*     va.c    4.7     %G%     */

 
 #include "va.h"
 #if NVA > 0
 
 #include "va.h"
 #if NVA > 0


@@ -258,8 +258,6 @@ vaclose()
        VAADDR->vacsl = 0;
 }
 
        VAADDR->vacsl = 0;
 }
 

-#define        DELAY(N)        { register int d; d = N; while (--d > 0); }
-

 vareset()
 {
 
 vareset()
 {
 

diff --git a/usr/src/sys/vax/vax/Locore.c b/usr/src/sys/vax/vax/Locore.c
index d929d63..07ffefc 100644 (file)
--- a/usr/src/sys/vax/vax/Locore.c
+++ b/usr/src/sys/vax/vax/Locore.c
@@ -1,4 +1,6 @@
-/*     Locore.c        4.6     %G%     */
+/*     Locore.c        4.7     %G%     */
+
+#include "dz.h"

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


@@ -9,7 +11,10 @@
 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/buf.h"
 #include "../h/tty.h"
 #include "../h/proc.h"
 #include "../h/buf.h"

-#include "../h/uba.h"
+#include "../h/ubavar.h"
+#include "../h/ubareg.h"
+#include "../h/nexus.h"
+#include "../h/msgbuf.h"

 
 /*
  * Pseudo file for lint to show what is used/defined in locore.s.
 
 /*
  * Pseudo file for lint to show what is used/defined in locore.s.


@@ -29,13 +34,6 @@ Xmba2int() { }
 Xmba1int() { }
 Xmba0int() { }
 
 Xmba1int() { }
 Xmba0int() { }
 

-#if VAX780
-Xuba3int() { }
-Xuba2int() { }
-Xuba1int() { }
-Xuba0int() { }
-#endif
-

 lowinit()
 {
 
 lowinit()
 {
 


@@ -44,6 +42,7 @@ lowinit()
         */
        lowinit();
        intstack[0] = intstack[1];
         */
        lowinit();
        intstack[0] = intstack[1];

+       rpb = rpb;

        scb = scb;
        maxmem = physmem = freemem = 0;
        u = u;
        scb = scb;
        maxmem = physmem = freemem = 0;
        u = u;


@@ -59,14 +58,29 @@ lowinit()
        ubaerror(0, (struct uba_hd *)0, 0, 0, (struct uba_regs *)0);
        cnrint(0);
        cnxint(0);
        ubaerror(0, (struct uba_hd *)0, 0, 0, (struct uba_regs *)0);
        cnrint(0);
        cnxint(0);

+       consdin();
+       consdout();
+#if NDZ > 0
+       dzdma();
+#endif

        hardclock((caddr_t)0, 0);
        hardclock((caddr_t)0, 0);

+       softclock((caddr_t)0, 0);

        trap(0, 0, (unsigned)0, 0, 0);
        syscall(0, 0, (unsigned)0, 0, 0);
        trap(0, 0, (unsigned)0, 0, 0);
        syscall(0, 0, (unsigned)0, 0, 0);

+
+       if (vmemall((struct pte *)0, 0, (struct proc *)0, 0))
+               return;         /* use value */
+       if (forceclose((dev_t)0))
+               return;         /* use value */
+       machinecheck((caddr_t)0);
+       memerr();

 }
 
 consdin() { }
 consdout() { }
 }
 
 consdin() { }
 consdout() { }

+#if NDZ > 0

 dzdma() { dzxint((struct tty *)0); }
 dzdma() { dzxint((struct tty *)0); }

+#endif

 
 int    catcher[256];
 int    cold = 1;
 
 int    catcher[256];
 int    cold = 1;


@@ -77,7 +91,7 @@ struct        pte Sysmap[6*NPTEPG];
 char   Sysbase[6*NPTEPG*NBPG];
 int    umbabeg;
 struct pte Nexmap[16][16];
 char   Sysbase[6*NPTEPG*NBPG];
 int    umbabeg;
 struct pte Nexmap[16][16];

-char   nexus[16][16*NBPG];
+struct nexus nexus[NNEXUS];

 struct pte UMEMmap[4][16];
 char   umem[4][16*NBPG];
 int    umbaend;
 struct pte UMEMmap[4][16];
 char   umem[4][16*NBPG];
 int    umbaend;


@@ -96,23 +110,25 @@ struct     user pushutl;
 struct pte Vfmap[UPAGES];
 struct user vfutl;
 struct pte CMAP1;
 struct pte Vfmap[UPAGES];
 struct user vfutl;
 struct pte CMAP1;

-char   CADDR1;
+char   CADDR1[NBPG];

 struct pte CMAP2;
 struct pte CMAP2;

-char   CADDR2;
+char   CADDR2[NBPG];

 struct pte mmap[1];
 char   vmmap[NBPG];
 struct pte msgbufmap[CLSIZE];
 struct pte mmap[1];
 char   vmmap[NBPG];
 struct pte msgbufmap[CLSIZE];

-char   msgbuf[CLSIZE*NBPG];
+struct msgbuf msgbuf;

 struct pte camap[32];
 int    cabase;
 struct pte camap[32];
 int    cabase;

+#ifdef unneeded

 char   caspace[32*NBPG];
 char   caspace[32*NBPG];

+#endif

 int    calimit;
 
 /*ARGSUSED*/
 badaddr(addr, len) caddr_t addr; int len; { return (0); }
 
 /*ARGSUSED*/
 int    calimit;
 
 /*ARGSUSED*/
 badaddr(addr, len) caddr_t addr; int len; { return (0); }
 
 /*ARGSUSED*/

-addupc(pc, prof, n) caddr_t pc; struct uprof *prof; { }
+addupc(pc, prof, n) int pc; struct uprof *prof; { }

 
 /*ARGSUSED*/
 copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; unsigned n; { return (0); }
 
 /*ARGSUSED*/
 copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; unsigned n; { return (0); }


@@ -132,7 +148,7 @@ setrq(p) struct proc *p; { }
 /*ARGSUSED*/
 remrq(p) struct proc *p; { }
 
 /*ARGSUSED*/
 remrq(p) struct proc *p; { }
 

-swtch() { }
+swtch() { if (whichqs) whichqs = 0; }

 
 /*ARGSUSED*/
 resume(pcbpf) unsigned pcbpf; { }
 
 /*ARGSUSED*/
 resume(pcbpf) unsigned pcbpf; { }


@@ -159,10 +175,12 @@ suword(base, i) caddr_t base; { return (0); }
 suiword(base, i) caddr_t base; { return (0); }
 
 /*ARGSUSED*/
 suiword(base, i) caddr_t base; { return (0); }
 
 /*ARGSUSED*/

-copyseg(udaddr, pf) caddr_t udaddr; unsigned pf; { }
+copyseg(udaddr, pf) caddr_t udaddr; unsigned pf; {
+    CMAP1 = CMAP1; CADDR1[0] = CADDR1[0];
+}

 
 /*ARGSUSED*/
 
 /*ARGSUSED*/

-clearseg(pf) unsigned pf; { }
+clearseg(pf) unsigned pf; { CMAP2 = CMAP2; CADDR2[0] = CADDR2[0]; }

 
 /*ARGSUSED*/
 useracc(udaddr, bcnt, rw) caddr_t udaddr; unsigned bcnt; { return (0); }
 
 /*ARGSUSED*/
 useracc(udaddr, bcnt, rw) caddr_t udaddr; unsigned bcnt; { return (0); }


@@ -179,7 +197,6 @@ mfpr(reg) int reg; { return (0); }
 
 
 spl0() { return (0); }
 
 
 spl0() { return (0); }

-spl1() { return (0); }

 spl4() { return (0); }
 spl5() { return (0); }
 spl6() { return (0); }
 spl4() { return (0); }
 spl5() { return (0); }
 spl6() { return (0); }


@@ -189,4 +206,8 @@ spl7() { return (0); }
 splx(s) int s; { }
 
 /*ARGSUSED*/
 splx(s) int s; { }
 
 /*ARGSUSED*/

-bcopy(to, from, count) caddr_t to, from; unsigned count; { (* int *)mcrmap = 0; }
+bcopy(to, from, count) caddr_t to, from; unsigned count;
+    { *(int *)mcrmap = 0; }
+
+/*ARGSUSED*/
+ffs(i) { return (0); }

diff --git a/usr/src/sys/vax/vax/autoconf.c b/usr/src/sys/vax/vax/autoconf.c
index f094dc5..f0c8ec2 100644 (file)
--- a/usr/src/sys/vax/vax/autoconf.c
+++ b/usr/src/sys/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*     autoconf.c      4.24    81/03/08        */
+/*     autoconf.c      4.25    81/03/09        */

 
 /*
  * Setup the system to run on the current machine.
 
 /*
  * Setup the system to run on the current machine.


@@ -117,7 +117,7 @@ configure()
 {
        union cpusid cpusid;
        register struct percpu *ocp;
 {
        union cpusid cpusid;
        register struct percpu *ocp;

-       register int i, *ip;
+       register int *ip;

        extern char Sysbase[];
 
        cpusid.cpusid = mfpr(SID);
        extern char Sysbase[];
 
        cpusid.cpusid = mfpr(SID);


@@ -150,17 +150,17 @@ configure()
  * at the things (mbas and ubas) in the nexus slots
  * and initialzing each appropriately.
  */
  * at the things (mbas and ubas) in the nexus slots
  * and initialzing each appropriately.
  */

+/*ARGSUSED*/

 c780(pcpu)
        register struct percpu *pcpu;
 {
        register struct nexus *nxv;
 c780(pcpu)
        register struct percpu *pcpu;
 {
        register struct nexus *nxv;

-       register struct uba_hd *uhp;

        struct nexus *nxp = NEX780;
        union nexcsr nexcsr;
        int i, ubawatch();
        
        for (nexnum = 0,nxv = nexus; nexnum < NNEX780; nexnum++,nxp++,nxv++) {
        struct nexus *nxp = NEX780;
        union nexcsr nexcsr;
        int i, ubawatch();
        
        for (nexnum = 0,nxv = nexus; nexnum < NNEX780; nexnum++,nxp++,nxv++) {

-               nxaccess((caddr_t)nxp, Nexmap[nexnum]);
+               nxaccess(nxp, Nexmap[nexnum]);

                if (badaddr((caddr_t)nxv, 4))
                        continue;
                nexcsr = nxv->nexcsr;
                if (badaddr((caddr_t)nxv, 4))
                        continue;
                nexcsr = nxv->nexcsr;


@@ -172,7 +172,7 @@ c780(pcpu)
                        printf("mba%d at tr%d\n", nummba, nexnum);
                        if (nummba >= NMBA) {
                                printf("%d mba's", nummba);
                        printf("mba%d at tr%d\n", nummba, nexnum);
                        if (nummba >= NMBA) {
                                printf("%d mba's", nummba);

-                               goto notconfig;
+                               goto unconfig;

                        }
 #if NMBA > 0
                        mbafind(nxv, nxp);
                        }
 #if NMBA > 0
                        mbafind(nxv, nxp);


@@ -189,7 +189,7 @@ c780(pcpu)
                                printf("5 uba's");
                                goto unsupp;
                        }
                                printf("5 uba's");
                                goto unsupp;
                        }

-                       setscbnex(nexnum, ubaintv[numuba]);
+                       setscbnex(ubaintv[numuba]);

                        i = nexcsr.nex_type - NEX_UBA0;
                        unifind((struct uba_regs *)nxv, (struct uba_regs *)nxp,
                            umem[i], umaddr780[i]);
                        i = nexcsr.nex_type - NEX_UBA0;
                        unifind((struct uba_regs *)nxv, (struct uba_regs *)nxp,
                            umem[i], umaddr780[i]);


@@ -232,7 +232,7 @@ unconfig:
                        continue;
                }
        }
                        continue;
                }
        }

-       timeout(ubawatch, 0, hz);
+       timeout(ubawatch, (caddr_t)0, hz);

 }
 #endif
 
 }
 #endif
 


@@ -248,10 +248,10 @@ c750(pcpu)
        struct nexus *nxp = NEX750;
 
        printf("mcr at %x\n", MCR_750);
        struct nexus *nxp = NEX750;
 
        printf("mcr at %x\n", MCR_750);

-       nxaccess((caddr_t)MCR_750, Nexmap[nexnum]);
+       nxaccess((struct nexus *)MCR_750, Nexmap[nexnum]);

        mcraddr[nmcr++] = (struct mcr *)nxv;
        for (nexnum = 0; nexnum < NNEX750; nexnum++, nxp++, nxv++) {
        mcraddr[nmcr++] = (struct mcr *)nxv;
        for (nexnum = 0; nexnum < NNEX750; nexnum++, nxp++, nxv++) {

-               nxaccess((caddr_t)nxp, Nexmap[nexnum]);
+               nxaccess(nxp, Nexmap[nexnum]);

                if (badaddr((caddr_t)nxv, 4))
                        continue;
                printf("mba%d at %x\n", nummba, nxp);
                if (badaddr((caddr_t)nxv, 4))
                        continue;
                printf("mba%d at %x\n", nummba, nxp);


@@ -265,7 +265,7 @@ c750(pcpu)
 #endif
        }
        printf("uba at %x\n", nxp);
 #endif
        }
        printf("uba at %x\n", nxp);

-       nxaccess((caddr_t)nxp, Nexmap[nexnum++]);
+       nxaccess(nxp, Nexmap[nexnum++]);

        unifind((struct uba_regs *)nxv, (struct uba_regs *)nxp,
            umem[0], UMEM750);
        numuba = 1;
        unifind((struct uba_regs *)nxv, (struct uba_regs *)nxp,
            umem[0], UMEM750);
        numuba = 1;


@@ -286,13 +286,13 @@ mbafind(nxv, nxp)
        register struct mba_drv *mbd;
        register struct mba_device *mi;
        register struct mba_slave *ms;
        register struct mba_drv *mbd;
        register struct mba_device *mi;
        register struct mba_slave *ms;

-       int dn, dt, sn, ds;
-       struct mba_device       fnd;
+       int dn, dt;
+       struct mba_device fnd;

 
        mdp = (struct mba_regs *)nxv;
        mba_hd[nummba].mh_mba = mdp;
        mba_hd[nummba].mh_physmba = (struct mba_regs *)nxp;
 
        mdp = (struct mba_regs *)nxv;
        mba_hd[nummba].mh_mba = mdp;
        mba_hd[nummba].mh_physmba = (struct mba_regs *)nxp;

-       setscbnex(nexnum, mbaintv[nummba]);
+       setscbnex(mbaintv[nummba]);

        fnd.mi_mba = mdp;
        fnd.mi_mbanum = nummba;
        for (mbd = mdp->mba_drv, dn = 0; mbd < &mdp->mba_drv[8]; mbd++, dn++) {
        fnd.mi_mba = mdp;
        fnd.mi_mbanum = nummba;
        for (mbd = mdp->mba_drv, dn = 0; mbd < &mdp->mba_drv[8]; mbd++, dn++) {


@@ -327,8 +327,8 @@ mbafind(nxv, nxp)
                        }
                }
        }
                        }
                }
        }

-       mdp->mba_cr = MBAINIT;
-       mdp->mba_cr = MBAIE;
+       mdp->mba_cr = MBCR_INIT;
+       mdp->mba_cr = MBCR_IE;

 }
 
 /*
 }
 
 /*


@@ -410,10 +410,19 @@ unifind(vubp, pubp, vumem, pumem)
        struct uba_regs *vubp, *pubp;
        caddr_t vumem, pumem;
 {
        struct uba_regs *vubp, *pubp;
        caddr_t vumem, pumem;
 {

+#ifndef lint

        register int br, cvec;                  /* MUST BE r11, r10 */
        register int br, cvec;                  /* MUST BE r11, r10 */

+#else
+       /*
+        * Lint doesn't realize that these
+        * can be initialized asynchronously
+        * when devices interrupt.
+        */
+       register int br = 0, cvec = 0;
+#endif

        register struct uba_device *ui;
        register struct uba_ctlr *um;
        register struct uba_device *ui;
        register struct uba_ctlr *um;

-       u_short *umem = (u_short *)vumem, *sp, *reg, addr;
+       u_short *reg, addr;

        struct uba_hd *uhp;
        struct uba_driver *udp;
        int i, (**ivec)(), haveubasr = 0;
        struct uba_hd *uhp;
        struct uba_driver *udp;
        int i, (**ivec)(), haveubasr = 0;


@@ -453,6 +462,7 @@ unifind(vubp, pubp, vumem, pumem)
        for (i = 0; i < 128; i++)
                uhp->uh_vec[i] =
                    scbentry(&catcher[i*2], SCB_ISTACK);
        for (i = 0; i < 128; i++)
                uhp->uh_vec[i] =
                    scbentry(&catcher[i*2], SCB_ISTACK);

+       /* THIS IS A CHEAT: USING THE FACT THAT UMEM and NEXI ARE SAME SIZE */

        nxaccess((struct nexus *)pumem, UMEMmap[numuba]);
 #if VAX780
        if (haveubasr) {
        nxaccess((struct nexus *)pumem, UMEMmap[numuba]);
 #if VAX780
        if (haveubasr) {


@@ -600,8 +610,8 @@ unifind(vubp, pubp, vumem, pumem)
        }
 }
 
        }
 }
 

-setscbnex(nexnum, fn)
-       int nexnum, (*fn)();
+setscbnex(fn)
+       int (*fn)();

 {
        register struct scb *scbp = &scb;
 
 {
        register struct scb *scbp = &scb;
 


@@ -619,14 +629,14 @@ setscbnex(nexnum, fn)
  * PRESENT NEXI DONT RESPOND TO ALL OF THEIR ADDRESS SPACE.
  */
 nxaccess(physa, pte)
  * PRESENT NEXI DONT RESPOND TO ALL OF THEIR ADDRESS SPACE.
  */
 nxaccess(physa, pte)

-       caddr_t physa;
+       struct nexus *physa;

        register struct pte *pte;
 {
        register struct pte *pte;
 {

-       register int cnt = btop(sizeof (struct nexus));
+       register int i = btop(sizeof (struct nexus));

        register unsigned v = btop(physa);
        
        do
                *(int *)pte++ = PG_V|PG_KW|v++;
        register unsigned v = btop(physa);
        
        do
                *(int *)pte++ = PG_V|PG_KW|v++;

-       while (--cnt > 0);
+       while (--i > 0);

        mtpr(TBIA, 0);
 }
        mtpr(TBIA, 0);
 }

diff --git a/usr/src/sys/vax/vax/conf.c b/usr/src/sys/vax/vax/conf.c
index 0868da3..9171388 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.24    %G%     */
+/*     conf.c  4.25    %G%     */

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


@@ -30,14 +30,15 @@ int hpstrategy(),hpread(),hpwrite(),hpintr(),hpdump();
  
 #include "tu.h"
 #if NHT > 0
  
 #include "tu.h"
 #if NHT > 0

-int    htopen(),htclose(),htstrategy(),htread(),htwrite(),htdump();
+int    htopen(),htclose(),htstrategy(),htread(),htwrite(),htdump(),htioctl();

 #else
 #define        htopen          nodev
 #define        htclose         nodev
 #define        htstrategy      nodev
 #define        htread          nodev
 #define        htwrite         nodev
 #else
 #define        htopen          nodev
 #define        htclose         nodev
 #define        htstrategy      nodev
 #define        htread          nodev
 #define        htwrite         nodev

-#define        htdump          0
+#define        htdump          nodev
+#define        htioctl         nodev

 #endif
 
 #include "rk.h"
 #endif
 
 #include "rk.h"


@@ -54,7 +55,8 @@ int   rkstrategy(),rkread(),rkwrite(),rkintr(),rkdump(),rkreset();
 
 #include "te.h"
 #if NTM > 0
 
 #include "te.h"
 #if NTM > 0

-int    tmopen(),tmclose(),tmstrategy(),tmread(),tmwrite(),tmioctl(),tmdump();
+int    tmopen(),tmclose(),tmstrategy(),tmread(),tmwrite();
+int    tmioctl(),tmdump(),tmreset();

 #else
 #define        tmopen          nodev
 #define        tmclose         nodev
 #else
 #define        tmopen          nodev
 #define        tmclose         nodev


@@ -63,6 +65,7 @@ int   tmopen(),tmclose(),tmstrategy(),tmread(),tmwrite(),tmioctl(),tmdump();
 #define        tmwrite         nodev
 #define        tmioctl         nodev
 #define        tmdump          nodev
 #define        tmwrite         nodev
 #define        tmioctl         nodev
 #define        tmdump          nodev

+#define        tmreset         nodev

 #endif
 
 #define        tsopen          nodev
 #endif
 
 #define        tsopen          nodev


@@ -215,7 +218,7 @@ struct cdevsw       cdevsw[] =
        nulldev,        nulldev,        hpread,         hpwrite,        /*4*/
        nodev,          nodev,          nulldev,        0,
        htopen,         htclose,        htread,         htwrite,        /*5*/
        nulldev,        nulldev,        hpread,         hpwrite,        /*4*/
        nodev,          nodev,          nulldev,        0,
        htopen,         htclose,        htread,         htwrite,        /*5*/

-       nodev,          nodev,          nulldev,        0,
+       htioctl,        nodev,          nulldev,        0,

        vpopen,         vpclose,        nodev,          vpwrite,        /*6*/
        vpioctl,        nulldev,        vpreset,        0,
        nulldev,        nulldev,        swread,         swwrite,        /*7*/
        vpopen,         vpclose,        nodev,          vpwrite,        /*6*/
        vpioctl,        nulldev,        vpreset,        0,
        nulldev,        nulldev,        swread,         swwrite,        /*7*/


@@ -238,7 +241,7 @@ struct cdevsw       cdevsw[] =
        nulldev,        nulldev,        upread,         upwrite,        /*13*/
        nodev,          nodev,          upreset,        0,
        tmopen,         tmclose,        tmread,         tmwrite,        /*14*/
        nulldev,        nulldev,        upread,         upwrite,        /*13*/
        nodev,          nodev,          upreset,        0,
        tmopen,         tmclose,        tmread,         tmwrite,        /*14*/

-       tmioctl,        nodev,          nulldev,        0,
+       tmioctl,        nodev,          tmreset,        0,

        lpopen,         lpclose,        nodev,          lpwrite,        /*15*/
        lpioctl,        nodev,          lpreset,        0,
        tsopen,         tsclose,        tsread,         tswrite,        /*16*/
        lpopen,         lpclose,        nodev,          lpwrite,        /*15*/
        lpioctl,        nodev,          lpreset,        0,
        tsopen,         tsclose,        tsread,         tswrite,        /*16*/

diff --git a/usr/src/sys/vax/vax/cons.c b/usr/src/sys/vax/vax/cons.c
index d9d4a94..ea7722d 100644 (file)
--- a/usr/src/sys/vax/vax/cons.c
+++ b/usr/src/sys/vax/vax/cons.c
@@ -1,4 +1,4 @@
-/*     cons.c  4.5     %G%     */
+/*     cons.c  4.6     %G%     */

 
 /*
  * Vax console driver and floppy interface
 
 /*
  * Vax console driver and floppy interface


@@ -17,18 +17,6 @@
 #include "../h/mx.h"
 #include "../h/cpu.h"
 
 #include "../h/mx.h"
 #include "../h/cpu.h"
 

-/*
- * When running dz's using only SAE (silo alarm) on input
- * it is necessary to call dzrint() at clock interrupt time.
- * This is unsafe unless spl5()s in tty code are changed to
- * spl6()s to block clock interrupts.  Note that the dh driver
- * currently in use works the same way as the dz, even though
- * we could try to more intelligently manage its silo.
- * Thus don't take this out if you have no dz's unless you
- * change clock.c and dhtimer().
- */
-#define        spl5    spl6
-

 #define        NL1     000400
 #define        NL2     001000
 #define        CR2     020000
 #define        NL1     000400
 #define        NL2     001000
 #define        CR2     020000


@@ -154,7 +142,7 @@ dev_t dev;
        else
                cnstart(tp);
 #if VAX780
        else
                cnstart(tp);
 #if VAX780

-       if (vax==VAX_780 && (tp->t_state & BUSY) == 0)
+       if (cpu==VAX_780 && (tp->t_state & BUSY) == 0)

                conxfl();
 #endif
 }
                conxfl();
 #endif
 }

diff --git a/usr/src/sys/vax/vax/locore.s b/usr/src/sys/vax/vax/locore.s
index f025e0f..3b886bc 100644 (file)
--- a/usr/src/sys/vax/vax/locore.s
+++ b/usr/src/sys/vax/vax/locore.s
@@ -1,4 +1,4 @@
-/*     locore.s        4.34    81/03/08        */
+/*     locore.s        4.35    81/03/09        */

 
 #include "../h/mtpr.h"
 #include "../h/trap.h"
 
 #include "../h/mtpr.h"
 #include "../h/trap.h"


@@ -7,6 +7,8 @@
 #include "../h/cpu.h"
 #include "../h/nexus.h"
 #include "../h/ubareg.h"
 #include "../h/cpu.h"
 #include "../h/nexus.h"
 #include "../h/ubareg.h"

+
+#include "dz.h"

 #include "mba.h"
 
        .set    HIGH,0x1f       # mask for total disable
 #include "mba.h"
 
        .set    HIGH,0x1f       # mask for total disable


@@ -167,6 +169,7 @@ SCBVEC(consdin):
 SCBVEC(consdout):
        halt
 
 SCBVEC(consdout):
        halt
 

+#if NDZ > 0

 /*
  * DZ pseudo dma routine:
  *     r0 - controller number
 /*
  * DZ pseudo dma routine:
  *     r0 - controller number


@@ -203,6 +206,7 @@ dzpcall:
        calls   $1,*(r0)                # call interrupt rtn
        movl    (sp)+,r3
        brb     dzploop                 # check for another line
        calls   $1,*(r0)                # call interrupt rtn
        movl    (sp)+,r3
        brb     dzploop                 # check for another line

+#endif

 
 /*
  * Stray UNIBUS interrupt catch routines
 
 /*
  * Stray UNIBUS interrupt catch routines

diff --git a/usr/src/sys/vax/vax/machdep.c b/usr/src/sys/vax/vax/machdep.c
index 955911f..0fddc3b 100644 (file)
--- a/usr/src/sys/vax/vax/machdep.c
+++ b/usr/src/sys/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/*     machdep.c       4.23    81/03/08        */
+/*     machdep.c       4.24    81/03/09        */

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


@@ -28,10 +28,7 @@
 #include "../h/cmap.h"
 #include <frame.h>
 
 #include "../h/cmap.h"
 #include <frame.h>
 

-int    coresw = 0;
-int    printsw = 0;
-
-char   version[] = "VAX/UNIX (Berkeley Version 4.23) 81/03/08 16:18:25 \n";
+char   version[] = "VAX/UNIX (Berkeley Version 4.24) 81/03/09 00:32:40 \n";

 int    icode[] =
 {
        0x9f19af9f,     /* pushab [&"init",0]; pushab */
 int    icode[] =
 {
        0x9f19af9f,     /* pushab [&"init",0]; pushab */


@@ -53,7 +50,7 @@ startup(firstaddr)
        int firstaddr;
 {
        register int unixsize;
        int firstaddr;
 {
        register int unixsize;

-       register int i;
+       register unsigned i;

        register struct pte *pte;
        register caddr_t v;
 
        register struct pte *pte;
        register caddr_t v;
 


@@ -440,8 +437,8 @@ tbiscl(v)
   
 int    waittime = -1;
 
   
 int    waittime = -1;
 

-boot(panic, arghowto)
-       int panic, arghowto;
+boot(paniced, arghowto)
+       int paniced, arghowto;

 {
        register int howto;             /* r11 == how to boot */
        register int devtype;           /* r10 == major of root dev */
 {
        register int howto;             /* r11 == how to boot */
        register int devtype;           /* r10 == major of root dev */


@@ -463,7 +460,7 @@ boot(panic, arghowto)
                for (;;)
                        ;
        } else {
                for (;;)
                        ;
        } else {

-               if (panic == RB_PANIC)
+               if (paniced == RB_PANIC)

                        doadump();
                tocons(TXDB_BOOT);
        }
                        doadump();
                tocons(TXDB_BOOT);
        }

diff --git a/usr/src/sys/vax/vax/nexus.h b/usr/src/sys/vax/vax/nexus.h
index 10ecdb9..d111606 100644 (file)
--- a/usr/src/sys/vax/vax/nexus.h
+++ b/usr/src/sys/vax/vax/nexus.h
@@ -1,4 +1,4 @@
-/*     nexus.h 4.5     81/03/06        */
+/*     nexus.h 4.6     81/03/09        */

 
 /*
  * Information about nexus's.
 
 /*
  * Information about nexus's.


@@ -28,7 +28,7 @@ struct        nexus {
        long    nex_pad[NEXSIZE / sizeof (long) - 1];
 };
 #ifdef KERNEL
        long    nex_pad[NEXSIZE / sizeof (long) - 1];
 };
 #ifdef KERNEL

-extern struct nexus nexus[NNEXUS];
+struct nexus nexus[NNEXUS];

 #endif
 #endif
 
 #endif
 #endif
 


@@ -48,7 +48,7 @@ extern struct nexus nexus[NNEXUS];
 #if VAX780
 #define        NEXFLT_BITS \
 "\20\40PARFLT\37WSQFLT\36URDFLT\35ISQFLT\34MXTFLT\33XMTFLT"
 #if VAX780
 #define        NEXFLT_BITS \
 "\20\40PARFLT\37WSQFLT\36URDFLT\35ISQFLT\34MXTFLT\33XMTFLT"

-extern char nexflt_bits[];
+char   nexflt_bits[];

 #endif
 #endif
 
 #endif
 #endif
 

diff --git a/usr/src/sys/vax/vax/trap.c b/usr/src/sys/vax/vax/trap.c
index 758f2af..e3ca7f3 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.6     %G%     */
+/*     trap.c  4.7     %G%     */

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


@@ -128,7 +128,7 @@ out:
                swtch();
        }
        if (u.u_prof.pr_scale && (syst -= u.u_vm.vm_stime))
                swtch();
        }
        if (u.u_prof.pr_scale && (syst -= u.u_vm.vm_stime))

-               addupc((caddr_t)locr0[PC], &u.u_prof, (int)-syst);
+               addupc(locr0[PC], &u.u_prof, (int)-syst);

        curpri = p->p_pri;
 }
 
        curpri = p->p_pri;
 }