Simplify cdevsw registration.

The cdevsw_add() function now finds the major number(s) in the
struct cdevsw passed to it.  cdevsw_add_generic() is no longer
needed, cdevsw_add() does the same thing.

cdevsw_add() will print an message if the d_maj field looks bogus.

Remove nblkdev and nchrdev variables.  Most places they were used
bogusly.  Instead check a dev_t for validity by seeing if devsw()
or bdevsw() returns NULL.

Move bdevsw() and devsw() functions to kern/kern_conf.c

Bump __FreeBSD_version to 400006

This commit removes:
        72 bogus makedev() calls
        26 bogus SYSINIT functions

if_xe.c bogusly accessed cdevsw[], author/maintainer please fix.

I4b and vinum not changed.  Patches emailed to authors.  LINT
probably broken until they catch up.

1 files changed, 5 insertions, 20 deletions

diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 650cc0b..73ccab3 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.50 1999/05/07 07:03:33 phk Exp $
+ * $Id: wt.c,v 1.51 1999/05/30 16:52:31 phk Exp $
  *
  */
 
@@ -223,6 +223,10 @@ static int
 wtprobe (struct isa_device *id)
 {
 	wtinfo_t *t = wttab + id->id_unit;
+	static int once;
+
+	if (!once++)
+		cdevsw_add(&wt_cdevsw);
 
 	t->unit = id->id_unit;
 	t->chan = id->id_drq;
@@ -993,23 +997,4 @@ wtstatus (wtinfo_t *t)
 	return (1);
 }
 
-
-static int wt_devsw_installed;
-
-static void 
-wt_drvinit(void *unused)
-{
-
-	if( ! wt_devsw_installed ) {
-		dev_t dev;
-
-		dev = makedev(CDEV_MAJOR, 0);
-		cdevsw_add(&dev, &wt_cdevsw, NULL);
-		wt_devsw_installed = 1;
-    	}
-}
-
-SYSINIT(wtdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wt_drvinit,NULL)
-
-
 #endif /* NWT */