name conflicts

SCCS-vsn: sys/vax/uba/dh.c 4.55
SCCS-vsn: sys/vax/uba/dn.c 4.14

diff --git a/usr/src/sys/vax/uba/dh.c b/usr/src/sys/vax/uba/dh.c
index ec70c3d..97eadec 100644 (file)
--- a/usr/src/sys/vax/uba/dh.c
+++ b/usr/src/sys/vax/uba/dh.c
@@ -1,4 +1,4 @@
-/*     dh.c    4.54    82/12/05        */
+/*     dh.c    4.55    82/12/10        */

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


@@ -784,7 +784,7 @@ dmintr(dm)
                        tp = &dh11[(dm<<4)+(addr->dmcsr&0xf)];
                        wakeup((caddr_t)&tp->t_rawq);
                        if ((tp->t_state&TS_WOPEN) == 0 &&
                        tp = &dh11[(dm<<4)+(addr->dmcsr&0xf)];
                        wakeup((caddr_t)&tp->t_rawq);
                        if ((tp->t_state&TS_WOPEN) == 0 &&

-                           (tp->t_mode & MDMBUF)) {
+                           (tp->t_flags & MDMBUF)) {

                                if (addr->dmlstat & DML_CAR) {
                                        tp->t_state &= ~TS_TTSTOP;
                                        ttstart(tp);
                                if (addr->dmlstat & DML_CAR) {
                                        tp->t_state &= ~TS_TTSTOP;
                                        ttstart(tp);


@@ -794,7 +794,7 @@ dmintr(dm)
                                }
                        } else if ((addr->dmlstat&DML_CAR)==0) {
                                if ((tp->t_state&TS_WOPEN)==0 &&
                                }
                        } else if ((addr->dmlstat&DML_CAR)==0) {
                                if ((tp->t_state&TS_WOPEN)==0 &&

-                                   (tp->t_mode & NOHANG) == 0) {
+                                   (tp->t_flags & NOHANG) == 0) {

                                        gsignal(tp->t_pgrp, SIGHUP);
                                        gsignal(tp->t_pgrp, SIGCONT);
                                        addr->dmlstat = 0;
                                        gsignal(tp->t_pgrp, SIGHUP);
                                        gsignal(tp->t_pgrp, SIGCONT);
                                        addr->dmlstat = 0;

diff --git a/usr/src/sys/vax/uba/dn.c b/usr/src/sys/vax/uba/dn.c
index e5d6248..a341cbe 100644 (file)
--- a/usr/src/sys/vax/uba/dn.c
+++ b/usr/src/sys/vax/uba/dn.c
@@ -1,4 +1,4 @@
-/*     dn.c    4.13    82/10/21        */
+/*     dn.c    4.14    82/12/10        */

 
 #include "dn.h"
 #if NDN > 0
 
 #include "dn.h"
 #if NDN > 0


@@ -14,7 +14,6 @@
 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/conf.h"
 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/conf.h"

-#include "../h/ioctl.h"

 #include "../h/uio.h"
 
 #include "../vaxuba/ubavar.h"
 #include "../h/uio.h"
 
 #include "../vaxuba/ubavar.h"