have right user & time come out for msgs

[unix-history] / usr / src / sys / vax / uba / up.c

diff --git a/usr/src/sys/vax/uba/up.c b/usr/src/sys/vax/uba/up.c
index e66cd05..a79d82c 100644 (file)
--- a/usr/src/sys/vax/uba/up.c
+++ b/usr/src/sys/vax/uba/up.c
@@ -1,6 +1,7 @@
-/*     up.c    4.1     %G%     */
+/*     up.c    4.3     %G%     */

 
 #include "../conf/up.h"
 
 #include "../conf/up.h"

+#if NUP > 0

 /*
  * UNIBUS disk driver with overlapped seeks and ECC recovery.
  */
 /*
  * UNIBUS disk driver with overlapped seeks and ECC recovery.
  */


@@ -207,7 +208,7 @@ register struct buf *bp;
        long sz, bn;
 
        if (upwstart == 0) {
        long sz, bn;
 
        if (upwstart == 0) {

-               timeout((caddr_t)upwatch, 0, HZ);
+               timeout(upwatch, (caddr_t)0, HZ);

                upwstart++;
        }
        xunit = minor(bp->b_dev) & 077;
                upwstart++;
        }
        xunit = minor(bp->b_dev) & 077;


@@ -528,7 +529,8 @@ upintr()
                        else
                                uptab.b_active = 0;     /* To force retry */
                        if (uptab.b_errcnt > 27)
                        else
                                uptab.b_active = 0;     /* To force retry */
                        if (uptab.b_errcnt > 27)

-                               deverror(bp, upaddr->upcs2, upaddr->uper1);
+                               deverror(bp, (int)upaddr->upcs2,
+                                   (int)upaddr->uper1);

                        /*
                         * If this was a correctible ECC error, let upecc
                         * do the dirty work to correct it.  If upecc
                        /*
                         * If this was a correctible ECC error, let upecc
                         * do the dirty work to correct it.  If upecc


@@ -610,7 +612,6 @@ upintr()
        if (uptab.b_actf && uptab.b_active == 0)
                if (upstart())
                        needie = 0;
        if (uptab.b_actf && uptab.b_active == 0)
                if (upstart())
                        needie = 0;

-out:

        if (needie)
                upaddr->upcs1 = IE;
 }
        if (needie)
                upaddr->upcs1 = IE;
 }


@@ -745,7 +746,7 @@ upwatch()
 {
        int i;
 
 {
        int i;
 

-       timeout((caddr_t)upwatch, 0, HZ);
+       timeout(upwatch, (caddr_t)0, HZ);

        if (uptab.b_active == 0) {
                for (i = 0; i < NUP; i++)
                        if (uputab[i].b_active)
        if (uptab.b_active == 0) {
                for (i = 0; i < NUP; i++)
                        if (uputab[i].b_active)


@@ -762,3 +763,4 @@ active:
                printf("\n");
        }
 }
                printf("\n");
        }
 }

+#endif