OK, that's it..

That's EVERY SINGLE driver that has an entry in conf.c..
my next trick will be to define cdevsw[] and bdevsw[]
as empty arrays and remove all those DAMNED defines as well..

Each of these drivers has a SYSINIT linker set entry
that comes in very early.. and asks teh driver to add it's own
entry to the two devsw[] tables.

some slight reworking of the commits from yesterday (added the SYSINIT
stuff and some usually wrong but token DEVFS entries to all these
devices.

BTW does anyone know where the 'ata' entries in conf.c actually reside?
seems we don't actually have a 'ataopen() etc...

If you want to add a new device in conf.c
please  make sure I know
so I can keep it up to date too..

as before, this is all dependent on #if defined(JREMOD)
(and #ifdef DEVFS in parts)

1 files changed, 20 insertions, 28 deletions

diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 050ba18..620ec9f 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.17 1995/09/09 18:09:55 davidg Exp $
+ *    $Id: spkr.c,v 1.18 1995/11/28 09:41:55 julian Exp $
  */
 
 #include "speaker.h"
@@ -26,31 +26,13 @@
 #ifdef JREMOD
 #include <sys/conf.h>
 #define CDEV_MAJOR 26
-static void 	spkr_devsw_install();
 #endif /*JREMOD*/
 
-#if defined(DEVFS) || defined(JREMOD)
-#include "sys/kernel.h"
 
 #ifdef	DEVFS
 #include <sys/devfsext.h>
-int spkropen();
 #endif
 
-void spkrdev_init(void *data) /* data not used */
-{
-  void * x;
-#ifdef JREMOD
-	spkr_devsw_install();
-#endif /*JREMOD*/
-#ifdef DEVFS
-/*            path	name		devsw   minor	type   uid gid perm*/
-   x=dev_add("/misc",	"speaker",	spkropen, 0,	DV_CHR, 0,  0, 0600);
-#endif
-
-}
-SYSINIT(spkrdev,SI_SUB_DEVFS, SI_ORDER_ANY, spkrdev_init, NULL)
-#endif /*DEVFS*/ /* JREMOD */
 
 /**************** MACHINE DEPENDENT PART STARTS HERE *************************
  *
@@ -595,19 +577,29 @@ struct cdevsw spkr_cdevsw =
 
 static spkr_devsw_installed = 0;
 
-static void 	spkr_devsw_install()
+static void 	spkr_drvinit(void *unused)
 {
-	dev_t descript;
+	dev_t dev;
+
 	if( ! spkr_devsw_installed ) {
-		descript = makedev(CDEV_MAJOR,0);
-		cdevsw_add(&descript,&spkr_cdevsw,NULL);
-#if defined(BDEV_MAJOR)
-		descript = makedev(BDEV_MAJOR,0);
-		bdevsw_add(&descript,&spkr_bdevsw,NULL);
-#endif /*BDEV_MAJOR*/
+		dev = makedev(CDEV_MAJOR,0);
+		cdevsw_add(&dev,&spkr_cdevsw,NULL);
 		spkr_devsw_installed = 1;
-	}
+#ifdef DEVFS
+		{
+			int x;
+/* default for a simple device with no probe routine (usually delete this) */
+			x=devfs_add_devsw(
+/*	path	name	devsw		minor	type   uid gid perm*/
+	"/",	"spkr",	major(dev),	0,	DV_CHR,	0,  0, 0600);
+		}
+    	}
+#endif
 }
+
+SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL)
+
 #endif /* JREMOD */
+
 #endif  /* NSPEAKER > 0 */
 /* spkr.c ends here */