name changes

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

diff --git a/usr/src/sys/vax/uba/dz.c b/usr/src/sys/vax/uba/dz.c
index 854a1a0..5456799 100644 (file)
--- a/usr/src/sys/vax/uba/dz.c
+++ b/usr/src/sys/vax/uba/dz.c
@@ -1,4 +1,4 @@
-/*     dz.c    4.15    %G%     */
+/*     dz.c    4.16    %G%     */

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


@@ -131,6 +131,10 @@ dzattach(ui)
                pdp++, tp++;
        }
        dzsoftCAR[ui->ui_unit] = ui->ui_flags;
                pdp++, tp++;
        }
        dzsoftCAR[ui->ui_unit] = ui->ui_flags;

+       if (dz_timer == 0) {
+               dz_timer++;
+               timeout(dzscan, (caddr_t)0, HZ);
+       }

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


@@ -147,10 +151,6 @@ dzopen(dev, flag)
                u.u_error = ENXIO;
                return;
        }
                u.u_error = ENXIO;
                return;
        }

-       if (dz_timer == 0) {
-               dz_timer++;
-               timeout(dzscan, (caddr_t)0, HZ);
-       }

        tp = &dz_tty[unit];
        tp->t_addr = (caddr_t)&dzpdma[unit];
        tp->t_oproc = dzstart;
        tp = &dz_tty[unit];
        tp->t_addr = (caddr_t)&dzpdma[unit];
        tp->t_oproc = dzstart;


@@ -425,6 +425,8 @@ dzscan()
  
        for (i = 0; i < dz_cnt ; i++) {
                dzaddr = dzpdma[i].p_addr;
  
        for (i = 0; i < dz_cnt ; i++) {
                dzaddr = dzpdma[i].p_addr;

+               if (dzaddr == 0)
+                       continue;

                tp = &dz_tty[i];
                bit = 1<<(i&07);
                if ((dzsoftCAR[i>>3]&bit) || (dzaddr->dzmsr&bit)) {
                tp = &dz_tty[i];
                bit = 1<<(i&07);
                if ((dzsoftCAR[i>>3]&bit) || (dzaddr->dzmsr&bit)) {