Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/nick-nhusb]: src/sys/dev/usb Use c99 designated initialisers for ucom_me...



details:   https://anonhg.NetBSD.org/src/rev/1fe6cb521cdb
branches:  nick-nhusb
changeset: 334080:1fe6cb521cdb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Dec 06 08:37:30 2014 +0000

description:
Use c99 designated initialisers for ucom_methods structs.

No functional change.

diffstat:

 sys/dev/usb/moscom.c  |  20 ++++++++++----------
 sys/dev/usb/u3g.c     |  20 ++++++++++----------
 sys/dev/usb/uark.c    |  18 +++++++++---------
 sys/dev/usb/ubsa.c    |  20 ++++++++++----------
 sys/dev/usb/uftdi.c   |  20 ++++++++++----------
 sys/dev/usb/ugensa.c  |  20 ++++++++++----------
 sys/dev/usb/uhmodem.c |  20 ++++++++++----------
 sys/dev/usb/uipaq.c   |  20 ++++++++++----------
 sys/dev/usb/ukyopon.c |  20 ++++++++++----------
 sys/dev/usb/umct.c    |  20 ++++++++++----------
 sys/dev/usb/umodem.c  |  20 ++++++++++----------
 sys/dev/usb/uplcom.c  |  20 ++++++++++----------
 sys/dev/usb/uslsa.c   |  20 ++++++++++----------
 sys/dev/usb/uvisor.c  |  20 ++++++++++----------
 sys/dev/usb/uvscom.c  |  20 ++++++++++----------
 15 files changed, 149 insertions(+), 149 deletions(-)

diffs (truncated from 606 to 300 lines):

diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/moscom.c
--- a/sys/dev/usb/moscom.c      Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/moscom.c      Sat Dec 06 08:37:30 2014 +0000
@@ -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_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[] = {
diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/u3g.c
--- a/sys/dev/usb/u3g.c Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/u3g.c Sat Dec 06 08:37:30 2014 +0000
@@ -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_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,
 };
 
 /*
diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/uark.c
--- a/sys/dev/usb/uark.c        Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/uark.c        Sat Dec 06 08:37:30 2014 +0000
@@ -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 @@
 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[] = {
diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/ubsa.c
--- a/sys/dev/usb/ubsa.c        Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/ubsa.c        Sat Dec 06 08:37:30 2014 +0000
@@ -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 @@
 #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[] = {
diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/uftdi.c
--- a/sys/dev/usb/uftdi.c       Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/uftdi.c       Sat Dec 06 08:37:30 2014 +0000
@@ -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_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,
 };
 
 /*
diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/ugensa.c
--- a/sys/dev/usb/ugensa.c      Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/ugensa.c      Sat Dec 06 08:37:30 2014 +0000
@@ -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 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
diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/uhmodem.c
--- a/sys/dev/usb/uhmodem.c     Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/uhmodem.c     Sat Dec 06 08:37:30 2014 +0000
@@ -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 <yuo%nui.org@localhost>.
@@ -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 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 {
diff -r cefaf1253795 -r 1fe6cb521cdb sys/dev/usb/uipaq.c
--- a/sys/dev/usb/uipaq.c       Sat Dec 06 08:27:23 2014 +0000
+++ b/sys/dev/usb/uipaq.c       Sat Dec 06 08:37:30 2014 +0000
@@ -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 @@
 
 
 struct ucom_methods uipaq_methods = {



Home | Main Index | Thread Index | Old Index