6 files changed, 116 insertions, 26 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index c0fa6bb..f8de2f7 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 4792809..a6e65cb 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 33a7d05..c10777a 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 b997e3d..fb6c30c 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 4f80e6a..a97adb4 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 d7d31c2..3119ca9 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