let's really zero bss

[unix-history] / usr / src / sys / tahoe / stand / conf.c

diff --git a/usr/src/sys/tahoe/stand/conf.c b/usr/src/sys/tahoe/stand/conf.c
index ca2f224..68069a6 100644 (file)
--- a/usr/src/sys/tahoe/stand/conf.c
+++ b/usr/src/sys/tahoe/stand/conf.c
@@ -1,4 +1,4 @@
-/*     conf.c  1.1     86/01/12        */
+/*     conf.c  1.3     86/12/18        */

 /*     conf.c  6.1     83/07/29        */
 
 #include "../machine/pte.h"
 /*     conf.c  6.1     83/07/29        */
 
 #include "../machine/pte.h"


@@ -7,7 +7,6 @@
 #include "inode.h"
 #include "fs.h"
 
 #include "inode.h"
 #include "fs.h"
 

-

 #include "saio.h"
 
 devread(io)
 #include "saio.h"
 
 devread(io)


@@ -48,41 +47,42 @@ devclose(io)
        (*devsw[io->i_ino.i_dev].dv_close)(io);
 }
 
        (*devsw[io->i_ino.i_dev].dv_close)(io);
 }
 

-
-/*ARGSUSED*/
-nullsys(io)
-       struct iob *io;
+devioctl(io, cmd, arg)
+       register struct iob *io;
+       int cmd;
+       caddr_t arg;

 {
 
 {
 

-       ;
+       return ((*devsw[io->i_ino.i_dev].dv_ioctl)(io, cmd, arg));

 }
 
 }
 

+/*ARGSUSED*/
+nullsys(io) struct iob *io; {}
+nullopen(io) struct iob *io; { _stop("bad device type"); }

 
 

-int    nullsys();
-
+/*ARGSUSED*/
+noioctl(io, cmd, arg)
+       struct iob *io;
+       int cmd;
+       caddr_t arg;
+{

 
 

-#define wchstrategy    nullsys 
-#define wchopen        nullsys 
-#define ctstrategy     nullsys 
-#define ctopen                 nullsys         
-#define ctclose        nullsys
+       return (ECMD);
+}

 
 

-int    udstrategy(),   udopen();
-int    vdstrategy(),   vdopen();
-int    cystrategy(),   cyopen(),       cyclose();
+int    udstrategy(), udopen();
+int    vdstrategy(), vdopen();
+int    cystrategy(), cyopen(), cyclose();

 
 struct devsw devsw[] = {
 
 struct devsw devsw[] = {

-       "fsd",  vdstrategy,     vdopen,         nullsys,
-       "smd",  vdstrategy,     vdopen,         nullsys,
-       "xfd",  vdstrategy,     vdopen,         nullsys,
-       "fuj",  vdstrategy,     vdopen,         nullsys,
-       "xsd",  vdstrategy,     vdopen,         nullsys,
-
-       "xmd",  udstrategy,     udopen,         nullsys,
-       "flp",  udstrategy,     udopen,         nullsys,
-       "cyp",  cystrategy,     cyopen,         cyclose,
-       "wch",  wchstrategy,    wchopen,        nullsys,
-       "ctp",  ctstrategy,     ctopen,         ctclose,
-       0,      0,              0,              0
+       { "ud", udstrategy,     udopen,         nullsys,        noioctl },
+       { "dk", vdstrategy,     vdopen,         nullsys,        noioctl },
+#ifdef notdef
+       { "xp", xpstrategy,     xpopen,         nullsys,        noioctl },
+#else
+       { "xp", nullopen,       nullsys,        nullsys,        noioctl },
+#endif
+       { "cy", cystrategy,     cyopen,         cyclose,        noioctl },
+       { 0 }

 };
 };

-
+int    ndevs = (sizeof(devsw) / sizeof(devsw[0]) - 1);