diff options
author | peter <peter@FreeBSD.org> | 2004-08-30 23:03:58 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2004-08-30 23:03:58 +0000 |
commit | 1d9abdbe783a3f2587fde29b89cda1c8da982097 (patch) | |
tree | 48d9944fb7d50a767ae5d57a3e3f8f4c3facf67e /usr.sbin/config/config.y | |
parent | 78508cab2611f6e60cfba0bb7d5314c1fd36f4b3 (diff) | |
download | FreeBSD-src-1d9abdbe783a3f2587fde29b89cda1c8da982097.zip FreeBSD-src-1d9abdbe783a3f2587fde29b89cda1c8da982097.tar.gz |
Kill count device support from config. I've changed the last few
remaining consumers to have the count passed as an option. This is
i4b, pc98/wdc, and coda.
Bump configvers.h from 500013 to 600000.
Remove heuristics that tried to parse "device ed5" as 5 units of the ed
device. This broke things like the snd_emu10k1 device, which required
quotes to make it parse right. The no-longer-needed quotes have been
removed from NOTES, GENERIC etc. eg, I've removed the quotes from:
device snd_maestro
device "snd_maestro3"
device snd_mss
I believe everything will still compile and work after this.
Diffstat (limited to 'usr.sbin/config/config.y')
-rw-r--r-- | usr.sbin/config/config.y | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index d16982a..47b2568 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -250,16 +250,7 @@ Device_spec: = { newopt(&opt, devopt($2), ns("1")); /* and the device part */ - newdev($2, UNKNOWN); - } | - DEVICE Dev NUMBER - = { - newopt(&opt, devopt($2), ns("1")); - /* and the device part */ - newdev($2, $3); - if ($3 == 0) - errx(1, "%s:%d: devices with zero units are not " - "likely to be correct", yyfile, yyline); + newdev($2); } | NODEVICE Dev = { @@ -298,14 +289,13 @@ newfile(char *name) * add a device to the list of devices */ static void -newdev(char *name, int count) +newdev(char *name) { struct device *np; np = (struct device *) malloc(sizeof *np); memset(np, 0, sizeof(*np)); np->d_name = name; - np->d_count = count; STAILQ_INSERT_TAIL(&dtab, np, d_next); } |