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, 26 insertions, 14 deletions

diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index c1edbf1..0684d3d 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.7 1995/09/08 11:07:34 bde Exp $
+ *	$Id: ctx.c,v 1.8 1995/11/28 09:40:48 julian Exp $
  */
 
 /*
@@ -128,9 +128,13 @@
 
 #ifdef JREMOD
 #include <sys/conf.h>
+#include <sys/kernel.h>
+#ifdef DEVFS
+#include <sys/devfsext.h>
+#endif /*DEVFS*/
 #define CDEV_MAJOR 40
-static void 	ctx_devsw_install();
 #endif /*JREMOD*/
+
 int     waitvb(short);
 
 /* state flags */
@@ -191,9 +195,6 @@ ctxprobe(struct isa_device * devp)
 		status = 0;
 	else {
 		status = 1; /*XXX uses only one port? */
-#ifdef JREMOD
-        	ctx_devsw_install();
-#endif /*JREMOD*/
 	}
 	return (status);
 }
@@ -448,6 +449,8 @@ waitvb(short port)
 	return (0);
 }
 
+
+
 #ifdef JREMOD
 struct cdevsw ctx_cdevsw = 
 	{ ctxopen,	ctxclose,	ctxread,	ctxwrite,	/*40*/
@@ -456,19 +459,28 @@ struct cdevsw ctx_cdevsw =
 
 static ctx_devsw_installed = 0;
 
-static void 	ctx_devsw_install()
+static void 	ctx_drvinit(void *unused)
 {
-	dev_t descript;
+	dev_t dev;
+
 	if( ! ctx_devsw_installed ) {
-		descript = makedev(CDEV_MAJOR,0);
-		cdevsw_add(&descript,&ctx_cdevsw,NULL);
-#if defined(BDEV_MAJOR)
-		descript = makedev(BDEV_MAJOR,0);
-		bdevsw_add(&descript,&ctx_bdevsw,NULL);
-#endif /*BDEV_MAJOR*/
+		dev = makedev(CDEV_MAJOR,0);
+		cdevsw_add(&dev,&ctx_cdevsw,NULL);
 		ctx_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*/
+	"/",	"ctx",	major(dev),	0,	DV_CHR,	0,  0, 0600);
+		}
+    	}
+#endif
 }
+
+SYSINIT(ctxdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ctx_drvinit,NULL)
+
 #endif /* JREMOD */
 
 #endif				/* NCTX > 0 */