minor fixes relating to u.u_error handling

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

diff --git a/usr/src/sys/vax/uba/dh.c b/usr/src/sys/vax/uba/dh.c
index 2fc93ae..f4ae51a 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.48    82/08/13        */
+/*     dh.c    4.52    82/10/10        */

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


@@ -16,8 +16,10 @@
 #include "../h/pte.h"
 #include "../h/buf.h"
 #include "../h/vm.h"
 #include "../h/pte.h"
 #include "../h/buf.h"
 #include "../h/vm.h"

-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
+
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
+

 #include "../h/bk.h"
 #include "../h/clist.h"
 #include "../h/file.h"
 #include "../h/bk.h"
 #include "../h/clist.h"
 #include "../h/file.h"


@@ -313,19 +315,18 @@ dhread(dev, uio)
        dev_t dev;
        struct uio *uio;
 {
        dev_t dev;
        struct uio *uio;
 {

-       register struct tty *tp;
+       register struct tty *tp = &dh11[minor(dev)];

 
 

-       tp = &dh11[minor(dev)];

        return ((*linesw[tp->t_line].l_read)(tp, uio));
 }
 
        return ((*linesw[tp->t_line].l_read)(tp, uio));
 }
 

-dhwrite(dev)
+dhwrite(dev, uio)

        dev_t dev;
        dev_t dev;

+       struct uio *uio;

 {
 {

-       register struct tty *tp;
+       register struct tty *tp = &dh11[minor(dev)];

 
 

-       tp = &dh11[minor(dev)];
-       (*linesw[tp->t_line].l_write)(tp);
+       return ((*linesw[tp->t_line].l_write)(tp, uio));

 }
 
 /*
 }
 
 /*


@@ -682,9 +683,11 @@ dhreset(uban)
 dhtimer()
 {
        register int dh;
 dhtimer()
 {
        register int dh;

+       register int s = spl5();

 
        for (dh = 0; dh < NDH; dh++)
                dhrint(dh);
 
        for (dh = 0; dh < NDH; dh++)
                dhrint(dh);

+       splx(s);

 }
 
 /*
 }
 
 /*