Implemented a new keyword `disable'. This should be useful for controlling

dangerous drivers in GENERIC.

Removed non-comments on #endifs in config.y.

Improved output formatting in mkioconf.c.

1 files changed, 5 insertions, 4 deletions

diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 39a0819..44fc260 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -722,10 +722,11 @@ isa_biotab(fp, table)
 			continue;
 		fprintf(fp, "{ -1, &%3sdriver, %8s,",
 			mp->d_name, mp->d_port);
-		fprintf(fp, "%6s, %2d, C 0x%05X, %5d, %8s,  %2d, 0x%04X, %2d, 0, 0, 0, 1, %2d, 0 },\n",
+		fprintf(fp, "%6s, %2d, C 0x%05X, %5d, %8s, %3d, 0x%04X, %5d,    0,       0,       0, %6d, %8d,   0 },\n",
 			sirq(mp->d_irq), mp->d_drq, mp->d_maddr,
 			mp->d_msize, shandler(mp), dp->d_unit,
-			dp->d_flags, dp->d_drive, dp->d_conflicts);
+			dp->d_flags, dp->d_drive, !dp->d_disabled,
+			dp->d_conflicts);
 	}
 	fprintf(fp, "0\n};\n");
 }
@@ -758,10 +759,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, %2d, 0 },\n",
+		fprintf(fp, "%6s, %2d, C 0x%05X, %5d, %8s, %3d, 0x%04X,     0,    0,       0,       0, %6d, %8d,   0 },\n",
 			sirq(dp->d_irq), dp->d_drq, dp->d_maddr,
 			dp->d_msize, shandler(dp), dp->d_unit,
-			dp->d_flags, dp->d_conflicts);
+			dp->d_flags, !dp->d_disabled, dp->d_conflicts);
 	}
 	fprintf(fp, "0\n};\n");
 }