reorganization to move ufsmount ops to be vnode ops;

[unix-history] / usr / src / sys / stand.att / dev.c

diff --git a/usr/src/sys/stand.att/dev.c b/usr/src/sys/stand.att/dev.c
index fe41026..4e7ce34 100644 (file)
--- a/usr/src/sys/stand.att/dev.c
+++ b/usr/src/sys/stand.att/dev.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dev.c       7.13 (Berkeley) %G%
+ *     @(#)dev.c       7.14 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -28,8 +28,10 @@ devread(io)
        io->i_error = 0;
        cc = (*devsw[io->i_dev].dv_strategy)(io, F_READ);
        io->i_flgs &= ~F_TYPEMASK;
        io->i_error = 0;
        cc = (*devsw[io->i_dev].dv_strategy)(io, F_READ);
        io->i_flgs &= ~F_TYPEMASK;

+#ifndef SMALL

        if (scankbd())
                _longjmp(exception, 1);
        if (scankbd())
                _longjmp(exception, 1);

+#endif

        return (cc);
 }
 
        return (cc);
 }
 


@@ -42,8 +44,10 @@ devwrite(io)
        io->i_error = 0;
        cc = (*devsw[io->i_dev].dv_strategy)(io, F_WRITE);
        io->i_flgs &= ~F_TYPEMASK;
        io->i_error = 0;
        cc = (*devsw[io->i_dev].dv_strategy)(io, F_WRITE);
        io->i_flgs &= ~F_TYPEMASK;

+#ifndef SMALL

        if (scankbd())
                _longjmp(exception, 1);
        if (scankbd())
                _longjmp(exception, 1);

+#endif

        return (cc);
 }
 
        return (cc);
 }
 


@@ -54,6 +58,9 @@ devopen(io)
 
        if (!(ret = (*devsw[io->i_dev].dv_open)(io)))
                return (0);
 
        if (!(ret = (*devsw[io->i_dev].dv_open)(io)))
                return (0);

+#ifdef SMALL
+       printf("open error\n");
+#else

        printf("%s(%d,%d,%d,%d): ", devsw[io->i_dev].dv_name,
                io->i_adapt, io->i_ctlr, io->i_unit, io->i_part);
        switch(ret) {
        printf("%s(%d,%d,%d,%d): ", devsw[io->i_dev].dv_name,
                io->i_adapt, io->i_ctlr, io->i_unit, io->i_part);
        switch(ret) {


@@ -84,6 +91,7 @@ devopen(io)
                printf("unknown open error\n");
                break;
        }
                printf("unknown open error\n");
                break;
        }

+#endif

        return (ret);
 }
 
        return (ret);
 }