5 files changed, 15 insertions, 68 deletions

diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 3e1c36696ab6..662bd8c68b22 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.13 1996/06/12 04:58:03 gpalmer Exp $ */
+/* $Id: ccd.c,v 1.14 1996/07/21 09:28:03 phk Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -182,20 +182,13 @@ d_write_t ccdwrite;
 #define CDEV_MAJOR 74
 #define BDEV_MAJOR 21
 
-extern struct cdevsw ccd_cdevsw;
+static struct cdevsw ccd_cdevsw;
 static struct bdevsw ccd_bdevsw = {
   ccdopen, ccdclose, ccdstrategy, ccdioctl,
   ccddump, ccdsize, 0,
   "ccd", &ccd_cdevsw, -1
 };
 
-static struct cdevsw ccd_cdevsw = {
-  ccdopen, ccdclose, rawread, rawwrite,
-  ccdioctl, nostop, nullreset, nodevtotty,
-  seltrue, nommap, ccdstrategy,
-  "ccd", &ccd_bdevsw, -1
-};
-
 /* Called by main() during pseudo-device attachment */
 static void	ccdattach __P((void *));
 PSEUDO_SET(ccdattach, ccd);
@@ -250,7 +243,6 @@ ccdattach(dummy)
 {
 	int i;
 	int num = NCCD;
-	dev_t dev;
 
 	if (num > 1)
 		printf("ccd0-%d: Concatenated disk drivers\n", num-1);
@@ -278,10 +270,7 @@ ccdattach(dummy)
 		ccddevs[i].ccd_dk = -1;
 
 	if( ! ccd_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR, 0);
-		cdevsw_add(&dev,&ccd_cdevsw, NULL);
-		dev = makedev(BDEV_MAJOR, 0);
-		bdevsw_add(&dev,&ccd_bdevsw, NULL);
+		bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &ccd_bdevsw);
 		ccd_devsw_installed = 1;
     	}
 	else {
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 9f378322e5dd..ac20996ae765 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.89 1996/05/03 20:15:11 phk Exp $
+ *	$Id: fd.c,v 1.90 1996/07/12 07:40:59 bde Exp $
  *
  */
 
@@ -64,7 +64,6 @@
 #include <machine/clock.h>
 #include <machine/ioctl_fd.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
@@ -348,16 +347,11 @@ static	d_strategy_t	fdstrategy;
 
 #define CDEV_MAJOR 9
 #define BDEV_MAJOR 2
-extern	struct cdevsw fd_cdevsw;
+static struct cdevsw fd_cdevsw;
 static struct bdevsw fd_bdevsw = 
 	{ Fdopen,	fdclose,	fdstrategy,	fdioctl,	/*2*/
 	  nodump,	nopsize,	0,	"fd",	&fd_cdevsw,	-1 };
 
-static struct cdevsw fd_cdevsw = 
-	{ Fdopen,	fdclose,	rawread,	rawwrite,	/*9*/
-	  fdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		fdstrategy,	"fd",
-	  &fd_bdevsw,	-1 };
 
 static struct isa_device *fdcdevs[NFDC];
 
@@ -1971,13 +1965,9 @@ static fd_devsw_installed = 0;
 
 static void 	fd_drvinit(void *notused )
 {
-	dev_t dev;
 
 	if( ! fd_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR, 0);
-		cdevsw_add(&dev,&fd_cdevsw, NULL);
-		dev = makedev(BDEV_MAJOR, 0);
-		bdevsw_add(&dev,&fd_bdevsw, NULL);
+		bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &fd_bdevsw);
 		fd_devsw_installed = 1;
 	}
 }
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 3c10a16881e1..c16c00472256 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.80 1996/06/12 05:03:47 gpalmer Exp $
+ *	$Id: mcd.c,v 1.81 1996/06/18 01:22:27 bde Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -220,17 +220,11 @@ static	d_strategy_t	mcdstrategy;
 
 #define CDEV_MAJOR 29
 #define BDEV_MAJOR 7
-extern	struct cdevsw mcd_cdevsw;
+static struct cdevsw mcd_cdevsw;
 static struct bdevsw mcd_bdevsw = 
 	{ mcdopen,	mcdclose,	mcdstrategy,	mcdioctl,	/*7*/
 	  nodump,	mcdsize,	0,	"mcd",	&mcd_cdevsw,	-1 };
 
-static struct cdevsw mcd_cdevsw = 
-	{ mcdopen,	mcdclose,	rawread,	nowrite,	/*29*/
-	  mcdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		mcdstrategy,	"mcd",
-	  &mcd_bdevsw,	-1 };
-
 #define mcd_put(port,byte)	outb(port,byte)
 
 #define MCD_RETRYS	5
@@ -1816,13 +1810,9 @@ static mcd_devsw_installed = 0;
 
 static void 	mcd_drvinit(void *unused)
 {
-	dev_t dev;
 
 	if( ! mcd_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR,0);
-		cdevsw_add(&dev,&mcd_cdevsw,NULL);
-		dev = makedev(BDEV_MAJOR,0);
-		bdevsw_add(&dev,&mcd_bdevsw,NULL);
+		bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &mcd_bdevsw);
 		mcd_devsw_installed = 1;
     	}
 }
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index df219c7db347..454cd5b20c47 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.22 1996/06/18 01:22:30 bde Exp $ */
+/* $Id: scd.c,v 1.23 1996/07/12 04:11:25 bde Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -194,18 +194,11 @@ static	d_strategy_t	scdstrategy;
 
 #define CDEV_MAJOR 45
 #define BDEV_MAJOR 16
-extern	struct cdevsw scd_cdevsw;
+static struct cdevsw scd_cdevsw;
 static struct bdevsw scd_bdevsw = 
 	{ scdopen,	scdclose,	scdstrategy,	scdioctl,	/*16*/
 	  nodump,	nopsize,	0, "scd",	&scd_cdevsw,	-1 };
 
-static struct cdevsw scd_cdevsw = 
-	{ scdopen,	scdclose,	rawread,	nowrite,	/*45*/
-	  scdioctl,	nostop,		nullreset,	nodevtotty,/* sony cd */
-	  seltrue,	nommap,		scdstrategy,	"scd",
-	  &scd_bdevsw,	-1 };
-
-
 static struct kern_devconf kdc_scd[NSCD] = { {
 	0, 0, 0,		/* filled in by dev_attach */
 	"scd", 0, { MDDT_ISA, 0, "bio" },
@@ -1550,13 +1543,9 @@ static scd_devsw_installed = 0;
 
 static void 	scd_drvinit(void *unused)
 {
-	dev_t dev;
 
 	if( ! scd_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR, 0);
-		cdevsw_add(&dev,&scd_cdevsw, NULL);
-		dev = makedev(BDEV_MAJOR, 0);
-		bdevsw_add(&dev,&scd_bdevsw, NULL);
+		bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &scd_bdevsw);
 		scd_devsw_installed = 1;
     	}
 }
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index a383fd52ab3c..652918e53fab 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id$
+ *	$Id: vn.c,v 1.36 1996/03/28 15:25:43 bde Exp $
  */
 
 /*
@@ -102,18 +102,11 @@ static	d_strategy_t	vnstrategy;
 
 #define CDEV_MAJOR 43
 #define BDEV_MAJOR 15
-extern	struct cdevsw vn_cdevsw;
+static struct cdevsw vn_cdevsw;
 static struct bdevsw vn_bdevsw = 
 	{ vnopen,	vnclose,	vnstrategy,	vnioctl,	/*15*/
 	  vndump,	vnsize,		0,	"vn",	&vn_cdevsw,	-1 };
 
-static struct cdevsw vn_cdevsw = 
-	{ vnopen,	vnclose,	rawread,	rawwrite,	/*43*/
-	  vnioctl,	nostop,		nullreset,	nodevtotty,/* vn */
-	  seltrue,	nommap,		vnstrategy,	"vn",
-	  &vn_bdevsw,	-1 };
-
-
 
 #ifdef DEBUG
 int dovncluster = 1;
@@ -622,7 +615,6 @@ static vn_devsw_installed = 0;
 static void 
 vn_drvinit(void *unused)
 {
-	dev_t dev;
 #ifdef DEVFS
 	int mynor;
 	int unit;
@@ -630,10 +622,7 @@ vn_drvinit(void *unused)
 #endif
 
 	if( ! vn_devsw_installed ) {
-		dev = makedev(CDEV_MAJOR,0);
-		cdevsw_add(&dev,&vn_cdevsw,NULL);
-		dev = makedev(BDEV_MAJOR,0);
-		bdevsw_add(&dev,&vn_bdevsw,NULL);
+		bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &vn_bdevsw);
 		vn_devsw_installed = 1;
 #ifdef DEVFS
 		for (unit = 0; unit < NVN; unit++) {