Subject: more patches for vinum and i4b
From: Poul-Henning Kamp <phk@freebsd.org>
Date: Mon, 31 May 1999 13:16:56 +0200

These are in addition to what you got for the last mega patch.

Poul-Henning

Index: vinum.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/vinum/vinum.c,v
retrieving revision 1.23
diff -u -r1.23 vinum.c
--- vinum.c	1999/05/15 05:49:19	1.23
+++ vinum.c	1999/05/31 09:28:03
@@ -52,7 +52,7 @@
 STATIC struct cdevsw vinum_cdevsw =
 {
     vinumopen, vinumclose, physread, physwrite,
-    vinumioctl, nostop, nullreset, nodevtotty,
+    vinumioctl, nostop, noreset, nodevtotty,
     seltrue, nommap, vinumstrategy, "vinum",
     NULL, -1, vinumdump, vinumsize,
     D_DISK, 0, -1
@@ -85,7 +85,7 @@
     daemonq = NULL;					    /* initialize daemon's work queue */
     dqend = NULL;
 
-    cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &vinum_cdevsw);
+    cdevsw_add(&vinum_cdevsw);
 #ifdef DEVFS
 #error DEVFS not finished yet
 #endif
@@ -236,7 +236,9 @@
 	    }
 	}
 #endif
+#if 0
 	cdevsw[CDEV_MAJOR] = NULL;			    /* no cdevsw any more */
+#endif
 	log(LOG_INFO, "vinum: unloaded\n");		    /* tell the world */
 	return 0;
     default:

Index: driver/i4b_ctl.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/driver/i4b_ctl.c,v
retrieving revision 1.4
diff -u -r1.4 i4b_ctl.c
--- i4b_ctl.c	1999/05/20 10:08:56	1.4
+++ i4b_ctl.c	1999/05/31 09:31:34
@@ -98,7 +98,7 @@
 #define CDEV_MAJOR 55
 static struct cdevsw i4bctl_cdevsw = 
 	{ i4bctlopen,	i4bctlclose,	noread,		nowrite,
-	  i4bctlioctl,	nostop,		nullreset,	nodevtotty,
+	  i4bctlioctl,	nostop,		noreset,	nodevtotty,
 #ifdef OS_USES_POLL
 	  i4bctlpoll,	nommap,		NULL,	"i4bctl", NULL,	-1 };
 #else
@@ -134,11 +134,8 @@
 static void
 i4bctlinit(void *unused)
 {
-    dev_t dev;
     
-    dev = makedev(CDEV_MAJOR, 0);
-
-    cdevsw_add(&dev, &i4bctl_cdevsw, NULL);
+    cdevsw_add(&i4bctl_cdevsw);
 }
 
 SYSINIT(i4bctldev, SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR, &i4bctlinit, NULL);
Index: driver/i4b_rbch.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/driver/i4b_rbch.c,v
retrieving revision 1.3
diff -u -r1.3 i4b_rbch.c
--- i4b_rbch.c	1999/05/20 10:09:02	1.3
+++ i4b_rbch.c	1999/05/31 09:29:56
@@ -196,11 +196,8 @@
 static void
 i4brbchinit(void *unused)
 {
-    dev_t dev;
-    
-    dev = makedev(CDEV_MAJOR, 0);
 
-    cdevsw_add(&dev, &i4brbch_cdevsw, NULL);
+    cdevsw_add(&i4brbch_cdevsw);
 }
 
 SYSINIT(i4brbchdev, SI_SUB_DRIVERS,
Index: driver/i4b_tel.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/driver/i4b_tel.c,v
retrieving revision 1.3
diff -u -r1.3 i4b_tel.c
--- i4b_tel.c	1999/05/20 10:09:03	1.3
+++ i4b_tel.c	1999/05/31 09:31:00
@@ -215,11 +215,8 @@
 PDEVSTATIC void
 i4btelinit(void *unused)
 {
-    dev_t dev;
     
-    dev = makedev(CDEV_MAJOR, 0);
-
-    cdevsw_add(&dev, &i4btel_cdevsw, NULL);
+    cdevsw_add(&i4btel_cdevsw);
 }
 
 SYSINIT(i4bteldev, SI_SUB_DRIVERS,
Index: driver/i4b_trace.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/driver/i4b_trace.c,v
retrieving revision 1.3
diff -u -r1.3 i4b_trace.c
--- i4b_trace.c	1999/05/20 10:09:05	1.3
+++ i4b_trace.c	1999/05/31 09:29:43
@@ -146,11 +146,8 @@
 static
 void i4btrcinit(void *unused)
 {
-    dev_t dev;
-    
-    dev = makedev(CDEV_MAJOR, 0);
 
-    cdevsw_add(&dev, &i4btrc_cdevsw, NULL);
+    cdevsw_add(&i4btrc_cdevsw);
 }
 
 SYSINIT(i4btrcdev, SI_SUB_DRIVERS,
Index: layer4/i4b_i4bdrv.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/layer4/i4b_i4bdrv.c,v
retrieving revision 1.5
diff -u -r1.5 i4b_i4bdrv.c
--- i4b_i4bdrv.c	1999/05/20 10:11:20	1.5
+++ i4b_i4bdrv.c	1999/05/31 09:32:40
@@ -147,7 +147,7 @@
 #define CDEV_MAJOR 60
 static struct cdevsw i4b_cdevsw = 
 	{ i4bopen,	i4bclose,	i4bread,	nowrite,
-	  i4bioctl,	nostop,		nullreset,	nodevtotty,
+	  i4bioctl,	nostop,		noreset,	nodevtotty,
 #ifdef OS_USES_POLL
 	  i4bpoll,	nommap,		NULL,	"i4b", NULL,	-1 };
 #else
@@ -952,13 +952,8 @@
 static void
 i4b_drvinit(void *unused)
 {
-	dev_t dev;
 
-	if( ! i4b_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR,0);
-		cdevsw_add(&dev,&i4b_cdevsw,NULL);
-		i4b_devsw_installed = 1;
-    	}
+	cdevsw_add(&i4b_cdevsw);
 }
 
 SYSINIT(i4bdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,i4b_drvinit,NULL)
Index: tina-dd/i4b_tina_dd.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/tina-dd/i4b_tina_dd.c,v
retrieving revision 1.2
diff -u -r1.2 i4b_tina_dd.c
--- i4b_tina_dd.c	1999/01/12 11:05:03	1.2
+++ i4b_tina_dd.c	1999/05/31 09:31:58
@@ -95,7 +95,7 @@
 #define CDEV_MAJOR 54
 static struct cdevsw tina_cdevsw = 
 	{ tinaopen,	tinaclose,	noread,		nowrite,
-	  tinaioctl,	nostop,		nullreset,	nodevtotty,
+	  tinaioctl,	nostop,		noreset,	nodevtotty,
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
 	  tinapoll,	nommap,		NULL,	"tina", NULL,	-1 };
 #else
@@ -185,11 +185,8 @@
 static void
 tinainit(void *unused)
 {
-    dev_t dev;
-    
-    dev = makedev(CDEV_MAJOR, 0);
 
-    cdevsw_add(&dev, &tina_cdevsw, NULL);
+    cdevsw_add(&tina_cdevsw);
 }
 
 SYSINIT(tinadev, SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR, &tinainit, NULL);

--
Poul-Henning Kamp             FreeBSD coreteam member
phk@FreeBSD.ORG               "Real hackers run -current on their laptop."
FreeBSD -- It will take a long time before progress goes too far!