s/HZ/hz/

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

diff --git a/usr/src/sys/vax/uba/va.c b/usr/src/sys/vax/uba/va.c
index 58cc776..729a3d4 100644 (file)
--- a/usr/src/sys/vax/uba/va.c
+++ b/usr/src/sys/vax/uba/va.c
@@ -1,6 +1,6 @@
-/*     va.c    3.7     %G%     */
+/*     va.c    4.6     %G%     */

 
 

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

 #if NVA > 0
 /*
  * Benson-Varian matrix printer/plotter
 #if NVA > 0
 /*
  * Benson-Varian matrix printer/plotter


@@ -124,7 +124,7 @@ vastrategy(bp)
        }
        (void) spl0();
 brkout:
        }
        (void) spl0();
 brkout:

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

        va11.va_bp = 0;
        va11.va_busy = 0;
        iodone(bp);
        va11.va_bp = 0;
        va11.va_busy = 0;
        iodone(bp);


@@ -166,6 +166,7 @@ vastart()
 {
        if (va11.va_wc) {
                VAADDR->vaba = va11.va_bufp;
 {
        if (va11.va_wc) {
                VAADDR->vaba = va11.va_bufp;

+               VAADDR->vacsl = (va11.va_bufp >> 12) & 0x30;

                VAADDR->vawc = va11.va_wc;
                return;
        }
                VAADDR->vawc = va11.va_wc;
                return;
        }


@@ -236,7 +237,7 @@ vacmd(vcmd)
 vatimo()
 {
        if (va11.va_open)
 vatimo()
 {
        if (va11.va_open)

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

        vaintr(0);
 }
 
        vaintr(0);
 }
 


@@ -279,7 +280,7 @@ vareset()
                return;
        if (va_ubinfo) {
                printf("<%d>", (va_ubinfo>>28)&0xf);
                return;
        if (va_ubinfo) {
                printf("<%d>", (va_ubinfo>>28)&0xf);

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

        }
        /* This code belongs in vastart() */
        va_ubinfo = ubasetup(va11.va_bp, vabdp);
        }
        /* This code belongs in vastart() */
        va_ubinfo = ubasetup(va11.va_bp, vabdp);