Julian forgot to make the *devsw structures static.

73 files changed, 289 insertions, 150 deletions

diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 6d8a94c..5702d87 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.22 1995/12/07 12:45:34 davidg Exp $
+ *	$Id: mem.c,v 1.23 1995/12/08 11:13:25 julian Exp $
  */
 
 /*
@@ -77,7 +77,7 @@ static	d_ioctl_t	mmioctl;
 static	d_mmap_t	memmmap;
 
 #define CDEV_MAJOR 2
-struct cdevsw mem_cdevsw = 
+static struct cdevsw mem_cdevsw = 
 	{ mmopen,	mmclose,	mmrw,		mmrw,		/*2*/
 	  mmioctl,	nullstop,	nullreset,	nodevtotty,/* memory */
 	  seltrue,	memmmap,	NULL,	"mem",	NULL, -1 };
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index acd4db6..bc078cc 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,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: cy.c,v 1.23 1995/12/06 23:42:34 bde Exp $
+ *	$Id: cy.c,v 1.24 1995/12/08 11:14:04 julian Exp $
  */
 
 #include "cy.h"
@@ -371,7 +371,7 @@ static	d_stop_t	cystop;
 static	d_ttycv_t	cydevtotty;
 
 #define CDEV_MAJOR 48
-struct cdevsw cy_cdevsw = 
+static struct cdevsw cy_cdevsw = 
 	{ cyopen,	cyclose,	cyread,		cywrite,	/*48*/
 	  cyioctl,	cystop,		nxreset,	cydevtotty,/*cyclades*/
 	  ttselect,	nxmmap,		NULL, "cy",	NULL,	-1 };
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index acd4db6..bc078cc 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,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: cy.c,v 1.23 1995/12/06 23:42:34 bde Exp $
+ *	$Id: cy.c,v 1.24 1995/12/08 11:14:04 julian Exp $
  */
 
 #include "cy.h"
@@ -371,7 +371,7 @@ static	d_stop_t	cystop;
 static	d_ttycv_t	cydevtotty;
 
 #define CDEV_MAJOR 48
-struct cdevsw cy_cdevsw = 
+static struct cdevsw cy_cdevsw = 
 	{ cyopen,	cyclose,	cyread,		cywrite,	/*48*/
 	  cyioctl,	cystop,		nxreset,	cydevtotty,/*cyclades*/
 	  ttselect,	nxmmap,		NULL, "cy",	NULL,	-1 };
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 8187b44..f293977 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.9 1995/12/07 12:45:18 davidg Exp $
+ *  dgb.c $Id: dgb.c,v 1.10 1995/12/08 11:12:42 julian Exp $
  *
  *  Digiboard driver.
  *
@@ -204,7 +204,7 @@ static	d_stop_t	dgbstop;
 static	d_ttycv_t	dgbdevtotty;
 
 #define CDEV_MAJOR 58
-struct cdevsw dgb_cdevsw = 
+static struct cdevsw dgb_cdevsw = 
 	{ dgbopen,	dgbclose,	dgbread,	dgbwrite,	/*58*/
 	  dgbioctl,	dgbstop,	nxreset,	dgbdevtotty, /* dgb */
 	  ttselect,	nommap,		NULL,	"dgb",	NULL,	-1 };
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index e1b3436..78c4840 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.72 1995/11/28 09:41:00 julian Exp $
+ *	$Id: fd.c,v 1.73 1995/12/08 11:14:10 julian Exp $
  *
  */
 
@@ -350,11 +350,11 @@ static	d_strategy_t	fdstrategy;
 #define CDEV_MAJOR 9
 #define BDEV_MAJOR 2
 extern	struct cdevsw fd_cdevsw;
-struct bdevsw fd_bdevsw = 
+static struct bdevsw fd_bdevsw = 
 	{ Fdopen,	fdclose,	fdstrategy,	fdioctl,	/*2*/
 	  nxdump,	zerosize,	0,	"fd",	&fd_cdevsw,	-1 };
 
-struct cdevsw fd_cdevsw = 
+static struct cdevsw fd_cdevsw = 
 	{ Fdopen,	fdclose,	rawread,	rawwrite,	/*9*/
 	  fdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		fdstrategy,	"fd",
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 2955d1c..99008ad 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -91,7 +91,7 @@ static	d_close_t	joyclose;
 static	d_read_t	joyread;
 static	d_ioctl_t	joyioctl;
 
-struct cdevsw joy_cdevsw = 
+static struct cdevsw joy_cdevsw = 
 	{ joyopen,	joyclose,	joyread,	nowrite,	/*51*/
 	  joyioctl,	nostop,		nullreset,	nodevtotty,/*joystick */
 	  seltrue,	nommap,		NULL,	"joy",	NULL,	-1 };
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index ee2e03a..8bd2782 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.51 1995/11/29 14:39:46 julian Exp $
+ *	$Id: mcd.c,v 1.52 1995/12/08 11:14:34 julian Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -222,11 +222,11 @@ static	d_strategy_t	mcdstrategy;
 #define CDEV_MAJOR 29
 #define BDEV_MAJOR 7
 extern	struct cdevsw mcd_cdevsw;
-struct bdevsw mcd_bdevsw = 
+static struct bdevsw mcd_bdevsw = 
 	{ mcdopen,	mcdclose,	mcdstrategy,	mcdioctl,	/*7*/
 	  nxdump,	mcdsize,	0,	"mcd",	&mcd_cdevsw,	-1 };
 
-struct cdevsw mcd_cdevsw = 
+static struct cdevsw mcd_cdevsw = 
 	{ mcdopen,	mcdclose,	rawread,	nowrite,	/*29*/
 	  mcdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		mcdstrategy,	"mcd",
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 96f62e5..2196a4c 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.19 1995/12/06 23:42:53 bde Exp $
+ * $Id: mse.c,v 1.20 1995/12/08 11:14:40 julian Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -79,7 +79,7 @@ static	d_read_t	mseread;
 static	d_select_t	mseselect;
 
 #define CDEV_MAJOR 27
-struct cdevsw mse_cdevsw = 
+static struct cdevsw mse_cdevsw = 
 	{ mseopen,	mseclose,	mseread,	nowrite,	/*27*/
 	  noioc,	nostop,		nullreset,	nodevtotty,/* mse */
 	  mseselect,	nommap,		NULL,	"mse",	NULL,	-1 };
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 83db4c6..206b38f 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -109,7 +109,7 @@ static	d_stop_t	rcstop;
 static	d_ttycv_t	rcdevtotty;
 
 #define CDEV_MAJOR 63
-struct cdevsw rc_cdevsw = 
+static struct cdevsw rc_cdevsw = 
 	{ rcopen,       rcclose,        rcread,         rcwrite,        /*63*/
 	  rcioctl,      rcstop,         nxreset,        rcdevtotty,/* rc */
 	  ttselect,	nommap,		NULL,	"rc",	NULL,	-1 };
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index a111bba..4768a44 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.12 1995/11/29 14:39:53 julian Exp $ */
+/* $Id: scd.c,v 1.13 1995/12/08 11:15:01 julian Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -199,11 +199,11 @@ static	d_strategy_t	scdstrategy;
 #define CDEV_MAJOR 45
 #define BDEV_MAJOR 16
 extern	struct cdevsw scd_cdevsw;
-struct bdevsw scd_bdevsw = 
+static struct bdevsw scd_bdevsw = 
 	{ scdopen,	scdclose,	scdstrategy,	scdioctl,	/*16*/
 	  nxdump,	scdsize,	0, "scd",	&scd_cdevsw,	-1 };
 
-struct cdevsw scd_cdevsw = 
+static struct cdevsw scd_cdevsw = 
 	{ scdopen,	scdclose,	rawread,	nowrite,	/*45*/
 	  scdioctl,	nostop,		nullreset,	nodevtotty,/* sony cd */
 	  seltrue,	nommap,		scdstrategy,	"scd",
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index cc1d6a7..1e930c3 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.22 1995/12/07 12:46:06 davidg Exp $
+ *	$Id: si.c,v 1.23 1995/12/08 11:15:05 julian Exp $
  */
 
 #ifndef lint
@@ -122,7 +122,7 @@ static	d_stop_t	sistop;
 static	d_ttycv_t	sidevtotty;
 
 #define CDEV_MAJOR 68
-struct cdevsw si_cdevsw = 
+static struct cdevsw si_cdevsw = 
 	{ siopen,	siclose,	siread,		siwrite,	/*68*/
 	  siioctl,	sistop,		nxreset,	sidevtotty,/* si */
 	  ttselect,	nxmmap,		NULL,	"si",	NULL,	-1 };
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index d44d7bc..61cd485 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.124 1995/12/06 23:43:07 bde Exp $
+ *	$Id: sio.c,v 1.125 1995/12/08 11:15:12 julian Exp $
  */
 
 #include "sio.h"
@@ -311,7 +311,7 @@ static	d_stop_t	siostop;
 static	d_ttycv_t	siodevtotty;
 
 #define CDEV_MAJOR 28
-struct cdevsw sio_cdevsw = 
+static struct cdevsw sio_cdevsw = 
 	{ sioopen,	sioclose,	sioread,	siowrite,	/*28*/
 	  sioioctl,	siostop,	nxreset,	siodevtotty,/* sio */
 	  ttselect,	nommap,		NULL,	driver_name,	NULL,	-1 };
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 27ffe9f..8f6a33e 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -44,7 +44,7 @@ static	d_ioctl_t	snpioctl;
 static	d_select_t	snpselect;
 
 #define CDEV_MAJOR 53
-struct cdevsw snp_cdevsw = 
+static struct cdevsw snp_cdevsw = 
 	{ snpopen,	snpclose,	snpread,	snpwrite,	/*53*/
 	  snpioctl,	nostop,		nullreset,	nodevtotty,/* snoop */
 	  snpselect,	nommap,		NULL,	"snp",	NULL,	-1 };
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 160c18b..07cdb72 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.20 1995/11/29 14:39:59 julian Exp $
+ *    $Id: spkr.c,v 1.21 1995/12/08 11:15:21 julian Exp $
  */
 
 #include "speaker.h"
@@ -37,7 +37,7 @@ static	d_write_t	spkrwrite;
 static	d_ioctl_t	spkrioctl;
 
 #define CDEV_MAJOR 26
-struct cdevsw spkr_cdevsw = 
+static struct cdevsw spkr_cdevsw = 
 	{ spkropen,     spkrclose,      noread,         spkrwrite,      /*26*/
 	  spkrioctl,    nostop,         nullreset,      nodevtotty,/* spkr */
 	  seltrue,	nommap,		NULL,	"spkr",	NULL,	-1 };
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 68ba760..54510e3 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -102,11 +102,11 @@ static	d_strategy_t	vnstrategy;
 #define CDEV_MAJOR 43
 #define BDEV_MAJOR 15
 extern	struct cdevsw vn_cdevsw;
-struct bdevsw vn_bdevsw = 
+static struct bdevsw vn_bdevsw = 
 	{ vnopen,	vnclose,	vnstrategy,	vnioctl,	/*15*/
 	  vndump,	vnsize,		0,	"vn",	&vn_cdevsw,	-1 };
 
-struct cdevsw vn_cdevsw = 
+static struct cdevsw vn_cdevsw = 
 	{ vnopen,	vnclose,	rawread,	rawwrite,	/*43*/
 	  vnioctl,	nostop,		nullreset,	nodevtotty,/* vn */
 	  seltrue,	nommap,		vnstrategy,	"vn",
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 8187b44..f293977 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.9 1995/12/07 12:45:18 davidg Exp $
+ *  dgb.c $Id: dgb.c,v 1.10 1995/12/08 11:12:42 julian Exp $
  *
  *  Digiboard driver.
  *
@@ -204,7 +204,7 @@ static	d_stop_t	dgbstop;
 static	d_ttycv_t	dgbdevtotty;
 
 #define CDEV_MAJOR 58
-struct cdevsw dgb_cdevsw = 
+static struct cdevsw dgb_cdevsw = 
 	{ dgbopen,	dgbclose,	dgbread,	dgbwrite,	/*58*/
 	  dgbioctl,	dgbstop,	nxreset,	dgbdevtotty, /* dgb */
 	  ttselect,	nommap,		NULL,	"dgb",	NULL,	-1 };
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index 85a4081..d6edea3 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.11 1995/11/29 14:39:07 julian Exp $";
+static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.12 1995/12/08 11:12:45 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.11 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,29 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.11 1995/11/29 14:39:07 juli
  *
  *******************************************************************************
  * $Log: nic3008.c,v $
+ * Revision 1.12  1995/12/08  11:12:45  julian
+ * 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.. :)
+ *
  * Revision 1.11  1995/11/29  14:39:07  julian
  * If you're going to mechanically replicate something in 50 files
  * it's best to not have a (compiles cleanly) typo in it! (sigh)
@@ -136,7 +159,7 @@ static	d_close_t	nicclose;
 static	d_ioctl_t	nicioctl;
 
 #define CDEV_MAJOR 54
-struct cdevsw nic_cdevsw = 
+static struct cdevsw nic_cdevsw = 
 	{ nicopen,	nicclose,	noread,		nowrite,	/*54*/
 	  nicioctl,	nostop,		nullreset,	nodevtotty,/* nic */
 	  seltrue,	nommap,		NULL, "nic",	NULL,	-1 };
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 8359c9d..e4f4109 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.11 1995/11/29 14:39:08 julian Exp $";
+static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.12 1995/12/08 11:12:47 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.11 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,29 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.11 1995/11/29 14:39:08 juli
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * Revision 1.12  1995/12/08  11:12:47  julian
+ * 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.. :)
+ *
  * Revision 1.11  1995/11/29  14:39:08  julian
  * If you're going to mechanically replicate something in 50 files
  * it's best to not have a (compiles cleanly) typo in it! (sigh)
@@ -128,7 +151,7 @@ static	d_close_t	nnicclose;
 static	d_ioctl_t	nnicioctl;
 
 #define CDEV_MAJOR 60
-struct cdevsw nnic_cdevsw = 
+static struct cdevsw nnic_cdevsw = 
 	{ nnicopen,	nnicclose,	noread,		nowrite,	/*60*/
 	  nnicioctl,	nostop,		nullreset,	nodevtotty,/* nnic */
 	  seltrue,	nommap,		NULL,	"nnic",	NULL,	-1 };
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index 470bea1..01ba1e3 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,6 +1,6 @@
-static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.7 1995/12/06 23:43:37 bde Exp $";
+static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.8 1995/12/08 11:12:52 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.7 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.8 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,29 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.7 1995/12/06 23:43:37 bde Exp
  *
  *******************************************************************************
  * $Log: iispy.c,v $
+ * Revision 1.8  1995/12/08  11:12:52  julian
+ * 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.. :)
+ *
  * Revision 1.7  1995/12/06  23:43:37  bde
  * Removed unnecessary #includes of <sys/user.h>.  Some of these were just
  * to get the definitions of TRUE and FALSE which happen to be defined in
@@ -106,7 +129,7 @@ static	d_read_t	ispyread;
 static	d_ioctl_t	ispyioctl;
 
 #define CDEV_MAJOR 59
-struct cdevsw ispy_cdevsw = 
+static struct cdevsw ispy_cdevsw = 
 	{ ispyopen,	ispyclose,	ispyread,	nowrite,	/*59*/
 	  ispyioctl,	nostop,		nullreset,	nodevtotty,/* ispy */
 	  seltrue,	nommap,         NULL,	"ispy",	NULL,	-1 };
diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c
index 21c87e8..7d219cc 100644
--- a/sys/gnu/isdn/iitel.c
+++ b/sys/gnu/isdn/iitel.c
@@ -1,6 +1,6 @@
-static char     _itelid[] = "@(#)$Id: iitel.c,v 1.8 1995/11/29 14:39:11 julian Exp $";
+static char     _itelid[] = "@(#)$Id: iitel.c,v 1.9 1995/12/08 11:12:54 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.8 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.9 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,29 @@ static char     _itelid[] = "@(#)$Id: iitel.c,v 1.8 1995/11/29 14:39:11 julian E
  *
  *******************************************************************************
  * $Log: iitel.c,v $
+ * Revision 1.9  1995/12/08  11:12:54  julian
+ * 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.. :)
+ *
  * Revision 1.8  1995/11/29  14:39:11  julian
  * If you're going to mechanically replicate something in 50 files
  * it's best to not have a (compiles cleanly) typo in it! (sigh)
@@ -91,7 +114,7 @@ static	d_write_t	itelwrite;
 static	d_ioctl_t	itelioctl;
 
 #define CDEV_MAJOR 57
-struct cdevsw itel_cdevsw = 
+static struct cdevsw itel_cdevsw = 
 	{ itelopen,	itelclose,	itelread,	itelwrite,	/*57*/
 	  itelioctl,	nostop,		nullreset,	nodevtotty,/* itel */
 	  seltrue,	nommap,		NULL,	"itel",	NULL,	-1 };
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c
index 3c4bf87..4304335 100644
--- a/sys/gnu/isdn/iitty.c
+++ b/sys/gnu/isdn/iitty.c
@@ -1,6 +1,6 @@
-static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.15 1995/12/05 20:33:47 bde Exp $";
+static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.16 1995/12/08 11:12:56 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.15 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.16 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,29 @@ static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.15 1995/12/05 20:33:47 bde Exp
  *
  *******************************************************************************
  * $Log: iitty.c,v $
+ * Revision 1.16  1995/12/08  11:12:56  julian
+ * 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.. :)
+ *
  * Revision 1.15  1995/12/05  20:33:47  bde
  * Fixed ity's d_stop entry.  itystop() wasn't used.  itystop() is inadequate
  * but probably harmless.  It's hard to tell because apparently no one runs
@@ -200,7 +223,7 @@ static	d_stop_t	itystop;
 static	d_ttycv_t	itydevtotty;
 
 #define CDEV_MAJOR 56
-struct cdevsw ity_cdevsw = 
+static struct cdevsw ity_cdevsw = 
 	{ ityopen,	ityclose,	ityread,	itywrite,	/*56*/
 	  ityioctl,	itystop,	noreset,	itydevtotty,/* ity */
 	  ttselect,	nommap,		NULL,	"ity",	NULL,	-1 };
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index 71755e3..d77bed9 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.8 1995/11/29 14:39:12 julian Exp $";
+static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.9 1995/12/08 11:13:01 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.8 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.9 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,29 @@ static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.8 1995/11/29 14:39:12 julian Ex
  *
  *******************************************************************************
  * $Log: isdn.c,v $
+ * Revision 1.9  1995/12/08  11:13:01  julian
+ * 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.. :)
+ *
  * Revision 1.8  1995/11/29  14:39:12  julian
  * If you're going to mechanically replicate something in 50 files
  * it's best to not have a (compiles cleanly) typo in it! (sigh)
@@ -111,7 +134,7 @@ static	d_write_t	isdnwrite;
 static	d_ioctl_t	isdnioctl;
 
 #define CDEV_MAJOR 55
-struct cdevsw isdn_cdevsw = 
+static struct cdevsw isdn_cdevsw = 
 	{ isdnopen,	isdnclose,	isdnread,	nowrite,	/*55*/
 	  isdnioctl,	nostop,		nullreset,	nodevtotty,/* isdn */
 	  seltrue,	nommap,		NULL,	"isdn",	NULL,	-1 };
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 4624a28..9db6f41 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.36 1995/11/29 14:39:24 julian Exp $
+ *	$Id: cons.c,v 1.37 1995/12/08 11:13:21 julian Exp $
  */
 
 #include <sys/param.h>
@@ -77,7 +77,7 @@ static	d_ioctl_t	cnioctl;
 static	d_select_t	cnselect;
 
 #define CDEV_MAJOR 0
-struct cdevsw cn_cdevsw = 
+static struct cdevsw cn_cdevsw = 
 	{ cnopen,	cnclose,	cnread,		cnwrite,	/*0*/
 	  cnioctl,	nullstop,	nullreset,	nodevtotty,/* console */
 	  cnselect,	nommap,		NULL,	"console",	NULL,	-1 };
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 6d8a94c..5702d87 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.22 1995/12/07 12:45:34 davidg Exp $
+ *	$Id: mem.c,v 1.23 1995/12/08 11:13:25 julian Exp $
  */
 
 /*
@@ -77,7 +77,7 @@ static	d_ioctl_t	mmioctl;
 static	d_mmap_t	memmmap;
 
 #define CDEV_MAJOR 2
-struct cdevsw mem_cdevsw = 
+static struct cdevsw mem_cdevsw = 
 	{ mmopen,	mmclose,	mmrw,		mmrw,		/*2*/
 	  mmioctl,	nullstop,	nullreset,	nodevtotty,/* memory */
 	  seltrue,	memmmap,	NULL,	"mem",	NULL, -1 };
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index d39231a..ff2a3f2 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -130,7 +130,7 @@ static	d_ioctl_t	bquioctl;
 static	d_select_t	bquselect;
 
 #define CDEV_MAJOR 8
-struct cdevsw bqu_cdevsw = 
+static struct cdevsw bqu_cdevsw = 
 	{ bquopen,      bquclose,       bquread,        bquwrite,       /*8*/
 	  bquioctl,     nostop,         nullreset,      nodevtotty,/* tputer */
 	  bquselect,    nommap,         NULL,	"bqu",	NULL,	-1 };
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 817d539..7739cea 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.11 1995/12/06 23:42:26 bde Exp $
+ *	$Id: ctx.c,v 1.12 1995/12/08 11:13:56 julian Exp $
  */
 
 /*
@@ -149,7 +149,7 @@ static	d_write_t	ctxwrite;
 static	d_ioctl_t	ctxioctl;
 #define CDEV_MAJOR 40
 
-struct cdevsw ctx_cdevsw = 
+static struct cdevsw ctx_cdevsw = 
 	{ ctxopen,	ctxclose,	ctxread,	ctxwrite,	/*40*/
 	  ctxioctl,	nostop,		nullreset,	nodevtotty,/* cortex */
 	  seltrue,	nommap,		NULL,	"ctx",	NULL,	-1 };
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index b634db0..d50a569 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -89,7 +89,7 @@ static	d_ttycv_t	cxdevtotty;
 
 # define CDEV_MAJOR 42
 
-struct cdevsw cx_cdevsw = 
+static struct cdevsw cx_cdevsw = 
 	{ cxopen,	cxclose,	cxread,		cxwrite,	/*42*/
 	  cxioctl,	cxstop,		nullreset,	cxdevtotty,/* cronyx */
 	  cxselect,	nommap,		NULL,	"cx",	NULL,	-1 };
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index acd4db6..bc078cc 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,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: cy.c,v 1.23 1995/12/06 23:42:34 bde Exp $
+ *	$Id: cy.c,v 1.24 1995/12/08 11:14:04 julian Exp $
  */
 
 #include "cy.h"
@@ -371,7 +371,7 @@ static	d_stop_t	cystop;
 static	d_ttycv_t	cydevtotty;
 
 #define CDEV_MAJOR 48
-struct cdevsw cy_cdevsw = 
+static struct cdevsw cy_cdevsw = 
 	{ cyopen,	cyclose,	cyread,		cywrite,	/*48*/
 	  cyioctl,	cystop,		nxreset,	cydevtotty,/*cyclades*/
 	  ttselect,	nxmmap,		NULL, "cy",	NULL,	-1 };
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index e1b3436..78c4840 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.72 1995/11/28 09:41:00 julian Exp $
+ *	$Id: fd.c,v 1.73 1995/12/08 11:14:10 julian Exp $
  *
  */
 
@@ -350,11 +350,11 @@ static	d_strategy_t	fdstrategy;
 #define CDEV_MAJOR 9
 #define BDEV_MAJOR 2
 extern	struct cdevsw fd_cdevsw;
-struct bdevsw fd_bdevsw = 
+static struct bdevsw fd_bdevsw = 
 	{ Fdopen,	fdclose,	fdstrategy,	fdioctl,	/*2*/
 	  nxdump,	zerosize,	0,	"fd",	&fd_cdevsw,	-1 };
 
-struct cdevsw fd_cdevsw = 
+static struct cdevsw fd_cdevsw = 
 	{ Fdopen,	fdclose,	rawread,	rawwrite,	/*9*/
 	  fdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		fdstrategy,	"fd",
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 76e11d9..43388bc 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -82,7 +82,7 @@ static	d_write_t	gpwrite;
 static	d_ioctl_t	gpioctl;
 
 #define CDEV_MAJOR 44
-struct cdevsw gp_cdevsw = 
+static struct cdevsw gp_cdevsw = 
 	{ gpopen,	gpclose,	noread,		gpwrite,	/*44*/
 	  gpioctl,	nostop,		nullreset,	nodevtotty,/* GPIB */
           seltrue,	nommap,		NULL,	"gp",	NULL,	-1 };
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index f8369e5..b564997 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -189,7 +189,7 @@ static	d_read_t	gscread;
 static	d_ioctl_t	gscioctl;
 
 #define CDEV_MAJOR 47
-struct cdevsw gsc_cdevsw = 
+static struct cdevsw gsc_cdevsw = 
 	{ gscopen,      gscclose,       gscread,        nowrite,	/*47*/
 	  gscioctl,     nostop,         nullreset,      nodevtotty,/* gsc */
 	  seltrue,      nommap,         NULL,	"gsc",	NULL,	-1 };
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index 2955d1c..99008ad 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -91,7 +91,7 @@ static	d_close_t	joyclose;
 static	d_read_t	joyread;
 static	d_ioctl_t	joyioctl;
 
-struct cdevsw joy_cdevsw = 
+static struct cdevsw joy_cdevsw = 
 	{ joyopen,	joyclose,	joyread,	nowrite,	/*51*/
 	  joyioctl,	nostop,		nullreset,	nodevtotty,/*joystick */
 	  seltrue,	nommap,		NULL,	"joy",	NULL,	-1 };
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 97984ee..a3287d6 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -289,7 +289,7 @@ static	d_ioctl_t	labpcioctl;
 static	d_strategy_t	labpcstrategy;
 
 #define CDEV_MAJOR 66
-struct cdevsw labpc_cdevsw = 
+static struct cdevsw labpc_cdevsw = 
 	{ labpcopen,	labpcclose,	rawread,	rawwrite,	/*66*/
 	  labpcioctl,	nostop,		nullreset,	nodevtotty,/* labpc */
 	  seltrue,	nommap,		labpcstrategy, "labpc",	NULL,	-1 };
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 81d503b..df0d0d9 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.45 1995/12/07 12:46:03 davidg Exp $
+ *	$Id: lpt.c,v 1.46 1995/12/08 11:14:30 julian Exp $
  */
 
 /*
@@ -292,7 +292,7 @@ static	d_write_t	lptwrite;
 static	d_ioctl_t	lptioctl;
 
 #define CDEV_MAJOR 16
-struct cdevsw lpt_cdevsw = 
+static struct cdevsw lpt_cdevsw = 
 	{ lptopen,	lptclose,	noread,		lptwrite,	/*16*/
 	  lptioctl,	nullstop,	nullreset,	nodevtotty,/* lpt */
 	  seltrue,	nommap,		nostrat,	"lpt",	NULL,	-1 };
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index ee2e03a..8bd2782 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/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.51 1995/11/29 14:39:46 julian Exp $
+ *	$Id: mcd.c,v 1.52 1995/12/08 11:14:34 julian Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -222,11 +222,11 @@ static	d_strategy_t	mcdstrategy;
 #define CDEV_MAJOR 29
 #define BDEV_MAJOR 7
 extern	struct cdevsw mcd_cdevsw;
-struct bdevsw mcd_bdevsw = 
+static struct bdevsw mcd_bdevsw = 
 	{ mcdopen,	mcdclose,	mcdstrategy,	mcdioctl,	/*7*/
 	  nxdump,	mcdsize,	0,	"mcd",	&mcd_cdevsw,	-1 };
 
-struct cdevsw mcd_cdevsw = 
+static struct cdevsw mcd_cdevsw = 
 	{ mcdopen,	mcdclose,	rawread,	nowrite,	/*29*/
 	  mcdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		mcdstrategy,	"mcd",
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 96f62e5..2196a4c 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.19 1995/12/06 23:42:53 bde Exp $
+ * $Id: mse.c,v 1.20 1995/12/08 11:14:40 julian Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -79,7 +79,7 @@ static	d_read_t	mseread;
 static	d_select_t	mseselect;
 
 #define CDEV_MAJOR 27
-struct cdevsw mse_cdevsw = 
+static struct cdevsw mse_cdevsw = 
 	{ mseopen,	mseclose,	mseread,	nowrite,	/*27*/
 	  noioc,	nostop,		nullreset,	nodevtotty,/* mse */
 	  mseselect,	nommap,		NULL,	"mse",	NULL,	-1 };
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index d0bb085..070ec8f 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.21 1995/12/01 23:09:20 julian Exp $
+ *	$Id: pcaudio.c,v 1.22 1995/12/08 11:14:45 julian Exp $
  */
 
 #include "pca.h"
@@ -101,7 +101,7 @@ static	d_ioctl_t	pcaioctl;
 static	d_select_t	pcaselect;
 
 #define CDEV_MAJOR 24
-struct cdevsw pca_cdevsw = 
+static struct cdevsw pca_cdevsw = 
  	{ pcaopen,      pcaclose,       noread,         pcawrite,       /*24*/
  	  pcaioctl,     nostop,         nullreset,      nodevtotty,/* pcaudio */
  	  pcaselect,	nommap,		NULL,	"pca",	NULL,	-1 };
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 83db4c6..206b38f 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -109,7 +109,7 @@ static	d_stop_t	rcstop;
 static	d_ttycv_t	rcdevtotty;
 
 #define CDEV_MAJOR 63
-struct cdevsw rc_cdevsw = 
+static struct cdevsw rc_cdevsw = 
 	{ rcopen,       rcclose,        rcread,         rcwrite,        /*63*/
 	  rcioctl,      rcstop,         nxreset,        rcdevtotty,/* rc */
 	  ttselect,	nommap,		NULL,	"rc",	NULL,	-1 };
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index a111bba..4768a44 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.12 1995/11/29 14:39:53 julian Exp $ */
+/* $Id: scd.c,v 1.13 1995/12/08 11:15:01 julian Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -199,11 +199,11 @@ static	d_strategy_t	scdstrategy;
 #define CDEV_MAJOR 45
 #define BDEV_MAJOR 16
 extern	struct cdevsw scd_cdevsw;
-struct bdevsw scd_bdevsw = 
+static struct bdevsw scd_bdevsw = 
 	{ scdopen,	scdclose,	scdstrategy,	scdioctl,	/*16*/
 	  nxdump,	scdsize,	0, "scd",	&scd_cdevsw,	-1 };
 
-struct cdevsw scd_cdevsw = 
+static struct cdevsw scd_cdevsw = 
 	{ scdopen,	scdclose,	rawread,	nowrite,	/*45*/
 	  scdioctl,	nostop,		nullreset,	nodevtotty,/* sony cd */
 	  seltrue,	nommap,		scdstrategy,	"scd",
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index cc1d6a7..1e930c3 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.22 1995/12/07 12:46:06 davidg Exp $
+ *	$Id: si.c,v 1.23 1995/12/08 11:15:05 julian Exp $
  */
 
 #ifndef lint
@@ -122,7 +122,7 @@ static	d_stop_t	sistop;
 static	d_ttycv_t	sidevtotty;
 
 #define CDEV_MAJOR 68
-struct cdevsw si_cdevsw = 
+static struct cdevsw si_cdevsw = 
 	{ siopen,	siclose,	siread,		siwrite,	/*68*/
 	  siioctl,	sistop,		nxreset,	sidevtotty,/* si */
 	  ttselect,	nxmmap,		NULL,	"si",	NULL,	-1 };
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index d44d7bc..61cd485 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.124 1995/12/06 23:43:07 bde Exp $
+ *	$Id: sio.c,v 1.125 1995/12/08 11:15:12 julian Exp $
  */
 
 #include "sio.h"
@@ -311,7 +311,7 @@ static	d_stop_t	siostop;
 static	d_ttycv_t	siodevtotty;
 
 #define CDEV_MAJOR 28
-struct cdevsw sio_cdevsw = 
+static struct cdevsw sio_cdevsw = 
 	{ sioopen,	sioclose,	sioread,	siowrite,	/*28*/
 	  sioioctl,	siostop,	nxreset,	siodevtotty,/* sio */
 	  ttselect,	nommap,		NULL,	driver_name,	NULL,	-1 };
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index ad4888f..8fb9bf8 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.c,v 1.36 1995/12/06 23:51:21 bde Exp $
+ * $Id: soundcard.c,v 1.37 1995/12/08 11:16:44 julian Exp $
  */
 
 #include "sound_config.h"
@@ -81,7 +81,7 @@ static d_ioctl_t	sndioctl;
 static d_select_t	sndselect;
 
 #define CDEV_MAJOR 30
-struct cdevsw snd_cdevsw = 
+static struct cdevsw snd_cdevsw = 
 	{ sndopen,	sndclose,	sndread,	sndwrite,	/*30*/
   	  sndioctl,	nostop,		nullreset,	nodevtotty,/* sound */
   	  sndselect,	nommap,		NULL,	"snd", NULL, -1 };
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index e542887..e46a1ba 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -109,7 +109,7 @@ static	d_select_t	spigot_select;
 static	d_mmap_t	spigot_mmap;
 
 #define CDEV_MAJOR 11
-struct cdevsw spigot_cdevsw = 
+static struct cdevsw spigot_cdevsw = 
 	{ spigot_open,	spigot_close,	spigot_read,	spigot_write,	/*11*/
 	  spigot_ioctl,	nostop,		nullreset,	nodevtotty,/* Spigot */
 	  spigot_select, spigot_mmap,	NULL,	"spigot",	NULL,	-1  };
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 160c18b..07cdb72 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.20 1995/11/29 14:39:59 julian Exp $
+ *    $Id: spkr.c,v 1.21 1995/12/08 11:15:21 julian Exp $
  */
 
 #include "speaker.h"
@@ -37,7 +37,7 @@ static	d_write_t	spkrwrite;
 static	d_ioctl_t	spkrioctl;
 
 #define CDEV_MAJOR 26
-struct cdevsw spkr_cdevsw = 
+static struct cdevsw spkr_cdevsw = 
 	{ spkropen,     spkrclose,      noread,         spkrwrite,      /*26*/
 	  spkrioctl,    nostop,         nullreset,      nodevtotty,/* spkr */
 	  seltrue,	nommap,		NULL,	"spkr",	NULL,	-1 };
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index f8406f0..79a0a11 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -213,7 +213,7 @@ static	d_write_t	twwrite;
 static	d_select_t	twselect;
 
 #define CDEV_MAJOR 19
-struct cdevsw tw_cdevsw = 
+static struct cdevsw tw_cdevsw = 
 	{ twopen,	twclose,	twread,		twwrite,	/*19*/
 	  noioc,	nullstop,	nullreset,	nodevtotty, /* tw */
 	  twselect,	nommap,		nostrat,	"tw",	NULL,	-1 };
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index 2b57f3a..f0d1fa4 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -46,11 +46,11 @@ static	d_strategy_t	wcdstrategy;
 #define CDEV_MAJOR 69
 #define BDEV_MAJOR 19
 extern	struct cdevsw wcd_cdevsw;
-struct bdevsw wcd_bdevsw = 
+static struct bdevsw wcd_bdevsw = 
 	{ wcdbopen,	wcdbclose,	wcdstrategy,	wcdioctl,	/*19*/
 	  nxdump,	zerosize,	0,	"wcd",	&wcd_cdevsw,	-1 };
 
-struct cdevsw wcd_cdevsw = 
+static struct cdevsw wcd_cdevsw = 
 	{ wcdropen,	wcdrclose,	rawread,	nowrite,	/*69*/
 	  wcdioctl,	nostop,		nullreset,	nodevtotty,/* atapi */
 	  seltrue,	nommap,		wcdstrategy,	"wcd",
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 1822a8b..f9fe93f 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.96 1995/12/07 12:46:12 davidg Exp $
+ *	$Id: wd.c,v 1.97 1995/12/08 11:15:43 julian Exp $
  */
 
 /* TODO:
@@ -311,11 +311,11 @@ static	d_strategy_t	wdstrategy;
 #define CDEV_MAJOR 3
 #define BDEV_MAJOR 0
 extern	struct cdevsw wd_cdevsw;
-struct bdevsw wd_bdevsw = 
+static struct bdevsw wd_bdevsw = 
 	{ wdopen,	wdclose,	wdstrategy,	wdioctl,	/*0*/
 	  wddump,	wdsize,		0,	"wd",	&wd_cdevsw,	-1 };
 
-struct cdevsw wd_cdevsw = 
+static struct cdevsw wd_cdevsw = 
 	{ wdopen,	wdclose,	rawread,	rawwrite,	/*3*/
 	  wdioctl,	nostop,		nullreset,	nodevtotty,/* wd */
 	  seltrue,	nommap,		wdstrategy,	"wd",
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 6fc75d8..7ea8b7e 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.23 1995/11/29 14:40:11 julian Exp $
+ * $Id: wt.c,v 1.24 1995/12/08 11:15:48 julian Exp $
  *
  */
 
@@ -207,11 +207,11 @@ static	d_strategy_t	wtstrategy;
 #define BDEV_MAJOR 3
 
 extern struct cdevsw wt_cdevsw; 
-struct bdevsw wt_bdevsw = 
+static struct bdevsw wt_bdevsw = 
 	{ wtopen,	wtclose,	wtstrategy,	wtioctl,	/*3*/
 	  wtdump,	wtsize,		B_TAPE,	"wt",	&wt_cdevsw,	-1 };
 
-struct cdevsw wt_cdevsw = 
+static struct cdevsw wt_cdevsw = 
 	{ wtopen,	wtclose,	rawread,	rawwrite,	/*10*/
 	  wtioctl,	nostop,		nullreset,	nodevtotty,/* wt */
 	  seltrue,	nommap,		wtstrategy,	"wt",
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index e1b3436..78c4840 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.72 1995/11/28 09:41:00 julian Exp $
+ *	$Id: fd.c,v 1.73 1995/12/08 11:14:10 julian Exp $
  *
  */
 
@@ -350,11 +350,11 @@ static	d_strategy_t	fdstrategy;
 #define CDEV_MAJOR 9
 #define BDEV_MAJOR 2
 extern	struct cdevsw fd_cdevsw;
-struct bdevsw fd_bdevsw = 
+static struct bdevsw fd_bdevsw = 
 	{ Fdopen,	fdclose,	fdstrategy,	fdioctl,	/*2*/
 	  nxdump,	zerosize,	0,	"fd",	&fd_cdevsw,	-1 };
 
-struct cdevsw fd_cdevsw = 
+static struct cdevsw fd_cdevsw = 
 	{ Fdopen,	fdclose,	rawread,	rawwrite,	/*9*/
 	  fdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		fdstrategy,	"fd",
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index 2955d1c..99008ad 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -91,7 +91,7 @@ static	d_close_t	joyclose;
 static	d_read_t	joyread;
 static	d_ioctl_t	joyioctl;
 
-struct cdevsw joy_cdevsw = 
+static struct cdevsw joy_cdevsw = 
 	{ joyopen,	joyclose,	joyread,	nowrite,	/*51*/
 	  joyioctl,	nostop,		nullreset,	nodevtotty,/*joystick */
 	  seltrue,	nommap,		NULL,	"joy",	NULL,	-1 };
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index d44d7bc..61cd485 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.124 1995/12/06 23:43:07 bde Exp $
+ *	$Id: sio.c,v 1.125 1995/12/08 11:15:12 julian Exp $
  */
 
 #include "sio.h"
@@ -311,7 +311,7 @@ static	d_stop_t	siostop;
 static	d_ttycv_t	siodevtotty;
 
 #define CDEV_MAJOR 28
-struct cdevsw sio_cdevsw = 
+static struct cdevsw sio_cdevsw = 
 	{ sioopen,	sioclose,	sioread,	siowrite,	/*28*/
 	  sioioctl,	siostop,	nxreset,	siodevtotty,/* sio */
 	  ttselect,	nommap,		NULL,	driver_name,	NULL,	-1 };
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index acc5a43..ddbc7c6 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.20 1995/12/07 12:46:38 davidg Exp $
+ * $Id: kern_descrip.c,v 1.21 1995/12/08 11:16:59 julian Exp $
  */
 
 #include <sys/param.h>
@@ -70,7 +70,7 @@ static	 d_open_t  fdopen;
 #define NUMFDESC 64
 
 #define CDEV_MAJOR 22
-struct cdevsw fildesc_cdevsw = 
+static struct cdevsw fildesc_cdevsw = 
 	{ fdopen,	noclose,	noread,		nowrite,	/*22*/
 	  noioc,	nostop,		nullreset,	nodevtotty,/*fd(!=Fd)*/
 	  noselect,	nommap,		nostrat };
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 8aa9ac4..4e1eab8 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.23 1995/12/07 12:46:43 davidg Exp $
+ * $Id: kern_lkm.c,v 1.24 1995/12/08 11:17:03 julian Exp $
  */
 
 #include <sys/param.h>
@@ -91,7 +91,7 @@ static	d_close_t	lkmcclose;
 static	d_ioctl_t	lkmcioctl;
 
 #define CDEV_MAJOR 32
-struct cdevsw lkmc_cdevsw = 
+static struct cdevsw lkmc_cdevsw = 
 	{ lkmcopen,	lkmcclose,	noread,		nowrite,	/*32*/
 	  lkmcioctl,	nostop,		nullreset,	nodevtotty,
 	  noselect,	nommap,		NULL,	"lkm",	NULL,	-1 };
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 5b8a86f..8671380 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.13 1995/12/02 18:58:52 bde Exp $
+ * $Id: subr_log.c,v 1.14 1995/12/08 11:17:06 julian Exp $
  */
 
 /*
@@ -64,7 +64,7 @@ static	d_ioctl_t	logioctl;
 static	d_select_t	logselect;
 
 #define CDEV_MAJOR 7
-struct cdevsw log_cdevsw = 
+static struct cdevsw log_cdevsw = 
 	{ logopen,	logclose,	logread,	nowrite,	/*7*/
 	  logioctl,	nostop,		nullreset,	nodevtotty,/* klog */
 	  logselect,	nommap,		NULL,	"log",	NULL,	-1 };
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 4624a28..9db6f41 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.36 1995/11/29 14:39:24 julian Exp $
+ *	$Id: cons.c,v 1.37 1995/12/08 11:13:21 julian Exp $
  */
 
 #include <sys/param.h>
@@ -77,7 +77,7 @@ static	d_ioctl_t	cnioctl;
 static	d_select_t	cnselect;
 
 #define CDEV_MAJOR 0
-struct cdevsw cn_cdevsw = 
+static struct cdevsw cn_cdevsw = 
 	{ cnopen,	cnclose,	cnread,		cnwrite,	/*0*/
 	  cnioctl,	nullstop,	nullreset,	nodevtotty,/* console */
 	  cnselect,	nommap,		NULL,	"console",	NULL,	-1 };
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 9897365..55c44dd 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_pty.c,v 1.28 1995/12/02 13:08:20 julian Exp $
+ * $Id: tty_pty.c,v 1.29 1995/12/08 11:17:09 julian Exp $
  */
 
 /*
@@ -76,12 +76,12 @@ static	d_select_t	ptcselect;
 
 #define CDEV_MAJOR_S 5
 #define CDEV_MAJOR_C 6
-struct cdevsw pts_cdevsw = 
+static struct cdevsw pts_cdevsw = 
 	{ ptsopen,	ptsclose,	ptsread,	ptswrite,	/*5*/
 	  ptyioctl,	ptsstop,	nullreset,	ptydevtotty,/* ttyp */
 	  ttselect,	nommap,		NULL,	"pts",	NULL,	-1 };
 
-struct cdevsw ptc_cdevsw = 
+static struct cdevsw ptc_cdevsw = 
 	{ ptcopen,	ptcclose,	ptcread,	ptcwrite,	/*6*/
 	  ptyioctl,	nullstop,	nullreset,	ptydevtotty,/* ptyp */
 	  ptcselect,	nommap,		NULL,	"ptc",	NULL,	-1 };
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 27ffe9f..8f6a33e 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -44,7 +44,7 @@ static	d_ioctl_t	snpioctl;
 static	d_select_t	snpselect;
 
 #define CDEV_MAJOR 53
-struct cdevsw snp_cdevsw = 
+static struct cdevsw snp_cdevsw = 
 	{ snpopen,	snpclose,	snpread,	snpwrite,	/*53*/
 	  snpioctl,	nostop,		nullreset,	nodevtotty,/* snoop */
 	  snpselect,	nommap,		NULL,	"snp",	NULL,	-1 };
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index d34536c..f69b63d 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.7 1995/11/29 14:40:38 julian Exp $
+ * $Id: tty_tty.c,v 1.8 1995/12/08 11:17:17 julian Exp $
  */
 
 /*
@@ -57,6 +57,7 @@ static	d_ioctl_t	cttyioctl;
 static	d_select_t	cttyselect;
 
 #define CDEV_MAJOR 1
+/* Don't make static, fdesc_vnops uses this. */
 struct cdevsw ctty_cdevsw = 
 	{ cttyopen,	nullclose,	cttyread,	cttywrite,	/*1*/
 	  cttyioctl,	nullstop,	nullreset,	nodevtotty,/* tty */
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 8a1840c..8a0c213 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.18 1995/12/06 23:51:53 bde Exp $
+ * $Id: bpf.c,v 1.19 1995/12/08 11:18:01 julian Exp $
  */
 
 #include "bpfilter.h"
@@ -150,7 +150,7 @@ static	d_ioctl_t	bpfioctl;
 static	d_select_t	bpfselect;
 
 #define CDEV_MAJOR 23
-struct cdevsw bpf_cdevsw = 
+static struct cdevsw bpf_cdevsw = 
  	{ bpfopen,	bpfclose,	bpfread,	bpfwrite,	/*23*/
  	  bpfioctl,	nostop,		nullreset,	nodevtotty,/* bpf */
  	  bpfselect,	nommap,		NULL,	"bpf",	NULL,	-1 };
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 3a7eccb..6a4c1a1 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -102,7 +102,7 @@ static	d_ioctl_t	crdioctl;
 static	d_select_t	crdselect;
 
 #define CDEV_MAJOR 50
-struct cdevsw crd_cdevsw = 
+static struct cdevsw crd_cdevsw = 
 	{ crdopen,	crdclose,	crdread,	crdwrite,	/*50*/
 	  crdioctl,	nostop,		nullreset,	nodevtotty,/* pcmcia */
 	  crdselect,	nommap,		NULL,	"crd",	NULL,	-1 };
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index f12173b..0f50ddf 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -181,7 +181,7 @@ static	d_ioctl_t	meteor_ioctl;
 static	d_mmap_t	meteor_mmap;
 
 #define CDEV_MAJOR 67
-struct cdevsw meteor_cdevsw = 
+static struct cdevsw meteor_cdevsw = 
         { meteor_open,  meteor_close,   meteor_read,    meteor_write,   /*67*/
           meteor_ioctl, nostop,         nullreset,      nodevtotty,/* Meteor */
           seltrue,	meteor_mmap, NULL,	"meteor",	NULL,	-1 };
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 9fd6a4a..6e79c6d 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.47 1995/11/29 14:40:51 julian Exp $
+ *      $Id: cd.c,v 1.48 1995/12/08 11:18:38 julian Exp $
  */
 
 #define SPLCD splbio
@@ -70,11 +70,11 @@ static	d_strategy_t	cdstrategy;
 #define CDEV_MAJOR 15
 #define BDEV_MAJOR 6
 extern	struct	cdevsw	cd_cdevsw;
-struct bdevsw cd_bdevsw = 
+static struct bdevsw cd_bdevsw = 
 	{ cdopen,	cdclose,	cdstrategy,	cdioctl,	/*6*/
 	  nxdump,	cdsize,		0,	"cd",	&cd_cdevsw,	-1 };
 
-struct cdevsw cd_cdevsw = 
+static struct cdevsw cd_cdevsw = 
 	{ cdopen,	cdclose,	rawread,	nowrite,	/*15*/
 	  cdioctl,	nostop,		nullreset,	nodevtotty,/* cd */
 	  seltrue,	nommap,		cdstrategy,	"cd",
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 360a8c8..8bff2c2 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -2,7 +2,7 @@
  * Written by grefen@convex.com (probably moved by now)
  * Based on scsi drivers by Julian Elischer (julian@tfs.com)
  *
- *      $Id: ch.c,v 1.25 1995/12/06 23:44:14 bde Exp $
+ *      $Id: ch.c,v 1.26 1995/12/08 11:18:40 julian Exp $
  */
 
 #include	<sys/types.h>
@@ -80,7 +80,7 @@ static	d_close_t	chclose;
 static	d_ioctl_t	chioctl;
 
 #define CDEV_MAJOR 17
-struct cdevsw ch_cdevsw = 
+static struct cdevsw ch_cdevsw = 
 	{ chopen,	chclose,	noread,		nowrite,	/*17*/
 	  chioctl,	nostop,		nullreset,	nodevtotty,/* ch */
 	  noselect,	nommap,		nostrat,	"ch",	NULL,	-1 };
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 568d343..7fe37b4 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.5 1995/11/29 14:40:57 julian Exp $
+ *	$Id: od.c,v 1.6 1995/12/08 11:18:45 julian Exp $
  */
 
 /*
@@ -124,11 +124,11 @@ static	d_strategy_t	odstrategy;
 #define CDEV_MAJOR 70
 #define BDEV_MAJOR 20
 extern	struct cdevsw od_cdevsw;
-struct bdevsw od_bdevsw = 
+static struct bdevsw od_bdevsw = 
 	{ odopen,	odclose,	odstrategy,	odioctl,	/*20*/
 	  nxdump,	odsize,		0,	"od",	&od_cdevsw,	-1 };
 
-struct cdevsw od_cdevsw = 
+static struct cdevsw od_cdevsw = 
 	{ odopen,	odclose,	rawread,	rawwrite,	/*70*/
 	  odioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		odstrategy,	"od",
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 12fa2fb..b00cc26 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pt.c,v 1.8 1995/11/29 14:40:59 julian Exp $
+ *      $Id: pt.c,v 1.9 1995/12/08 11:18:48 julian Exp $
  */
 
 /*
@@ -73,7 +73,7 @@ static	d_ioctl_t	ptioctl;
 static	d_strategy_t	ptstrategy;
 
 #define CDEV_MAJOR 61
-struct cdevsw pt_cdevsw = 
+static struct cdevsw pt_cdevsw = 
 	{ ptopen,	ptclose,	rawread,	rawwrite,	/*61*/
 	  ptioctl,	nostop,		nullreset,	nodevtotty,/* pt */
 	  seltrue,	nommap,		ptstrategy,	"pt",	NULL,	-1 };
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index de3e748..a4045a0 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -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.8 1995/11/29 14:41:00 julian Exp $
+ *      $Id: sctarg.c,v 1.9 1995/12/08 11:18:51 julian Exp $
  */
 
 /*
@@ -79,7 +79,7 @@ static	d_ioctl_t	sctargioctl;
 static	d_strategy_t	sctargstrategy;
 
 #define CDEV_MAJOR 65
-struct cdevsw sctarg_cdevsw = 
+static struct cdevsw sctarg_cdevsw = 
 	{ sctargopen,	sctargclose,	rawread,	rawwrite,	/*65*/
 	  sctargioctl,	nostop,		nullreset,	nodevtotty,/* sctarg */
 	  seltrue,	nommap,		sctargstrategy,	"sctarg", NULL,	-1 };
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index fa70096..92604f8 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.75 1995/12/07 12:47:48 davidg Exp $
+ *      $Id: sd.c,v 1.76 1995/12/08 11:18:53 julian Exp $
  */
 
 #define SPLSD splbio
@@ -105,11 +105,11 @@ static	d_strategy_t	sdstrategy;
 #define CDEV_MAJOR 13
 #define BDEV_MAJOR 4
 extern struct cdevsw sd_cdevsw; /* hold off the complaints for a second */
-struct bdevsw sd_bdevsw = 
+static struct bdevsw sd_bdevsw = 
 	{ sdopen,	sdclose,	sdstrategy,	sdioctl,	/*4*/
 	  sddump,	sdsize,		0,	"sd",	&sd_cdevsw,	-1 };
 
-struct cdevsw sd_cdevsw = 
+static struct cdevsw sd_cdevsw = 
 	{ sdopen,	sdclose,	rawread,	rawwrite,	/*13*/
 	  sdioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		sdstrategy,	"sd",
diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c
index 2a0988b..7c1a62e 100644
--- a/sys/scsi/ssc.c
+++ b/sys/scsi/ssc.c
@@ -49,7 +49,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *End copyright
- * $Id: ssc.c,v 1.7 1995/12/05 19:36:33 bde Exp $
+ * $Id: ssc.c,v 1.8 1995/12/08 11:18:55 julian Exp $
  */
 
 #include <sys/types.h>
@@ -75,7 +75,7 @@ extern	d_close_t	suclose;
 extern	d_ioctl_t	suioctl;
 
 #define CDEV_MAJOR 49
-struct cdevsw ssc_cdevsw = 
+static struct cdevsw ssc_cdevsw = 
 	{ sscopen,	sscclose,	noread,		nowrite,	/*49*/
 	  sscioctl,	nostop,		nullreset,	nodevtotty,
 	  noselect,	nxmmap,		nostrategy,	"ssc",	NULL,	-1 };
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 86cb8c6..dbb814e 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.48 1995/12/06 23:44:23 bde Exp $
+ * $Id: st.c,v 1.49 1995/12/08 11:18:59 julian Exp $
  */
 
 /*
@@ -269,11 +269,11 @@ d_strategy_t	ststrategy;
 
 #define CDEV_MAJOR 14
 #define BDEV_MAJOR 5
-struct bdevsw st_bdevsw = 
+static struct bdevsw st_bdevsw = 
 	{ stopen,	stclose,	ststrategy,	stioctl,	/*5*/
 	  nxdump,	zerosize,	0 };
 
-struct cdevsw st_cdevsw = 
+static struct cdevsw st_cdevsw = 
 	{ stopen,	stclose,	rawread,	rawwrite,	/*14*/
 	  stioctl,	nostop,		nullreset,	nodevtotty,/* st */
 	  seltrue,	nommap,		ststrategy };
diff --git a/sys/scsi/su.c b/sys/scsi/su.c
index 1bbefa1..616277e 100644
--- a/sys/scsi/su.c
+++ b/sys/scsi/su.c
@@ -44,7 +44,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- *      $Id: su.c,v 1.8 1995/11/29 14:41:06 julian Exp $
+ *      $Id: su.c,v 1.9 1995/12/08 11:19:01 julian Exp $
  *
  * Tabstops 4
  * XXX devfs entries for this device should be handled by generic scsiconfig
@@ -74,7 +74,7 @@ static	d_write_t	suwrite;
 static	d_select_t	suselect;
 static	d_strategy_t	sustrategy;
 
-struct cdevsw su_cdevsw = 
+static struct cdevsw su_cdevsw = 
 	{ suopen,	suclose,	suread,		suwrite,	/*18*/
 	  suioctl,	nostop,		nullreset,	nodevtotty,/* scsi */
 	  suselect,	nxmmap,		sustrategy, "su",	NULL,	-1 };
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index 53302e2..f144e48 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -2,7 +2,7 @@
  * Driver for a device we can't identify.
  * by Julian Elischer (julian@tfs.com)
  *
- *      $Id: uk.c,v 1.11 1995/11/29 14:41:07 julian Exp $
+ *      $Id: uk.c,v 1.12 1995/12/08 11:19:03 julian Exp $
  *
  * If you find that you are adding any code to this file look closely
  * at putting it in "scsi_driver.c" instead.
@@ -24,7 +24,7 @@ static	d_close_t	ukclose;
 static	d_ioctl_t	ukioctl;
 
 #define CDEV_MAJOR 31
-struct cdevsw uk_cdevsw = 
+static struct cdevsw uk_cdevsw = 
 	{ ukopen,	ukclose,	noread,         nowrite,      	/*31*/
 	  ukioctl,	nostop,		nullreset,	nodevtotty,/* unknown */
 	  seltrue,	nommap,		NULL,	"uk"	,NULL,	-1 };
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index b065bf8..7b4c0b0 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.13 1995/12/05 07:14:27 julian Exp $
+ *      $Id: worm.c,v 1.14 1995/12/08 11:19:07 julian Exp $
  */
 
 /* XXX This is PRELIMINARY.
@@ -90,7 +90,7 @@ static	d_ioctl_t	wormioctl;
 d_strategy_t	wormstrategy;
 
 #define CDEV_MAJOR 62
-struct cdevsw worm_cdevsw = 
+static struct cdevsw worm_cdevsw = 
 	{ wormopen,	wormclose,	rawread,	rawwrite,	/*62*/
 	  wormioctl,	nostop,		nullreset,	nodevtotty,/* worm */
 	  seltrue,	nommap,		wormstrategy };
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index db7b2ad..b9dc8e7 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.28 1995/12/07 12:48:28 davidg Exp $
+ * $Id: vm_swap.c,v 1.29 1995/12/08 11:19:42 julian Exp $
  */
 
 #include <sys/param.h>
@@ -56,11 +56,11 @@
 #define CDEV_MAJOR 4
 #define BDEV_MAJOR 1
 
-struct bdevsw sw_bdevsw = 
+static struct bdevsw sw_bdevsw = 
 	{ noopen,	noclose,	swstrategy,	noioc,		/*1*/
 	  nodump,	zerosize,	NULL,	"sw",	NULL,	-1 };
 
-struct cdevsw sw_cdevsw = 
+static struct cdevsw sw_cdevsw = 
 	{ nullopen,	nullclose,	rawread,	rawwrite,	/*4*/
 	  noioc,	nostop,		noreset,	nodevtotty,/* swap */
 	  noselect,	nommap,		swstrategy,	"sw",	NULL,	-1 };