BSD 4_3_Reno release

[unix-history] / usr / src / sys / vaxuba / uu.c

diff --git a/usr/src/sys/vaxuba/uu.c b/usr/src/sys/vaxuba/uu.c
index 7579eb5..fae2862 100644 (file)
--- a/usr/src/sys/vaxuba/uu.c
+++ b/usr/src/sys/vaxuba/uu.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)uu.c        7.1 (Berkeley) 6/5/86
+ *     @(#)uu.c        7.4 (Berkeley) 4/3/90

  */
 
 #include "uu.h"
  */
 
 #include "uu.h"


@@ -27,7 +27,7 @@
  *
  */
 
  *
  */
 

-#include "../machine/pte.h"
+#include "machine/pte.h"

 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"


@@ -132,7 +132,7 @@ uuopen(dev, flag)
        register struct uba_device *ui;
        register struct uu_softc *uuc;
        register struct uudevice *uuaddr;
        register struct uba_device *ui;
        register struct uu_softc *uuc;
        register struct uudevice *uuaddr;

-       int ctlr, unit = UNIT(dev), s;
+       int ctlr, unit = UNIT(dev), s, error;

 
        ctlr = unit / NDPC;
        if (unit >= NUX || (ui = uudinfo[ctlr]) == 0 || ui->ui_alive == 0)
 
        ctlr = unit / NDPC;
        if (unit >= NUX || (ui = uudinfo[ctlr]) == 0 || ui->ui_alive == 0)


@@ -167,7 +167,10 @@ uuopen(dev, flag)
         * and wait for things to settle down.
         */
        uureset(ctlr);
         * and wait for things to settle down.
         */
        uureset(ctlr);

-       sleep((caddr_t)uuc, PZERO+1);
+       if (error = tsleep((caddr_t)uuc, (PZERO+1) | PCATCH, devopn, 0)) {
+               splx(s);
+               return (error);
+       }

        uitab[ctlr].b_active = NULL;
        if (uuc->tu_state != TUS_IDLE) {
                uuc->tu_state = TUS_INIT1;
        uitab[ctlr].b_active = NULL;
        if (uuc->tu_state != TUS_IDLE) {
                uuc->tu_state = TUS_INIT1;


@@ -222,6 +225,7 @@ uuclose(dev, flag)
                uuaddr->rcs = 0;
        }
        splx(s);
                uuaddr->rcs = 0;
        }
        splx(s);

+       return (0);

 }
 
 uuwake(bp)
 }
 
 uuwake(bp)