43 files changed, 898 insertions, 261 deletions

diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 0f00d1cf45e1..b46f77096d28 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.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: ata-disk.c,v 1.10 1999/05/11 19:53:58 phk Exp $
+ *	$Id: ata-disk.c,v 1.11 1999/05/17 15:58:45 sos Exp $
  */
 
 #include "ata.h"
@@ -62,16 +62,31 @@ static d_psize_t	adpsize;
 
 #define BDEV_MAJOR 30
 #define CDEV_MAJOR 116
-static struct cdevsw ad_cdevsw = {
-    adopen,	adclose,	physread,	physwrite,	
-    adioctl,	nostop,		nullreset,	nodevtotty,
 #ifdef NOTYET	/* the boot code needs to be fixed to boot arbitrary devices */
-    seltrue,	nommap,		adstrategy,	"ad",
+#define DRIVER_NAME "ad"
 #else
-    seltrue,	nommap,		adstrategy,	"wd",
+#define DRIVER_NAME "wd"
 #endif
-    NULL,	-1,		nodump,		adpsize,
-    D_DISK,	0,		-1
+static struct cdevsw ad_cdevsw = {
+	/* open */	adopen,
+	/* close */	adclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	adioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	adstrategy,
+	/* name */	DRIVER_NAME,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	adpsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR,
 };
 
 /* misc defines */
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index d779c5ee653c..aaec64429ed6 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/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.7 1999/05/07 07:03:13 phk Exp $
+ *	$Id: atapi-cd.c,v 1.8 1999/05/17 15:58:46 sos Exp $
  */
 
 #include "ata.h"
@@ -63,11 +63,25 @@ static d_strategy_t	acdstrategy;
 #define BDEV_MAJOR 31
 #define CDEV_MAJOR 117
 static struct cdevsw acd_cdevsw = {
-    acdopen,	acdclose,	physread,	physwrite,	
-    acdioctl,	nostop,		nullreset,	nodevtotty,
-    seltrue,	nommap,		acdstrategy,	"acd",
-    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 */	"acd",
+	/* 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/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index e6bad6076d08..d63a03912ba8 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.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-fd.c,v 1.7 1999/05/17 15:58:46 sos Exp $
+ *	$Id: atapi-fd.c,v 1.8 1999/05/20 09:12:05 sos Exp $
  */
 
 #include "ata.h"
@@ -65,11 +65,25 @@ static  d_strategy_t	afdstrategy;
 #define CDEV_MAJOR 118
 
 static struct cdevsw afd_cdevsw = {
-	  afdopen,	afdclose,	physread,	physwrite,
-	  afdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		afdstrategy,	"afd",
-	  NULL,		-1,		nodump,		nopsize,
-	  D_DISK,	0,		-1
+	/* open */	afdopen,
+	/* close */	afdclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	afdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	afdstrategy,
+	/* name */	"afd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR,
 };
 
 #define NUNIT 			8
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 43edafa70eab..7699d899150a 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.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-tape.c,v 1.7 1999/05/07 07:03:15 phk Exp $
+ *	$Id: atapi-tape.c,v 1.8 1999/05/17 15:58:47 sos Exp $
  */
 
 #include "ata.h"
@@ -61,11 +61,25 @@ static  d_strategy_t	aststrategy;
 #define CDEV_MAJOR 119
 
 static struct cdevsw ast_cdevsw = {
-    astopen,	astclose,	physread,	physwrite,
-    astioctl,	nostop,		nullreset,	nodevtotty,
-    seltrue,	nommap,		aststrategy,	"ast",
-    NULL,	-1,		nodump,		nopsize,
-    D_TAPE,	0,		-1
+	/* open */	astopen,
+	/* close */	astclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	astioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	aststrategy,
+	/* name */	"ast",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TAPE,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
 };
 
 static u_int32_t ast_total = 0;
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index ecbac638b98e..ea828f0f0eb0 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.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: atkbd.c,v 1.9 1999/05/18 11:05:58 yokota Exp $
+ * $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $
  */
 
 #include "atkbd.h"
@@ -64,11 +64,26 @@ static d_read_t		atkbdread;
 static d_ioctl_t	atkbdioctl;
 static d_poll_t		atkbdpoll;
 
-static struct  cdevsw atkbd_cdevsw = {
-	atkbdopen,	atkbdclose,	atkbdread,	nowrite,
-	atkbdioctl,	nostop,		nullreset,	nodevtotty,
-	atkbdpoll,	nommap,		NULL,		ATKBD_DRIVER_NAME,
-	NULL,		-1,
+static struct cdevsw atkbd_cdevsw = {
+	/* open */	atkbdopen,
+	/* close */	atkbdclose,
+	/* read */	atkbdread,
+	/* write */	nowrite,
+	/* ioctl */	atkbdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	atkbdpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	ATKBD_DRIVER_NAME,
+	/* parms */	noparms,
+	/* maj */	-1,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #endif /* KBD_INSTALL_CDEV */
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index a520b65797af..1d1589c7bbd0 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -20,7 +20,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: psm.c,v 1.8 1999/05/09 04:58:35 yokota Exp $
+ * $Id: psm.c,v 1.9 1999/05/09 13:00:43 phk Exp $
  */
 
 /*
@@ -315,10 +315,26 @@ static driver_t psm_driver = {
 
 #define CDEV_MAJOR        21
 
-static struct  cdevsw psm_cdevsw = {
-	psmopen,	psmclose,	psmread,	nowrite,	/* 21 */
-	psmioctl,	nostop,		nullreset,	nodevtotty,
-	psmpoll,	nommap,		NULL,		"psm",	NULL,	-1
+static struct cdevsw psm_cdevsw = {
+	/* open */	psmopen,
+	/* close */	psmclose,
+	/* read */	psmread,
+	/* write */	nowrite,
+	/* ioctl */	psmioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	psmpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"psm",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 /* debug message level */
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 67b2eb2e1f88..70d3367dfa01 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.80 1999/05/23 21:40:51 roger Exp $ */
+/* $Id: brooktree848.c,v 1.81 1999/05/25 12:43:40 roger Exp $ */
 /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -600,12 +600,26 @@ static	d_ioctl_t	bktr_ioctl;
 static	d_mmap_t	bktr_mmap;
 
 #define CDEV_MAJOR 92 
-static struct cdevsw bktr_cdevsw = 
-{
-	bktr_open,	bktr_close,	bktr_read,	bktr_write,
-	bktr_ioctl,	nostop,		nullreset,	nodevtotty,
-	seltrue,	bktr_mmap,	NULL,		"bktr",
-	NULL,		-1
+static struct cdevsw bktr_cdevsw = {
+	/* open */	bktr_open,
+	/* close */	bktr_close,
+	/* read */	bktr_read,
+	/* write */	bktr_write,
+	/* ioctl */	bktr_ioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	bktr_mmap,
+	/* strategy */	nostrategy,
+	/* name */	"bktr",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 #endif  /* __FreeBSD__ */
 
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 1ff7fd72922e..2f26794a25cd 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.46 1999/05/07 10:09:42 phk Exp $ */
+/* $Id: ccd.c,v 1.47 1999/05/11 19:54:00 phk Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -174,11 +174,26 @@ static d_psize_t ccdsize;
 #define BDEV_MAJOR 21
 
 static struct cdevsw ccd_cdevsw = {
-	  ccdopen,	ccdclose,	physread,	physwrite,
-	  ccdioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		ccdstrategy,	"ccd",
-	  NULL, 	-1,		ccddump,	ccdsize,
-	  D_DISK,	0,		-1 };
+	/* open */	ccdopen,
+	/* close */	ccdclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	ccdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	ccdstrategy,
+	/* name */	"ccd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	ccddump,
+	/* psize */	ccdsize,
+	/* flags */	D_DISK,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 /* called during module initialization */
 static	void ccdattach __P((void));
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 93e820049617..70d0466d7923 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.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/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 93e820049617..70d0466d7923 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.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/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index e9a044bee226..b39c89df7206 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.47 1999/05/02 21:39:52 peter Exp $
+ *  dgb.c $Id: dgb.c,v 1.48 1999/05/08 07:02:24 phk Exp $
  *
  *  Digiboard driver.
  *
@@ -224,12 +224,26 @@ static	d_stop_t	dgbstop;
 static	d_devtotty_t	dgbdevtotty;
 
 #define	CDEV_MAJOR	58
-static	struct cdevsw	dgb_cdevsw = {
-	dgbopen,	dgbclose,	dgbread,	dgbwrite,
-	dgbioctl,	dgbstop,	noreset,	dgbdevtotty,
-	ttpoll,		nommap,		NULL,		"dgb",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw dgb_cdevsw = {
+	/* open */	dgbopen,
+	/* close */	dgbclose,
+	/* read */	dgbread,
+	/* write */	dgbwrite,
+	/* ioctl */	dgbioctl,
+	/* stop */	dgbstop,
+	/* reset */	noreset,
+	/* devtotty */	dgbdevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"dgb",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static	speed_t	dgbdefaultrate = TTYDEF_SPEED;
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index 291e520c4192..5f3ff63fcd97 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.12 1999/05/03 09:32:31 brian Exp $
+ *	$Id: dgm.c,v 1.13 1999/05/08 07:02:25 phk Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -228,12 +228,26 @@ static	d_stop_t	dgmstop;
 static	d_devtotty_t	dgmdevtotty;
 
 #define	CDEV_MAJOR	101
-static	struct cdevsw	dgm_cdevsw = {
-	dgmopen,	dgmclose,	dgmread,	dgmwrite,
-	dgmioctl,	dgmstop,	noreset,	dgmdevtotty,
-	ttpoll,		nommap,		NULL,		"dgm",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw dgm_cdevsw = {
+	/* open */	dgmopen,
+	/* close */	dgmclose,
+	/* read */	dgmread,
+	/* write */	dgmwrite,
+	/* ioctl */	dgmioctl,
+	/* stop */	dgmstop,
+	/* reset */	noreset,
+	/* devtotty */	dgmdevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"dgm",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static	speed_t	dgmdefaultrate = TTYDEF_SPEED;
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index d0a33ced2bf9..0f9eff8cb549 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,7 +36,7 @@
  * future.
  */
 
-#ident "$Id: dpt_control.c,v 1.11 1999/05/11 11:03:18 jkh Exp $"
+#ident "$Id: dpt_control.c,v 1.12 1999/05/13 05:24:53 jkh Exp $"
 
 #include "opt_dpt.h"
 
@@ -91,11 +91,27 @@ static dpt_sig_t dpt_sig = {
 #define CDEV_MAJOR	    DPT_CDEV_MAJOR
 
 /* Normally, this is a static structure.  But we need it in pci/dpt_pci.c */
-struct cdevsw   dpt_cdevsw = {
-	dpt_open, dpt_close, dpt_read, dpt_write,
-	dpt_ioctl, nostop, nullreset, nodevtotty,
-	seltrue, nommap, NULL, "dpt",
-NULL, -1};
+static struct cdevsw dpt_cdevsw = {
+	/* open */	dpt_open,
+	/* close */	dpt_close,
+	/* read */	dpt_read,
+	/* write */	dpt_write,
+	/* ioctl */	dpt_ioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"dpt",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static struct buf *dpt_inbuf[DPT_MAX_ADAPTERS];
 static char     dpt_rw_command[DPT_MAX_ADAPTERS][DPT_RW_CMD_LEN + 1];
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 99d15f852a37..0b694b80fc71 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.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: fb.c,v 1.2 1999/01/12 10:35:50 yokota Exp $
+ * $Id: fb.c,v 1.3 1999/01/19 11:31:10 yokota Exp $
  */
 
 #include "fb.h"
@@ -286,10 +286,25 @@ static d_mmap_t		fbmmap;
 #define CDEV_MAJOR	141	/* XXX */
 
 static struct cdevsw fb_cdevsw = {
-	fbopen,		fbclose,	noread,		nowrite,   /* ??? */
-	fbioctl,	nostop,		nullreset,	nodevtotty,
-	seltrue,	fbmmap,		NULL,		DRIVER_NAME,
-	NULL,		-1,		nodump,		nopsize,
+	/* open */	fbopen,
+	/* close */	fbclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	fbioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	fbmmap,
+	/* strategy */	nostrategy,
+	/* name */	DRIVER_NAME,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static void
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index cc51f9338364..cd7001be8151 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.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/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index a6cbe10c2a31..3921475ed7ee 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_load.c,v 1.7 1999/05/09 17:07:30 peter Exp $
+ *	@(#) $Id: fore_load.c,v 1.8 1999/05/10 22:53:45 mks Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_load.c,v 1.7 1999/05/09 17:07:30 peter Exp $");
+__RCSID("@(#) $Id: fore_load.c,v 1.8 1999/05/10 22:53:45 mks Exp $");
 #endif
 
 
@@ -1522,18 +1522,26 @@ fore_mod(cmd, vdp, vdi, vds)
 /*
  * Driver entry points
  */
-static struct cdevsw	fore_cdev = {
-	(d_open_t *)enodev,	/* open */
-	(d_close_t *)enodev,	/* close */
-	NULL,			/* read */
-	NULL,			/* write */
-	NULL,			/* ioctl */
-	NULL,			/* stop */
-	NULL,			/* reset */
-	NULL,			/* devtotty */
-	NULL,			/* select */
-	NULL,			/* mmap */
-	NULL			/* strategy */
+static struct cdevsw fore_cdev = {
+	/* open */	noopen,
+	/* close */	noclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	noioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	noname,
+	/* parms */	noparms,
+	/* maj */	-1,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index f7c7d6ea7948..fbdcbcc35c45 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.c,v 1.9 1999/05/08 21:59:03 dfr Exp $
+ *	$Id: iic.c,v 1.10 1999/05/09 13:00:35 phk Exp $
  *
  */
 #include <sys/param.h>
@@ -92,10 +92,27 @@ static	d_read_t	iicread;
 static	d_ioctl_t	iicioctl;
 
 #define CDEV_MAJOR 105
-static struct cdevsw iic_cdevsw = 
-	{ iicopen,	iicclose,	iicread,	iicwrite,	/*105*/
-	  iicioctl,	nullstop,	nullreset,	nodevtotty,	/*iic*/
-	  seltrue,	nommap,		nostrat,	"iic",	NULL,	-1 };
+static struct cdevsw iic_cdevsw = {
+	/* open */	iicopen,
+	/* close */	iicclose,
+	/* read */	iicread,
+	/* write */	iicwrite,
+	/* ioctl */	iicioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"iic",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 /*
  * iicprobe()
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 5d4a7c233060..6847f43d4122 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/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/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index ecbac638b98e..ea828f0f0eb0 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.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: atkbd.c,v 1.9 1999/05/18 11:05:58 yokota Exp $
+ * $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $
  */
 
 #include "atkbd.h"
@@ -64,11 +64,26 @@ static d_read_t		atkbdread;
 static d_ioctl_t	atkbdioctl;
 static d_poll_t		atkbdpoll;
 
-static struct  cdevsw atkbd_cdevsw = {
-	atkbdopen,	atkbdclose,	atkbdread,	nowrite,
-	atkbdioctl,	nostop,		nullreset,	nodevtotty,
-	atkbdpoll,	nommap,		NULL,		ATKBD_DRIVER_NAME,
-	NULL,		-1,
+static struct cdevsw atkbd_cdevsw = {
+	/* open */	atkbdopen,
+	/* close */	atkbdclose,
+	/* read */	atkbdread,
+	/* write */	nowrite,
+	/* ioctl */	atkbdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	atkbdpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	ATKBD_DRIVER_NAME,
+	/* parms */	noparms,
+	/* maj */	-1,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #endif /* KBD_INSTALL_CDEV */
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 75624229f014..47d9d5e71205 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.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: kbd.c,v 1.6 1999/05/18 11:08:39 yokota Exp $
+ * $Id: kbd.c,v 1.7 1999/05/30 14:55:24 phk Exp $
  */
 
 #include "kbd.h"
@@ -406,10 +406,25 @@ static d_mmap_t		kbdmmap;
 #define CDEV_MAJOR	112
 
 static struct cdevsw kbd_cdevsw = {
-	kbdopen,	kbdclose,	kbdread,	kbdwrite,   /* ??? */
-	kbdioctl,	nullstop,	noreset,	kbddevtotty,
-	kbdpoll,	kbdmmap,	nostrategy,	"kbd",
-	NULL,		-1,		nodump,		nopsize,
+	/* open */	kbdopen,
+	/* close */	kbdclose,
+	/* read */	kbdread,
+	/* write */	kbdwrite,
+	/* ioctl */	kbdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	kbddevtotty,
+	/* poll */	kbdpoll,
+	/* mmap */	kbdmmap,
+	/* strategy */	nostrategy,
+	/* name */	"kbd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static void
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 8af4105bfa47..c57a67566ed7 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.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/dev/mse/mse.c b/sys/dev/mse/mse.c
index e952af08d941..b70cf156eadc 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.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/dev/pci/pci.c b/sys/dev/pci/pci.c
index 552e2024c382..bf5e65761909 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.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: pci.c,v 1.104 1999/05/20 15:33:31 gallatin Exp $
+ * $Id: pci.c,v 1.105 1999/05/30 10:54:31 dfr Exp $
  *
  */
 
@@ -847,8 +847,25 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 #define	PCI_CDEV	78
 
 static struct cdevsw pcicdev = {
-	pci_open, pci_close, noread, nowrite, pci_ioctl, nostop, noreset,
-	nodevtotty, seltrue, nommap, nostrategy, "pci", 0, PCI_CDEV
+	/* open */	pci_open,
+	/* close */	pci_close,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	pci_ioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"pci",
+	/* parms */	noparms,
+	/* maj */	PCI_CDEV,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #ifdef DEVFS
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index cc2f94d6bc46..ab61978305b6 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -48,7 +48,7 @@
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
- *	$Id: lpt.c,v 1.2 1999/02/14 16:19:16 nsouch Exp $
+ *	$Id: lpt.c,v 1.3 1999/04/28 10:51:35 dt Exp $
  */
 
 /*
@@ -206,10 +206,27 @@ static	d_read_t	lptread;
 static	d_ioctl_t	lptioctl;
 
 #define CDEV_MAJOR 16
-static struct cdevsw lpt_cdevsw = 
-	{ lptopen,	lptclose,	lptread,	lptwrite,	/*16*/
-	  lptioctl,	nullstop,	nullreset,	nodevtotty,	/* lpt */
-	  seltrue,	nommap,		nostrat,	LPT_NAME,	NULL,	-1 };
+static struct cdevsw lpt_cdevsw = {
+	/* open */	lptopen,
+	/* close */	lptclose,
+	/* read */	lptread,
+	/* write */	lptwrite,
+	/* ioctl */	lptioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	LPT_NAME,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static int
 lpt_request_ppbus(struct lpt_data *sc, int how)
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index d3a09a1b9ba0..315ea29dafbe 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.12 1999/02/14 11:59:59 nsouch Exp $
+ *	$Id: ppi.c,v 1.13 1999/04/28 10:51:39 dt Exp $
  *
  */
 #include "ppi.h"
@@ -91,10 +91,27 @@ static	d_write_t	ppiwrite;
 static	d_read_t	ppiread;
 
 #define CDEV_MAJOR 82
-static struct cdevsw ppi_cdevsw = 
-	{ ppiopen,	ppiclose,	ppiread,	ppiwrite,	/* 82 */
-	  ppiioctl,	nullstop,	nullreset,	nodevtotty,
-	  seltrue,	nommap,		nostrat,	"ppi",	NULL,	-1 };
+static struct cdevsw ppi_cdevsw = {
+	/* open */	ppiopen,
+	/* close */	ppiclose,
+	/* read */	ppiread,
+	/* write */	ppiwrite,
+	/* ioctl */	ppiioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"ppi",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 #ifdef PERIPH_1284
 
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 6f80fb040ace..8fc552867e98 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: pps.c,v 1.16 1999/04/25 08:58:10 phk Exp $
+ * $Id: pps.c,v 1.17 1999/05/06 22:03:14 peter Exp $
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
@@ -60,11 +60,27 @@ static	d_close_t	ppsclose;
 static	d_ioctl_t	ppsioctl;
 
 #define CDEV_MAJOR 89
-static struct cdevsw pps_cdevsw = 
-	{ ppsopen,	ppsclose,	noread,		nowrite,
-	  ppsioctl,	nullstop,	nullreset,	nodevtotty,
-	  seltrue,	nommap,		nostrat,	PPS_NAME,
-	  NULL,		-1 };
+static struct cdevsw pps_cdevsw = {
+	/* open */	ppsopen,
+	/* close */	ppsclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	ppsioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	PPS_NAME,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 
 static struct ppb_device *
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 1671c7d04dc3..fdcbcf6b54d9 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/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/dev/rp/rp.c b/sys/dev/rp/rp.c
index 1824841effb3..a3c2382dd0be 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/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/dev/scd/scd.c b/sys/dev/scd/scd.c
index 519b28c3e3e2..24af2e119c3d 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/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/dev/si/si.c b/sys/dev/si/si.c
index 7a6c60d3a91b..0565390eeb8d 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.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/dev/sio/sio.c b/sys/dev/sio/sio.c
index 4439ed2108c8..c0a33cde32c8 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.243 1999/05/28 09:37:11 dfr Exp $
+ *	$Id: sio.c,v 1.244 1999/05/30 11:14:39 dfr Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -361,12 +361,26 @@ static	d_stop_t	siostop;
 static	d_devtotty_t	siodevtotty;
 
 #define	CDEV_MAJOR	28
-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
 };
 
 int	comconsole = -1;
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index c812b40aa588..f411f8aca3ae 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.c,v 1.10 1999/05/08 21:59:08 dfr Exp $
+ *	$Id: smb.c,v 1.11 1999/05/09 13:00:37 phk Exp $
  *
  */
 #include <sys/param.h>
@@ -93,10 +93,27 @@ static	d_read_t	smbread;
 static	d_ioctl_t	smbioctl;
 
 #define CDEV_MAJOR 106
-static struct cdevsw smb_cdevsw = 
-	{ smbopen,	smbclose,	smbread,	smbwrite,	/*106*/
-	  smbioctl,	nullstop,	nullreset,	nodevtotty,	/*smb*/
-	  seltrue,	nommap,		nostrat,	"smb",	NULL,	-1 };
+static struct cdevsw smb_cdevsw = {
+	/* open */	smbopen,
+	/* close */	smbclose,
+	/* read */	smbread,
+	/* write */	smbwrite,
+	/* ioctl */	smbioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"smb",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 /*
  * smbprobe()
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 1018083b5315..8b45c8aca963 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -46,10 +46,27 @@ static	d_ioctl_t	snpioctl;
 static	d_poll_t	snppoll;
 
 #define CDEV_MAJOR 53
-static struct cdevsw snp_cdevsw = 
-	{ snpopen,	snpclose,	snpread,	snpwrite,	/*53*/
-	  snpioctl,	nostop,		nullreset,	nodevtotty,/* snoop */
-	  snppoll,	nommap,		NULL,	"snp",	NULL,	-1 };
+static struct cdevsw snp_cdevsw = {
+	/* open */	snpopen,
+	/* close */	snpclose,
+	/* read */	snpread,
+	/* write */	snpwrite,
+	/* ioctl */	snpioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	snppoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"snp",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 
 #ifndef MIN
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 460ef789a393..759a9fcd9c38 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.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/dev/streams/streams.c b/sys/dev/streams/streams.c
index fdf98bd23b54..e3790e8912b0 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -105,20 +105,26 @@ static struct fileops svr4_netops = {
  
 #define CDEV_MAJOR 103
 static struct cdevsw streams_cdevsw = {
-	streamsopen,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	"streams",
-	NULL,
-	-1 };
+	/* open */	streamsopen,
+	/* close */	noclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	noioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"streams",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
  
 struct streams_softc {
 	struct isa_device *dev;
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 4a974438a456..41ee89a72990 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.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: syscons.c,v 1.302 1999/05/10 14:01:32 dfr Exp $
+ *	$Id: syscons.c,v 1.303 1999/05/12 04:45:56 bde Exp $
  */
 
 #include "sc.h"
@@ -365,12 +365,26 @@ static	d_write_t	scwrite;
 static	d_ioctl_t	scioctl;
 static	d_mmap_t	scmmap;
 
-struct cdevsw	sc_cdevsw = {
-	scopen,		scclose,	scread,		scwrite,
-	scioctl,	nullstop,	noreset,	scdevtotty,
-	ttpoll,		scmmap,		nostrategy,	"sc",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw sc_cdevsw = {
+	/* open */	scopen,
+	/* close */	scclose,
+	/* read */	scread,
+	/* write */	scwrite,
+	/* ioctl */	scioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	scdevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	scmmap,
+	/* strategy */	nostrategy,
+	/* name */	"sc",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #ifdef __i386__
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index c0fa6bb5a30e..f8de2f74f671 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -121,10 +121,25 @@ d_poll_t  ugenpoll;
 #define UGEN_CDEV_MAJOR	114
 
 static struct cdevsw ugen_cdevsw = {
-	ugenopen,	ugenclose,	ugenread,	ugenwrite,
-	ugenioctl,	nostop,		nullreset,	nodevtotty,
-	ugenpoll,	nommap,		nostrat,
-	"ugen",		NULL,		-1
+	/* open */	ugenopen,
+	/* close */	ugenclose,
+	/* read */	ugenread,
+	/* write */	ugenwrite,
+	/* ioctl */	ugenioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	ugenpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"ugen",
+	/* parms */	noparms,
+	/* maj */	UGEN_CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 47928092c96a..a6e65cb35bd5 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -133,10 +133,25 @@ d_poll_t	uhidpoll;
 #define		UHID_CDEV_MAJOR 122
 
 static struct cdevsw uhid_cdevsw = {
-	uhidopen,	uhidclose,	uhidread,	uhidwrite,
-	uhidioctl,	nostop,		nullreset,	nodevtotty,
-	uhidpoll,	nommap,		nostrat,
-	"uhid",		NULL,		-1
+	/* open */	uhidopen,
+	/* close */	uhidclose,
+	/* read */	uhidread,
+	/* write */	uhidwrite,
+	/* ioctl */	uhidioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	uhidpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"uhid",
+	/* parms */	noparms,
+	/* maj */	UHID_CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 33a7d0542231..c10777a37336 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -136,11 +136,26 @@ static d_read_t		ukbdread;
 static d_ioctl_t	ukbdioctl;
 static d_poll_t		ukbdpoll;
 
-static struct  cdevsw ukbd_cdevsw = {
-	ukbdopen,	ukbdclose,	ukbdread,	nowrite,
-	ukbdioctl,	nostop,		nullreset,	nodevtotty,
-	ukbdpoll,	nommap,		NULL,		DRIVER_NAME,
-	NULL,		-1,
+static struct cdevsw ukbd_cdevsw = {
+	/* open */	ukbdopen,
+	/* close */	ukbdclose,
+	/* read */	ukbdread,
+	/* write */	nowrite,
+	/* ioctl */	ukbdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	ukbdpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	DRIVER_NAME,
+	/* parms */	noparms,
+	/* maj */	-1,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #endif /* KBD_INSTALL_CDEV */
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index b997e3d90af9..fb6c30c44a9d 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -130,11 +130,26 @@ static d_ioctl_t ulptioctl;
 
 #define ULPT_CDEV_MAJOR 113
 
-static struct  cdevsw ulpt_cdevsw = {
-	ulptopen,	ulptclose,	noread,		ulptwrite,
-	ulptioctl,	nostop,		nullreset,	nodevtotty,
-	seltrue,	nommap,		nostrat,
-	"ulpt",		NULL,		-1
+static struct cdevsw ulpt_cdevsw = {
+	/* open */	ulptopen,
+	/* close */	ulptclose,
+	/* read */	noread,
+	/* write */	ulptwrite,
+	/* ioctl */	ulptioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"ulpt",
+	/* parms */	noparms,
+	/* maj */	ULPT_CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 4f80e6a4624f..a97adb4c0fb5 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -157,10 +157,25 @@ static d_poll_t ums_poll;
 #define UMS_CDEV_MAJOR	111
 
 static struct cdevsw ums_cdevsw = {
-	ums_open,	ums_close,	ums_read,	nowrite,
-	ums_ioctl,	nostop,		nullreset,	nodevtotty,
-	ums_poll,	nommap,		nostrat,
-	"ums",		NULL,		-1
+	/* open */	ums_open,
+	/* close */	ums_close,
+	/* read */	ums_read,
+	/* write */	nowrite,
+	/* ioctl */	ums_ioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	ums_poll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"ums",
+	/* parms */	noparms,
+	/* maj */	UMS_CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index d7d31c2b936b..3119ca9cd4af 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -116,10 +116,25 @@ d_ioctl_t usbioctl;
 int usbpoll __P((dev_t, int, struct proc *));
 
 struct cdevsw usb_cdevsw = {
-	usbopen,     usbclose,    noread,         nowrite,
-	usbioctl,    nullstop,    nullreset,      nodevtotty,
-	usbpoll,     nommap,      nostrat,
-	"usb",        NULL,   -1
+	/* open */	usbopen,
+	/* close */	usbclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	usbioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	usbpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"usb",
+	/* parms */	noparms,
+	/* maj */	-1,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index f3db33627f92..32880387955c 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.78 1999/05/07 10:10:10 phk Exp $
+ *	$Id: vn.c,v 1.79 1999/05/11 19:54:02 phk Exp $
  */
 
 /*
@@ -121,11 +121,26 @@ static	d_parms_t	vnparms;
  */
 
 static struct cdevsw vn_cdevsw = {
-	  vnopen,	vnclose,	physread,	physwrite,
-	  vnioctl,	nostop,		nullreset,	nodevtotty,
-	  seltrue,	nommap,		vnstrategy,	"vn",
-	  vnparms,	-1,		vndump,		vnsize,
-	  D_DISK|D_CANFREE,	0,	-1 };
+	/* open */	vnopen,
+	/* close */	vnclose,
+	/* read */	physread,
+	/* write */	physwrite,
+	/* ioctl */	vnioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	vnstrategy,
+	/* name */	"vn",
+	/* parms */	vnparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	vndump,
+	/* psize */	vnsize,
+	/* flags */	D_DISK|D_CANFREE,
+	/* maxio */	0,
+	/* bmaj */	BDEV_MAJOR
+};
 
 
 #define	vnunit(dev)	dkunit(dev)