pte has moved, isn't needed

[unix-history] / usr / src / usr.sbin / config / mkioconf.c

diff --git a/usr/src/usr.sbin/config/mkioconf.c b/usr/src/usr.sbin/config/mkioconf.c
index a0d268e..2c871e6 100644 (file)
--- a/usr/src/usr.sbin/config/mkioconf.c
+++ b/usr/src/usr.sbin/config/mkioconf.c
@@ -1,6 +1,13 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)mkioconf.c 2.9 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)mkioconf.c 5.18 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <stdio.h>
 #include "y.tab.h"
 
 #include <stdio.h>
 #include "y.tab.h"


@@ -24,14 +31,13 @@ vax_ioconf()
                perror(path("ioconf.c"));
                exit(1);
        }
                perror(path("ioconf.c"));
                exit(1);
        }

-       fprintf(fp, "#include \"../machine/pte.h\"\n");
-       fprintf(fp, "#include \"../h/param.h\"\n");
-       fprintf(fp, "#include \"../h/buf.h\"\n");
-       fprintf(fp, "#include \"../h/map.h\"\n");
-       fprintf(fp, "#include \"../h/vm.h\"\n");
+       fprintf(fp, "#include \"vax/include/pte.h\"\n");
+       fprintf(fp, "#include \"sys/param.h\"\n");
+       fprintf(fp, "#include \"sys/buf.h\"\n");
+       fprintf(fp, "#include \"sys/map.h\"\n");

        fprintf(fp, "\n");
        fprintf(fp, "\n");

-       fprintf(fp, "#include \"../vaxmba/mbavar.h\"\n");
-       fprintf(fp, "#include \"../vaxuba/ubavar.h\"\n\n");
+       fprintf(fp, "#include \"vax/mba/mbavar.h\"\n");
+       fprintf(fp, "#include \"vax/uba/ubavar.h\"\n\n");

        fprintf(fp, "\n");
        fprintf(fp, "#define C (caddr_t)\n\n");
        /*
        fprintf(fp, "\n");
        fprintf(fp, "#define C (caddr_t)\n\n");
        /*


@@ -111,7 +117,7 @@ vax_ioconf()
                        struct idlst *ip;
                        mp = dp->d_conn;
                        if (mp == 0 || mp == TO_NEXUS ||
                        struct idlst *ip;
                        mp = dp->d_conn;
                        if (mp == 0 || mp == TO_NEXUS ||

-                           !eq(mp->d_name, "uba"))
+                           (!eq(mp->d_name, "uba") && !eq(mp->d_name, "bi")))

                                continue;
                        fprintf(fp,
                            "extern struct uba_driver %sdriver;\n",
                                continue;
                        fprintf(fp,
                            "extern struct uba_driver %sdriver;\n",


@@ -127,7 +133,7 @@ vax_ioconf()
                        }
                        fprintf(fp, ";\n");
                        fprintf(fp, "int\t (*%sint%d[])() = { ", dp->d_name,
                        }
                        fprintf(fp, ";\n");
                        fprintf(fp, "int\t (*%sint%d[])() = { ", dp->d_name,

-                           dp->d_unit, dp->d_unit);
+                           dp->d_unit);

                        ip = dp->d_vec;
                        for (;;) {
                                fprintf(fp, "X%s%d", ip->id, dp->d_unit);
                        ip = dp->d_vec;
                        for (;;) {
                                fprintf(fp, "X%s%d", ip->id, dp->d_unit);


@@ -256,11 +262,11 @@ vax_ioconf()
 }
 #endif
 
 }
 #endif
 

-#if MACHINE_SUN
-sun_ioconf()
+#if MACHINE_TAHOE
+tahoe_ioconf()

 {
 {

-       register struct device *dp, *mp;
-       register int slave;
+       register struct device *dp, *mp, *np;
+       register int vba_n, slave;

        FILE *fp;
 
        fp = fopen(path("ioconf.c"), "w");
        FILE *fp;
 
        fp = fopen(path("ioconf.c"), "w");


@@ -268,40 +274,61 @@ sun_ioconf()
                perror(path("ioconf.c"));
                exit(1);
        }
                perror(path("ioconf.c"));
                exit(1);
        }

-       fprintf(fp, "#include \"../h/param.h\"\n");
-       fprintf(fp, "#include \"../h/buf.h\"\n");
-       fprintf(fp, "#include \"../h/map.h\"\n");
-       fprintf(fp, "#include \"../h/vm.h\"\n");
+       fprintf(fp, "#include \"sys/param.h\"\n");
+       fprintf(fp, "#include \"tahoe/include/pte.h\"\n");
+       fprintf(fp, "#include \"sys/buf.h\"\n");
+       fprintf(fp, "#include \"sys/map.h\"\n");

        fprintf(fp, "\n");
        fprintf(fp, "\n");

-       fprintf(fp, "#include \"../sundev/mbvar.h\"\n");
+       fprintf(fp, "#include \"tahoe/vba/vbavar.h\"\n");

        fprintf(fp, "\n");
        fprintf(fp, "#define C (caddr_t)\n\n");
        fprintf(fp, "\n");
        fprintf(fp, "#define C (caddr_t)\n\n");

-       fprintf(fp, "\n");

        /*
        /*

-        * Now generate interrupt vectors for the Multibus
+        * Now generate interrupt vectors for the versabus

         */
        for (dp = dtab; dp != 0; dp = dp->d_next) {
         */
        for (dp = dtab; dp != 0; dp = dp->d_next) {

-               if (dp->d_pri != 0) {
-                       mp = dp->d_conn;
-                       if (mp == 0 || mp == TO_NEXUS ||
-                           !eq(mp->d_name, "mb"))
-                               continue;
-                       fprintf(fp, "extern struct mb_driver %sdriver;\n",
+               mp = dp->d_conn;
+               if (mp == 0 || mp == TO_NEXUS || !eq(mp->d_name, "vba"))
+                       continue;
+               if (dp->d_vec != 0) {
+                       struct idlst *ip;
+                       fprintf(fp,
+                           "extern struct vba_driver %sdriver;\n",
+                           dp->d_name);
+                       fprintf(fp, "extern ");
+                       ip = dp->d_vec;
+                       for (;;) {
+                               fprintf(fp, "X%s%d()", ip->id, dp->d_unit);
+                               ip = ip->id_next;
+                               if (ip == 0)
+                                       break;
+                               fprintf(fp, ", ");
+                       }
+                       fprintf(fp, ";\n");
+                       fprintf(fp, "int\t (*%sint%d[])() = { ", dp->d_name,
+                           dp->d_unit);
+                       ip = dp->d_vec;
+                       for (;;) {
+                               fprintf(fp, "X%s%d", ip->id, dp->d_unit);
+                               ip = ip->id_next;
+                               if (ip == 0)
+                                       break;
+                               fprintf(fp, ", ");
+                       }
+                       fprintf(fp, ", 0 } ;\n");
+               } else if (dp->d_type == DRIVER)  /* devices w/o interrupts */
+                       fprintf(fp,
+                           "extern struct vba_driver %sdriver;\n",

                            dp->d_name);
                            dp->d_name);

-               }

        }
        }

-       /*
-        * Now spew forth the mb_cinfo structure
-        */
-       fprintf(fp, "\nstruct mb_ctlr mbcinit[] = {\n");
-       fprintf(fp, "/*\t driver,\tctlr,\talive,\taddr,\tintpri */\n");
+       fprintf(fp, "\nstruct vba_ctlr vbminit[] = {\n");
+       fprintf(fp, "/*\t driver,\tctlr,\tvbanum,\talive,\tintr,\taddr */\n");

        for (dp = dtab; dp != 0; dp = dp->d_next) {
                mp = dp->d_conn;
                if (dp->d_type != CONTROLLER || mp == TO_NEXUS || mp == 0 ||
        for (dp = dtab; dp != 0; dp = dp->d_next) {
                mp = dp->d_conn;
                if (dp->d_type != CONTROLLER || mp == TO_NEXUS || mp == 0 ||

-                   !eq(mp->d_name, "mb"))
+                   !eq(mp->d_name, "vba"))

                        continue;
                        continue;

-               if (dp->d_pri == 0) {
-                       printf("must specify priority for %s%d\n",
+               if (dp->d_vec == 0) {
+                       printf("must specify vector for %s%d\n",

                            dp->d_name, dp->d_unit);
                        continue;
                }
                            dp->d_name, dp->d_unit);
                        continue;
                }


@@ -311,62 +338,68 @@ sun_ioconf()
                        continue;
                }
                if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {
                        continue;
                }
                if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {

-                       printf("drives need their own entries; ");
-                       printf("dont specify drive or slave for %s%d\n",
+                       printf("drives need their own entries; dont ");
+                       printf("specify drive or slave for %s%d\n",

                            dp->d_name, dp->d_unit);
                        continue;
                }
                if (dp->d_flags) {
                            dp->d_name, dp->d_unit);
                        continue;
                }
                if (dp->d_flags) {

-                       printf("controllers (e.g. %s%d) don't have flags, ");
-                       printf("only devices do\n",
+                       printf("controllers (e.g. %s%d) ",

                            dp->d_name, dp->d_unit);
                            dp->d_name, dp->d_unit);

+                       printf("don't have flags, only devices do\n");

                        continue;
                }
                        continue;
                }

-               fprintf(fp, "\t{ &%sdriver,\t%d,\t0,\tC 0x%x,\t%d },\n",
-                   dp->d_name, dp->d_unit, dp->d_addr, dp->d_pri);
+               fprintf(fp,
+                   "\t{ &%sdriver,\t%d,\t%s,\t0,\t%sint%d, C 0x%x },\n",
+                   dp->d_name, dp->d_unit, qu(mp->d_unit),
+                   dp->d_name, dp->d_unit, dp->d_addr);

        }
        fprintf(fp, "\t0\n};\n");
        }
        fprintf(fp, "\t0\n};\n");

-       /*
-        * Now we go for the mb_device stuff
-        */
-       fprintf(fp, "\nstruct mb_device mbdinit[] = {\n");
+/* versabus devices */
+       fprintf(fp, "\nstruct vba_device vbdinit[] = {\n");

        fprintf(fp,
        fprintf(fp,

-"\t/* driver,  unit, ctlr,  slave,   addr,    pri,    dk, flags*/\n");
+"\t/* driver,  unit, ctlr,  vbanum, slave,   intr,    addr,    dk, flags*/\n");

        for (dp = dtab; dp != 0; dp = dp->d_next) {
                mp = dp->d_conn;
                if (dp->d_unit == QUES || dp->d_type != DEVICE || mp == 0 ||
                    mp == TO_NEXUS || mp->d_type == MASTER ||
                    eq(mp->d_name, "mba"))
                        continue;
        for (dp = dtab; dp != 0; dp = dp->d_next) {
                mp = dp->d_conn;
                if (dp->d_unit == QUES || dp->d_type != DEVICE || mp == 0 ||
                    mp == TO_NEXUS || mp->d_type == MASTER ||
                    eq(mp->d_name, "mba"))
                        continue;

-               if (eq(mp->d_name, "mb")) {
-                       if (dp->d_pri == 0) {
-                               printf("must specify vector for device %s%d\n",
+               np = mp->d_conn;
+               if (np != 0 && np != TO_NEXUS && eq(np->d_name, "mba"))
+                       continue;
+               np = 0;
+               if (eq(mp->d_name, "vba")) {
+                       if (dp->d_vec == 0)
+                               printf(
+               "Warning, no interrupt vector specified for device %s%d\n",

                                    dp->d_name, dp->d_unit);
                                    dp->d_name, dp->d_unit);

-                               continue;
-                       }

                        if (dp->d_addr == 0) {
                                printf("must specify csr for device %s%d\n",
                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                        if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {
                        if (dp->d_addr == 0) {
                                printf("must specify csr for device %s%d\n",
                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                        if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {

-                               printf("drives/slaves can be specified only ");
-                               printf("for controllers, not for device %s%d\n",
+                               printf("drives/slaves can be specified ");
+                               printf("only for controllers, ");
+                               printf("not for device %s%d\n",

                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                                    dp->d_name, dp->d_unit);
                                continue;
                        }

+                       vba_n = mp->d_unit;

                        slave = QUES;
                } else {
                        slave = QUES;
                } else {

-                       if (mp->d_conn == 0) {
-                               printf("%s%d isn't connected to anything, ",
+                       if ((np = mp->d_conn) == 0) {
+                               printf("%s%d isn't connected to anything ",

                                    mp->d_name, mp->d_unit);
                                    mp->d_name, mp->d_unit);

-                               printf("so %s%d is unattached\n",
+                               printf(", so %s%d is unattached\n",

                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                                    dp->d_name, dp->d_unit);
                                continue;
                        }

+                       vba_n = np->d_unit;

                        if (dp->d_drive == UNKNOWN) {
                        if (dp->d_drive == UNKNOWN) {

-                               printf("must specify ``drive number'' for %s%d\n",
-                                  dp->d_name, dp->d_unit);
+                               printf("must specify ``drive number'' ");
+                               printf("for %s%d\n", dp->d_name, dp->d_unit);

                                continue;
                        }
                        /* NOTE THAT ON THE UNIBUS ``drive'' IS STORED IN */
                                continue;
                        }
                        /* NOTE THAT ON THE UNIBUS ``drive'' IS STORED IN */


@@ -377,39 +410,319 @@ sun_ioconf()
                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                                    dp->d_name, dp->d_unit);
                                continue;
                        }

-                       if (dp->d_pri != 0) {
-                               printf("interrupt priority should not be ");
+                       if (dp->d_vec != 0) {
+                               printf("interrupt vectors should not be ");

                                printf("given for drive %s%d\n",
                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                        if (dp->d_addr != 0) {
                                printf("given for drive %s%d\n",
                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                        if (dp->d_addr != 0) {

-                               printf("csr addresses should be given only");
+                               printf("csr addresses should be given only ");

                                printf("on controllers, not on %s%d\n",
                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                        slave = dp->d_drive;
                }
                                printf("on controllers, not on %s%d\n",
                                    dp->d_name, dp->d_unit);
                                continue;
                        }
                        slave = dp->d_drive;
                }

+               fprintf(fp, "\t{ &%sdriver,  %2d,   %s,",
+                   eq(mp->d_name, "vba") ? dp->d_name : mp->d_name, dp->d_unit,
+                   eq(mp->d_name, "vba") ? " -1" : qu(mp->d_unit));
+               fprintf(fp, "  %s,    %2d,   %s, C 0x%-6x,  %d,  0x%x },\n",
+                   qu(vba_n), slave, intv(dp), dp->d_addr, dp->d_dk,
+                   dp->d_flags);
+       }
+       fprintf(fp, "\t0\n};\n");
+       (void) fclose(fp);
+}
+#endif
+
+#if MACHINE_HP300
+hp300_ioconf()
+{
+       register struct device *dp, *mp, *np;
+       register int hpib, slave;
+       FILE *fp;
+       extern char *wnum();
+
+       fp = fopen(path("ioconf.c"), "w");
+       if (fp == 0) {
+               perror(path("ioconf.c"));
+               exit(1);
+       }
+       fprintf(fp, "#include \"sys/param.h\"\n");
+       fprintf(fp, "#include \"sys/buf.h\"\n");
+       fprintf(fp, "#include \"sys/map.h\"\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "#include \"hp300/dev/device.h\"\n\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "#define C (caddr_t)\n");
+       fprintf(fp, "#define D (struct driver *)\n\n");
+       /*
+        * First print the hpib controller initialization structures
+        */
+       for (dp = dtab; dp != 0; dp = dp->d_next) {
+               mp = dp->d_conn;
+               if (dp->d_unit == QUES || mp == 0)
+                       continue;
+               fprintf(fp, "extern struct driver %sdriver;\n", dp->d_name);
+       }
+       fprintf(fp, "\nstruct hp_ctlr hp_cinit[] = {\n");
+       fprintf(fp, "/*\tdriver,\t\tunit,\talive,\taddr,\tflags */\n");
+       for (dp = dtab; dp != 0; dp = dp->d_next) {
+               mp = dp->d_conn;
+               if (dp->d_unit == QUES ||
+                       dp->d_type != MASTER && dp->d_type != CONTROLLER)
+                       continue;
+               if (mp != TO_NEXUS) {
+                       printf("%s%s must be attached to an sc (nexus)\n",
+                               dp->d_name, wnum(dp->d_unit));
+                       continue;
+               }
+               if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {
+                       printf("can't specify drive/slave for %s%s\n",
+                               dp->d_name, wnum(dp->d_unit));
+                       continue;
+               }

                fprintf(fp,
                fprintf(fp,

-"\t{ &%sdriver,  %2d,   %s,    %2d,   C 0x%x, %d,  %d,  0x%x },\n",
-                   eq(mp->d_name, "mb") ? dp->d_name : mp->d_name, dp->d_unit,
-                   eq(mp->d_name, "mb") ? " -1" : qu(mp->d_unit),
-                   slave, dp->d_addr, dp->d_pri, dp->d_dk, dp->d_flags);
+                       "\t{ &%sdriver,\t%d,\t0,\tC 0x%x,\t0x%x },\n",
+                       dp->d_name, dp->d_unit, dp->d_addr, dp->d_flags);

        }
        fprintf(fp, "\t0\n};\n");
        }
        fprintf(fp, "\t0\n};\n");

+/* devices */
+       fprintf(fp, "\nstruct hp_device hp_dinit[] = {\n");
+       fprintf(fp,
+          "/*driver,\tcdriver,\tunit,\tctlr,\tslave,\taddr,\tdk,\tflags*/\n");
+       for (dp = dtab; dp != 0; dp = dp->d_next) {
+               mp = dp->d_conn;
+               if (mp == 0 || dp->d_type != DEVICE || hpbadslave(mp, dp))
+                       continue;
+               if (mp == TO_NEXUS) {
+                       if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {
+                               printf("can't specify drive/slave for %s%s\n",
+                                       dp->d_name, wnum(dp->d_unit));
+                               continue;
+                       }
+                       slave = QUES;
+                       hpib = QUES;
+               } else {
+                       if (dp->d_addr != 0) {
+                               printf("can't specify sc for device %s%s\n",
+                                       dp->d_name, wnum(dp->d_unit));
+                               continue;
+                       }
+                       if (mp->d_type == CONTROLLER) {
+                               if (dp->d_drive == UNKNOWN) {
+                                       printf("must specify drive for %s%s\n",
+                                               dp->d_name, wnum(dp->d_unit));
+                                       continue;
+                               }
+                               slave = dp->d_drive;
+                       } else {
+                               if (dp->d_slave == UNKNOWN) {
+                                       printf("must specify slave for %s%s\n",
+                                               dp->d_name, wnum(dp->d_unit));
+                                       continue;
+                               }
+                               slave = dp->d_slave;
+                       }
+                       hpib = mp->d_unit;
+               }
+               fprintf(fp, "{ &%sdriver,\t", dp->d_name);
+               if (mp == TO_NEXUS)
+                       fprintf(fp, "D 0x0,\t");
+               else
+                       fprintf(fp, "&%sdriver,", mp->d_name);
+               fprintf(fp, "\t%d,\t%d,\t%d,\tC 0x%x,\t%d,\t0x%x },\n",
+                       dp->d_unit, hpib, slave,
+                       dp->d_addr, dp->d_dk, dp->d_flags);
+       }
+       fprintf(fp, "0\n};\n");

        (void) fclose(fp);
 }
        (void) fclose(fp);
 }

+
+#define ishpibdev(n) (eq(n,"rd") || eq(n,"ct") || eq(n,"mt") || eq(n,"ppi"))
+#define isscsidev(n) (eq(n,"sd") || eq(n,"st"))
+
+hpbadslave(mp, dp)
+       register struct device *dp, *mp;
+{
+       extern char *wnum();
+
+       if (mp == TO_NEXUS && ishpibdev(dp->d_name) ||
+           mp != TO_NEXUS && eq(mp->d_name, "hpib") &&
+           !ishpibdev(dp->d_name)) {
+               printf("%s%s must be attached to an hpib\n",
+                      dp->d_name, wnum(dp->d_unit));
+               return (1);
+       }
+       if (mp == TO_NEXUS && isscsidev(dp->d_name) ||
+           mp != TO_NEXUS && eq(mp->d_name, "scsi") &&
+           !isscsidev(dp->d_name)) {
+               printf("%s%s must be attached to a scsi\n",
+                      dp->d_name, wnum(dp->d_unit));
+               return (1);
+       }
+       return (0);
+}
+
+char *
+wnum(num)
+{
+
+       if (num == QUES || num == UNKNOWN)
+               return ("?");
+       (void) sprintf(errbuf, "%d", num);
+       return (errbuf);
+}

 #endif
 
 #endif
 

-char *intv(dev)
+#if MACHINE_I386
+char *sirq();
+
+i386_ioconf()
+{
+       register struct device *dp, *mp, *np;
+       register int uba_n, slave;
+       FILE *fp;
+
+       fp = fopen(path("ioconf.c"), "w");
+       if (fp == 0) {
+               perror(path("ioconf.c"));
+               exit(1);
+       }
+       fprintf(fp, "/*\n");
+       fprintf(fp, " * ioconf.c \n");
+       fprintf(fp, " * Generated by config program\n");
+       fprintf(fp, " */\n\n");
+       fprintf(fp, "#include \"machine/pte.h\"\n");
+       fprintf(fp, "#include \"sys/param.h\"\n");
+       fprintf(fp, "#include \"sys/buf.h\"\n");
+       fprintf(fp, "#include \"sys/map.h\"\n");
+       fprintf(fp, "#include \"sys/vm.h\"\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "#define V(s)       V/**/s\n");
+       fprintf(fp, "#define C (caddr_t)\n\n");
+       /*
+        * First print the isa initialization structures
+        */
+       if (seen_isa) {
+
+               fprintf(fp, "/*\n");
+               fprintf(fp, " * ISA devices\n");
+               fprintf(fp, " */\n\n");
+               fprintf(fp, "#include \"i386/isa/isa_device.h\"\n");
+               fprintf(fp, "#include \"i386/isa/isa.h\"\n");
+               fprintf(fp, "#include \"i386/isa/icu.h\"\n\n");
+
+               for (dp = dtab; dp != 0; dp = dp->d_next) {
+                       mp = dp->d_conn;
+                       if (mp == 0 || mp == TO_NEXUS ||
+                           !eq(mp->d_name, "isa"))
+                               continue;
+                       fprintf(fp,
+"extern struct isa_driver %sdriver; extern V(%s%d)();\n",
+                           dp->d_name, dp->d_name, dp->d_unit);
+               }
+               fprintf(fp, "\nstruct isa_device isa_devtab_bio[] = {\n");
+               fprintf(fp, "\
+/* driver      iobase  irq   drq     maddr    msiz    intr   unit */\n");
+               for (dp = dtab; dp != 0; dp = dp->d_next) {
+                       mp = dp->d_conn;
+                       if (dp->d_unit == QUES || mp == 0 ||
+                           mp == TO_NEXUS || !eq(mp->d_name, "isa"))
+                               continue;
+                       if (!eq(dp->d_mask, "bio")) continue;
+                       if (dp->d_port)
+                fprintf(fp, "{ &%sdriver,  %8.8s,", dp->d_name, dp->d_port);
+                       else
+        fprintf(fp, "{ &%sdriver,     0x%03x,", dp->d_name, dp->d_portn);
+               fprintf(fp, " %5.5s, %2d,  C 0x%05X, %5d, V(%s%d),  %2d },\n",
+                               sirq(dp->d_irq), dp->d_drq, dp->d_maddr,
+                        dp->d_msize, dp->d_name, dp->d_unit, dp->d_unit);
+               }
+               fprintf(fp, "0\n};\n");
+
+               fprintf(fp, "struct isa_device isa_devtab_tty[] = {\n");
+               fprintf(fp, "\
+/* driver      iobase  irq   drq     maddr    msiz    intr   unit */\n");
+               for (dp = dtab; dp != 0; dp = dp->d_next) {
+                       mp = dp->d_conn;
+                       if (dp->d_unit == QUES || mp == 0 ||
+                           mp == TO_NEXUS || !eq(mp->d_name, "isa"))
+                               continue;
+                       if (!eq(dp->d_mask, "tty")) continue;
+                       if (dp->d_port)
+                fprintf(fp, "{ &%sdriver,  %8.8s,", dp->d_name, dp->d_port);
+                       else
+        fprintf(fp, "{ &%sdriver,     0x%03x,", dp->d_name, dp->d_portn);
+               fprintf(fp, " %5.5s, %2d,  C 0x%05X, %5d, V(%s%d),  %2d },\n",
+                               sirq(dp->d_irq), dp->d_drq, dp->d_maddr,
+                        dp->d_msize, dp->d_name, dp->d_unit, dp->d_unit);
+               }
+               fprintf(fp, "0\n};\n\n");
+
+               fprintf(fp, "struct isa_device isa_devtab_net[] = {\n");
+               fprintf(fp, "\
+/* driver      iobase  irq   drq     maddr    msiz    intr   unit */\n");
+               for (dp = dtab; dp != 0; dp = dp->d_next) {
+                       mp = dp->d_conn;
+                       if (dp->d_unit == QUES || mp == 0 ||
+                           mp == TO_NEXUS || !eq(mp->d_name, "isa"))
+                               continue;
+                       if (!eq(dp->d_mask, "net")) continue;
+                       if (dp->d_port)
+                fprintf(fp, "{ &%sdriver,  %8.8s,", dp->d_name, dp->d_port);
+                       else
+        fprintf(fp, "{ &%sdriver,     0x%03x,", dp->d_name, dp->d_portn);
+               fprintf(fp, " %5.5s, %2d,  C 0x%05X, %5d, V(%s%d),  %2d },\n",
+                               sirq(dp->d_irq), dp->d_drq, dp->d_maddr,
+                        dp->d_msize, dp->d_name, dp->d_unit, dp->d_unit);
+               }
+               fprintf(fp, "0\n};\n\n");
+
+               fprintf(fp, "struct isa_device isa_devtab_null[] = {\n");
+               fprintf(fp, "\
+/* driver      iobase  irq   drq     maddr    msiz    intr   unit */\n");
+               for (dp = dtab; dp != 0; dp = dp->d_next) {
+                       mp = dp->d_conn;
+                       if (dp->d_unit == QUES || mp == 0 ||
+                           mp == TO_NEXUS || !eq(mp->d_name, "isa"))
+                               continue;
+                       if (!eq(dp->d_mask, "null")) continue;
+                       if (dp->d_port)
+                fprintf(fp, "{ &%sdriver,  %8.8s,", dp->d_name, dp->d_port);
+                       else
+        fprintf(fp, "{ &%sdriver,     0x%03x,", dp->d_name, dp->d_portn);
+               fprintf(fp, " %5.5s, %2d,  C 0x%05X, %5d, V(%s%d),  %2d },\n",
+                               sirq(dp->d_irq), dp->d_drq, dp->d_maddr,
+                        dp->d_msize, dp->d_name, dp->d_unit, dp->d_unit);
+               }
+               fprintf(fp, "0\n};\n\n");
+       }
+       (void) fclose(fp);
+}
+
+char *
+sirq(num)
+{
+
+       if (num == -1)
+               return ("0");
+       sprintf(errbuf, "IRQ%d", num);
+       return (errbuf);
+}
+#endif
+
+char *
+intv(dev)

        register struct device *dev;
 {
        static char buf[20];
 
        if (dev->d_vec == 0)
                return ("     0");
        register struct device *dev;
 {
        static char buf[20];
 
        if (dev->d_vec == 0)
                return ("     0");

-       return (sprintf(buf, "%sint%d", dev->d_name, dev->d_unit));
+       (void) sprintf(buf, "%sint%d", dev->d_name, dev->d_unit);
+       return (buf);

 }
 
 char *
 }
 
 char *


@@ -420,5 +733,6 @@ qu(num)
                return ("'?'");
        if (num == UNKNOWN)
                return (" -1");
                return ("'?'");
        if (num == UNKNOWN)
                return (" -1");

-       return (sprintf(errbuf, "%3d", num));
+       (void) sprintf(errbuf, "%3d", num);
+       return (errbuf);

 }
 }