new format of error prints; no more FLAKEY UP resets

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

diff --git a/usr/src/sys/vax/uba/vp.c b/usr/src/sys/vax/uba/vp.c
index e93147b..304d536 100644 (file)
--- a/usr/src/sys/vax/uba/vp.c
+++ b/usr/src/sys/vax/uba/vp.c
@@ -1,6 +1,6 @@
-/*     vp.c    4.2     %G%     */
+/*     vp.c    4.6     %G%     */

 
 

-#include "../conf/vp.h"
+#include "vp.h"

 #if NVP > 0
 /*
  * Versatec matrix printer/plotter
 #if NVP > 0
 /*
  * Versatec matrix printer/plotter


@@ -109,7 +109,7 @@ vpstrategy(bp)
                vp11.vp_state = (vp11.vp_state &~ MODE) | PLOT;
        (void) spl0();
 brkout:
                vp11.vp_state = (vp11.vp_state &~ MODE) | PLOT;
        (void) spl0();
 brkout:

-       ubafree(vp_ubinfo), vp_ubinfo = 0;
+       ubarelse(&vp_ubinfo);

        vp11.vp_state &= ~VBUSY;
        vp11.vp_bp = 0;
        iodone(bp);
        vp11.vp_state &= ~VBUSY;
        vp11.vp_bp = 0;
        iodone(bp);


@@ -210,7 +210,7 @@ vptimo()
 {
 
        if (vp11.vp_state&VISOPEN)
 {
 
        if (vp11.vp_state&VISOPEN)

-               timeout(vptimo, (caddr_t)0, HZ/10);
+               timeout(vptimo, (caddr_t)0, hz/10);

        vpintr(0);
 }
 
        vpintr(0);
 }
 


@@ -241,7 +241,7 @@ vpreset()
                return;
        if (vp_ubinfo) {
                printf("<%d>", (vp_ubinfo>>28)&0xf);
                return;
        if (vp_ubinfo) {
                printf("<%d>", (vp_ubinfo>>28)&0xf);

-               ubafree(vp_ubinfo), vp_ubinfo = 0;
+               ubarelse(&vp_ubinfo);

        }
        vp11.vp_bufp = vp_ubinfo & 0x3ffff;
        vp11.vp_count = vp11.vp_bp->b_bcount;
        }
        vp11.vp_bufp = vp_ubinfo & 0x3ffff;
        vp11.vp_count = vp11.vp_bp->b_bcount;