? sys/conf/modules
Index: usr.sbin/config/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- usr.sbin/config/Makefile	2001/02/19 04:43:21	1.28
+++ usr.sbin/config/Makefile	2001/02/22 05:34:11
@@ -10,6 +10,9 @@
 DPADD=	${LIBL}
 LDADD=	-ll
 
+STRIP=
+CFLAGS+=-g
+
 mkmakefile.o: configvers.h
 
 .include <bsd.prog.mk>
Index: usr.sbin/config/config.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/config.h,v
retrieving revision 1.45
diff -u -r1.45 config.h
--- usr.sbin/config/config.h	2001/02/22 03:40:50	1.45
+++ usr.sbin/config/config.h	2001/02/22 05:34:11
@@ -71,15 +71,11 @@
 #define NO_IMPLCT_RULE	2
 #define NO_OBJ		4
 #define BEFORE_DEPEND	8
-#define NEED_COUNT	16
-#define ISDUP		32
+#define ISDUP		16
 
 struct device {
 	int	d_done;			/* processed */
 	char	*d_name;		/* name of device (e.g. rk11) */
-	int	d_count;		/* device count */
-#define QUES	-1	/* -1 means '?' */
-#define	UNKNOWN -2	/* -2 means not set yet */
 	struct	device *d_next;		/* Next one in list */
 };
 
Index: usr.sbin/config/config.y
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/config.y,v
retrieving revision 1.54
diff -u -r1.54 config.y
--- usr.sbin/config/config.y	2001/02/22 04:00:29	1.54
+++ usr.sbin/config/config.y	2001/02/22 05:34:11
@@ -221,15 +221,7 @@
 	      = {
 		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, "line %d: devices with zero units are not likely to be correct", yyline);
+		newdev($2);
 		} ;
 
 %%
@@ -245,14 +237,13 @@
  * 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;
 	np->d_next = 0;
 	if (curp == 0)
 		dtab = np;
Index: usr.sbin/config/configvers.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/configvers.h,v
retrieving revision 1.25
diff -u -r1.25 configvers.h
--- usr.sbin/config/configvers.h	2001/01/19 12:49:21	1.25
+++ usr.sbin/config/configvers.h	2001/02/22 05:34:11
@@ -8,4 +8,4 @@
  *
  * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.25 2001/01/19 12:49:21 peter Exp $
  */
-#define	CONFIGVERS	500006
+#define	CONFIGVERS	500007
Index: usr.sbin/config/lang.l
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/lang.l,v
retrieving revision 1.30
diff -u -r1.30 lang.l
--- usr.sbin/config/lang.l	2001/02/19 04:43:21	1.30
+++ usr.sbin/config/lang.l	2001/02/22 05:34:11
@@ -58,6 +58,7 @@
 	{ "machine",	ARCH }, /* MACHINE is defined in /sys/param.h */
 	{ "makeoptions", MAKEOPTIONS },
 	{ "maxusers",	MAXUSERS },
+	{ "module",	DEVICE },
 	{ "profile",	PROFILE },
 	{ "option",	OPTIONS },
 	{ "options",	OPTIONS },
@@ -74,24 +75,11 @@
 ID	[A-Za-z_][-A-Za-z_0-9]*
 %START NONUM TOEOL
 %%
-<NONUM>{WORD}	{
-			int i;
-
-			BEGIN 0;
-			if ((i = kw_lookup(yytext)) == -1)
-			{
-				yylval.str = strdup(yytext);
-				return ID;
-			}
-			return i;
-		}
 <INITIAL>{WORD}/[0-9]* {
 			int i;
 
 			if ((i = kw_lookup(yytext)) == -1)
 				REJECT;
-			if (i == DEVICE)
-				BEGIN NONUM;
 			return i;
 		}
 <INITIAL>{ID}	{
Index: usr.sbin/config/mkheaders.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/mkheaders.c,v
retrieving revision 1.22
diff -u -r1.22 mkheaders.c
--- usr.sbin/config/mkheaders.c	2001/01/31 11:18:49	1.22
+++ usr.sbin/config/mkheaders.c	2001/02/22 05:34:11
@@ -51,28 +51,18 @@
 #include "config.h"
 #include "y.tab.h"
 
-static void do_header(char *, int);
-static char *toheader(char *);
-static char *tomacro(char *);
-
 void
 headers(void)
 {
 	struct file_list *fl;
 	struct device *dp;
-	int match;
 
 	for (fl = ftab; fl != 0; fl = fl->f_next) {
 		if (fl->f_needs != 0) {
-			match = 0;
 			for (dp = dtab; dp != 0; dp = dp->d_next) {
-				if (eq(dp->d_name, fl->f_needs)) {
-					match++;
+				if (eq(dp->d_name, fl->f_needs))
 					dp->d_done |= DEVDONE;
-				}
 			}
-			if (fl->f_flags & NEED_COUNT)
-				do_header(fl->f_needs, match);
 		}
 	}
 	for (dp = dtab; dp != 0; dp = dp->d_next) {
@@ -80,126 +70,4 @@
 			errx(1, "Error: device \"%s\" is unknown",
 			       dp->d_name);
 	}
-}
-
-static void
-do_header(char *dev, int match)
-{
-	char *file, *name, *inw;
-	struct file_list *fl, *fl_head, *tflp;
-	struct device *dp;
-	FILE *inf, *outf;
-	int inc, oldcount;
-	int count, hicount;
-
-	/*
-	 * After this loop, "count" will be the actual number of units,
-	 * and "hicount" will be the highest unit declared.  do_header()
-	 * must use this higher of these values.
-	 */
-	for (hicount = count = 0, dp = dtab; dp != 0; dp = dp->d_next) {
-		if (eq(dp->d_name, dev)) {
-			count =
-			    dp->d_count != UNKNOWN ? dp->d_count : 1;
-			break;
-		}
-	}
-	file = toheader(dev);
-	name = tomacro(dev);
-	if (match)
-		printf("FYI: static unit limits for %s are set: %s=%d\n", dev, name, count);
-	remember(file);
-	inf = fopen(file, "r");
-	oldcount = -1;
-	if (inf == 0) {
-		outf = fopen(file, "w");
-		if (outf == 0)
-			err(1, "%s", file);
-		fprintf(outf, "#define %s %d\n", name, count);
-		(void) fclose(outf);
-		return;
-	}
-	fl_head = NULL;
-	for (;;) {
-		char *cp;
-		if ((inw = get_word(inf)) == 0 || inw == (char *)EOF)
-			break;
-		if ((inw = get_word(inf)) == 0 || inw == (char *)EOF)
-			break;
-		inw = ns(inw);
-		cp = get_word(inf);
-		if (cp == 0 || cp == (char *)EOF)
-			break;
-		inc = atoi(cp);
-		if (eq(inw, name)) {
-			oldcount = inc;
-			inc = count;
-		}
-		cp = get_word(inf);
-		if (cp == (char *)EOF)
-			break;
-		fl = (struct file_list *) malloc(sizeof *fl);
-		bzero(fl, sizeof(*fl));
-		fl->f_fn = inw;		/* malloced */
-		fl->f_type = inc;
-		fl->f_next = fl_head;
-		fl_head = fl;
-	}
-	(void) fclose(inf);
-	if (count == oldcount) {
-		for (fl = fl_head; fl != NULL; fl = tflp) {
-			tflp = fl->f_next;
-			free(fl->f_fn);
-			free(fl);
-		}
-		return;
-	}
-	if (oldcount == -1) {
-		fl = (struct file_list *) malloc(sizeof *fl);
-		bzero(fl, sizeof(*fl));
-		fl->f_fn = ns(name);
-		fl->f_type = count;
-		fl->f_next = fl_head;
-		fl_head = fl;
-	}
-	outf = fopen(file, "w");
-	if (outf == 0)
-		err(1, "%s", file);
-	for (fl = fl_head; fl != NULL; fl = tflp) {
-		fprintf(outf,
-		    "#define %s %u\n", fl->f_fn, count ? fl->f_type : 0);
-		tflp = fl->f_next;
-		free(fl->f_fn);
-		free(fl);
-	}
-	(void) fclose(outf);
-}
-
-/*
- * convert a dev name to a .h file name
- */
-static char *
-toheader(char *dev)
-{
-	static char hbuf[MAXPATHLEN];
-
-	snprintf(hbuf, sizeof(hbuf), "%s.h", path(dev));
-	return (hbuf);
-}
-
-/*
- * convert a dev name to a macro name
- */
-static char *
-tomacro(char *dev)
-{
-	static char mbuf[20];
-	char *cp;
-
-	cp = mbuf;
-	*cp++ = 'N';
-	while (*dev)
-		*cp++ = islower(*dev) ? toupper(*dev++) : *dev++;
-	*cp++ = 0;
-	return (mbuf);
 }
Index: usr.sbin/config/mkmakefile.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/mkmakefile.c,v
retrieving revision 1.62
diff -u -r1.62 mkmakefile.c
--- usr.sbin/config/mkmakefile.c	2001/02/19 04:43:21	1.62
+++ usr.sbin/config/mkmakefile.c	2001/02/22 05:34:11
@@ -285,7 +285,7 @@
 	char fname[MAXPATHLEN];
 	int ddwarned = 0;
 	int nreqs, first = 1, configdep, isdup, std, filetype,
-	    imp_rule, no_obj, needcount, before_depend, mandatory;
+	    imp_rule, no_obj, before_depend, mandatory;
 
 	ftab = 0;
 	save_dp = NULL;
@@ -300,7 +300,7 @@
 		err(1, "%s", fname);
 next:
 	/*
-	 * filename    [ standard | mandatory | optional | count ]
+	 * filename    [ standard | mandatory | optional ]
 	 *	[ config-dependent ]
 	 *	[ dev* | profiling-routine ] [ no-obj ]
 	 *	[ compile-with "compile rule" [no-implicit-rule] ]
@@ -370,7 +370,6 @@
 	std = mandatory = 0;
 	imp_rule = 0;
 	no_obj = 0;
-	needcount = 0;
 	before_depend = 0;
 	filetype = NORMAL;
 	if (eq(wd, "standard")) {
@@ -382,10 +381,8 @@
 	 */
 	} else if (eq(wd, "mandatory")) {
 		mandatory = 1;
-	} else if (eq(wd, "count")) {
-		needcount = 1;
 	} else if (!eq(wd, "optional")) {
-		printf("%s: %s must be count, optional, mandatory or standard\n",
+		printf("%s: %s must be optional, mandatory or standard\n",
 		       fname, this);
 		exit(1);
 	}
@@ -479,11 +476,8 @@
 	if (isdup)
 		goto invis;
 	for (dp = dtab; dp != 0; save_dp = dp, dp = dp->d_next)
-		if (eq(dp->d_name, wd)) {
-			if (std && dp->d_count <= 0)
-				dp->d_count = 1;
+		if (eq(dp->d_name, wd))
 			goto nextparam;
-		}
 	if (mandatory) {
 		printf("%s: mandatory device \"%s\" not found\n",
 		       fname, wd);
@@ -493,7 +487,6 @@
 		dp = (struct device *) malloc(sizeof *dp);
 		bzero(dp, sizeof *dp);
 		dp->d_name = ns(wd);
-		dp->d_count = 1;
 		save_dp->d_next = dp;
 		goto nextparam;
 	}
@@ -514,8 +507,6 @@
 	tp->f_type = INVISIBLE;
 	tp->f_needs = needs;
 	tp->f_flags |= isdup;
-	if (needcount)
-		tp->f_flags |= NEED_COUNT;
 	tp->f_special = special;
 	tp->f_depends = depends;
 	tp->f_clean = clean;
@@ -553,8 +544,6 @@
 		tp->f_flags |= NO_IMPLCT_RULE;
 	if (no_obj)
 		tp->f_flags |= NO_OBJ;
-	if (needcount)
-		tp->f_flags |= NEED_COUNT;
 	tp->f_needs = needs;
 	tp->f_special = special;
 	tp->f_depends = depends;
Index: sys/conf/Makefile.alpha
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.alpha,v
retrieving revision 1.91
diff -u -r1.91 Makefile.alpha
--- sys/conf/Makefile.alpha	2001/02/17 07:26:57	1.91
+++ sys/conf/Makefile.alpha	2001/02/22 05:34:11
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
Index: sys/conf/Makefile.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.224
diff -u -r1.224 Makefile.i386
--- sys/conf/Makefile.i386	2001/02/17 07:26:57	1.224
+++ sys/conf/Makefile.i386	2001/02/22 05:34:11
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
@@ -275,14 +275,15 @@
 reinstall.debug: modules-reinstall.debug
 .endif
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
+MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} \
+		CONFDIR=${.CURDIR}
 
-modules:
+modules:	${MFILES:T:S/.m$/.h/} vnode_if.h
 	@mkdir -p ${.OBJDIR}/modules
 	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
 	    env ${MKMODULESENV} ${MAKE} all
 
-modules-depend:
+modules-depend:	${MFILES:T:S/.m$/.h/} vnode_if.h
 	@mkdir -p ${.OBJDIR}/modules
 	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
 	    env ${MKMODULESENV} ${MAKE} depend
Index: sys/conf/Makefile.ia64
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.ia64,v
retrieving revision 1.14
diff -u -r1.14 Makefile.ia64
--- sys/conf/Makefile.ia64	2001/02/12 05:55:33	1.14
+++ sys/conf/Makefile.ia64	2001/02/22 05:34:11
@@ -27,7 +27,7 @@
 MACHINE_ARCH=	ia64
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
Index: sys/conf/Makefile.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.pc98,v
retrieving revision 1.123
diff -u -r1.123 Makefile.pc98
--- sys/conf/Makefile.pc98	2001/02/17 07:26:57	1.123
+++ sys/conf/Makefile.pc98	2001/02/22 05:34:11
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500006
+%VERSREQ=	500007
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
Index: sys/conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.487
diff -u -r1.487 files
--- sys/conf/files	2001/02/08 04:58:17	1.487
+++ sys/conf/files	2001/02/22 05:34:11
@@ -39,7 +39,7 @@
 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
@@ -259,7 +259,7 @@
 dev/awi/if_awi_pccard.c	optional awi pccard
 dev/bktr/bktr_audio.c	optional bktr pci
 dev/bktr/bktr_card.c	optional bktr pci
-dev/bktr/bktr_core.c	count bktr pci
+dev/bktr/bktr_core.c	optional bktr pci
 dev/bktr/bktr_i2c.c	optional bktr pci smbus
 dev/bktr/bktr_os.c	optional bktr pci
 dev/bktr/bktr_tuner.c	optional bktr pci
@@ -270,13 +270,13 @@
 dev/buslogic/bt_pci.c	optional bt pci
 dev/cardbus/cardbus.c	optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
-dev/ccd/ccd.c		count ccd
+dev/ccd/ccd.c		optional ccd
 dev/cs/if_cs.c		optional cs
 dev/cs/if_cs_isa.c	optional cs isa
 dev/cs/if_cs_pccard.c	optional cs card
 dev/cs/if_cs_pccard.c	optional cs pccard
-dev/dgb/dgb.c		count		dgb
-dev/dgb/dgm.c		count		dgm
+dev/dgb/dgb.c		optional dgb
+dev/dgb/dgm.c		optional dgm
 #dev/dpt/dpt_control.c	optional dpt
 dev/dpt/dpt_eisa.c	optional dpt eisa
 dev/dpt/dpt_pci.c	optional dpt pci
@@ -327,7 +327,7 @@
 dev/ida/ida_disk.c	optional ida
 dev/ida/ida_eisa.c	optional ida eisa
 dev/ida/ida_pci.c	optional ida pci
-dev/ie/if_ie.c		count ie isa
+dev/ie/if_ie.c		optional ie isa
 dev/iicbus/iicbb_if.m	optional iicbb
 dev/iicbus/iicbus_if.m	optional iicbus
 dev/iicbus/if_ic.c	optional ic
@@ -395,7 +395,7 @@
 dev/pci/fixup_pci.c	optional pci
 dev/pci/ignore_pci.c	optional pci
 dev/pci/isa_pci.c	optional pci
-dev/pci/pci.c		count pci
+dev/pci/pci.c		optional pci
 dev/pci/pci_if.m	optional pci
 dev/pci/pci_pci.c	optional pci
 dev/pci/pci_user.c	optional pci
@@ -443,7 +443,7 @@
 dev/smbus/smbus_if.m	optional smbus
 dev/smbus/smb.c		optional smb
 dev/smbus/smbconf.c	optional smbus
-dev/smbus/smbus.c	count smbus
+dev/smbus/smbus.c	optional smbus
 dev/sn/if_sn.c		optional sn
 dev/sn/if_sn_isa.c	optional sn isa
 dev/sn/if_sn_pccard.c	optional sn card
@@ -583,14 +583,14 @@
 #
 # 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		count i4bctl
-i4b/driver/i4b_ing.c		count i4bing
-i4b/driver/i4b_isppp.c		count i4bisppp
+i4b/driver/i4b_ctl.c		optional i4bctl
+i4b/driver/i4b_ing.c		optional i4bing
+i4b/driver/i4b_isppp.c		optional i4bisppp
 i4b/driver/i4b_ispppsubr.c	optional i4bisppp
 net/slcompress.c		optional i4bisppp
 #
@@ -600,7 +600,7 @@
 #
 # isdn4bsd Q.921 handler
 #
-i4b/layer2/i4b_l2.c		count i4bq921
+i4b/layer2/i4b_l2.c		optional i4bq921
 i4b/layer2/i4b_l2fsm.c		optional i4bq921
 i4b/layer2/i4b_uframe.c		optional i4bq921
 i4b/layer2/i4b_tei.c		optional i4bq921
@@ -612,7 +612,7 @@
 #
 # isdn4bsd Q.931 handler
 #
-i4b/layer3/i4b_q931.c		count i4bq931
+i4b/layer3/i4b_q931.c		optional i4bq931
 i4b/layer3/i4b_l3fsm.c		optional i4bq931
 i4b/layer3/i4b_l3timer.c	optional i4bq931
 i4b/layer3/i4b_l2if.c		optional i4bq931
@@ -621,7 +621,7 @@
 #
 # isdn4bsd control device driver, interface to isdnd
 #
-i4b/layer4/i4b_i4bdrv.c		count i4b
+i4b/layer4/i4b_i4bdrv.c		optional i4b
 i4b/layer4/i4b_l4.c		optional i4b
 i4b/layer4/i4b_l4mgmt.c		optional i4b
 i4b/layer4/i4b_l4timer.c	optional i4b
@@ -817,20 +817,20 @@
 net/if_disc.c		optional disc
 net/if_ef.c		optional ef
 net/if_ethersubr.c	optional ether
-net/if_faith.c		count faith
+net/if_faith.c		optional faith
 net/if_fddisubr.c	optional fddi
-net/if_gif.c		count gif
+net/if_gif.c		optional gif
 net/if_iso88025subr.c	optional token
 net/if_loop.c		optional loop
 net/if_media.c		standard
 net/if_mib.c		standard
-net/if_ppp.c		count ppp
+net/if_ppp.c		optional ppp
 net/if_sl.c		optional sl
 net/if_spppsubr.c	optional sppp
-net/if_stf.c		count stf
+net/if_stf.c		optional stf
 net/if_tun.c		optional tun
 net/if_tap.c		optional tap
-net/if_vlan.c		count vlan
+net/if_vlan.c		optional vlan
 net/intrq.c		standard
 net/net_osdep.c		standard
 net/ppp_deflate.c	optional ppp_deflate
@@ -1103,7 +1103,7 @@
 nwfs/nwfs_subr.c	optional nwfs
 nwfs/nwfs_vfsops.c	optional nwfs
 nwfs/nwfs_vnops.c	optional nwfs
-pccard/pccard.c		count card
+pccard/pccard.c		optional card
 pccard/pccard_beep.c	optional card
 pccard/pccard_nbk.c	optional card
 pccard/pcic.c		optional pcic card
@@ -1137,7 +1137,7 @@
 pci/if_wx.c		optional wx
 pci/if_xl.c		optional xl
 pci/intpm.c		optional intpm
-pci/meteor.c		count meteor pci
+pci/meteor.c		optional meteor pci
 pci/ncr.c		optional ncr
 pci/ohci_pci.c		optional ohci
 dev/pccbb/pccbb.c	optional pccbb
Index: sys/conf/files.alpha
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.alpha,v
retrieving revision 1.66
diff -u -r1.66 files.alpha
--- sys/conf/files.alpha	2001/01/31 10:54:45	1.66
+++ sys/conf/files.alpha	2001/02/22 05:34:11
@@ -185,15 +185,15 @@
 dev/ed/if_ed_isa.c		optional	ed isa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fb/vga.c			optional	vga
 dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		count		atkbdc
+dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
Index: sys/conf/files.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.i386,v
retrieving revision 1.357
diff -u -r1.357 files.i386
--- sys/conf/files.i386	2001/02/06 12:05:12	1.357
+++ sys/conf/files.i386	2001/02/22 05:34:11
@@ -95,18 +95,18 @@
 dev/eisa/eisaconf.c		optional	eisa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fb/vga.c			optional	vga
 dev/fe/if_fe_isa.c		optional	fe isa
 dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		count		atkbdc
+dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
 dev/kbd/kbd.c			optional	vt
 dev/sr/if_sr_isa.c		optional	sr isa
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
@@ -207,21 +207,21 @@
 i386/ibcs2/ibcs2_xenix.c	optional	ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional	ibcs2
 i386/ibcs2/imgact_coff.c	optional	ibcs2
-i386/isa/asc.c			count		asc
+i386/isa/asc.c			optional	asc
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx
-i386/isa/ctx.c			count		ctx
-i386/isa/cx.c			count		cx
-i386/isa/cy.c			count		cy
+i386/isa/ctx.c			optional	ctx
+i386/isa/cx.c			optional	cx
+i386/isa/cy.c			optional	cy
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 i386/isa/gpib.c			optional	gp
-i386/isa/gsc.c			count		gsc
+i386/isa/gsc.c			optional	gsc
 i386/isa/if_cx.c		optional	cx
-i386/isa/if_el.c		count		el
-i386/isa/if_le.c		count		le
-i386/isa/if_rdp.c		count		rdp
-i386/isa/if_wl.c		count		wl
+i386/isa/if_el.c		optional	el
+i386/isa/if_le.c		optional	le
+i386/isa/if_rdp.c		optional	rdp
+i386/isa/if_wl.c		optional	wl
 i386/isa/if_wlp.c		optional	wlp
 i386/isa/intr_machdep.c		standard
 i386/isa/ithread.c		standard
@@ -231,9 +231,9 @@
 i386/isa/isa_dma.c		optional	isa
 i386/isa/istallion.c		optional	stli
 i386/isa/loran.c		optional	loran
-i386/isa/matcd/matcd.c		count		matcd
+i386/isa/matcd/matcd.c		optional	matcd
 i386/isa/mca_machdep.c		optional	mca
-i386/isa/mcd.c			count		mcd
+i386/isa/mcd.c			optional	mcd
 i386/isa/mse.c			optional	mse
 i386/isa/npx.c			mandatory	npx
 i386/isa/pcaudio.c		optional	pca
@@ -246,16 +246,16 @@
 i386/isa/pcvt/pcvt_vtf.c	optional	vt
 i386/isa/pmtimer.c		optional	pmtimer
 i386/isa/prof_machdep.c		optional	profiling-routine
-i386/isa/rc.c			count		rc
+i386/isa/rc.c			optional	rc
 #i386/isa/rp.c			optional	rp
-i386/isa/scd.c			count		scd
+i386/isa/scd.c			optional	scd
 i386/isa/spic.c			optional	spic
-i386/isa/spigot.c		count		spigot
+i386/isa/spigot.c		optional	spigot
 i386/isa/spkr.c			optional	speaker
 i386/isa/stallion.c		optional	stl
-i386/isa/tw.c			count		tw
+i386/isa/tw.c			optional	tw
 i386/isa/vesa.c			optional	vga vesa
-i386/isa/wt.c			count		wt
+i386/isa/wt.c			optional	wt
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux
 i386/linux/linux_locore.s	optional	compat_linux		\
@@ -298,7 +298,7 @@
 i4b/layer1/isic/i4b_elsa_pcc16.c	optional	isic
 i4b/layer1/isic/i4b_hscx.c		optional	isic
 i4b/layer1/isic/i4b_isac.c		optional	isic
-i4b/layer1/isic/i4b_isic.c		count		isic
+i4b/layer1/isic/i4b_isic.c		optional	isic
 i4b/layer1/isic/i4b_isic_isa.c		optional	isic
 i4b/layer1/isic/i4b_isic_pnp.c		optional	isic
 i4b/layer1/isic/i4b_itk_ix1.c		optional	isic
@@ -314,7 +314,7 @@
 #
 # isdn4bsd, iwic
 #
-i4b/layer1/iwic/i4b_iwic_pci.c		count		iwic
+i4b/layer1/iwic/i4b_iwic_pci.c		optional	iwic
 i4b/layer1/iwic/i4b_iwic_dchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_bchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_fsm.c		optional	iwic
@@ -322,27 +322,27 @@
 #
 # isdn4bsd, ifpi
 #
-i4b/layer1/ifpi/i4b_ifpi_pci.c		count		ifpi
+i4b/layer1/ifpi/i4b_ifpi_pci.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_isac.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1fsm.c	optional	ifpi
 #
 # isdn4bsd, ifpnp
 #
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c	count		ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional	ifpnp
 #
 # isdn4bsd, ihfc
 #
-i4b/layer1/ihfc/i4b_ihfc_l1if.c		count		ihfc
+i4b/layer1/ihfc/i4b_ihfc_l1if.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_pnp.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_drv.c		optional	ihfc
 #
 # isdn4bsd, itjc
 #
-i4b/layer1/itjc/i4b_itjc_pci.c		count		itjc
+i4b/layer1/itjc/i4b_itjc_pci.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_isac.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional	itjc
Index: sys/conf/files.ia64
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.ia64,v
retrieving revision 1.8
diff -u -r1.8 files.ia64
--- sys/conf/files.ia64	2001/01/31 10:54:45	1.8
+++ sys/conf/files.ia64	2001/02/22 05:34:11
@@ -58,15 +58,15 @@
 dev/aic/aic_isa.c		optional	aic isa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fb/vga.c			optional	vga
 dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		count		atkbdc
+dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
Index: sys/conf/files.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/files.pc98,v
retrieving revision 1.190
diff -u -r1.190 files.pc98
--- sys/conf/files.pc98	2001/02/13 14:17:21	1.190
+++ sys/conf/files.pc98	2001/02/22 05:34:11
@@ -93,19 +93,19 @@
 dev/eisa/eisaconf.c		optional	eisa
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	gdc
-dev/fb/splash.c			count		splash
+dev/fb/splash.c			optional	splash
 dev/fe/if_fe_cbus.c		optional	fe isa
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
-dev/kbd/kbd.c			count		pckbd
+dev/kbd/kbd.c			optional	pckbd
 dev/snc/dp83932.c		optional	snc
 dev/snc/dp83932subr.c		optional	snc
 dev/snc/if_snc.c		optional	snc
 dev/snc/if_snc_cbus.c		optional	snc isa
 dev/snc/if_snc_pccard.c		optional	snc card
 dev/sr/if_sr_isa.c		optional	sr isa
-dev/syscons/schistory.c		count		sc
+dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
@@ -201,21 +201,21 @@
 i386/isa/bs/bs.c		optional	bs
 i386/isa/bs/bsfunc.c		optional	bs
 i386/isa/bs/bshw.c		optional	bs
-i386/isa/bs/bsif.c		count		bs
-i386/isa/asc.c			count		asc
+i386/isa/bs/bsif.c		optional	bs
+i386/isa/asc.c			optional	asc
 i386/isa/cronyx.c		optional	cx
-i386/isa/ctx.c			count		ctx
-i386/isa/cx.c			count		cx
-i386/isa/cy.c			count		cy
+i386/isa/ctx.c			optional	ctx
+i386/isa/cx.c			optional	cx
+i386/isa/cy.c			optional	cy
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 i386/isa/gpib.c			optional	gp
-i386/isa/gsc.c			count		gsc
+i386/isa/gsc.c			optional	gsc
 i386/isa/if_cx.c		optional	cx
-i386/isa/if_el.c		count		el
-i386/isa/if_le.c		count		le
-i386/isa/if_rdp.c		count		rdp
-i386/isa/if_wl.c		count		wl
+i386/isa/if_el.c		optional	el
+i386/isa/if_le.c		optional	le
+i386/isa/if_rdp.c		optional	rdp
+i386/isa/if_wl.c		optional	wl
 i386/isa/intr_machdep.c		standard
 i386/isa/ithread.c		standard
 i386/isa/isa.c			optional	isa
@@ -223,9 +223,9 @@
 	warning "Old ISA driver compatibility shims present."
 i386/isa/istallion.c		optional	stli
 i386/isa/loran.c		optional	loran
-i386/isa/matcd/matcd.c		count		matcd
+i386/isa/matcd/matcd.c		optional	matcd
 i386/isa/mca_machdep.c		optional	mca
-i386/isa/mcd.c			count		mcd
+i386/isa/mcd.c			optional	mcd
 i386/isa/pcf.c			optional	pcf
 i386/isa/pcvt/pcvt_drv.c	optional	vt
 i386/isa/pcvt/pcvt_ext.c	optional	vt
@@ -235,14 +235,14 @@
 i386/isa/pcvt/pcvt_vtf.c	optional	vt
 i386/isa/pmtimer.c		optional	pmtimer
 i386/isa/prof_machdep.c		optional	profiling-routine
-i386/isa/rc.c			count		rc
+i386/isa/rc.c			optional	rc
 #i386/isa/rp.c			optional	rp
-i386/isa/scd.c			count		scd
+i386/isa/scd.c			optional	scd
 i386/isa/spic.c			optional	spic
-i386/isa/spigot.c		count		spigot
+i386/isa/spigot.c		optional	spigot
 i386/isa/stallion.c		optional	stl
-i386/isa/tw.c			count		tw
-i386/isa/wt.c			count		wt
+i386/isa/tw.c			optional	tw
+i386/isa/wt.c			optional	wt
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux
 i386/linux/linux_locore.s	optional	compat_linux		\
@@ -285,7 +285,7 @@
 i4b/layer1/isic/i4b_elsa_pcc16.c	optional	isic
 i4b/layer1/isic/i4b_hscx.c		optional	isic
 i4b/layer1/isic/i4b_isac.c		optional	isic
-i4b/layer1/isic/i4b_isic.c		count		isic
+i4b/layer1/isic/i4b_isic.c		optional	isic
 i4b/layer1/isic/i4b_isic_isa.c		optional	isic
 i4b/layer1/isic/i4b_isic_pnp.c		optional	isic
 i4b/layer1/isic/i4b_itk_ix1.c		optional	isic
@@ -300,7 +300,7 @@
 #
 # isdn4bsd, iwic
 #
-i4b/layer1/iwic/i4b_iwic_pci.c		count		iwic
+i4b/layer1/iwic/i4b_iwic_pci.c		optional	iwic
 i4b/layer1/iwic/i4b_iwic_dchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_bchan.c	optional	iwic
 i4b/layer1/iwic/i4b_iwic_fsm.c		optional	iwic
@@ -308,27 +308,27 @@
 #
 # isdn4bsd, ifpi
 #
-i4b/layer1/ifpi/i4b_ifpi_pci.c		count		ifpi
+i4b/layer1/ifpi/i4b_ifpi_pci.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_isac.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1.c		optional	ifpi
 i4b/layer1/ifpi/i4b_ifpi_l1fsm.c	optional	ifpi
 #
 # isdn4bsd, ifpnp
 #
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c	count		ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional	ifpnp
 #
 # isdn4bsd, ihfc
 #
-i4b/layer1/ihfc/i4b_ihfc_l1if.c		count		ihfc
+i4b/layer1/ihfc/i4b_ihfc_l1if.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_pnp.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_drv.c		optional	ihfc
 #
 # isdn4bsd, itjc
 #
-i4b/layer1/itjc/i4b_itjc_pci.c		count		itjc
+i4b/layer1/itjc/i4b_itjc_pci.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_isac.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional	itjc
@@ -337,7 +337,7 @@
 kern/imgact_aout.c		standard
 kern/imgact_gzip.c		optional	gzip
 kern/link_aout.c		standard
-kern/subr_diskmbr.c		count		compat_atdisk
+kern/subr_diskmbr.c		optional	compat_atdisk
 libkern/divdi3.c		standard
 libkern/moddi3.c		standard
 libkern/qdivrem.c		standard
@@ -355,7 +355,7 @@
 pc98/pc98/isa_dma.c		optional	isa
 pc98/pc98/mse.c			optional	mse
 pc98/pc98/npx.c			mandatory	npx
-pc98/pc98/olpt.c		count		olpt
+pc98/pc98/olpt.c		optional	olpt
 pc98/pc98/pc98gdc.c		optional	gdc
 pc98/pc98/pc98kbd.c		optional	pckbd
 pc98/pc98/pc98_machdep.c	standard
@@ -368,8 +368,8 @@
 pc98/pc98/spkr.c		optional	speaker
 pc98/pc98/syscons.c		optional	sc
 pc98/pc98/syscons_pc98.c	optional	sc
-pc98/pc98/wd.c			count		wdc
-pc98/pc98/wd_cd.c		count		wcd wdc
-pc98/pc98/wfd.c			count		wfd wdc
-pc98/pc98/wst.c			count		wst wdc
+pc98/pc98/wd.c			optional	wdc
+pc98/pc98/wd_cd.c		optional	wcd wdc
+pc98/pc98/wfd.c			optional	wfd wdc
+pc98/pc98/wst.c			optional	wst wdc
 #pci/ide_pci.c			optional	wdc pci
Index: sys/conf/kmod.mk
===================================================================
RCS file: /home/ncvs/src/sys/conf/kmod.mk,v
retrieving revision 1.94
diff -u -r1.94 kmod.mk
--- sys/conf/kmod.mk	2001/02/20 09:37:00	1.94
+++ sys/conf/kmod.mk	2001/02/22 05:34:11
@@ -88,7 +88,6 @@
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
 
 CFLAGS+=	${COPTS} -D_KERNEL ${CWARNFLAGS}
-CFLAGS+=	-DKLD_MODULE
 
 # Don't use any standard or source-relative include directories.
 # Since -nostdinc will annull any previous -I paths, we repeat all
@@ -97,6 +96,8 @@
 _ICFLAGS:=	${CFLAGS:M-I*}
 CFLAGS+=	-nostdinc -I- ${INCLMAGIC} ${_ICFLAGS}
 
+CFLAGS+=	-I${CONFDIR} -include ${CONFDIR}/opt_global.h
+
 # Add -I paths for system headers.  Individual KLD makefiles don't
 # need any -I paths for this.  Similar defaults for .PATH can't be
 # set because there are no standard paths for non-headers.
@@ -265,7 +266,7 @@
     dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
     dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
     dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
-    dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m
+    dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m pci/agp_if.m
 
 .for _srcsrc in ${MFILES}
 .for _ext in c h
Index: sys/conf/options
===================================================================
RCS file: /home/ncvs/src/sys/conf/options,v
retrieving revision 1.253
diff -u -r1.253 options
--- sys/conf/options	2001/02/04 15:35:08	1.253
+++ sys/conf/options	2001/02/22 05:34:11
@@ -121,11 +121,11 @@
 NTFS		opt_dontuse.h
 HPFS		opt_dontuse.h
 
-# These static filesystems has one slightly bogus static dependency in
+# These static filesystems have one slightly bogus static dependency in
 # sys/i386/i386/autoconf.c.  If any of these filesystems are
-# statically compiled into the kernel, code for mounting them as root
-# filesystems will be enabled - but look below.
+# statically compiled into the kernel, the _ROOT option can be used.
 NFS
+NFS_ROOT	opt_nfsroot.h
 
 # If you are following the conditions in the copyright,
 # you can enable soft-updates which will speed up a lot of thigs
@@ -138,12 +138,6 @@
 # as well as new file system features.
 FFS_EXTATTR	opt_ffs.h
 
-# The above static dependencies are planned removed, with a
-# <filesystem>_ROOT option to control if it usable as root.  This list
-# allows these options to be present in config files already (though
-# they won't make any difference yet).
-NFS_ROOT	opt_nfsroot.h
-
 # The union static file system has bogus static dependencies, so it isn't
 # hidden yet.
 UNION
@@ -493,3 +487,56 @@
 DEV_SNP			opt_snp.h
 DEV_MCA			opt_mca.h
 DEV_BPF			opt_bpf.h
+DEV_SMBUS		opt_smbus.h
+
+# Old/broken driver compatability
+NVCODA			vcoda.h
+NAHA			aha.h
+NBKTR			bktr.h
+NCCD			ccd.h
+NDGB			dgb.h
+NDGM			dgm.h
+NIE			ie.h
+NPCI			pci.h
+NI4BTRC			i4btrc.h
+NI4BRBCH		i4brbch.h
+NI4BTEL			i4btel.h
+NI4BIPR			i4bipr.h
+NI4BCTL			i4bctl.h
+NI4BING			i4bing.h
+NI4BISPPP		i4bisppp.h
+NI4BQ921		i4bq921.h
+NI4BQ931		i4bq931.h
+NI4B			i4b.h
+NFAITH			faith.h
+NGIF			gif.h
+NPPP			ppp.h
+NSTF			stf.h
+NVLAN			vlan.h
+NCARD			card.h
+NMETEOR			meteor.h
+NSPLASH			splash.h
+NATKBDC			atkbdc.h
+NSC			sc.h
+NASC			asc.h
+NCTX			ctx.h
+NCX			cx.h
+NCY			cy.h
+NGSC			gsc.h
+NEL			el.h
+NLE			le.h
+NRDP			rdp.h
+NWL			wl.h
+NMATCD			matcd.h
+NMCD			mcd.h
+NRC			rc.h
+NSCD			scd.h
+NSPIGOT			spigot.h
+NTW			tw.h
+NWT			wt.h
+NISIC			isic.h
+NIWIC			iwic.h
+NIFPI			ifpi.h
+NIFPNP			ifpnp.h
+NIHFC			ihfc.h
+NITJC			itjc.h