l_write returns a value; pass it on

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

diff --git a/usr/src/sys/vax/uba/rk.c b/usr/src/sys/vax/uba/rk.c
index 7b923e8..bd8e9e0 100644 (file)
--- a/usr/src/sys/vax/uba/rk.c
+++ b/usr/src/sys/vax/uba/rk.c
@@ -1,6 +1,4 @@
-#define        RKDEBUG
-#define RKBDEBUG
-/*     rk.c    4.43    82/08/13        */
+/*     rk.c    4.47    82/10/10        */

 
 #include "rk.h"
 #if NHK > 0
 
 #include "rk.h"
 #if NHK > 0


@@ -29,15 +27,15 @@ int rkbdebug;
 #include "../h/pte.h"
 #include "../h/map.h"
 #include "../h/vm.h"
 #include "../h/pte.h"
 #include "../h/map.h"
 #include "../h/vm.h"

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

 #include "../h/dk.h"
 #include "../h/dk.h"

-#include "../h/cpu.h"

 #include "../h/cmap.h"
 #include "../h/dkbad.h"
 #include "../h/uio.h"
 
 #include "../h/cmap.h"
 #include "../h/dkbad.h"
 #include "../h/uio.h"
 

-#include "../h/rkreg.h"
+#include "../vax/cpu.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
+#include "../vaxuba/rkreg.h"

 
 struct rk_softc {
        int     sc_softas;
 
 struct rk_softc {
        int     sc_softas;


@@ -521,20 +519,19 @@ rkread(dev, uio)
        register int unit = minor(dev) >> 3;
 
        if (unit >= NRK)
        register int unit = minor(dev) >> 3;
 
        if (unit >= NRK)

-               u.u_error = ENXIO;
-       else
-               physio(rkstrategy, &rrkbuf[unit], dev, B_READ, minphys, uio);
+               return (ENXIO);
+       return (physio(rkstrategy, &rrkbuf[unit], dev, B_READ, minphys, uio));

 }
 
 }
 

-rkwrite(dev)
+rkwrite(dev, uio)

        dev_t dev;
        dev_t dev;

+       struct uio *uio;

 {
        register int unit = minor(dev) >> 3;
 
        if (unit >= NRK)
 {
        register int unit = minor(dev) >> 3;
 
        if (unit >= NRK)

-               u.u_error = ENXIO;
-       else
-               physio(rkstrategy, &rrkbuf[unit], dev, B_WRITE, minphys, 0);
+               return (ENXIO);
+       return (physio(rkstrategy, &rrkbuf[unit], dev, B_WRITE, minphys, uio));

 }
 
 rkecc(ui, flag)
 }
 
 rkecc(ui, flag)