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, 16 deletions

diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 24af2e119c3d..ff4832d96a55 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.45 1999/05/09 20:29:04 phk Exp $ */
+/* $Id: scd.c,v 1.46 1999/05/30 16:52:24 phk Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -718,6 +718,10 @@ scd_probe(struct isa_device *dev)
 	static char namebuf[8+16+8+3];
 	char *s = namebuf;
 	int loop_count = 0;
+	static int once;
+
+	if (!once++)
+		cdevsw_add(&scd_cdevsw);
 
 	scd_data[unit].flags = SCDPROBING;
 	scd_data[unit].iobase = dev->id_iobase;
@@ -1574,19 +1578,4 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te)
 	return 0;
 }
 
-
-static int scd_devsw_installed;
-
-static void 	scd_drvinit(void *unused)
-{
-
-	if( ! scd_devsw_installed ) {
-		cdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &scd_cdevsw);
-		scd_devsw_installed = 1;
-    	}
-}
-
-SYSINIT(scddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,scd_drvinit,NULL)
-
-
 #endif /* NSCD > 0 */