1 files changed, 12 insertions, 1003 deletions

diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 110902b..777bc93 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkioconf.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-	"$Id: mkioconf.c,v 1.48 1999/02/05 16:58:22 bde Exp $";
+	"$Id: mkioconf.c,v 1.49 1999/04/16 21:28:10 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -47,19 +47,12 @@ static const char rcsid[] =
 /*
  * build the ioconf.c file
  */
-char	*qu();
-char	*intv();
-char	*wnum();
-void	pseudo_ioconf();
-void comp_config __P((FILE *));
+static char	*qu();
+static char	*intv();
+static char	*wnum();
 void scbus_devtab __P((FILE *, int *));
-void isa_devtab __P((FILE *, char *, int *));
-void isa_biotab __P((FILE *, char *));
 void i386_ioconf __P((void));
-void hp300_ioconf __P((void));
-int hpbadslave __P((struct device *, struct device *));
-void tahoe_ioconf __P((void));
-void vax_ioconf __P((void));
+void alpha_ioconf __P((void));
 
 static char *
 devstr(struct device *dp)
@@ -175,554 +168,8 @@ write_devtab(FILE *fp)
 	fprintf(fp, "int devtab_count = %d;\n", count);
 }
 
-#if MACHINE_VAX
-void
-vax_ioconf()
-{
-	register struct device *dp, *mp, *np;
-	register int uba_n, slave;
-	FILE *fp;
-
-	fp = fopen(path("ioconf.c"), "w");
-	if (fp == 0)
-		err(1, "%s", path("ioconf.c"));
-	fprintf(fp, "#include <vax/include/pte.h>\n");
-	fprintf(fp, "#include <sys/param.h>\n");
-	fprintf(fp, "#include <sys/buf.h>\n");
-	fprintf(fp, "\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");
-	/*
-	 * First print the mba initialization structures
-	 */
-	if (seen_mba) {
-		for (dp = dtab; dp != 0; dp = dp->d_next) {
-			mp = dp->d_conn;
-			if (mp == 0 || mp == TO_NEXUS ||
-			    !eq(mp->d_name, "mba"))
-				continue;
-			fprintf(fp, "extern struct mba_driver %sdriver;\n",
-			    dp->d_name);
-		}
-		fprintf(fp, "\nstruct mba_device mbdinit[] = {\n");
-		fprintf(fp, "\t/* Device,  Unit, Mba, Drive, Dk */\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, "mba"))
-				continue;
-			if (dp->d_addr) {
-				printf("can't specify csr address on mba for %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			if (dp->d_vec != 0) {
-				printf("can't specify vector for %s%d on mba\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			if (dp->d_drive == UNKNOWN) {
-				printf("drive not specified for %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			if (dp->d_slave != UNKNOWN) {
-				printf("can't specify slave number for %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			fprintf(fp, "\t{ &%sdriver, %d,   %s,",
-				dp->d_name, dp->d_unit, qu(mp->d_unit));
-			fprintf(fp, "  %s,  %d },\n",
-				qu(dp->d_drive), dp->d_dk);
-		}
-		fprintf(fp, "\t0\n};\n\n");
-		/*
-		 * Print the mbsinit structure
-		 * Driver Controller Unit Slave
-		 */
-		fprintf(fp, "struct mba_slave mbsinit [] = {\n");
-		fprintf(fp, "\t/* Driver,  Ctlr, Unit, Slave */\n");
-		for (dp = dtab; dp != 0; dp = dp->d_next) {
-			/*
-			 * All slaves are connected to something which
-			 * is connected to the massbus.
-			 */
-			if ((mp = dp->d_conn) == 0 || mp == TO_NEXUS)
-				continue;
-			np = mp->d_conn;
-			if (np == 0 || np == TO_NEXUS ||
-			    !eq(np->d_name, "mba"))
-				continue;
-			fprintf(fp, "\t{ &%sdriver, %s",
-			    mp->d_name, qu(mp->d_unit));
-			fprintf(fp, ",  %2d,    %s },\n",
-			    dp->d_unit, qu(dp->d_slave));
-		}
-		fprintf(fp, "\t0\n};\n\n");
-	}
-	/*
-	 * Now generate interrupt vectors for the unibus
-	 */
-	for (dp = dtab; dp != 0; dp = dp->d_next) {
-		if (dp->d_vec != 0) {
-			struct idlst *ip;
-			mp = dp->d_conn;
-			if (mp == 0 || mp == TO_NEXUS ||
-			    (!eq(mp->d_name, "uba") && !eq(mp->d_name, "bi")))
-				continue;
-			fprintf(fp,
-			    "extern struct uba_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");
-		}
-	}
-	fprintf(fp, "\nstruct uba_ctlr ubminit[] = {\n");
-	fprintf(fp, "/*\t driver,\tctlr,\tubanum,\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 ||
-		    !eq(mp->d_name, "uba"))
-			continue;
-		if (dp->d_vec == 0) {
-			printf("must specify vector for %s%d\n",
-			    dp->d_name, dp->d_unit);
-			continue;
-		}
-		if (dp->d_addr == 0) {
-			printf("must specify csr address for %s%d\n",
-			    dp->d_name, dp->d_unit);
-			continue;
-		}
-		if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {
-			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) {
-			printf("controllers (e.g. %s%d) ",
-			    dp->d_name, dp->d_unit);
-			printf("don't have flags, only devices do\n");
-			continue;
-		}
-		fprintf(fp,
-		    "\t{ &%sdriver,\t%d,\t%s,\t0,\t%sint%d, C 0%o },\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");
-/* unibus devices */
-	fprintf(fp, "\nstruct uba_device ubdinit[] = {\n");
-	fprintf(fp,
-"\t/* driver,  unit, ctlr,  ubanum, 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;
-		np = mp->d_conn;
-		if (np != 0 && np != TO_NEXUS && eq(np->d_name, "mba"))
-			continue;
-		np = 0;
-		if (eq(mp->d_name, "uba")) {
-			if (dp->d_vec == 0) {
-				printf("must specify vector for device %s%d\n",
-				    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) {
-				printf("drives/slaves can be specified ");
-				printf("only for controllers, ");
-				printf("not for device %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			uba_n = mp->d_unit;
-			slave = QUES;
-		} else {
-			if ((np = mp->d_conn) == 0) {
-				printf("%s%d isn't connected to anything ",
-				    mp->d_name, mp->d_unit);
-				printf(", so %s%d is unattached\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			uba_n = np->d_unit;
-			if (dp->d_drive == UNKNOWN) {
-				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 */
-			/* ``SLAVE'' AND WE DON'T WANT A SLAVE SPECIFIED */
-			if (dp->d_slave != UNKNOWN) {
-				printf("slave numbers should be given only ");
-				printf("for massbus tapes, not for %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			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("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;
-		}
-		fprintf(fp, "\t{ &%sdriver,  %2d,   %s,",
-		    eq(mp->d_name, "uba") ? dp->d_name : mp->d_name, dp->d_unit,
-		    eq(mp->d_name, "uba") ? " -1" : qu(mp->d_unit));
-		fprintf(fp, "  %s,    %2d,   %s, C 0%-6o,  %d,  0x%x },\n",
-		    qu(uba_n), slave, intv(dp), dp->d_addr, dp->d_dk,
-		    dp->d_flags);
-	}
-	fprintf(fp, "\t0\n};\n");
-	pseudo_ioconf(fp);
-	(void) fclose(fp);
-}
-#endif
-
-#if MACHINE_TAHOE
-void
-tahoe_ioconf()
-{
-	register struct device *dp, *mp, *np;
-	register int vba_n, slave;
-	FILE *fp;
-
-	fp = fopen(path("ioconf.c"), "w");
-	if (fp == 0)
-		err(1, "%s", path("ioconf.c"));
-	fprintf(fp, "#include <sys/param.h>\n");
-	fprintf(fp, "#include <tahoe/include/pte.h>\n");
-	fprintf(fp, "#include <sys/buf.h>\n");
-	fprintf(fp, "\n");
-	fprintf(fp, "#include <tahoe/vba/vbavar.h>\n");
-	fprintf(fp, "\n");
-	fprintf(fp, "#define C (caddr_t)\n\n");
-	/*
-	 * Now generate interrupt vectors for the versabus
-	 */
-	for (dp = dtab; dp != 0; dp = dp->d_next) {
-		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);
-	}
-	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 ||
-		    !eq(mp->d_name, "vba"))
-			continue;
-		if (dp->d_vec == 0) {
-			printf("must specify vector for %s%d\n",
-			    dp->d_name, dp->d_unit);
-			continue;
-		}
-		if (dp->d_addr == 0) {
-			printf("must specify csr address for %s%d\n",
-			    dp->d_name, dp->d_unit);
-			continue;
-		}
-		if (dp->d_drive != UNKNOWN || dp->d_slave != UNKNOWN) {
-			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) {
-			printf("controllers (e.g. %s%d) ",
-			    dp->d_name, dp->d_unit);
-			printf("don't have flags, only devices do\n");
-			continue;
-		}
-		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");
-/* versabus devices */
-	fprintf(fp, "\nstruct vba_device vbdinit[] = {\n");
-	fprintf(fp,
-"\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;
-		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);
-			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 ");
-				printf("only for controllers, ");
-				printf("not for device %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			vba_n = mp->d_unit;
-			slave = QUES;
-		} else {
-			if ((np = mp->d_conn) == 0) {
-				printf("%s%d isn't connected to anything ",
-				    mp->d_name, mp->d_unit);
-				printf(", so %s%d is unattached\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			vba_n = np->d_unit;
-			if (dp->d_drive == UNKNOWN) {
-				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 */
-			/* ``SLAVE'' AND WE DON'T WANT A SLAVE SPECIFIED */
-			if (dp->d_slave != UNKNOWN) {
-				printf("slave numbers should be given only ");
-				printf("for massbus tapes, not for %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			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("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;
-		}
-		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");
-	pseudo_ioconf(fp);
-	(void) fclose(fp);
-}
-#endif
-
-#if MACHINE_HP300 || MACHINE_LUNA68K
-void
-hp300_ioconf()
-{
-	register struct device *dp, *mp;
-	register int hpib, slave;
-	FILE *fp;
-
-	fp = fopen(path("ioconf.c"), "w");
-	if (fp == 0)
-		err(1, "%s", path("ioconf.c"));
-	fprintf(fp, "#include <sys/param.h>\n");
-	fprintf(fp, "#include <sys/buf.h>\n");
-	fprintf(fp, "\n");
-	if (machine == MACHINE_HP300)
-		fprintf(fp, "#include <hp/dev/device.h>\n\n");
-	else
-		fprintf(fp, "#include <luna68k/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,
-			"\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");
-/* 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");
-	pseudo_ioconf(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") || eq(n,"ac"))
-
-int
-hpbadslave(mp, dp)
-	register struct device *dp, *mp;
-{
-
-	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);
-}
-#endif
-
 #if MACHINE_I386
-char *sirq();
+static char *sirq();
 
 void
 i386_ioconf()
@@ -745,60 +192,6 @@ i386_ioconf()
 	fprintf(fp, "\n");
 	fprintf(fp, "#define C (caddr_t)\n");
 
-#if 0
-	/*
-	 * First print the isa initialization structures
-	 */
-	if (seen_isa) {
-		int seen_wdc = 0, seen_fdc = 0;
-
-		fprintf(fp, "\n");
-		fprintf(fp, "/*\n");
-		fprintf(fp, " * ISA devices.\n");
-		fprintf(fp, " */\n");
-		fprintf(fp, "\n");
-		fprintf(fp, "#include <i386/isa/icu.h>\n");
-		if (machine == MACHINE_I386)
-			fprintf(fp, "#include <i386/isa/isa.h>\n");
-		else
-			fprintf(fp, "#include <pc98/pc98/pc98.h>\n");
-		fprintf(fp, "#include <i386/isa/isa_device.h>\n");
-		fprintf(fp, "\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;
-			if (old_d_name == NULL || !eq(dp->d_name, old_d_name)) {
-				old_d_name = dp->d_name;
-				fprintf(fp,
-					"extern struct isa_driver %3sdriver;\n",
-					old_d_name);
-			}
-			if (eq(dp->d_name, "wdc"))
-				seen_wdc++;
-			if (eq(dp->d_name, "fdc"))
-				seen_fdc++;
-			if ((dp->d_irq == 2) && (machine == MACHINE_I386)) {
-				fprintf(stderr,
-		"remapped irq 2 to irq 9, please update your config file\n");
-				dp->d_irq = 9;
-			}
-		}
-		dev_id = 10;		/* XXX must match mkglue.c */
-		isa_devtab(fp, "bio", &dev_id);
-		if (seen_wdc)
-			isa_biotab(fp, "wdc");
-		if (seen_fdc)
-			isa_biotab(fp, "fdc");
-		isa_devtab(fp, "tty", &dev_id);
-		isa_devtab(fp, "net", &dev_id);
-		isa_devtab(fp, "cam", &dev_id);
-		isa_devtab(fp, "ha", &dev_id);
-		isa_devtab(fp, "null", &dev_id);
-	}
-#endif
-
 	if (seen_scbus)
 		scbus_devtab(fp, &dev_id);
 
@@ -819,78 +212,6 @@ i386_ioconf()
 	moveifchanged(path("ioconf.c.new"), path("ioconf.c"));
 }
 
-void
-isa_biotab(fp, table)
-	FILE	*fp;
-	char	*table;
-{
-	register struct device *dp, *mp;
-
-	fprintf(fp, "\n");
-	fprintf(fp, "struct isa_device isa_biotab_%s[] = {\n", table);
-	fprintf(fp, "\
-/* id     driver    iobase    irq drq      maddr   msiz intr unit   flags  drive alive ri_flags reconfig enabled conflicts next */\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, table))
-			continue;
-		fprintf(fp, "{ -1, &%3sdriver, ",
-			mp->d_name);
-		if (mp->d_port)
-			fprintf(fp, " %8s,", mp->d_port);
-		else if (mp->d_portn == -1)
-			fprintf(fp, "       %d,", mp->d_portn);
-		else
-			fprintf(fp, "   0x%04x,", mp->d_portn);
-		fprintf(fp, "%6s, %2d, C 0x%05X, %5d, {0}, %3d, 0x%04X, %5d,    0,       0,       0, %6d, %8d,   0 },\n",
-			sirq(mp->d_irq), mp->d_drq, mp->d_maddr,
-			mp->d_msize, dp->d_unit,
-			dp->d_flags, dp->d_drive, !dp->d_disabled,
-			dp->d_conflicts);
-	}
-	fprintf(fp, "{ 0 }\n};\n");
-}
-
-/*
- * Generized routine for isa bus device table, instead of repeating
- * all this 4 times, call this with the table argument.
- *
- * 4/26/93 rgrimes
- */
-void
-isa_devtab(fp, table, dev_idp)
-	FILE	*fp;
-	char	*table;
-	int	*dev_idp;
-{
-	register struct device *dp, *mp;
-
-	fprintf(fp, "\n");
-	fprintf(fp, "struct isa_device isa_devtab_%s[] = {\n", table);
-	fprintf(fp, "\
-/* id     driver    iobase    irq drq      maddr   msiz intr unit   flags scsiid alive ri_flags reconfig enabled conflicts next */\n");
-	for (dp = dtab; dp != 0; dp = dp->d_next) {
-		if (dp->d_unit == QUES || !eq(dp->d_mask, table))
-			continue;
-		mp = dp->d_conn;
-		if (mp == NULL || mp == TO_NEXUS || !eq(mp->d_name, "isa"))
-			continue;
-		fprintf(fp, "{ %2d, &%3sdriver,", (*dev_idp)++, dp->d_name);
-		if (dp->d_port)
-			fprintf(fp, " %8s,", dp->d_port);
-		else if (dp->d_portn == -1)
-			fprintf(fp, "       %d,", dp->d_portn);
-		else
-			fprintf(fp, "   0x%04x,", dp->d_portn);
-		fprintf(fp, "%6s, %2d, C 0x%05X, %5d, {0}, %3d, 0x%04X,     0,    0,       0,       0, %6d, %8d,   0 },\n",
-			sirq(dp->d_irq), dp->d_drq, dp->d_maddr,
-			dp->d_msize, dp->d_unit,
-			dp->d_flags, !dp->d_disabled, dp->d_conflicts);
-	}
-	fprintf(fp, "{ 0 }\n};\n");
-}
-
 static char *
 id(int unit)
 {
@@ -912,7 +233,8 @@ id(int unit)
 	return s;
 }
 
-static void id_put(fp, unit, s)
+static void
+id_put(fp, unit, s)
 	FILE *fp;
 	int unit;
 	char *s;
@@ -1003,7 +325,7 @@ scbus_devtab(fp, dev_idp)
  * little pieces of it.
  */
 
-char *
+static char *
 sirq(num)
 {
 
@@ -1014,241 +336,6 @@ sirq(num)
 }
 #endif
 
-#if MACHINE_PMAX
-void
-pmax_ioconf()
-{
-	register struct device *dp, *mp;
-	FILE *fp;
-
-	fp = fopen(path("ioconf.c"), "w");
-	if (fp == 0)
-		err(1, "%s", path("ioconf.c"));
-	fprintf(fp, "#include <sys/types.h>\n");
-	fprintf(fp, "#include <sys/time.h>\n");
-	fprintf(fp, "#include <pmax/dev/device.h>\n\n");
-	fprintf(fp, "#define C (char *)\n\n");
-
-	/* print controller initialization structures */
-	for (dp = dtab; dp != 0; dp = dp->d_next) {
-		if (dp->d_type == PSEUDO_DEVICE)
-			continue;
-		fprintf(fp, "extern struct driver %sdriver;\n", dp->d_name);
-	}
-	fprintf(fp, "\nstruct pmax_ctlr pmax_cinit[] = {\n");
-	fprintf(fp, "/*\tdriver,\t\tunit,\taddr,\t\tpri,\tflags */\n");
-	for (dp = dtab; dp != 0; dp = dp->d_next) {
-		if (dp->d_type != CONTROLLER && dp->d_type != MASTER)
-			continue;
-		if (dp->d_conn != TO_NEXUS) {
-			printf("%s%s must be attached to a nexus (internal bus)\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;
-		}
-		if (dp->d_unit == UNKNOWN || dp->d_unit == QUES)
-			dp->d_unit = 0;
-		fprintf(fp,
-			"\t{ &%sdriver,\t%d,\tC 0x%x,\t%d,\t0x%x },\n",
-			dp->d_name, dp->d_unit, dp->d_addr, dp->d_pri,
-			dp->d_flags);
-	}
-	fprintf(fp, "\t0\n};\n");
-
-	/* print devices connected to other controllers */
-	fprintf(fp, "\nstruct scsi_device scsi_dinit[] = {\n");
-	fprintf(fp,
-	   "/*driver,\tcdriver,\tunit,\tctlr,\tdrive,\tslave,\tdk,\tflags*/\n");
-	for (dp = dtab; dp != 0; dp = dp->d_next) {
-		if (dp->d_type == CONTROLLER || dp->d_type == MASTER ||
-		    dp->d_type == PSEUDO_DEVICE)
-			continue;
-		mp = dp->d_conn;
-		if (mp == 0 ||
-		    (!eq(mp->d_name, "asc") && !eq(mp->d_name, "sii"))) {
-			printf("%s%s: devices must be attached to a SCSI (asc or sii) controller\n",
-				dp->d_name, wnum(dp->d_unit));
-			continue;
-		}
-		if ((unsigned)dp->d_drive > 6) {
-			printf("%s%s: SCSI drive must be in the range 0..6\n",
-				dp->d_name, wnum(dp->d_unit));
-			continue;
-		}
-		/* may want to allow QUES later */
-		if ((unsigned)dp->d_slave > 7) {
-			printf("%s%s: SCSI slave (LUN) must be in the range 0..7\n",
-				dp->d_name, wnum(dp->d_unit));
-			continue;
-		}
-		fprintf(fp, "{ &%sdriver,\t&%sdriver,", dp->d_name, mp->d_name);
-		fprintf(fp, "\t%d,\t%d,\t%d,\t%d,\t%d,\t0x%x },\n",
-			dp->d_unit, mp->d_unit, dp->d_drive, dp->d_slave,
-			dp->d_dk, dp->d_flags);
-	}
-	fprintf(fp, "0\n};\n");
-	pseudo_ioconf(fp);
-	(void) fclose(fp);
-}
-#endif
-
-#if MACHINE_NEWS3400
-int have_iop = 0;
-int have_hb = 0;
-int have_vme = 0;
-
-void
-news_ioconf()
-{
-	register struct device *dp, *mp;
-	register int slave;
-	FILE *fp;
-
-	fp = fopen(path("ioconf.c"), "w");
-	if (fp == 0)
-		err(1, "%s", path("ioconf.c"));
-	fprintf(fp, "#include <sys/param.h>\n");
-	fprintf(fp, "#include <sys/buf.h>\n");
-	fprintf(fp, "#include <vm/vm.h>\n");
-	fprintf(fp, "#include \"iop.h\"\n");
-	fprintf(fp, "#include \"hb.h\"\n");
-	fprintf(fp, "\n");
-	fprintf(fp, "#if NIOP > 0\n");
-	fprintf(fp, "#include <news3400/iop/iopvar.h>\n");
-	fprintf(fp, "#endif\n");
-	fprintf(fp, "#if NHB > 0\n");
-	fprintf(fp, "#include <news3400/hbdev/hbvar.h>\n");
-	fprintf(fp, "#endif\n");
-	fprintf(fp, "\n");
-	fprintf(fp, "#define C (caddr_t)\n\n");
-	fprintf(fp, "\n");
-
-/* BEGIN HB */
-	fprintf(fp, "#if NHB > 0\n");
-	/*
-	 * Now generate interrupt vectors for the HYPER-BUS
-	 */
-	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, "hb"))
-				continue;
-			fprintf(fp, "extern struct hb_driver %sdriver;\n",
-			    dp->d_name);
-			have_hb++;
-		}
-	}
-	/*
-	 * Now spew forth the hb_cinfo structure
-	 */
-	fprintf(fp, "\nstruct hb_ctlr hminit[] = {\n");
-	fprintf(fp, "/*\t driver,\tctlr,\talive,\taddr,\tintpri */\n");
-	for (dp = dtab; dp != 0; dp = dp->d_next) {
-		mp = dp->d_conn;
-		if ((dp->d_type != MASTER && dp->d_type != CONTROLLER)
-		    || mp == TO_NEXUS || mp == 0 ||
-		    !eq(mp->d_name, "hb"))
-			continue;
-		if (dp->d_pri < 0) {
-			printf("must specify priority for %s%d\n",
-			    dp->d_name, dp->d_unit);
-			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",
-			    dp->d_name, dp->d_unit);
-			continue;
-		}
-		if (dp->d_flags) {
-			printf(
-		"controllers (e.g. %s%d) don't have flags, only devices do\n",
-			    dp->d_name, dp->d_unit);
-			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, "\t0\n};\n");
-	/*
-	 * Now we go for the hb_device stuff
-	 */
-	fprintf(fp, "\nstruct hb_device hdinit[] = {\n");
-	fprintf(fp,
-"\t/* driver,  unit, ctlr,  slave,   addr,    pri,    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, "iop") || eq(mp->d_name, "vme"))
-			continue;
-		if (eq(mp->d_name, "hb")) {
-			if (dp->d_pri < 0) {
-				printf("must specify vector 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",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			slave = QUES;
-		} else {
-			if (mp->d_conn == 0) {
-				printf("%s%d isn't connected to anything, ",
-				    mp->d_name, mp->d_unit);
-				printf("so %s%d is unattached\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			if (dp->d_drive == UNKNOWN) {
-				printf("must specify ``drive number'' for %s%d\n",
-				   dp->d_name, dp->d_unit);
-				continue;
-			}
-			/* NOTE THAT ON THE IOP ``drive'' IS STORED IN */
-			/* ``SLAVE'' AND WE DON'T WANT A SLAVE SPECIFIED */
-			if (dp->d_slave != UNKNOWN) {
-				printf("slave numbers should be given only ");
-				printf("for massbus tapes, not for %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			if (dp->d_pri >= 0) {
-				printf("interrupt priority should not be ");
-				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("on controllers, not on %s%d\n",
-				    dp->d_name, dp->d_unit);
-				continue;
-			}
-			slave = dp->d_drive;
-		}
-		fprintf(fp,
-"\t{ &%sdriver,  %2d,   %s,    %2d,   C 0x%x, %d,  %d,  0x%x },\n",
-		    eq(mp->d_name, "hb") ? dp->d_name : mp->d_name, dp->d_unit,
-		    eq(mp->d_name, "hb") ? " -1" : qu(mp->d_unit),
-		    slave, dp->d_addr, dp->d_pri, dp->d_dk, dp->d_flags);
-	}
-	fprintf(fp, "\t0\n};\n\n");
-	fprintf(fp, "#endif\n\n");
-/* END HB */
-	pseudo_ioconf(fp);
-	(void) fclose(fp);
-}
-#endif
-
 #if MACHINE_ALPHA
 void
 alpha_ioconf()
@@ -1280,7 +367,7 @@ alpha_ioconf()
 
 #endif
 
-char *
+static char *
 intv(dev)
 	register struct device *dev;
 {
@@ -1292,7 +379,7 @@ intv(dev)
 	return (buf);
 }
 
-char *
+static char *
 qu(num)
 {
 
@@ -1304,7 +391,7 @@ qu(num)
 	return (errbuf);
 }
 
-char *
+static char *
 wnum(num)
 {
 
@@ -1313,81 +400,3 @@ wnum(num)
 	(void) sprintf(errbuf, "%d", num);
 	return (errbuf);
 }
-
-void
-pseudo_ioconf(fp)
-	register FILE *fp;
-{
-	register struct device *dp;
-
-	(void)fprintf(fp, "\n#include <sys/device.h>\n\n");
-	for (dp = dtab; dp != NULL; dp = dp->d_next)
-		if (dp->d_type == PSEUDO_DEVICE)
-			(void)fprintf(fp, "extern void %sattach __P((int));\n",
-			    dp->d_name);
-	/*
-	 * XXX concatonated disks are pseudo-devices but appear as DEVICEs
-	 * since they don't adhere to normal pseudo-device conventions
-	 * (i.e. one entry with total count in d_slave).
-	 */
-	if (seen_cd)
-		(void)fprintf(fp, "extern void cdattach __P((int));\n");
-	/* XXX temporary for HP300, others */
-	(void)fprintf(fp, "\n#include <sys/systm.h> /* XXX */\n");
-	(void)fprintf(fp, "#define etherattach (void (*)__P((int)))nullop\n");
-	(void)fprintf(fp, "#define iteattach (void (*) __P((int)))nullop\n");
-	(void)fprintf(fp, "\nstruct pdevinit pdevinit[] = {\n");
-	for (dp = dtab; dp != NULL; dp = dp->d_next)
-		if (dp->d_type == PSEUDO_DEVICE)
-			(void)fprintf(fp, "\t{ %sattach, %d },\n", dp->d_name,
-			    dp->d_slave > 0 ? dp->d_slave : 1);
-	/*
-	 * XXX count up cds and put out an entry
-	 */
-	if (seen_cd) {
-		struct file_list *fl;
-		int cdmax = -1;
-
-		for (fl = comp_list; fl != NULL; fl = fl->f_next)
-			if (fl->f_type == COMPDEVICE && fl->f_compinfo > cdmax)
-				cdmax = fl->f_compinfo;
-		(void)fprintf(fp, "\t{ cdattach, %d },\n", cdmax+1);
-	}
-	(void)fprintf(fp, "\t{ 0, 0 }\n};\n");
-	if (seen_cd)
-		comp_config(fp);
-}
-
-void
-comp_config(fp)
-	FILE *fp;
-{
-	register struct file_list *fl;
-	register struct device *dp;
-
-	fprintf(fp, "\n#include <dev/cdvar.h>\n");
-	fprintf(fp, "\nstruct cddevice cddevice[] = {\n");
-	fprintf(fp, "/*\tunit\tileave\tflags\tdk\tdevs\t\t\t\t*/\n");
-
-	fl = comp_list;
-	while (fl) {
-		if (fl->f_type != COMPDEVICE) {
-			fl = fl->f_next;
-			continue;
-		}
-		for (dp = dtab; dp != 0; dp = dp->d_next)
-			if (dp->d_type == DEVICE &&
-			    eq(dp->d_name, fl->f_fn) &&
-			    dp->d_unit == fl->f_compinfo)
-				break;
-		if (dp == 0)
-			continue;
-		fprintf(fp, "\t%d,\t%d,\t%d,\t%d,\t{",
-			dp->d_unit, dp->d_pri < 0 ? 0 : dp->d_pri,
-			dp->d_flags, 1);
-		for (fl = fl->f_next; fl->f_type == COMPSPEC; fl = fl->f_next)
-			fprintf(fp, " 0x%x,", fl->f_compdev);
-		fprintf(fp, " NODEV },\n");
-	}
-	fprintf(fp, "\t-1,\t0,\t0,\t0,\t{ 0 },\n};\n");
-}