diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-05-11 09:59:41 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-05-11 09:59:41 +0000 |
| commit | 9846d93ae61466fbc6b02726c19022214acae9aa (patch) | |
| tree | f5f4554f1f1e10622e28178a7e2f5938f2ce420a /usr.sbin/config/mkioconf.c | |
| parent | 6733520104299f140a5e240a63e9282f64a00ab9 (diff) | |
Formerly reuse of unit numbers of detached devices was impossible, with
this change starred devices will search from the first allowed unit for
such devices and up for free units when attaching. This means you have
to rerun config(8) before yopu compile current kernels. FYI, this is
a necessity when doing PCMCIA flashcard reading, otherwise you soon run
out of unit numbers.
I have also added a way to detach all children of a certain device, used
in a new PCMCIA framework to come, so you detach all functions on a
single PCMCIA card when pulling it out.
A few bugs wrt starred devices fixed in the autoconfig_verbose code too.
Last and least, fixed some panic messages.
Diffstat (limited to 'usr.sbin/config/mkioconf.c')
| -rw-r--r-- | usr.sbin/config/mkioconf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index 6403a9307d5..e9d2b971337 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkioconf.c,v 1.12 1997/08/07 10:36:58 deraadt Exp $ */ +/* $OpenBSD: mkioconf.c,v 1.13 1998/05/11 09:59:40 niklas Exp $ */ /* $NetBSD: mkioconf.c,v 1.41 1996/11/11 14:18:49 mycroft Exp $ */ /* @@ -355,7 +355,7 @@ emitcfdata(fp) #define DSTR FSTATE_DSTAR\n\ \n\ struct cfdata cfdata[] = {\n\ - /* attachment driver unit state loc flags parents nm ivstubs */\n") < 0) + /* attachment driver unit state loc flags parents nm ivstubs starunit1 */\n") < 0) return (1); for (p = packed; (i = *p) != NULL; p++) { /* the description */ @@ -403,11 +403,11 @@ struct cfdata cfdata[] = {\n\ } else loc = "loc"; if (fprintf(fp, "\ - {&%s_ca,%s&%s_cd,%s%2d, %s, %7s, %#4x, pv+%2d, %d, %s%d},\n", + {&%s_ca,%s&%s_cd,%s%2d, %s, %7s, %#4x, pv+%2d, %d, %s%d, %4d},\n", attachment, strlen(attachment) < 6 ? "\t\t" : "\t", basename, strlen(basename) < 3 ? "\t\t" : "\t", unit, state, loc, i->i_cfflags, i->i_pvoff, i->i_locnami, - vs, v) < 0) + vs, v, unit) < 0) return (1); } if (fprintf(fp, " {0},\n {0},\n {0},\n {0},\n") < 0) |