Module Name: src
Committed By: skrll
Date: Sat Dec 6 08:37:30 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: moscom.c u3g.c uark.c ubsa.c uftdi.c
ugensa.c uhmodem.c uipaq.c ukyopon.c umct.c umodem.c uplcom.c
uslsa.c uvisor.c uvscom.c
Log Message:
Use c99 designated initialisers for ucom_methods structs.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.14.1 src/sys/dev/usb/moscom.c
cvs rdiff -u -r1.31.2.5 -r1.31.2.6 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.6 -r1.6.14.1 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.30.16.1 -r1.30.16.2 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.59.6.4 -r1.59.6.5 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.31.6.3 -r1.31.6.4 src/sys/dev/usb/ugensa.c
cvs rdiff -u -r1.13.24.4 -r1.13.24.5 src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.19.14.3 -r1.19.14.4 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.16.16.1 -r1.16.16.2 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.32.24.6 -r1.32.24.7 src/sys/dev/usb/umct.c
cvs rdiff -u -r1.66 -r1.66.4.1 src/sys/dev/usb/umodem.c
cvs rdiff -u -r1.74.4.5 -r1.74.4.6 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.19 -r1.19.6.1 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.45.24.2 -r1.45.24.3 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.28.16.1 -r1.28.16.2 src/sys/dev/usb/uvscom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/moscom.c
diff -u src/sys/dev/usb/moscom.c:1.8 src/sys/dev/usb/moscom.c:1.8.14.1
--- src/sys/dev/usb/moscom.c:1.8 Sun Sep 23 01:08:17 2012
+++ src/sys/dev/usb/moscom.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: moscom.c,v 1.8 2012/09/23 01:08:17 chs Exp $ */
+/* $NetBSD: moscom.c,v 1.8.14.1 2014/12/06 08:37:30 skrll Exp $ */
/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8 2012/09/23 01:08:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.1 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,14 +156,14 @@ int moscom_open(void *, int);
int moscom_cmd(struct moscom_softc *, int, int);
struct ucom_methods moscom_methods = {
- NULL,
- moscom_set,
- moscom_param,
- NULL,
- moscom_open,
- NULL,
- NULL,
- NULL,
+ .ucom_get_status = NULL,
+ .ucom_set = moscom_set,
+ .ucom_param = moscom_param,
+ .ucom_ioctl = NULL,
+ .ucom_open = moscom_open,
+ .ucom_close = NULL,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
static const struct usb_devno moscom_devs[] = {
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.31.2.5 src/sys/dev/usb/u3g.c:1.31.2.6
--- src/sys/dev/usb/u3g.c:1.31.2.5 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/u3g.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.31.2.5 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: u3g.c,v 1.31.2.6 2014/12/06 08:37:30 skrll Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.5 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.6 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -170,14 +170,14 @@ static void u3g_read(void *, int, u_char
static void u3g_write(void *, int, u_char *, u_char *, uint32_t *);
struct ucom_methods u3g_methods = {
- u3g_get_status,
- u3g_set,
- NULL,
- NULL,
- u3g_open,
- u3g_close,
- u3g_read,
- u3g_write,
+ .ucom_get_status = u3g_get_status,
+ .ucom_set = u3g_set,
+ .ucom_param = NULL,
+ .ucom_ioctl = NULL,
+ .ucom_open = u3g_open,
+ .ucom_close = u3g_close,
+ .ucom_read = u3g_read,
+ .ucom_write = u3g_write,
};
/*
Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.6 src/sys/dev/usb/uark.c:1.6.14.1
--- src/sys/dev/usb/uark.c:1.6 Sat Oct 27 17:18:38 2012
+++ src/sys/dev/usb/uark.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uark.c,v 1.6 2012/10/27 17:18:38 chs Exp $ */
+/* $NetBSD: uark.c,v 1.6.14.1 2014/12/06 08:37:30 skrll Exp $ */
/* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */
/*
@@ -78,14 +78,14 @@ void uark_break(void *, int, int);
int uark_cmd(struct uark_softc *, uint16_t, uint16_t);
struct ucom_methods uark_methods = {
- uark_get_status,
- uark_set,
- uark_param,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ .ucom_get_status = uark_get_status,
+ .ucom_set = uark_set,
+ .ucom_param = uark_param,
+ .ucom_ioctl = NULL,
+ .ucom_open = NULL,
+ .ucom_close = NULL,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
static const struct usb_devno uark_devs[] = {
Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.30.16.1 src/sys/dev/usb/ubsa.c:1.30.16.2
--- src/sys/dev/usb/ubsa.c:1.30.16.1 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/ubsa.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.30.16.1 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: ubsa.c,v 1.30.16.2 2014/12/06 08:37:30 skrll Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.30.16.1 2014/12/03 14:18:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.30.16.2 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,14 +95,14 @@ int ubsadebug = 0;
#define DPRINTF(x) DPRINTFN(0, x)
struct ucom_methods ubsa_methods = {
- ubsa_get_status,
- ubsa_set,
- ubsa_param,
- NULL,
- ubsa_open,
- ubsa_close,
- NULL,
- NULL
+ .ucom_get_status = ubsa_get_status,
+ .ucom_set = ubsa_set,
+ .ucom_param = ubsa_param,
+ .ucom_ioctl = NULL,
+ .ucom_open = ubsa_open,
+ .ucom_close = ubsa_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL
};
Static const struct usb_devno ubsa_devs[] = {
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.59.6.4 src/sys/dev/usb/uftdi.c:1.59.6.5
--- src/sys/dev/usb/uftdi.c:1.59.6.4 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/uftdi.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.59.6.4 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: uftdi.c,v 1.59.6.5 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.6.4 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.6.5 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,14 +107,14 @@ Static void uftdi_write(void *, int, u_c
Static void uftdi_break(void *, int, int);
struct ucom_methods uftdi_methods = {
- uftdi_get_status,
- uftdi_set,
- uftdi_param,
- NULL,
- uftdi_open,
- NULL,
- uftdi_read,
- uftdi_write,
+ .ucom_get_status = uftdi_get_status,
+ .ucom_set = uftdi_set,
+ .ucom_param = uftdi_param,
+ .ucom_ioctl = NULL,
+ .ucom_open = uftdi_open,
+ .ucom_close = NULL,
+ .ucom_read = uftdi_read,
+ .ucom_write = uftdi_write,
};
/*
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.31.6.3 src/sys/dev/usb/ugensa.c:1.31.6.4
--- src/sys/dev/usb/ugensa.c:1.31.6.3 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/ugensa.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.31.6.3 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: ugensa.c,v 1.31.6.4 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.31.6.3 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.31.6.4 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,14 +71,14 @@ struct ugensa_softc {
};
struct ucom_methods ugensa_methods = {
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
+ .ucom_get_status = NULL,
+ .ucom_set = NULL,
+ .ucom_param = NULL,
+ .ucom_ioctl = NULL,
+ .ucom_open = NULL,
+ .ucom_close = NULL,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
#define UGENSA_CONFIG_INDEX 0
Index: src/sys/dev/usb/uhmodem.c
diff -u src/sys/dev/usb/uhmodem.c:1.13.24.4 src/sys/dev/usb/uhmodem.c:1.13.24.5
--- src/sys/dev/usb/uhmodem.c:1.13.24.4 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/uhmodem.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhmodem.c,v 1.13.24.4 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: uhmodem.c,v 1.13.24.5 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <[email protected]>.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.13.24.4 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.13.24.5 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,14 +135,14 @@ struct uhmodem_softc {
};
struct ucom_methods uhmodem_methods = {
- ubsa_get_status,
- ubsa_set,
- ubsa_param,
- NULL,
- uhmodem_open,
- ubsa_close,
- NULL,
- NULL
+ .ucom_get_status = ubsa_get_status,
+ .ucom_set = ubsa_set,
+ .ucom_param = ubsa_param,
+ .ucom_ioctl = NULL,
+ .ucom_open = uhmodem_open,
+ .ucom_close = ubsa_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL
};
struct uhmodem_type {
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.19.14.3 src/sys/dev/usb/uipaq.c:1.19.14.4
--- src/sys/dev/usb/uipaq.c:1.19.14.3 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/uipaq.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.19.14.3 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: uipaq.c,v 1.19.14.4 2014/12/06 08:37:30 skrll Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.19.14.3 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.19.14.4 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,14 +101,14 @@ Static void uipaq_break(struct uipaq_sof
struct ucom_methods uipaq_methods = {
- NULL,
- uipaq_set,
- NULL,
- NULL,
- NULL, /*open*/
- NULL, /*close*/
- NULL,
- NULL
+ .ucom_get_status = NULL,
+ .ucom_set = uipaq_set,
+ .ucom_param = NULL,
+ .ucom_ioctl = NULL,
+ .ucom_open = NULL,
+ .ucom_close = NULL,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
struct uipaq_type {
Index: src/sys/dev/usb/ukyopon.c
diff -u src/sys/dev/usb/ukyopon.c:1.16.16.1 src/sys/dev/usb/ukyopon.c:1.16.16.2
--- src/sys/dev/usb/ukyopon.c:1.16.16.1 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/ukyopon.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.c,v 1.16.16.1 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: ukyopon.c,v 1.16.16.2 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.16.1 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.16.2 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,14 +86,14 @@ Static void ukyopon_get_status(void *, i
Static int ukyopon_ioctl(void *, int, u_long, void *, int, proc_t *);
Static struct ucom_methods ukyopon_methods = {
- ukyopon_get_status,
- umodem_set,
- umodem_param,
- ukyopon_ioctl,
- umodem_open,
- umodem_close,
- NULL,
- NULL,
+ .ucom_get_status = ukyopon_get_status,
+ .ucom_set = umodem_set,
+ .ucom_param = umodem_param,
+ .ucom_ioctl = ukyopon_ioctl,
+ .ucom_open = umodem_open,
+ .ucom_close = umodem_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
int ukyopon_match(device_t, cfdata_t, void *);
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.32.24.6 src/sys/dev/usb/umct.c:1.32.24.7
--- src/sys/dev/usb/umct.c:1.32.24.6 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/umct.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.32.24.6 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: umct.c,v 1.32.24.7 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.6 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.7 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,14 +124,14 @@ Static int umct_open(void *, int);
Static void umct_close(void *, int);
struct ucom_methods umct_methods = {
- umct_get_status,
- umct_set,
- umct_param,
- NULL,
- umct_open,
- umct_close,
- NULL,
- NULL,
+ .ucom_get_status = umct_get_status,
+ .ucom_set = umct_set,
+ .ucom_param = umct_param,
+ .ucom_ioctl = NULL,
+ .ucom_open = umct_open,
+ .ucom_close = umct_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
static const struct usb_devno umct_devs[] = {
Index: src/sys/dev/usb/umodem.c
diff -u src/sys/dev/usb/umodem.c:1.66 src/sys/dev/usb/umodem.c:1.66.4.1
--- src/sys/dev/usb/umodem.c:1.66 Sun Apr 6 02:01:43 2014
+++ src/sys/dev/usb/umodem.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem.c,v 1.66 2014/04/06 02:01:43 christos Exp $ */
+/* $NetBSD: umodem.c,v 1.66.4.1 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66 2014/04/06 02:01:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.1 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,14 +71,14 @@ __KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1
#include <dev/usb/umodemvar.h>
Static struct ucom_methods umodem_methods = {
- umodem_get_status,
- umodem_set,
- umodem_param,
- umodem_ioctl,
- umodem_open,
- umodem_close,
- NULL,
- NULL,
+ .ucom_get_status = umodem_get_status,
+ .ucom_set = umodem_set,
+ .ucom_param = umodem_param,
+ .ucom_ioctl = umodem_ioctl,
+ .ucom_open = umodem_open,
+ .ucom_close = umodem_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
int umodem_match(device_t, cfdata_t, void *);
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.74.4.5 src/sys/dev/usb/uplcom.c:1.74.4.6
--- src/sys/dev/usb/uplcom.c:1.74.4.5 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/uplcom.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.74.4.5 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: uplcom.c,v 1.74.4.6 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.4.5 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.4.6 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,14 +136,14 @@ Static void uplcom_close(void *, int);
Static usbd_status uplcom_vendor_control_write(usbd_device_handle, uint16_t, uint16_t);
struct ucom_methods uplcom_methods = {
- uplcom_get_status,
- uplcom_set,
- uplcom_param,
- NULL, /* uplcom_ioctl, TODO */
- uplcom_open,
- uplcom_close,
- NULL,
- NULL,
+ .ucom_get_status = uplcom_get_status,
+ .ucom_set = uplcom_set,
+ .ucom_param = uplcom_param,
+ .ucom_ioctl = NULL, /* TODO */
+ .ucom_open = uplcom_open,
+ .ucom_close = uplcom_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
static const struct usb_devno uplcom_devs[] = {
Index: src/sys/dev/usb/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.19 src/sys/dev/usb/uslsa.c:1.19.6.1
--- src/sys/dev/usb/uslsa.c:1.19 Mon Mar 10 19:55:18 2014
+++ src/sys/dev/usb/uslsa.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.19 2014/03/10 19:55:18 reinoud Exp $ */
+/* $NetBSD: uslsa.c,v 1.19.6.1 2014/12/06 08:37:30 skrll Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.19 2014/03/10 19:55:18 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.19.6.1 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,14 +108,14 @@ static int uslsa_request_set(struct usls
static int uslsa_set_flow(struct uslsa_softc *, tcflag_t, tcflag_t);
static const struct ucom_methods uslsa_methods = {
- uslsa_get_status,
- uslsa_set,
- uslsa_param,
- uslsa_ioctl,
- uslsa_open,
- uslsa_close,
- NULL,
- NULL,
+ .ucom_get_status = uslsa_get_status,
+ .ucom_set = uslsa_set,
+ .ucom_param = uslsa_param,
+ .ucom_ioctl = uslsa_ioctl,
+ .ucom_open = uslsa_open,
+ .ucom_close = uslsa_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
};
#define USLSA_CONFIG_INDEX 0
Index: src/sys/dev/usb/uvisor.c
diff -u src/sys/dev/usb/uvisor.c:1.45.24.2 src/sys/dev/usb/uvisor.c:1.45.24.3
--- src/sys/dev/usb/uvisor.c:1.45.24.2 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/uvisor.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.45.24.2 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: uvisor.c,v 1.45.24.3 2014/12/06 08:37:30 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.45.24.2 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.45.24.3 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,14 +149,14 @@ Static void uvisor_close(void *, int);
struct ucom_methods uvisor_methods = {
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- uvisor_close,
- NULL,
- NULL,
+ .ucom_param = NULL,
+ .ucom_ioctl = NULL,
+ .ucom_open = NULL,
+ .ucom_close = uvisor_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL,
+ .ucom_get_status = NULL,
+ .ucom_set = NULL,
};
struct uvisor_type {
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.28.16.1 src/sys/dev/usb/uvscom.c:1.28.16.2
--- src/sys/dev/usb/uvscom.c:1.28.16.1 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/uvscom.c Sat Dec 6 08:37:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.28.16.1 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: uvscom.c,v 1.28.16.2 2014/12/06 08:37:30 skrll Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <[email protected]>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.1 2014/12/03 14:18:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.2 2014/12/06 08:37:30 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -185,14 +185,14 @@ Static int uvscom_open(void *, int);
Static void uvscom_close(void *, int);
struct ucom_methods uvscom_methods = {
- uvscom_get_status,
- uvscom_set,
- uvscom_param,
- NULL, /* uvscom_ioctl, TODO */
- uvscom_open,
- uvscom_close,
- NULL,
- NULL
+ .ucom_get_status = uvscom_get_status,
+ .ucom_set = uvscom_set,
+ .ucom_param = uvscom_param,
+ .ucom_ioctl = NULL, /* TODO */
+ .ucom_open = uvscom_open,
+ .ucom_close = uvscom_close,
+ .ucom_read = NULL,
+ .ucom_write = NULL
};
static const struct usb_devno uvscom_devs [] = {
