This commit should be a extensive NO-OP:

        Reformat and initialize correctly all "struct cdevsw".

        Initialize the d_maj and d_bmaj fields.

        The d_reset field was not removed, although it is never used.

I used a program to do most of this, so all the files now use the
same consistent format.  Please keep it that way.

Vinum and i4b not modified, patches emailed to respective authors.

36 files changed, 758 insertions, 197 deletions

diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index ad3313c..c8fbf1c 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.85 1999/05/09 13:00:41 phk Exp $
+ *	$Id: apm.c,v 1.86 1999/05/11 19:54:03 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -88,10 +88,27 @@ static d_close_t apmclose;
 static d_ioctl_t apmioctl;
 
 #define CDEV_MAJOR 39
-static struct cdevsw apm_cdevsw = 
-	{ apmopen,	apmclose,	noread,		nowrite,	/*39*/
-	  apmioctl,	nostop,		nullreset,	nodevtotty,/* APM */
-	  seltrue,	nommap,		NULL ,	"apm"	,NULL,	-1};
+static struct cdevsw apm_cdevsw = {
+	/* open */	apmopen,
+	/* close */	apmclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	apmioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"apm",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 /* setup APM GDT discriptors */
 static void
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index ad3313c..c8fbf1c 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.85 1999/05/09 13:00:41 phk Exp $
+ *	$Id: apm.c,v 1.86 1999/05/11 19:54:03 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -88,10 +88,27 @@ static d_close_t apmclose;
 static d_ioctl_t apmioctl;
 
 #define CDEV_MAJOR 39
-static struct cdevsw apm_cdevsw = 
-	{ apmopen,	apmclose,	noread,		nowrite,	/*39*/
-	  apmioctl,	nostop,		nullreset,	nodevtotty,/* APM */
-	  seltrue,	nommap,		NULL ,	"apm"	,NULL,	-1};
+static struct cdevsw apm_cdevsw = {
+	/* open */	apmopen,
+	/* close */	apmclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	apmioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"apm",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 /* setup APM GDT discriptors */
 static void
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 32b181d..6b7efb4 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.64 1999/04/28 10:52:04 dt Exp $
+ *	$Id: cons.c,v 1.65 1999/05/08 06:39:20 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -65,12 +65,26 @@ static	d_ioctl_t	cnioctl;
 static	d_poll_t	cnpoll;
 
 #define	CDEV_MAJOR	0
-static	struct cdevsw	cn_cdevsw = {
-	cnopen,		cnclose,	cnread,		cnwrite,
-	cnioctl,	nullstop,	nullreset,	nodevtotty,
-	cnpoll,		nommap,		NULL,		"console",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw cn_cdevsw = {
+	/* open */	cnopen,
+	/* close */	cnclose,
+	/* read */	cnread,
+	/* write */	cnwrite,
+	/* ioctl */	cnioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	cnpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"console",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static dev_t	cn_dev_t; 	/* seems to be never really used */
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 04cf926..20a7820 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.60 1999/05/08 17:48:21 peter Exp $
+ *	$Id: mem.c,v 1.61 1999/05/11 19:54:06 phk Exp $
  */
 
 /*
@@ -87,10 +87,27 @@ static	d_mmap_t	memmmap;
 static	d_poll_t	mmpoll;
 
 #define CDEV_MAJOR 2
-static struct cdevsw mem_cdevsw = 
-	{ mmopen,	mmclose,	mmrw,		mmrw,		/*2*/
-	  mmioctl,	nullstop,	nullreset,	nodevtotty,/* memory */
-	  mmpoll,	memmmap,	NULL,	"mem",	NULL, -1 };
+static struct cdevsw mem_cdevsw = {
+	/* open */	mmopen,
+	/* close */	mmclose,
+	/* read */	mmrw,
+	/* write */	mmrw,
+	/* ioctl */	mmioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	mmpoll,
+	/* mmap */	memmmap,
+	/* strategy */	nostrategy,
+	/* name */	"mem",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static struct random_softc random_softc[16];
 static caddr_t	zbuf;
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 2e14e04..4a6a071 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.35 1999/04/28 10:52:14 dt Exp $
+ * $Id: asc.c,v 1.36 1999/05/06 18:12:24 peter Exp $
  */
 
 #include "asc.h"
@@ -199,10 +199,27 @@ static d_poll_t		ascpoll;
 
 #define CDEV_MAJOR 71
 
-static struct cdevsw asc_cdevsw = 
-	{ ascopen,      ascclose,       ascread,        nowrite,        /*71*/
-	  ascioctl,     nostop,         nullreset,      nodevtotty, /* asc */   
-	  ascpoll,	nommap,         NULL,	"asc",	NULL,	-1 };
+static struct cdevsw asc_cdevsw = {
+	/* open */	ascopen,
+	/* close */	ascclose,
+	/* read */	ascread,
+	/* write */	nowrite,
+	/* ioctl */	ascioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	ascpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"asc",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 #define STATIC static
 
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index 99333d4..644fb3f 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.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: atapi-cd.c,v 1.17 1999/05/07 07:03:23 phk Exp $
+ *	$Id: atapi-cd.c,v 1.18 1999/05/11 10:39:27 sos Exp $
  */
 
 #include "wdc.h"
@@ -61,11 +61,25 @@ static d_strategy_t	acdstrategy;
 #define CDEV_MAJOR 69
 #define BDEV_MAJOR 19
 static struct cdevsw acd_cdevsw = {
-    acdopen,	acdclose,	physread,	physwrite,	
-    acdioctl,	nostop,		nullreset,	nodevtotty,
-    seltrue,	nommap,		acdstrategy,	"wcd",
-    NULL,	-1,		nodump,		nopsize,
-    D_DISK,	0,		-1
+	/* open */	acdopen,
+	/* close */	acdclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	acdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	acdstrategy,
+	/* name */	"wcd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
 };
 
 #define NUNIT	16		/* Max # of devices */
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 28d61a1..f1b5953 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.29 1998/12/09 02:56:48 eivind Exp $
+ *	$Id: ctx.c,v 1.30 1999/04/28 10:52:19 dt Exp $
  */
 
 /*
@@ -146,10 +146,27 @@ static	d_write_t	ctxwrite;
 static	d_ioctl_t	ctxioctl;
 #define CDEV_MAJOR 40
 
-static struct cdevsw ctx_cdevsw = 
-	{ ctxopen,	ctxclose,	ctxread,	ctxwrite,	/*40*/
-	  ctxioctl,	nostop,		nullreset,	nodevtotty,/* cortex */
-	  seltrue,	nommap,		NULL,	"ctx",	NULL,	-1 };
+static struct cdevsw ctx_cdevsw = {
+	/* open */	ctxopen,
+	/* close */	ctxclose,
+	/* read */	ctxread,
+	/* write */	ctxwrite,
+	/* ioctl */	ctxioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"ctx",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 
 #define   LUTSIZE     256	/* buffer size for Look Up Table (LUT) */
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 4234000..7f5624e 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -90,12 +90,26 @@ static	d_devtotty_t	cxdevtotty;
 
 #define	CDEV_MAJOR	42
 /* Don't make this static, since if_cx.c uses it. */
-struct cdevsw	cx_cdevsw = {
-	cxopen,		cxclose,	cxread,		cxwrite,
-	cxioctl,	cxstop,		nullreset,	cxdevtotty,
-	ttpoll,		nommap,		NULL,		"cx",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+struct cdevsw cx_cdevsw = {
+	/* open */	cxopen,
+	/* close */	cxclose,
+	/* read */	cxread,
+	/* write */	cxwrite,
+	/* ioctl */	cxioctl,
+	/* stop */	cxstop,
+	/* reset */	noreset,
+	/* devtotty */	cxdevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"cx",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 #else
 struct tty *cx_tty [NCX*NCHAN];         /* tty data */
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 93e8200..70d0466 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.87 1999/04/27 11:14:54 phk Exp $
+ *	$Id: cy.c,v 1.88 1999/05/28 13:23:21 bde Exp $
  */
 
 #include "opt_compat.h"
@@ -388,12 +388,26 @@ static	d_stop_t	siostop;
 static	d_devtotty_t	siodevtotty;
 
 #define	CDEV_MAJOR	48
-static	struct cdevsw	sio_cdevsw = {
-	sioopen,	sioclose,	sioread,	siowrite,
-	sioioctl,	siostop,	noreset,	siodevtotty,
-	ttpoll,		nommap,		NULL,		driver_name,
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw sio_cdevsw = {
+	/* open */	sioopen,
+	/* close */	sioclose,
+	/* read */	sioread,
+	/* write */	siowrite,
+	/* ioctl */	sioioctl,
+	/* stop */	siostop,
+	/* reset */	noreset,
+	/* devtotty */	siodevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	driver_name,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static	int	comconsole = -1;
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index cc51f93..cd7001b 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.143 1999/05/11 04:58:30 bde Exp $
+ *	$Id: fd.c,v 1.144 1999/05/30 11:10:54 dfr Exp $
  *
  */
 
@@ -370,16 +370,31 @@ static	d_close_t	fdclose;
 static	d_ioctl_t	fdioctl;
 static	d_strategy_t	fdstrategy;
 
-static struct cdevsw fd_cdevsw = {
-	  Fdopen,	fdclose,	physread,	physwrite,
-	  fdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		fdstrategy,	"fd",
-	  NULL,		-1,		nodump,		nopsize,
-	  D_DISK,	0,		-1
-};
 #define CDEV_MAJOR 9
 #define BDEV_MAJOR 2
 
+static struct cdevsw fd_cdevsw = {
+	/* open */	Fdopen,
+	/* close */	fdclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	fdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	fdstrategy,
+	/* name */	"fd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
+
 static int
 fdc_err(struct fdc_data *fdc, const char *s)
 {
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index b289f57..cf67cdc 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -75,10 +75,27 @@ static	d_write_t	gpwrite;
 static	d_ioctl_t	gpioctl;
 
 #define CDEV_MAJOR 44
-static struct cdevsw gp_cdevsw = 
-	{ gpopen,	gpclose,	noread,		gpwrite,	/*44*/
-	  gpioctl,	nostop,		nullreset,	nodevtotty,/* GPIB */
-          seltrue,	nommap,		NULL,	"gp",	NULL,	-1 };
+static struct cdevsw gp_cdevsw = {
+	/* open */	gpopen,
+	/* close */	gpclose,
+	/* read */	noread,
+	/* write */	gpwrite,
+	/* ioctl */	gpioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"gp",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 #define   BUFSIZE      1024
 #define   ATTACHED     0x08
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 7295ae7..9ac7b43 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -194,10 +194,27 @@ static	d_read_t	gscread;
 static	d_ioctl_t	gscioctl;
 
 #define CDEV_MAJOR 47
-static struct cdevsw gsc_cdevsw = 
-	{ gscopen,      gscclose,       gscread,        nowrite,	/*47*/
-	  gscioctl,     nostop,         nullreset,      nodevtotty,/* gsc */
-	  seltrue,      nommap,         NULL,	"gsc",	NULL,	-1 };
+static struct cdevsw gsc_cdevsw = {
+	/* open */	gscopen,
+	/* close */	gscclose,
+	/* read */	gscread,
+	/* write */	nowrite,
+	/* ioctl */	gscioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"gsc",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 
 /***********************************************************************
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 84b4277..0ade414 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.26 1999/04/28 10:52:35 dt Exp $
+ * $Id: istallion.c,v 1.27 1999/05/08 07:02:29 phk Exp $
  */
 
 /*****************************************************************************/
@@ -640,12 +640,26 @@ struct isa_driver	stlidriver = {
  */
 
 #define	CDEV_MAJOR	75
-static	struct cdevsw	stli_cdevsw = {
-	stliopen,	stliclose,	stliread,	stliwrite,
-	stliioctl,	stlistop,	noreset,	stlidevtotty,
-	ttpoll,		nommap,		NULL,		stli_drvname,
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw stli_cdevsw = {
+	/* open */	stliopen,
+	/* close */	stliclose,
+	/* read */	stliread,
+	/* write */	stliwrite,
+	/* ioctl */	stliioctl,
+	/* stop */	stlistop,
+	/* reset */	noreset,
+	/* devtotty */	stlidevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	stli_drvname,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static int stli_devsw_installed;
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index 5d4a7c2..6847f43 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -92,10 +92,27 @@ static	d_close_t	joyclose;
 static	d_read_t	joyread;
 static	d_ioctl_t	joyioctl;
 
-static struct cdevsw joy_cdevsw = 
-	{ joyopen,	joyclose,	joyread,	nowrite,	/*51*/
-	  joyioctl,	nostop,		nullreset,	nodevtotty,/*joystick */
-	  seltrue,	nommap,		NULL,	"joy",	NULL,	-1 };
+static struct cdevsw joy_cdevsw = {
+	/* open */	joyopen,
+	/* close */	joyclose,
+	/* read */	joyread,
+	/* write */	nowrite,
+	/* ioctl */	joyioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"joy",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static int get_tick __P((void));
 
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 28b91e7..180252b 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -291,10 +291,27 @@ static	d_ioctl_t	labpcioctl;
 static	d_strategy_t	labpcstrategy;
 
 #define CDEV_MAJOR 66
-static struct cdevsw labpc_cdevsw = 
-	{ labpcopen,	labpcclose,	physread,	physwrite,
-	  labpcioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		labpcstrategy, "labpc",	NULL,	-1 };
+static struct cdevsw labpc_cdevsw = {
+	/* open */	labpcopen,
+	/* close */	labpcclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	labpcioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	labpcstrategy,
+	/* name */	"labpc",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static ointhand2_t labpcintr;
 static void start(struct ctlr *ctlr);
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index a4a4729..2769d41 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: loran.c,v 1.17 1999/05/06 22:13:04 peter Exp $
+ * $Id: loran.c,v 1.18 1999/05/08 14:36:48 phk Exp $
  *
  * This device-driver helps the userland controlprogram for a LORAN-C
  * receiver avoid monopolizing the CPU.
@@ -635,11 +635,27 @@ struct	isa_driver lorandriver = {
 };
 
 #define CDEV_MAJOR 94
-static struct cdevsw loran_cdevsw = 
-	{ loranopen,	loranclose,	loranread,	loranwrite,
-	  noioctl,	nullstop,	nullreset,	nodevtotty,
-	  seltrue,	nommap,		nostrat,	"loran",
-	  NULL,		-1 };
+static struct cdevsw loran_cdevsw = {
+	/* open */	loranopen,
+	/* close */	loranclose,
+	/* read */	loranread,
+	/* write */	loranwrite,
+	/* ioctl */	noioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"loran",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 
 static int loran_devsw_installed;
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 6f0f8fe..fb4a261 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.38 1999/04/28 10:53:12 dt Exp $ */
+/* $Id: matcd.c,v 1.39 1999/05/07 07:03:36 phk Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
@@ -524,11 +524,26 @@ static d_strategy_t	matcdstrategy;
 #define BDEV_MAJOR 17
 
 static struct cdevsw matcd_cdevsw = {
-	  matcdopen,	matcdclose,	physread,	nowrite,
-	  matcdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		matcdstrategy,	"matcd",
-	  NULL,		-1,	nodump,		nopsize,
-	  D_DISK,	0,		-1 };
+	/* open */	matcdopen,
+	/* close */	matcdclose,
+	/* read */	physread,
+	/* write */	nowrite,
+	/* ioctl */	matcdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	matcdstrategy,
+	/* name */	"matcd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 /*---------------------------------------------------------------------------
 	Internal function declarations
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 8af4105..c57a675 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.105 1999/05/07 07:03:27 phk Exp $
+ *	$Id: mcd.c,v 1.106 1999/05/08 07:02:30 phk Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -221,11 +221,26 @@ static	d_strategy_t	mcdstrategy;
 
 
 static struct cdevsw mcd_cdevsw = {
-	  mcdopen,	mcdclose,	physread,	nowrite,
-	  mcdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		mcdstrategy,	"mcd",
-	  NULL,		-1,		nodump, 	nopsize,
-	  D_DISK};
+	/* open */	mcdopen,
+	/* close */	mcdclose,
+	/* read */	physread,
+	/* write */	nowrite,
+	/* ioctl */	mcdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	mcdstrategy,
+	/* name */	"mcd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 #define mcd_put(port,byte)	outb(port,byte)
 
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index e952af0..b70cf15 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.41 1999/05/06 18:12:28 peter Exp $
+ * $Id: mse.c,v 1.42 1999/05/06 18:44:02 peter Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -82,10 +82,27 @@ static  d_ioctl_t	mseioctl;
 static	d_poll_t	msepoll;
 
 #define CDEV_MAJOR 27
-static struct cdevsw mse_cdevsw = 
-	{ mseopen,	mseclose,	mseread,	nowrite,	/*27*/
-	  mseioctl,	nostop,		nullreset,	nodevtotty,/* mse */
-	  msepoll,	nommap,		NULL,	"mse",	NULL,	-1 };
+static struct cdevsw mse_cdevsw = {
+	/* open */	mseopen,
+	/* close */	mseclose,
+	/* read */	mseread,
+	/* write */	nowrite,
+	/* ioctl */	mseioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	msepoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"mse",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static ointhand2_t mseintr;
 
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index d7591e9..c44bc55 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.47 1999/05/06 18:12:29 peter Exp $
+ *	$Id: pcaudio.c,v 1.48 1999/05/06 18:58:05 peter Exp $
  */
 
 #include "pca.h"
@@ -141,10 +141,27 @@ static	d_ioctl_t	pcaioctl;
 static	d_poll_t	pcapoll;
 
 #define CDEV_MAJOR 24
-static struct cdevsw pca_cdevsw = 
- 	{ pcaopen,      pcaclose,       noread,         pcawrite,       /*24*/
- 	  pcaioctl,     nostop,         nullreset,      nodevtotty,/* pcaudio */
- 	  pcapoll,	nommap,		NULL,	"pca",	NULL,	-1 };
+static struct cdevsw pca_cdevsw = {
+	/* open */	pcaopen,
+	/* close */	pcaclose,
+	/* read */	noread,
+	/* write */	pcawrite,
+	/* ioctl */	pcaioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	pcapoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"pca",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static void pca_continue __P((void));
 static void pca_init __P((void));
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index a72bc32..aad4fed 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -132,12 +132,26 @@ static	d_devtotty_t	pcdevtotty;
 static	d_mmap_t	pcmmap;
 
 #define	CDEV_MAJOR	12
-static	struct cdevsw	pc_cdevsw = {
-	pcopen,		pcclose,	pcread,		pcwrite,
-	pcioctl,	nullstop,	noreset,	pcdevtotty,
-	ttpoll,		pcmmap,		nostrategy,	"vt",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw pc_cdevsw = {
+	/* open */	pcopen,
+	/* close */	pcclose,
+	/* read */	pcread,
+	/* write */	pcwrite,
+	/* ioctl */	pcioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	pcdevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	pcmmap,
+	/* strategy */	nostrategy,
+	/* name */	"vt",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #if PCVT_FREEBSD > 205
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 1671c7d..fdcbcf6 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -99,12 +99,26 @@ static	d_stop_t	rcstop;
 static	d_devtotty_t	rcdevtotty;
 
 #define	CDEV_MAJOR	63
-static	struct cdevsw	rc_cdevsw = {
-	rcopen,		rcclose,	rcread,		rcwrite,
-	rcioctl,	rcstop,		noreset,	rcdevtotty,
-	ttpoll,		nommap,		NULL,		"rc",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw rc_cdevsw = {
+	/* open */	rcopen,
+	/* close */	rcclose,
+	/* read */	rcread,
+	/* write */	rcwrite,
+	/* ioctl */	rcioctl,
+	/* stop */	rcstop,
+	/* reset */	noreset,
+	/* devtotty */	rcdevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"rc",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 /* Per-board structure */
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 1824841..a3c2382 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rp.c,v 1.25 1999/05/06 18:44:04 peter Exp $
+ *	$Id: rp.c,v 1.26 1999/05/09 17:07:20 peter Exp $
  */
 
 /* 
@@ -801,12 +801,26 @@ static	d_stop_t	rpstop;
 static	d_devtotty_t	rpdevtotty;
 
 #define	CDEV_MAJOR	81
-static	struct cdevsw	rp_cdevsw = {
-	rpopen,		rpclose,	rpread,		rpwrite,
-	rpioctl,	rpstop,		noreset,	rpdevtotty,
-	ttpoll,		nommap,		NULL,		driver_name,
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw rp_cdevsw = {
+	/* open */	rpopen,
+	/* close */	rpclose,
+	/* read */	rpread,
+	/* write */	rpwrite,
+	/* ioctl */	rpioctl,
+	/* stop */	rpstop,
+	/* reset */	noreset,
+	/* devtotty */	rpdevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	driver_name,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static int rp_controller_port = 0;
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 519b28c..24af2e1 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.44 1999/05/07 07:03:29 phk Exp $ */
+/* $Id: scd.c,v 1.45 1999/05/09 20:29:04 phk Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -193,11 +193,26 @@ static	d_strategy_t	scdstrategy;
 #define CDEV_MAJOR 45
 #define BDEV_MAJOR 16
 static struct cdevsw scd_cdevsw = {
-	  scdopen,	scdclose,	physread,	nowrite,
-	  scdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		scdstrategy,	"scd",
-	  NULL,		-1,		nodump,		nopsize,
-	  D_DISK,	0,		-1 };
+	/* open */	scdopen,
+	/* close */	scdclose,
+	/* read */	physread,
+	/* write */	nowrite,
+	/* ioctl */	scdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	scdstrategy,
+	/* name */	"scd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 
 static int
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 7a6c60d..0565390 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.84 1999/05/08 07:02:31 phk Exp $
+ *	$Id: si.c,v 1.85 1999/05/09 17:07:21 peter Exp $
  */
 
 #ifndef lint
@@ -179,12 +179,26 @@ static	d_stop_t	sistop;
 static	d_devtotty_t	sidevtotty;
 
 #define	CDEV_MAJOR	68
-static	struct cdevsw	si_cdevsw = {
-	siopen,		siclose,	siread,		siwrite,
-	siioctl,	sistop,		noreset,	sidevtotty,
-	ttpoll,		nommap,		NULL,		"si",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw si_cdevsw = {
+	/* open */	siopen,
+	/* close */	siclose,
+	/* read */	siread,
+	/* write */	siwrite,
+	/* ioctl */	siioctl,
+	/* stop */	sistop,
+	/* reset */	noreset,
+	/* devtotty */	sidevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"si",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #ifdef SI_DEBUG		/* use: ``options "SI_DEBUG"'' in your config file */
diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c
index 7b4e1bb..f4be1a6 100644
--- a/sys/i386/isa/snd/sound.c
+++ b/sys/i386/isa/snd/sound.c
@@ -75,10 +75,25 @@ static d_mmap_t sndmmap;
 
 #define CDEV_MAJOR 30
 static struct cdevsw snd_cdevsw = {
-	sndopen, sndclose, sndread, sndwrite,
-	sndioctl, nostop, noreset, nodevtotty,
-	sndselect, sndmmap, nostrategy, "snd",
-	NULL, -1,
+	/* open */	sndopen,
+	/* close */	sndclose,
+	/* read */	sndread,
+	/* write */	sndwrite,
+	/* ioctl */	sndioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	sndselect,
+	/* mmap */	sndmmap,
+	/* strategy */	nostrategy,
+	/* name */	"snd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 /*
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 0718183..0d122ae 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -93,9 +93,25 @@ static char     driver_name[] = "snd";
 
 #define CDEV_MAJOR 30
 static struct cdevsw snd_cdevsw = {
-	sndopen, sndclose, sndread, sndwrite,
-	sndioctl, nostop, noreset, nodevtotty,
-	sndpoll, sndmmap, nostrategy, driver_name,
+	/* open */	sndopen,
+	/* close */	sndclose,
+	/* read */	sndread,
+	/* write */	sndwrite,
+	/* ioctl */	sndioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	sndpoll,
+	/* mmap */	sndmmap,
+	/* strategy */	nostrategy,
+	/* name */	driver_name,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 347b260..4c8f15d 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -102,10 +102,27 @@ static	d_ioctl_t	spigot_ioctl;
 static	d_mmap_t	spigot_mmap;
 
 #define CDEV_MAJOR 11
-static struct cdevsw spigot_cdevsw = 
-	{ spigot_open,	spigot_close,	spigot_read,	spigot_write,	/*11*/
-	  spigot_ioctl,	nostop,		nullreset,	nodevtotty,/* Spigot */
-	  seltrue,	spigot_mmap,	NULL,	"spigot",	NULL,	-1  };
+static struct cdevsw spigot_cdevsw = {
+	/* open */	spigot_open,
+	/* close */	spigot_close,
+	/* read */	spigot_read,
+	/* write */	spigot_write,
+	/* ioctl */	spigot_ioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	spigot_mmap,
+	/* strategy */	nostrategy,
+	/* name */	"spigot",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static ointhand2_t	spigintr;
 
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 460ef78..759a9fc 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.34 1998/06/07 17:11:00 dfr Exp $
+ *    $Id: spkr.c,v 1.35 1998/08/24 02:28:16 bde Exp $
  */
 
 #include "speaker.h"
@@ -35,10 +35,27 @@ static	d_write_t	spkrwrite;
 static	d_ioctl_t	spkrioctl;
 
 #define CDEV_MAJOR 26
-static struct cdevsw spkr_cdevsw = 
-	{ spkropen,     spkrclose,      noread,         spkrwrite,      /*26*/
-	  spkrioctl,    nostop,         nullreset,      nodevtotty,/* spkr */
-	  seltrue,	nommap,		NULL,	"spkr",	NULL,	-1 };
+static struct cdevsw spkr_cdevsw = {
+	/* open */	spkropen,
+	/* close */	spkrclose,
+	/* read */	noread,
+	/* write */	spkrwrite,
+	/* ioctl */	spkrioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"spkr",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 /**************** MACHINE DEPENDENT PART STARTS HERE *************************
  *
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 13b3ad7..91cec5d 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.30 1999/05/08 07:02:33 phk Exp $
+ * $Id: stallion.c,v 1.31 1999/05/09 17:07:22 peter Exp $
  */
 
 /*****************************************************************************/
@@ -535,12 +535,26 @@ COMPAT_PCI_DRIVER (stlpci, stlpcidriver);
  */
 
 #define	CDEV_MAJOR	72
-static	struct cdevsw	stl_cdevsw = {
-	stlopen,	stlclose,	stlread,	stlwrite,
-	stlioctl,	stlstop,	noreset,	stldevtotty,
-	ttpoll,		nommap,		NULL,		"stl",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw stl_cdevsw = {
+	/* open */	stlopen,
+	/* close */	stlclose,
+	/* read */	stlread,
+	/* write */	stlwrite,
+	/* ioctl */	stlioctl,
+	/* stop */	stlstop,
+	/* reset */	noreset,
+	/* devtotty */	stldevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"stl",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static int stl_devsw_installed;
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 3b7b176..3385a85 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -221,10 +221,27 @@ static	d_write_t	twwrite;
 static	d_poll_t	twpoll;
 
 #define CDEV_MAJOR 19
-static struct cdevsw tw_cdevsw = 
-	{ twopen,	twclose,	twread,		twwrite,	/*19*/
-	  noioc,	nullstop,	nullreset,	nodevtotty, /* tw */
-	  twpoll,	nommap,		nostrat,	"tw",	NULL,	-1 };
+static struct cdevsw tw_cdevsw = {
+	/* open */	twopen,
+	/* close */	twclose,
+	/* read */	twread,
+	/* write */	twwrite,
+	/* ioctl */	noioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	twpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"tw",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 /*
  * Software control structure for TW523
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index b9346b8..78ad4e6 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.196 1999/05/07 07:03:30 phk Exp $
+ *	$Id: wd.c,v 1.197 1999/05/08 18:13:15 peter Exp $
  */
 
 /* TODO:
@@ -246,11 +246,26 @@ static	d_psize_t	wdsize;
 
 
 static struct cdevsw wd_cdevsw = {
-	  wdopen,	wdclose,	physread,	physwrite,
-	  wdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		wdstrategy,	"wd",
-	  NULL,		-1,		wddump,		wdsize,
-	  D_DISK,	0,		-1 };
+	/* open */	wdopen,
+	/* close */	wdclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	wdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	wdstrategy,
+	/* name */	"wd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	wddump,
+	/* psize */	wdsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 
 static int      atapictrlr;
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index 99333d4..644fb3f 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.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: atapi-cd.c,v 1.17 1999/05/07 07:03:23 phk Exp $
+ *	$Id: atapi-cd.c,v 1.18 1999/05/11 10:39:27 sos Exp $
  */
 
 #include "wdc.h"
@@ -61,11 +61,25 @@ static d_strategy_t	acdstrategy;
 #define CDEV_MAJOR 69
 #define BDEV_MAJOR 19
 static struct cdevsw acd_cdevsw = {
-    acdopen,	acdclose,	physread,	physwrite,	
-    acdioctl,	nostop,		nullreset,	nodevtotty,
-    seltrue,	nommap,		acdstrategy,	"wcd",
-    NULL,	-1,		nodump,		nopsize,
-    D_DISK,	0,		-1
+	/* open */	acdopen,
+	/* close */	acdclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	acdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	acdstrategy,
+	/* name */	"wcd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
 };
 
 #define NUNIT	16		/* Max # of devices */
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index 8aa5e11..d03a201 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,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: wfd.c,v 1.22 1999/04/28 10:53:04 dt Exp $
+ *      $Id: wfd.c,v 1.23 1999/05/07 07:03:31 phk Exp $
  */
 
 /*
@@ -61,11 +61,26 @@ static	d_strategy_t	wfdstrategy;
 #define BDEV_MAJOR 1
 
 static struct cdevsw wfd_cdevsw = {
-	  wfdopen,	wfdclose,	physread,	physwrite,
-	  wfdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		wfdstrategy,	"wfd",
-	  NULL,		-1,		nodump,		nopsize,
-	  D_DISK,	0,		-1 };
+	/* open */	wfdopen,
+	/* close */	wfdclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	wfdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	wfdstrategy,
+	/* name */	"wfd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 int  wfdattach(struct atapi*, int, struct atapi_params*, int);
 
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 67af539..82832d4 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.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: wst.c,v 1.20 1999/05/06 18:50:10 peter Exp $
+ *	$Id: wst.c,v 1.21 1999/05/07 07:03:32 phk Exp $
  */
 
 #include "wdc.h"
@@ -59,10 +59,26 @@ static  d_strategy_t    wststrategy;
 
 
 static struct cdevsw wst_cdevsw = {
-	  wstopen,	wstclose,	physread,	physwrite,
-	  wstioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		wststrategy,	"wst",
-	  NULL,	-1 };
+	/* open */	wstopen,
+	/* close */	wstclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	wstioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	wststrategy,
+	/* name */	"wst",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 static unsigned int wst_total = 0;
 
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 40ee9a8..650cc0b 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.49 1999/05/06 18:44:11 peter Exp $
+ * $Id: wt.c,v 1.50 1999/05/07 07:03:33 phk Exp $
  *
  */
 
@@ -194,10 +194,26 @@ static	d_strategy_t	wtstrategy;
 
 
 static struct cdevsw wt_cdevsw = {
-	  wtopen,	wtclose,	physread,	physwrite,
-	  wtioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		wtstrategy,	"wt",
-	  NULL,	-1 };
+	/* open */	wtopen,
+	/* close */	wtclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	wtioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	wtstrategy,
+	/* name */	"wt",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 
 /*