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.

31 files changed, 86 insertions, 87 deletions

diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index d3feff0b2b91..8ea98263d175 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "vcoda.h"
+#include "opt_coda.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index 03e408da63d6..35eb7257604d 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 
 extern int coda_nc_initialized;    /* Set if cache has been initialized */
 
-#include <vcoda.h>
+#include "opt_coda.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index 189ee92487fc..04e739c49e55 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -43,7 +43,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <vcoda.h>
+#include "opt_coda.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index d17855daab85..b310d5dbe281 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 .if !defined(S)
 .if exists(./@/.)
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 02687616bb2f..965524732e3e 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 998d296e187e..dbbe7d614a41 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 # Temporary stuff while we're still embryonic
 NO_MODULES?=	yes
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 6259f6932172..dd02522c1a6f 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 82d79a8d5e4e..b543fbcfd29c 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -19,7 +19,7 @@
 GCC3=	you bet
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index eb8fda091ab9..161dbccddd89 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 .if !defined(S)
 .if exists(./@/.)
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 471ae7f92765..93c219cc6a96 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 # Temporary stuff while we're still embryonic
 NO_MODULES?=	yes
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index a9e11e51d9de..357bc0fbfa8e 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500013
+%VERSREQ=	600000
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5eb1b49176db..f03555f03fb0 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -817,10 +817,11 @@ options 	NFS_DEBUG		# Enable NFS Debugging
 
 # Coda stuff:
 options 	CODA			#CODA filesystem.
-device		vcoda	4		#coda minicache <-> venus comm.
+device		vcoda			#coda minicache <-> venus comm.
 # Use the old Coda 5.x venus<->kernel interface instead of the new
 # realms-aware 6.x protocol.
 #options 	CODA_COMPAT_5
+options 	NVCODA=4
 
 #
 # Add support for the EXT2FS filesystem of Linux fame.  Be a bit
@@ -1869,32 +1870,32 @@ device		sound
 # snd_vibes:		S3 Sonicvibes PCI.
 # snd_uaudio:		USB audio.
 
-device		"snd_ad1816"
-device		"snd_als4000"
-#device		"snd_au88x0"
+device		snd_ad1816
+device		snd_als4000
+#device		snd_au88x0
 device		snd_cmi
-device		"snd_cs4281"
+device		snd_cs4281
 device		snd_csa
-device		"snd_ds1"
-device		"snd_emu10k1"
-device		"snd_es137x"
+device		snd_ds1
+device		snd_emu10k1
+device		snd_es137x
 device		snd_ess
-device		"snd_fm801"
+device		snd_fm801
 device		snd_gusc
 device		snd_ich
 device		snd_maestro
-device		"snd_maestro3"
+device		snd_maestro3
 device		snd_mss
 device		snd_neomagic
-device		"snd_sb16"
-device		"snd_sb8"
+device		snd_sb16
+device		snd_sb8
 device		snd_sbc
 device		snd_solo
-device		"snd_t4dwave"
-device		"snd_via8233"
-device		"snd_via82c686"
+device		snd_t4dwave
+device		snd_via8233
+device		snd_via82c686
 device		snd_vibes
-#device		"snd_vortex1"
+#device		snd_vortex1
 device		snd_uaudio
 
 # For non-pnp sound cards:
diff --git a/sys/conf/files b/sys/conf/files
index 32aa116ca59b..0874c7ad9b7e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -82,7 +82,7 @@ cam/scsi/scsi_sa.c	optional sa
 cam/scsi/scsi_ses.c	optional ses
 cam/scsi/scsi_targ_bh.c	optional targbh
 cam/scsi/scsi_target.c	optional targ
-coda/coda_fbsd.c	count vcoda
+coda/coda_fbsd.c	optional vcoda
 coda/coda_namecache.c	optional vcoda
 coda/coda_psdev.c	optional vcoda
 coda/coda_subr.c	optional vcoda
@@ -992,14 +992,14 @@ gnu/ext2fs/ext2_vnops.c		optional ext2fs
 #
 # isdn4bsd device drivers
 #
-i4b/driver/i4b_trace.c		count i4btrc
-i4b/driver/i4b_rbch.c		count i4brbch
-i4b/driver/i4b_tel.c		count i4btel
-i4b/driver/i4b_ipr.c		count i4bipr
+i4b/driver/i4b_trace.c		optional i4btrc
+i4b/driver/i4b_rbch.c		optional i4brbch
+i4b/driver/i4b_tel.c		optional i4btel
+i4b/driver/i4b_ipr.c		optional i4bipr
 net/slcompress.c		optional i4bipr
 i4b/driver/i4b_ctl.c		optional i4bctl
-i4b/driver/i4b_ing.c		count i4bing
-i4b/driver/i4b_isppp.c		count i4bisppp
+i4b/driver/i4b_ing.c		optional i4bing
+i4b/driver/i4b_isppp.c		optional i4bisppp
 net/slcompress.c		optional i4bisppp
 #
 # isdn4bsd CAPI driver
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 634566ae70e1..66f02c4a8047 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -347,8 +347,8 @@ pc98/pc98/scvtbpc98.c		optional	sc
 pc98/pc98/sio.c			optional	sio
 pc98/pc98/sio_cbus.c		optional	sio isa
 pc98/pc98/syscons_pc98.c	optional	sc
-pc98/pc98/wd.c			count		wdc
-pc98/pc98/wd_cd.c		count		wcd wdc
+pc98/pc98/wd.c			optional	wdc
+pc98/pc98/wd_cd.c		optional	wcd wdc
 pccard/mecia.c			optional	mecia card
 pci/agp_ali.c			optional	agp
 pci/agp_amd.c			optional	agp
diff --git a/sys/conf/options b/sys/conf/options
index 28c9e5c728e9..9cbc5409d0c4 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -60,6 +60,7 @@ ADAPTIVE_GIANT	opt_adaptive_mutexes.h
 NO_ADAPTIVE_MUTEXES	opt_adaptive_mutexes.h
 ALQ
 CODA_COMPAT_5	opt_coda.h
+NVCODA		opt_coda.h
 COMPAT_43	opt_compat.h
 COMPAT_FREEBSD4	opt_compat.h
 COMPILING_LINT	opt_global.h
@@ -679,3 +680,11 @@ DCONS_BUF_SIZE		opt_dcons.h
 DCONS_POLL_HZ		opt_dcons.h
 DCONS_FORCE_CONSOLE	opt_dcons.h
 DCONS_FORCE_GDB		opt_dcons.h
+
+# Static unit counts
+NI4BTRC			opt_i4b.h
+NI4BRBCH		opt_i4b.h
+NI4BTEL			opt_i4b.h
+NI4BIPR			opt_i4b.h
+NI4BING			opt_i4b.h
+NI4BISPPP		opt_i4b.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index e5354a905a19..7a147de00c11 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -108,3 +108,7 @@ PC98			opt_global.h
 DEV_APIC		opt_apic.h
 DEV_MECIA		opt_mecia.h
 DEV_NPX			opt_npx.h
+DEV_WCD			opt_wcd.h
+
+# Static unit counts
+NWDC			opt_wdc.h
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index d3feff0b2b91..8ea98263d175 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "vcoda.h"
+#include "opt_coda.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index 03e408da63d6..35eb7257604d 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 
 extern int coda_nc_initialized;    /* Set if cache has been initialized */
 
-#include <vcoda.h>
+#include "opt_coda.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index 189ee92487fc..04e739c49e55 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -43,7 +43,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <vcoda.h>
+#include "opt_coda.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index fd4a62435a9f..7f3cbeea6966 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -471,7 +471,7 @@ device		acpi_video
 # for AGP r128 and radeon cards.
 
 device		mgadrm
-device		"r128drm"
+device		r128drm
 device		radeondrm
 device		sisdrm
 device		tdfxdrm
@@ -870,7 +870,7 @@ device		ifpi
 #	ifpi2 driver for AVM Fritz!Card PCI version 2
 #
 # AVM Fritz!Card PCI version 2
-device		"ifpi2"
+device		ifpi2
 #
 #---------------------------------------------------------------------------
 #	iwic driver for Winbond W6692 chipset
@@ -900,34 +900,38 @@ hint.iavc.0.irq="5"
 #	ISDN Protocol Stack - mandatory for all hardware drivers
 #
 # Q.921 / layer 2 - i4b passive cards D channel handling
-device		"i4bq921"
+device		i4bq921
 #
 # Q.931 / layer 3 - i4b passive cards D channel handling
-device		"i4bq931"
+device		i4bq931
 #
 # layer 4 - i4b common passive and active card handling
-device		"i4b"
+device		i4b
 #
 #---------------------------------------------------------------------------
 #	ISDN devices - mandatory for all hardware drivers
 #
 # userland driver to do ISDN tracing (for passive cards only)
-device		"i4btrc"	4
+device		i4btrc
+options		NI4BTRC=4
 #
 # userland driver to control the whole thing
-device		"i4bctl"
+device		i4bctl
 #
 #---------------------------------------------------------------------------
 #	ISDN devices - optional
 #
 # userland driver for access to raw B channel
-device		"i4brbch"	4
+device		i4brbch
+options		NI4BRBCH=4
 #
 # userland driver for telephony
-device		"i4btel"	2
+device		i4btel
+options 	NI4BTEL=2
 #
 # network driver for IP over raw HDLC ISDN
-device		"i4bipr"	4
+device		i4bipr
+options 	NI4BIPR=4
 # enable VJ header compression detection for ipr i/f
 options 	IPR_VJ
 # enable logging of the first n IP packets to isdnd (n=32 here)
@@ -935,13 +939,15 @@ options 	IPR_LOG=32
 #
 # network driver for sync PPP over ISDN; requires an equivalent
 # number of sppp device to be configured
-device		"i4bisppp"	4
+device		i4bisppp
+options 	NI4BISPPP=4
 #
 # B-channel interface to the netgraph subsystem
-device		"i4bing"	2
+device		i4bing
+options		NI4BING=2
 #
 # CAPI driver needed for active ISDN cards (see iavc driver above)
-device		"i4bcapi"
+device		i4bcapi
 #
 #---------------------------------------------------------------------------
 
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index e1024e184789..e9e73a8815e5 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -33,8 +33,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4bing.h"
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index cc087dc56a8d..5a612587ef4f 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -56,8 +56,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4bipr.h"
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 3f374dcc65ee..3f7f56c34f10 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -41,7 +41,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4bisppp.h"
+#include "opt_i4b.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index f44dcaf7f03d..d34ccdd2895e 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4brbch.h"
+#include "opt_i4b.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index c4fc0e35b3cd..5c3b37bd3a64 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4btel.h"
+#include "opt_i4b.h"
 
 #undef I4BTELDEBUG
 
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index e165d960f452..888e2b0fbdf8 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -35,7 +35,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4btrc.h"
+#include "opt_i4b.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 671cba40bd27..e80c9449a9fd 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -33,8 +33,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4bipr.h"
-#include "i4btel.h"
+#include "opt_i4b.h"
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
@@ -48,9 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/selinfo.h>
 #include <net/if.h>
 
-#include "i4bing.h"
-#include "i4bisppp.h"
-
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_cause.h>
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 0b744f05f0c5..3acc6b04ea5d 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -33,18 +33,13 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "i4bipr.h"
+#include "opt_i4b.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include "i4bing.h"
-#include "i4bisppp.h"
-#include "i4brbch.h"
-#include "i4btel.h"
-
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_cause.h>
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 954157535825..7dac4274f45d 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -89,10 +89,11 @@ device		atapist		# ATAPI tape drives
 options 	ATA_STATIC_ID	# Static device numbering
 
 # IDE controller and disks
-#device		wdc	1	# Needs COMPAT_OLDISA
+#device		wdc		# Needs COMPAT_OLDISA
+#options 	NWDC=1
 
 # ATAPI devices on wdc
-#device		wcd	1	# IDE CD-ROM
+#device		wcd		# IDE CD-ROM
 
 # SCSI Controllers
 device		adv		# Advansys SCSI adapters
diff --git a/sys/pc98/pc98/atapi.c b/sys/pc98/pc98/atapi.c
index d52fff5a6fea..b8c7817bbca2 100644
--- a/sys/pc98/pc98/atapi.c
+++ b/sys/pc98/pc98/atapi.c
@@ -101,11 +101,8 @@
  */
 #undef DEBUG
 
-#include "wdc.h"
-
-#include "wcd.h"
-
-#if NWDC > 0
+#include "opt_wcd.h"
+#include "opt_wdc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -248,14 +245,14 @@ int atapi_attach (int ctlr, int unit, int port)
 		break;
 
 	case AT_TYPE_DIRECT:            /* direct-access */
-#if NWCD > 0
+#ifdef DEV_WCD
 		/* FALLTHROUGH */
 #else
 		printf ("wdc%d: ATAPI Floppies not configured\n", ctlr);
 		break;
 #endif
 	case AT_TYPE_CDROM:             /* CD-ROM device */
-#if NWCD > 0
+#ifdef DEV_WCD
 		/* ATAPI CD-ROM & CD-R/RW drives */
 		if (acdattach (ata, unit, ap, ata->debug) < 0)
 			break;
@@ -966,5 +963,3 @@ struct atapires atapi_request_immediate (struct atapi *ata, int unit,
 	}
 	return (ac->result);
 }
-
-#endif /* NWDC */
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 6e366946a972..9e096b72276b 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -48,12 +48,10 @@
  *	  driver entries for polled reinit and polled write).
  */
 
-#include "wdc.h"
+#include "opt_wdc.h"
 #undef NWD
 #define NWD (NWDC * 4)		/* 4 drives per wdc on PC98 */
 
-#if     NWDC > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -2068,5 +2066,3 @@ wdwait(struct softc *du, u_char bits_wanted, int timeout)
 	} while (--timeout != 0);
 	return (-1);
 }
-
-#endif /* NWDC > 0 */