Pass 3 of the great devsw changes

most devsw referenced functions are now static, as they are
in the same file as their devsw structure. I've also added DEVFS
support for nearly every device in the system, however
many of the devices have 'incorrect' names under DEVFS
because I couldn't quickly work out the correct naming conventions.
(but devfs won't be coming on line for a month or so anyhow so that doesn't
matter)

If you "OWN" a device which would normally have an entry in /dev
then search for the devfs_add_devsw() entries and munge to make them right..
check out similar devices to see what I might have done in them in you
can't see what's going on..
for a laugh compare conf.c conf.h defore and after... :)
I have not doen DEVFS entries for any DISKSLICE devices yet as that will be
a much more complicated job.. (pass 5 :)

pass 4 will be to make the devsw tables of type (cdevsw * )
rather than (cdevsw)
seems to work here..
complaints to the usual places.. :)

1 files changed, 19 insertions, 22 deletions

diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 73ad274..b634db0 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -39,12 +39,6 @@
 #      include <machine/pio.h>
 #      define RB_GETC(q) getc(q)
 #   else /* BSD 4.4 Lite */
-#	ifdef JREMOD
-#	 define CDEV_MAJOR 42
-#        if defined(DEVFS)
-#          include <sys/devfsext.h>
-#        endif /*DEVFS*/
-#	endif /*JREMOD*/
 #      include <sys/devconf.h>
 #   endif
 #endif
@@ -83,6 +77,23 @@ extern cx_chan_t *cxchan [NCX*NCHAN];   /* unit to channel struct pointer */
 #if __FreeBSD__ >= 2
 extern struct kern_devconf kdc_cx [NCX];
 struct tty cx_tty [NCX*NCHAN];          /* tty data */
+
+static	d_open_t	cxopen;
+static	d_close_t	cxclose;
+static	d_read_t	cxread;
+static	d_write_t	cxwrite;
+static	d_ioctl_t	cxioctl;
+static	d_stop_t	cxstop;
+static	d_select_t	cxselect;
+static	d_ttycv_t	cxdevtotty;
+
+# define CDEV_MAJOR 42
+
+struct cdevsw cx_cdevsw = 
+	{ cxopen,	cxclose,	cxread,		cxwrite,	/*42*/
+	  cxioctl,	cxstop,		nullreset,	cxdevtotty,/* cronyx */
+	  cxselect,	nommap,		NULL,	"cx",	NULL,	-1 };
+
 #else
 struct tty *cx_tty [NCX*NCHAN];         /* tty data */
 #endif
@@ -968,14 +979,9 @@ void cxtimeout (void *a)
 	timeout (cxtimeout, 0, hz*5);
 }
 
-#ifdef JREMOD
-struct cdevsw cx_cdevsw = 
-	{ cxopen,	cxclose,	cxread,		cxwrite,	/*42*/
-	  cxioctl,	cxstop,		nullreset,	cxdevtotty,/* cronyx */
-	  cxselect,	nommap,		NULL };
 
+#if defined(__FreeBSD__) && (__FreeBSD__ > 1 )
 static cx_devsw_installed = 0;
-
 static void 	cx_drvinit(void *unused)
 {
 	dev_t dev;
@@ -984,20 +990,11 @@ static void 	cx_drvinit(void *unused)
 		dev = makedev(CDEV_MAJOR,0);
 		cdevsw_add(&dev,&cx_cdevsw,NULL);
 		cx_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*/
-	"/",	"cx",	major(dev),	0,	DV_CHR,	0,  0, 0600);
-		}
-#endif
     	}
 }
 
 SYSINIT(cxdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cx_drvinit,NULL)
 
-#endif /* JREMOD */
 
+#endif
 #endif /* NCX */