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, 22 insertions, 24 deletions

diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 42592eb..de3e748 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -1,5 +1,5 @@
 /*
- * sctarg: Processor Type driver.
+ * sctarg: Target mode user interface
  *
  * Copyright (C) 1995, HD Associates, Inc.
  * PO Box 276
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sctarg.c,v 1.7 1995/11/29 10:49:01 julian Exp $
+ *      $Id: sctarg.c,v 1.8 1995/11/29 14:41:00 julian Exp $
  */
 
 /*
@@ -50,17 +50,14 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <scsi/scsi_all.h>
-#include <scsi/scsiconf.h>
-
-#ifdef JREMOD
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#define CDEV_MAJOR 65
-#endif /*JREMOD*/
+#include <scsi/scsi_all.h>
+#include <scsi/scsiconf.h>
+
 
 #define OPEN 0x01
 
@@ -76,6 +73,17 @@ errval sctarg_close(dev_t dev, int flag, int fmt, struct proc *p,
         struct scsi_link *sc_link);
 void sctarg_strategy(struct buf *bp, struct scsi_link *sc_link);
 
+static	d_open_t	sctargopen;
+static	d_close_t	sctargclose;
+static	d_ioctl_t	sctargioctl;
+static	d_strategy_t	sctargstrategy;
+
+#define CDEV_MAJOR 65
+struct cdevsw sctarg_cdevsw = 
+	{ sctargopen,	sctargclose,	rawread,	rawwrite,	/*65*/
+	  sctargioctl,	nostop,		nullreset,	nodevtotty,/* sctarg */
+	  seltrue,	nommap,		sctargstrategy,	"sctarg", NULL,	-1 };
+
 SCSI_DEVICE_ENTRIES(sctarg)
 
 struct scsi_device sctarg_switch =
@@ -276,35 +284,25 @@ sctarg_strategy(struct buf *bp, struct scsi_link *sc_link)
 	return;
 }
 
-#ifdef JREMOD
-struct cdevsw sctarg_cdevsw = 
-	{ sctargopen,	sctargclose,	rawread,	rawwrite,	/*65*/
-	  sctargioctl,	nostop,		nullreset,	nodevtotty,/* sctarg */
-	  seltrue,	nommap,		sctargstrategy };
-
 static sctarg_devsw_installed = 0;
 
 static void 	sctarg_drvinit(void *unused)
 {
 	dev_t dev;
+	void	*x;
 
 	if( ! sctarg_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR,0);
-		cdevsw_add(&dev,&sctarg_cdevsw,NULL);
+		dev = makedev(CDEV_MAJOR, 0);
+		cdevsw_add(&dev,&sctarg_cdevsw, NULL);
 		sctarg_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*/
-	"/",	"sctarg",	major(dev),	0,	DV_CHR,	0,  0, 0600);
-		}
+		/* XXX should be in ADAPTER code */
+		x=devfs_add_devsw( "/scsi", "sctarg", &sctarg_cdevsw, 0,
+					DV_CHR, 0,  0, 0600);
 #endif
     	}
 }
 
 SYSINIT(sctargdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sctarg_drvinit,NULL)
 
-#endif /* JREMOD */