summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/ucom.c24
-rw-r--r--sys/dev/usb/ufm.c18
-rw-r--r--sys/dev/usb/ugen.c21
-rw-r--r--sys/dev/usb/uhid.c21
-rw-r--r--sys/dev/usb/ulpt.c19
-rw-r--r--sys/dev/usb/ums.c20
-rw-r--r--sys/dev/usb/urio.c20
-rw-r--r--sys/dev/usb/usb.c20
-rw-r--r--sys/dev/usb/uscanner.c20
9 files changed, 65 insertions, 118 deletions
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 8ed19a6..5409913 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -128,23 +128,19 @@ Static d_ioctl_t ucomioctl;
#define UCOM_CDEV_MAJOR 138
static struct cdevsw ucom_cdevsw = {
- /* open */ ucomopen,
- /* close */ ucomclose,
- /* read */ ucomread,
- /* write */ ucomwrite,
- /* ioctl */ ucomioctl,
- /* poll */ ttypoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "ucom",
- /* maj */ UCOM_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ D_TTY | D_KQFILTER,
+ .d_open = ucomopen,
+ .d_close = ucomclose,
+ .d_read = ucomread,
+ .d_write = ucomwrite,
+ .d_ioctl = ucomioctl,
+ .d_poll = ttypoll,
+ .d_name = "ucom",
+ .d_maj = UCOM_CDEV_MAJOR,
+ .d_flags = D_TTY | D_KQFILTER,
#if __FreeBSD_version < 500014
/* bmaj */ -1,
#endif
- /* kqfilter */ ttykqfilter,
+ .d_kqfilter = ttykqfilter,
};
Static void ucom_cleanup(struct ucom_softc *);
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 42c7a43..4517d55 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -90,19 +90,11 @@ d_ioctl_t ufmioctl;
#define UFM_CDEV_MAJOR MAJOR_AUTO
Static struct cdevsw ufm_cdevsw = {
- /* open */ ufmopen,
- /* close */ ufmclose,
- /* read */ noread,
- /* write */ nowrite,
- /* ioctl */ ufmioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "ufm",
- /* maj */ UFM_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = ufmopen,
+ .d_close = ufmclose,
+ .d_ioctl = ufmioctl,
+ .d_name = "ufm",
+ .d_maj = UFM_CDEV_MAJOR,
#if (__FreeBSD_version < 500014)
-1
#endif
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 5f997dc..ffecd12 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -138,19 +138,14 @@ d_poll_t ugenpoll;
#define UGEN_CDEV_MAJOR 114
Static struct cdevsw ugen_cdevsw = {
- /* open */ ugenopen,
- /* close */ ugenclose,
- /* read */ ugenread,
- /* write */ ugenwrite,
- /* ioctl */ ugenioctl,
- /* poll */ ugenpoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "ugen",
- /* maj */ UGEN_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = ugenopen,
+ .d_close = ugenclose,
+ .d_read = ugenread,
+ .d_write = ugenwrite,
+ .d_ioctl = ugenioctl,
+ .d_poll = ugenpoll,
+ .d_name = "ugen",
+ .d_maj = UGEN_CDEV_MAJOR,
#if __FreeBSD_version < 500014
/* bmaj */ -1
#endif
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 2570aa1..68ee1d3 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -149,19 +149,14 @@ d_poll_t uhidpoll;
#define UHID_CDEV_MAJOR 122
Static struct cdevsw uhid_cdevsw = {
- /* open */ uhidopen,
- /* close */ uhidclose,
- /* read */ uhidread,
- /* write */ uhidwrite,
- /* ioctl */ uhidioctl,
- /* poll */ uhidpoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "uhid",
- /* maj */ UHID_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = uhidopen,
+ .d_close = uhidclose,
+ .d_read = uhidread,
+ .d_write = uhidwrite,
+ .d_ioctl = uhidioctl,
+ .d_poll = uhidpoll,
+ .d_name = "uhid",
+ .d_maj = UHID_CDEV_MAJOR,
#if __FreeBSD_version < 500014
/* bmaj */ -1
#endif
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index c4fd586..71f6326 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -147,19 +147,12 @@ Static d_ioctl_t ulptioctl;
#define ULPT_CDEV_MAJOR 113
Static struct cdevsw ulpt_cdevsw = {
- /* open */ ulptopen,
- /* close */ ulptclose,
- /* read */ noread,
- /* write */ ulptwrite,
- /* ioctl */ ulptioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "ulpt",
- /* maj */ ULPT_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = ulptopen,
+ .d_close = ulptclose,
+ .d_write = ulptwrite,
+ .d_ioctl = ulptioctl,
+ .d_name = "ulpt",
+ .d_maj = ULPT_CDEV_MAJOR,
#if __FreeBSD_version < 500014
/* bmaj */ -1
#endif
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index e313d3e..642d7d5 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -149,19 +149,13 @@ Static d_poll_t ums_poll;
#define UMS_CDEV_MAJOR 111
Static struct cdevsw ums_cdevsw = {
- /* open */ ums_open,
- /* close */ ums_close,
- /* read */ ums_read,
- /* write */ nowrite,
- /* ioctl */ ums_ioctl,
- /* poll */ ums_poll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "ums",
- /* maj */ UMS_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = ums_open,
+ .d_close = ums_close,
+ .d_read = ums_read,
+ .d_ioctl = ums_ioctl,
+ .d_poll = ums_poll,
+ .d_name = "ums",
+ .d_maj = UMS_CDEV_MAJOR,
#if __FreeBSD_version < 500014
/* bmaj */ -1
#endif
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index e5f6cc7..3b45bb4 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -116,19 +116,13 @@ d_ioctl_t urioioctl;
#define URIO_CDEV_MAJOR 143
Static struct cdevsw urio_cdevsw = {
- /* open */ urioopen,
- /* close */ urioclose,
- /* read */ urioread,
- /* write */ uriowrite,
- /* ioctl */ urioioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "urio",
- /* maj */ URIO_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = urioopen,
+ .d_close = urioclose,
+ .d_read = urioread,
+ .d_write = uriowrite,
+ .d_ioctl = urioioctl,
+ .d_name = "urio",
+ .d_maj = URIO_CDEV_MAJOR,
#if __FreeBSD_version < 500014
-1
#endif
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 21127d6..74d024f 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -136,19 +136,13 @@ d_ioctl_t usbioctl;
d_poll_t usbpoll;
struct cdevsw usb_cdevsw = {
- /* open */ usbopen,
- /* close */ usbclose,
- /* read */ usbread,
- /* write */ nowrite,
- /* ioctl */ usbioctl,
- /* poll */ usbpoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "usb",
- /* maj */ USB_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = usbopen,
+ .d_close = usbclose,
+ .d_read = usbread,
+ .d_ioctl = usbioctl,
+ .d_poll = usbpoll,
+ .d_name = "usb",
+ .d_maj = USB_CDEV_MAJOR,
#if __FreeBSD_version < 500014
/* bmaj */ -1
#endif
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 80f79ab..13d287b9 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -249,19 +249,13 @@ d_poll_t uscannerpoll;
#define USCANNER_CDEV_MAJOR 156
Static struct cdevsw uscanner_cdevsw = {
- /* open */ uscanneropen,
- /* close */ uscannerclose,
- /* read */ uscannerread,
- /* write */ uscannerwrite,
- /* ioctl */ noioctl,
- /* poll */ uscannerpoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "uscanner",
- /* maj */ USCANNER_CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = uscanneropen,
+ .d_close = uscannerclose,
+ .d_read = uscannerread,
+ .d_write = uscannerwrite,
+ .d_poll = uscannerpoll,
+ .d_name = "uscanner",
+ .d_maj = USCANNER_CDEV_MAJOR,
#if __FreeBSD_version < 500014
/* bmaj */ -1
#endif
OpenPOWER on IntegriCloud