Add a new `conflicts' flag for telling when a device is in conflict with

others.  The flag can be put in descriptive locations, e.g.:

device sb0      at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr
or
device psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr

But is nonetheless boolean only.  You can't turn conflict checking off for
only a given type of conflict.  I didn't deem it worth the trouble at this
stage, and it's far better than the ALLOW_CONFLICT_* that preceeded it.

1 files changed, 3 insertions, 3 deletions

diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 0f2af8a..3866124 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -717,7 +717,7 @@ isa_devtab(fp, table, dev_idp)
 
 	fprintf(fp, "\n\nstruct isa_device isa_devtab_%s[] = {\n", table);
 	fprintf(fp, "\
-/* id     driver    iobase    irq drq      maddr   msiz      intr unit   flags */\n");
+/* id     driver    iobase    irq drq      maddr   msiz      intr unit   flags conflicts */\n");
 	for (dp = dtab; dp != 0; dp = dp->d_next) {
 		if (dp->d_unit == QUES || !eq(dp->d_mask, table))
 			continue;
@@ -729,10 +729,10 @@ isa_devtab(fp, table, dev_idp)
 			fprintf(fp, " %8s,", dp->d_port);
 		else
 			fprintf(fp, "   0x%04x,", dp->d_portn);
-		fprintf(fp, "%6s, %2d, C 0x%05X, %5d, %8s,  %2d, 0x%04X, 0, 0, 0, 0, 1 },\n",
+		fprintf(fp, "%6s, %2d, C 0x%05X, %5d, %8s,  %2d, 0x%04X, %2d, 0, 0, 0, 0, 1 },\n",
 			sirq(dp->d_irq), dp->d_drq, dp->d_maddr,
 			dp->d_msize, shandler(dp), dp->d_unit,
-			dp->d_flags);
+			dp->d_flags, dp->d_conflicts);
 	}
 	fprintf(fp, "0\n};\n");
 }