diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2016-07-07 06:55:38 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2016-07-07 06:55:38 +0000 |
| commit | 575a7585ffe052b9dac5fb3ff127257dd2a5cb28 (patch) | |
| tree | c5421da8f1b1c98cdbbe988cd984e6fd31fcdbff /sys/dev/usb | |
| parent | ed4c94c1f059db38c1bf5b31d4b80b6eb3e0541f (diff) | |
KNF. Remove extra spaces. No functional change.
Diffstat (limited to 'sys/dev/usb')
46 files changed, 374 insertions, 407 deletions
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 3939fdf3871..5b5e84b9b73 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_aue.c,v 1.136 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_aue.c,v 1.137 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.136 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.137 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -775,7 +775,8 @@ aue_attach(device_t parent, device_t self, void *aux) "creating multicast configuration thread\n"); return; } - sc->aue_flags = aue_lookup(uaa->uaa_vendor, uaa->uaa_product)->aue_flags; + sc->aue_flags = aue_lookup(uaa->uaa_vendor, + uaa->uaa_product)->aue_flags; sc->aue_udev = dev; sc->aue_iface = iface; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 6da02f3d643..fd6ac1ab70b 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_kue.c,v 1.85 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_kue.c,v 1.86 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.85 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.86 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -512,8 +512,7 @@ kue_attach(device_t parent, device_t self, void *aux) sc->kue_attached = true; splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->kue_udev, - sc->kue_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->kue_udev, sc->kue_dev); return; } diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index b8747cc8197..19a2c319465 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.55 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_rum.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.55 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -479,8 +479,7 @@ rum_attach(device_t parent, device_t self, void *aux) ieee80211_announce(ic); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index d5c362d7c7c..33ebf5066d3 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_udav.c,v 1.47 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_udav.c,v 1.48 2016/07/07 06:55:42 msaitoh Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.47 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.48 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -85,12 +85,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.47 2016/06/10 13:27:15 ozaki-r Exp $") /* Function declarations */ -int udav_match(device_t, cfdata_t, void *); -void udav_attach(device_t, device_t, void *); -int udav_detach(device_t, int); -int udav_activate(device_t, enum devact); +int udav_match(device_t, cfdata_t, void *); +void udav_attach(device_t, device_t, void *); +int udav_detach(device_t, int); +int udav_activate(device_t, enum devact); extern struct cfdriver udav_cd; -CFATTACH_DECL_NEW(udav, sizeof(struct udav_softc), udav_match, udav_attach, udav_detach, udav_activate); +CFATTACH_DECL_NEW(udav, sizeof(struct udav_softc), udav_match, udav_attach, + udav_detach, udav_activate); Static int udav_openpipes(struct udav_softc *); Static int udav_rx_list_init(struct udav_softc *); @@ -217,7 +218,8 @@ udav_attach(device_t parent, device_t self, void *aux) usb_init_task(&sc->sc_tick_task, udav_tick_task, sc, 0); mutex_init(&sc->sc_mii_lock, MUTEX_DEFAULT, IPL_NONE); - usb_init_task(&sc->sc_stop_task, (void (*)(void *))udav_stop_task, sc, 0); + usb_init_task(&sc->sc_stop_task, (void (*)(void *))udav_stop_task, sc, + 0); /* get control interface */ err = usbd_device2interface_handle(dev, UDAV_IFACE_INDEX, &iface); @@ -229,7 +231,8 @@ udav_attach(device_t parent, device_t self, void *aux) sc->sc_udev = dev; sc->sc_ctl_iface = iface; - sc->sc_flags = udav_lookup(uaa->uaa_vendor, uaa->uaa_product)->udav_flags; + sc->sc_flags = udav_lookup(uaa->uaa_vendor, + uaa->uaa_product)->udav_flags; /* get interface descriptor */ id = usbd_get_interface_descriptor(sc->sc_ctl_iface); @@ -381,8 +384,7 @@ udav_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_mii_lock); @@ -937,8 +939,8 @@ udav_rx_list_init(struct udav_softc *sc) if (udav_newbuf(sc, c, NULL) == ENOBUFS) return ENOBUFS; if (c->udav_xfer == NULL) { - int error = usbd_create_xfer(sc->sc_pipe_rx, UDAV_BUFSZ, - USBD_SHORT_XFER_OK, 0, &c->udav_xfer); + int error = usbd_create_xfer(sc->sc_pipe_rx, + UDAV_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->udav_xfer); if (error) return error; c->udav_buf = usbd_get_buffer(c->udav_xfer); diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 4a401d47592..800f21dc894 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_upl.c,v 1.55 2016/06/22 10:44:31 knakahara Exp $ */ +/* $NetBSD: if_upl.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.55 2016/06/22 10:44:31 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -171,12 +171,13 @@ Static struct upl_type sc_devs[] = { { 0, 0 } }; -int upl_match(device_t, cfdata_t, void *); -void upl_attach(device_t, device_t, void *); -int upl_detach(device_t, int); -int upl_activate(device_t, enum devact); +int upl_match(device_t, cfdata_t, void *); +void upl_attach(device_t, device_t, void *); +int upl_detach(device_t, int); +int upl_activate(device_t, enum devact); extern struct cfdriver upl_cd; -CFATTACH_DECL_NEW(upl, sizeof(struct upl_softc), upl_match, upl_attach, upl_detach, upl_activate); +CFATTACH_DECL_NEW(upl, sizeof(struct upl_softc), upl_match, upl_attach, + upl_detach, upl_activate); Static int upl_openpipes(struct upl_softc *); Static int upl_tx_list_init(struct upl_softc *); @@ -316,8 +317,7 @@ upl_attach(device_t parent, device_t self, void *aux) sc->sc_attached = 1; splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; } @@ -357,8 +357,7 @@ upl_detach(device_t self, int flags) sc->sc_attached = 0; splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c index 279e2b1979e..c3b999a0513 100644 --- a/sys/dev/usb/if_ural.c +++ b/sys/dev/usb/if_ural.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ural.c,v 1.49 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_ural.c,v 1.50 2016/07/07 06:55:42 msaitoh Exp $ */ /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.49 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.50 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -343,12 +343,13 @@ static const struct { { 161, 0x08808, 0x0242f, 0x00281 } }; -int ural_match(device_t, cfdata_t, void *); -void ural_attach(device_t, device_t, void *); -int ural_detach(device_t, int); -int ural_activate(device_t, enum devact); +int ural_match(device_t, cfdata_t, void *); +void ural_attach(device_t, device_t, void *); +int ural_detach(device_t, int); +int ural_activate(device_t, enum devact); extern struct cfdriver ural_cd; -CFATTACH_DECL_NEW(ural, sizeof(struct ural_softc), ural_match, ural_attach, ural_detach, ural_activate); +CFATTACH_DECL_NEW(ural, sizeof(struct ural_softc), ural_match, ural_attach, + ural_detach, ural_activate); int ural_match(device_t parent, cfdata_t match, void *aux) @@ -520,8 +521,7 @@ ural_attach(device_t parent, device_t self, void *aux) ieee80211_announce(ic); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -552,8 +552,7 @@ ural_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index bab346b7b4b..ad373c28062 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_url.c,v 1.52 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_url.c,v 1.53 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002 @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.52 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.53 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -86,12 +86,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.52 2016/06/10 13:27:15 ozaki-r Exp $"); /* Function declarations */ -int url_match(device_t, cfdata_t, void *); -void url_attach(device_t, device_t, void *); -int url_detach(device_t, int); -int url_activate(device_t, enum devact); +int url_match(device_t, cfdata_t, void *); +void url_attach(device_t, device_t, void *); +int url_detach(device_t, int); +int url_activate(device_t, enum devact); extern struct cfdriver url_cd; -CFATTACH_DECL_NEW(url, sizeof(struct url_softc), url_match, url_attach, url_detach, url_activate); +CFATTACH_DECL_NEW(url, sizeof(struct url_softc), url_match, url_attach, + url_detach, url_activate); Static int url_openpipes(struct url_softc *); Static int url_rx_list_init(struct url_softc *); @@ -380,8 +381,7 @@ url_detach(device_t self, int flags) splx(s); rw_destroy(&sc->sc_mii_rwlock); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 2dae3ebe881..a992fc4979f 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ -/* $NetBSD: if_zyd.c,v 1.41 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_zyd.c,v 1.42 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.41 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.42 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -485,8 +485,7 @@ zyd_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c index 72bdbe40150..8f29b0c77fb 100644 --- a/sys/dev/usb/moscom.c +++ b/sys/dev/usb/moscom.c @@ -1,4 +1,4 @@ -/* $NetBSD: moscom.c,v 1.9 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: moscom.c,v 1.10 2016/07/07 06:55:42 msaitoh 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.9 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -267,8 +267,7 @@ moscom_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_arg = sc; ucaa.ucaa_info = NULL; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -295,8 +294,7 @@ moscom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/pseye.c b/sys/dev/usb/pseye.c index 0fdd72bd688..165ea9ec05c 100644 --- a/sys/dev/usb/pseye.c +++ b/sys/dev/usb/pseye.c @@ -1,4 +1,4 @@ -/* $NetBSD: pseye.c,v 1.22 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: pseye.c,v 1.23 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.22 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.23 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -266,8 +266,7 @@ pseye_attach(device_t parent, device_t self, void *opaque) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - self); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, self); } @@ -309,8 +308,7 @@ pseye_detach(device_t self, int flags) cv_destroy(&sc->sc_cv); mutex_destroy(&sc->sc_mtx); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/slurm.c b/sys/dev/usb/slurm.c index fa20b7013fc..d2e06715c71 100644 --- a/sys/dev/usb/slurm.c +++ b/sys/dev/usb/slurm.c @@ -1,4 +1,4 @@ -/* $NetBSD: slurm.c,v 1.2 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2012 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.2 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -154,8 +154,7 @@ slurm_detach(device_t self, int flags) if ((rv = config_detach_children(self, flags)) != 0) return rv; - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (rv); } diff --git a/sys/dev/usb/stuirda.c b/sys/dev/usb/stuirda.c index ec0281ea3ea..f0322854f94 100644 --- a/sys/dev/usb/stuirda.c +++ b/sys/dev/usb/stuirda.c @@ -1,4 +1,4 @@ -/* $NetBSD: stuirda.c,v 1.17 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: stuirda.c,v 1.18 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001,2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.17 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.18 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> @@ -96,12 +96,13 @@ struct irframe_methods stuirda_methods = { #define stuirda_activate uirda_activate #define stuirda_detach uirda_detach -int stuirda_match(device_t, cfdata_t, void *); -void stuirda_attach(device_t, device_t, void *); -int stuirda_detach(device_t, int); -int stuirda_activate(device_t, enum devact); +int stuirda_match(device_t, cfdata_t, void *); +void stuirda_attach(device_t, device_t, void *); +int stuirda_detach(device_t, int); +int stuirda_activate(device_t, enum devact); extern struct cfdriver stuirda_cd; -CFATTACH_DECL_NEW(stuirda, sizeof(struct stuirda_softc), stuirda_match, stuirda_attach, stuirda_detach, stuirda_activate); +CFATTACH_DECL_NEW(stuirda, sizeof(struct stuirda_softc), stuirda_match, + stuirda_attach, stuirda_detach, stuirda_activate); int stuirda_match(device_t parent, cfdata_t match, void *aux) @@ -131,7 +132,8 @@ stuirda_attach(device_t parent, device_t self, void *aux) } int -stuirda_fwload(struct uirda_softc *sc) { +stuirda_fwload(struct uirda_softc *sc) +{ int rc; diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index cbf2c2ad446..3b30692971e 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $NetBSD: uark.c,v 1.7 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uark.c,v 1.8 2016/07/07 06:55:42 msaitoh Exp $ */ /* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */ /* @@ -183,8 +183,7 @@ uark_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_arg = sc; ucaa.ucaa_info = NULL; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -204,8 +203,7 @@ uark_detach(device_t self, int flags) sc->sc_subdev = NULL; } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 91173cd6efd..6b71f304336 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: uaudio.c,v 1.146 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uaudio.c,v 1.147 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.146 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.147 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -499,8 +499,7 @@ uaudio_attach(device_t parent, device_t self, void *aux) aprint_normal_dev(self, "%d mixer controls\n", sc->sc_nctls); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF("%s", "doing audio_attach_mi\n"); sc->sc_audiodev = audio_attach_mi(&uaudio_hw_if, sc, sc->sc_dev); @@ -544,8 +543,7 @@ uaudio_detach(device_t self, int flags) if (sc->sc_audiodev != NULL) rv = config_detach(sc->sc_audiodev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); if (sc->sc_formats != NULL) kmem_free(sc->sc_formats, diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index dfcea839c7a..1bf75dce495 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubsa.c,v 1.31 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ubsa.c,v 1.32 2016/07/07 06:55:42 msaitoh 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.31 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.32 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,8 +289,7 @@ ubsa_attach(device_t parent, device_t self, void *aux) sc->sc_subdevs[0] = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -336,8 +335,7 @@ ubsa_detach(device_t self, int flags) rv |= config_detach(sc->sc_subdevs[i], flags); } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (rv); } diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c index bbfb69f55c1..98b65affba3 100644 --- a/sys/dev/usb/ubt.c +++ b/sys/dev/usb/ubt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubt.c,v 1.54 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ubt.c,v 1.55 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.54 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.55 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -285,12 +285,13 @@ static const struct hci_if ubt_hci = { * */ -int ubt_match(device_t, cfdata_t, void *); -void ubt_attach(device_t, device_t, void *); -int ubt_detach(device_t, int); -int ubt_activate(device_t, enum devact); +int ubt_match(device_t, cfdata_t, void *); +void ubt_attach(device_t, device_t, void *); +int ubt_detach(device_t, int); +int ubt_activate(device_t, enum devact); extern struct cfdriver ubt_cd; -CFATTACH_DECL_NEW(ubt, sizeof(struct ubt_softc), ubt_match, ubt_attach, ubt_detach, ubt_activate); +CFATTACH_DECL_NEW(ubt, sizeof(struct ubt_softc), ubt_match, ubt_attach, + ubt_detach, ubt_activate); static int ubt_set_isoc_config(struct ubt_softc *); static int ubt_sysctl_config(SYSCTLFN_PROTO); @@ -601,8 +602,7 @@ ubt_attach(device_t parent, device_t self, void *aux) /* Attach HCI */ sc->sc_unit = hci_attach_pcb(&ubt_hci, sc->sc_dev, 0); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); /* sysctl set-up for alternate configs */ sysctl_createv(&sc->sc_log, 0, NULL, &node, @@ -700,8 +700,7 @@ ubt_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); DPRINTFN(1, "driver detached\n"); diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c index 618937d52da..c746232fb5d 100644 --- a/sys/dev/usb/uchcom.c +++ b/sys/dev/usb/uchcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uchcom.c,v 1.14 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uchcom.c,v 1.15 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.14 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.15 2016/07/07 06:55:42 msaitoh Exp $"); /* * driver for WinChipHead CH341/340, the worst USB-serial chip in the world. @@ -295,8 +295,7 @@ uchcom_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_arg = sc; ucaa.ucaa_info = NULL; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -332,8 +331,7 @@ uchcom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c index 02a84782267..6b75bf45279 100644 --- a/sys/dev/usb/ucycom.c +++ b/sys/dev/usb/ucycom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucycom.c,v 1.43 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ucycom.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.43 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -186,20 +186,21 @@ Static const struct usb_devno ucycom_devs[] = { }; #define ucycom_lookup(v, p) usb_lookup(ucycom_devs, v, p) -int ucycom_match(device_t, cfdata_t, void *); -void ucycom_attach(device_t, device_t, void *); -int ucycom_detach(device_t, int); -int ucycom_activate(device_t, enum devact); +int ucycom_match(device_t, cfdata_t, void *); +void ucycom_attach(device_t, device_t, void *); +int ucycom_detach(device_t, int); +int ucycom_activate(device_t, enum devact); extern struct cfdriver ucycom_cd; -CFATTACH_DECL_NEW(ucycom, sizeof(struct ucycom_softc), ucycom_match, ucycom_attach, ucycom_detach, ucycom_activate); +CFATTACH_DECL_NEW(ucycom, sizeof(struct ucycom_softc), ucycom_match, + ucycom_attach, ucycom_detach, ucycom_activate); int ucycom_match(device_t parent, cfdata_t match, void *aux) { struct uhidev_attach_arg *uha = aux; - return ucycom_lookup(uha->uiaa->uiaa_vendor, uha->uiaa->uiaa_product) != NULL ? - UMATCH_VENDOR_PRODUCT : UMATCH_NONE; + return ucycom_lookup(uha->uiaa->uiaa_vendor, uha->uiaa->uiaa_product) + != NULL ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE; } void @@ -514,8 +515,8 @@ ucycomstart(struct tty *tp) memcpy(sc->sc_obuf + 1, data, len); sc->sc_obuf[0] = len | sc->sc_mcr; - DPRINTF(("ucycomstart(8): sc->sc_obuf[0] = %d | %d = %d\n", len, - sc->sc_mcr, sc->sc_obuf[0])); + DPRINTF(("ucycomstart(8): sc->sc_obuf[0] = %d | %d = %d\n", + len, sc->sc_mcr, sc->sc_obuf[0])); #ifdef UCYCOM_DEBUG if (ucycomdebug > 10) { uint32_t i; diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c index 99b497a04e3..09290c10835 100644 --- a/sys/dev/usb/udsbr.c +++ b/sys/dev/usb/udsbr.c @@ -1,4 +1,4 @@ -/* $NetBSD: udsbr.c,v 1.23 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: udsbr.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.23 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -150,8 +150,7 @@ udsbr_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("udsbr_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_child = radio_attach_mi(&udsbr_hw_if, sc, sc->sc_dev); @@ -172,8 +171,7 @@ udsbr_detach(device_t self, int flags) if (sc->sc_child != NULL) rv = config_detach(sc->sc_child, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/udsir.c b/sys/dev/usb/udsir.c index 6bf6c13f6bd..dff0910b601 100644 --- a/sys/dev/usb/udsir.c +++ b/sys/dev/usb/udsir.c @@ -1,4 +1,4 @@ -/* $NetBSD: udsir.c,v 1.2 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: udsir.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.2 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -224,8 +224,7 @@ udsir_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("udsir_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ia.ia_type = IR_TYPE_IRFRAME; ia.ia_methods = &udsir_methods; diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index eeeebf3d08b..f061eb76637 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $NetBSD: uftdi.c,v 1.61 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uftdi.c,v 1.62 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.61 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.62 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -335,8 +335,7 @@ uftdi_attach(device_t parent, device_t self, void *aux) &ucaa, ucomprint, ucomsubmatch); } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -387,8 +386,7 @@ uftdi_detach(device_t self, int flags) config_detach(sc->sc_subdev[i], flags); } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 6659191856c..7ae800aa404 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.133 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ugen.c,v 1.134 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.133 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.134 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -181,12 +181,13 @@ Static void ugen_clear_endpoints(struct ugen_softc *); #define UGENENDPOINT(n) (minor(n) & 0xf) #define UGENDEV(u, e) (makedev(0, ((u) << 4) | (e))) -int ugen_match(device_t, cfdata_t, void *); -void ugen_attach(device_t, device_t, void *); -int ugen_detach(device_t, int); -int ugen_activate(device_t, enum devact); +int ugen_match(device_t, cfdata_t, void *); +void ugen_attach(device_t, device_t, void *); +int ugen_detach(device_t, int); +int ugen_activate(device_t, enum devact); extern struct cfdriver ugen_cd; -CFATTACH_DECL_NEW(ugen, sizeof(struct ugen_softc), ugen_match, ugen_attach, ugen_detach, ugen_activate); +CFATTACH_DECL_NEW(ugen, sizeof(struct ugen_softc), ugen_match, ugen_attach, + ugen_detach, ugen_activate); /* toggle to control attach priority. -1 means "let autoconf decide" */ int ugen_override = -1; @@ -262,8 +263,7 @@ ugen_attach(device_t parent, device_t self, void *aux) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -1064,8 +1064,7 @@ ugen_detach(device_t self, int flags) mn = device_unit(self) * USB_MAX_ENDPOINTS; vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); for (i = 0; i < USB_MAX_ENDPOINTS; i++) { for (dir = OUT; dir <= IN; dir++) { diff --git a/sys/dev/usb/ugensa.c b/sys/dev/usb/ugensa.c index 46b3780b1e5..df207a8eec4 100644 --- a/sys/dev/usb/ugensa.c +++ b/sys/dev/usb/ugensa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ugensa.c,v 1.32 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ugensa.c,v 1.33 2016/07/07 06:55:42 msaitoh 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.32 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.33 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -195,8 +195,7 @@ ugensa_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_methods = &ugensa_methods; ucaa.ucaa_arg = sc; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1; for (i = 0; i < id->bNumEndpoints; i++) { @@ -290,8 +289,7 @@ ugensa_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 8377c2d07a0..1000e3a8b47 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhid.c,v 1.97 2016/05/09 04:55:34 mlelstv Exp $ */ +/* $NetBSD: uhid.c,v 1.98 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.97 2016/05/09 04:55:34 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.98 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -138,12 +138,13 @@ Static int uhid_do_read(struct uhid_softc *, struct uio *, int); Static int uhid_do_write(struct uhid_softc *, struct uio *, int); Static int uhid_do_ioctl(struct uhid_softc*, u_long, void *, int, struct lwp *); -int uhid_match(device_t, cfdata_t, void *); -void uhid_attach(device_t, device_t, void *); -int uhid_detach(device_t, int); -int uhid_activate(device_t, enum devact); +int uhid_match(device_t, cfdata_t, void *); +void uhid_attach(device_t, device_t, void *); +int uhid_detach(device_t, int); +int uhid_activate(device_t, enum devact); extern struct cfdriver uhid_cd; -CFATTACH_DECL_NEW(uhid, sizeof(struct uhid_softc), uhid_match, uhid_attach, uhid_detach, uhid_activate); +CFATTACH_DECL_NEW(uhid, sizeof(struct uhid_softc), uhid_match, uhid_attach, + uhid_detach, uhid_activate); int uhid_match(device_t parent, cfdata_t match, void *aux) @@ -173,8 +174,7 @@ uhid_attach(device_t parent, device_t self, void *aux) sc->sc_hdev.sc_intr = uhid_intr; sc->sc_hdev.sc_parent = uha->parent; sc->sc_hdev.sc_report_id = uha->reportid; - sc->sc_sih = softint_establish(SOFTINT_CLOCK, - uhid_softintr, sc); + sc->sc_sih = softint_establish(SOFTINT_CLOCK, uhid_softintr, sc); uhidev_get_report_desc(uha->parent, &desc, &size); repid = uha->reportid; @@ -244,8 +244,7 @@ uhid_detach(device_t self, int flags) #if 0 usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, - sc->sc_hdev.sc_parent->sc_udev, - sc->sc_hdev.sc_dev); + sc->sc_hdev.sc_parent->sc_udev, sc->sc_hdev.sc_dev); #endif cv_destroy(&sc->sc_cv); cv_destroy(&sc->sc_detach_cv); diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index 4a11a1df00d..8f8ae1f72bb 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhidev.c,v 1.67 2016/04/30 18:40:26 jakllsch Exp $ */ +/* $NetBSD: uhidev.c,v 1.68 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.67 2016/04/30 18:40:26 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.68 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -331,8 +331,7 @@ nomem: sc->sc_isize = maxinpktsize; sc->sc_nrepid = nrepid; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); for (repid = 0; repid < nrepid; repid++) { repsz = hid_report_size(desc, size, hid_input, repid); @@ -464,8 +463,7 @@ uhidev_detach(device_t self, int flags) } } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); pmf_device_deregister(self); mutex_destroy(&sc->sc_lock); diff --git a/sys/dev/usb/uhso.c b/sys/dev/usb/uhso.c index cf153f0f23c..bbb5731838c 100644 --- a/sys/dev/usb/uhso.c +++ b/sys/dev/usb/uhso.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhso.c,v 1.21 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: uhso.c,v 1.22 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2009 Iain Hibbert @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.21 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.22 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -342,7 +342,8 @@ CFATTACH_DECL_NEW(uhso, sizeof(struct uhso_softc), uhso_match, uhso_attach, Static int uhso_switch_mode(struct usbd_device *); Static int uhso_get_iface_spec(struct usb_attach_arg *, uint8_t, uint8_t *); -Static usb_endpoint_descriptor_t *uhso_get_endpoint(struct usbd_interface *, int, int); +Static usb_endpoint_descriptor_t *uhso_get_endpoint(struct usbd_interface *, + int, int); Static void uhso_mux_attach(struct uhso_softc *, struct usbd_interface *, int); Static int uhso_mux_abort(struct uhso_port *); @@ -410,7 +411,8 @@ Static int uhso_tty_control(struct uhso_port *, u_long, int); #define UHSODIALOUT(x) TTDIALOUT(x) #define UHSOMINOR(u, p) ((((u) << 4) & UHSO_UNIT_MASK) | ((p) & UHSO_UNIT_MASK)) -Static void uhso_ifnet_attach(struct uhso_softc *, struct usbd_interface *, int); +Static void uhso_ifnet_attach(struct uhso_softc *, struct usbd_interface *, + int); Static int uhso_ifnet_abort(struct uhso_port *); Static int uhso_ifnet_detach(struct uhso_port *); Static void uhso_ifnet_read_cb(struct usbd_xfer *, void *, usbd_status); @@ -481,7 +483,8 @@ uhso_attach(device_t parent, device_t self, void *aux) } if (uaa->uaa_class != UDCLASS_VENDOR) { - aprint_verbose_dev(self, "Switching device into modem mode..\n"); + aprint_verbose_dev(self, + "Switching device into modem mode..\n"); if (uhso_switch_mode(uaa->uaa_device) != 0) aprint_error_dev(self, "modem switch failed\n"); @@ -776,8 +779,8 @@ uhso_mux_attach(struct uhso_softc *sc, struct usbd_interface *ifh, int index) sc, buf, size, uhso_mux_intr, USBD_DEFAULT_INTERVAL); if (status != USBD_NORMAL_COMPLETION) { - aprint_error_dev(sc->sc_dev, "failed to open interrupt pipe: %s", - usbd_errstr(status)); + aprint_error_dev(sc->sc_dev, + "failed to open interrupt pipe: %s", usbd_errstr(status)); kmem_free(buf, size); return; @@ -915,7 +918,8 @@ uhso_mux_write(struct uhso_port *hp) usb_device_request_t req; usbd_status status; - DPRINTF(5, "hp=%p, index=%d, wlen=%zd\n", hp, hp->hp_index, hp->hp_wlen); + DPRINTF(5, "hp=%p, index=%d, wlen=%zd\n", hp, hp->hp_index, + hp->hp_wlen); req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SEND_ENCAPSULATED_COMMAND; @@ -1054,7 +1058,8 @@ uhso_bulk_attach(struct uhso_softc *sc, struct usbd_interface *ifh, int index) id = usbd_get_interface_descriptor(ifh); if (id == NULL) { - aprint_error_dev(sc->sc_dev, "interface descriptor not found\n"); + aprint_error_dev(sc->sc_dev, + "interface descriptor not found\n"); return; } @@ -1758,7 +1763,8 @@ void uhso_tty_stop(struct tty *tp, int flag) { #if 0 - struct uhso_softc *sc = device_lookup_private(&uhso_cd, UHSOUNIT(tp->t_dev)); + struct uhso_softc *sc = device_lookup_private(&uhso_cd, + UHSOUNIT(tp->t_dev)); struct uhso_port *hp = sc->sc_port[UHSOPORT(tp->t_dev)]; #endif } @@ -1796,7 +1802,8 @@ uhso_tty_poll(dev_t dev, int events, struct lwp *l) Static int uhso_tty_param(struct tty *tp, struct termios *t) { - struct uhso_softc *sc = device_lookup_private(&uhso_cd, UHSOUNIT(tp->t_dev)); + struct uhso_softc *sc = device_lookup_private(&uhso_cd, + UHSOUNIT(tp->t_dev)); struct uhso_port *hp = sc->sc_port[UHSOPORT(tp->t_dev)]; if (!device_is_active(sc->sc_dev)) @@ -1834,7 +1841,8 @@ uhso_tty_param(struct tty *tp, struct termios *t) Static void uhso_tty_start(struct tty *tp) { - struct uhso_softc *sc = device_lookup_private(&uhso_cd, UHSOUNIT(tp->t_dev)); + struct uhso_softc *sc = device_lookup_private(&uhso_cd, + UHSOUNIT(tp->t_dev)); struct uhso_port *hp = sc->sc_port[UHSOPORT(tp->t_dev)]; int s; @@ -2112,7 +2120,8 @@ uhso_ifnet_input(struct ifnet *ifp, struct mbuf **mb, uint8_t *cp, size_t cc) want = mtod(m, struct ip *)->ip_hl << 2; if (mtod(m, struct ip *)->ip_v != 4 || want != sizeof(struct ip)) { - aprint_error_ifnet(ifp, "bad IP header (v=%d, hl=%zd)\n", + aprint_error_ifnet(ifp, + "bad IP header (v=%d, hl=%zd)\n", mtod(m, struct ip *)->ip_v, want); ifp->if_ierrors++; @@ -2203,7 +2212,8 @@ uhso_ifnet_ioctl(struct ifnet *ifp, u_long cmd, void *data) } SET(ifp->if_flags, IFF_RUNNING); - DPRINTF(1, "hp=%p, ifp=%p INITIFADDR\n", hp, ifp); + DPRINTF(1, "hp=%p, ifp=%p INITIFADDR\n", hp, + ifp); break; } @@ -2339,8 +2349,8 @@ uhso_ifnet_start(struct ifnet *ifp) } Static int -uhso_ifnet_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, - const struct rtentry *rt0) +uhso_ifnet_output(struct ifnet *ifp, struct mbuf *m, + const struct sockaddr *dst, const struct rtentry *rt0) { int error; diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c index 2046b93d104..484768106a0 100644 --- a/sys/dev/usb/uipaq.c +++ b/sys/dev/usb/uipaq.c @@ -1,4 +1,4 @@ -/* $NetBSD: uipaq.c,v 1.20 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uipaq.c,v 1.21 2016/07/07 06:55:42 msaitoh 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.20 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.21 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -177,8 +177,8 @@ uipaq_attach(device_t parent, device_t self, void *aux) /* Move the device into the configured state. */ err = usbd_set_config_no(dev, UIPAQ_CONFIG_NO, 1); if (err) { - aprint_error_dev(self, "failed to set configuration" - ", err=%s\n", usbd_errstr(err)); + aprint_error_dev(self, "failed to set configuration, err=%s\n", + usbd_errstr(err)); goto bad; } @@ -214,8 +214,7 @@ uipaq_attach(device_t parent, device_t self, void *aux) goto bad; }*/ - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1; for (i=0; i<id->bNumEndpoints; i++) { @@ -269,7 +268,8 @@ uipaq_dtr(struct uipaq_softc* sc, int onoff) /* Other parameters depend on reg */ req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SET_CONTROL_LINE_STATE; - sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_DTR : sc->sc_lcr & ~UCDC_LINE_DTR; + sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_DTR + : sc->sc_lcr & ~UCDC_LINE_DTR; USETW(req.wValue, sc->sc_lcr); USETW(req.wIndex, 0x0); USETW(req.wLength, 0); @@ -299,7 +299,8 @@ uipaq_rts(struct uipaq_softc* sc, int onoff) req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SET_CONTROL_LINE_STATE; - sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_RTS : sc->sc_lcr & ~UCDC_LINE_RTS; + sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_RTS + : sc->sc_lcr & ~UCDC_LINE_RTS; USETW(req.wValue, sc->sc_lcr); USETW(req.wIndex, 0x0); USETW(req.wLength, 0); @@ -320,7 +321,8 @@ uipaq_break(struct uipaq_softc* sc, int onoff) usbd_status err; int retries = 3; - DPRINTF(("%s: uipaq_break: onoff=%x\n", device_xname(sc->sc_dev), onoff)); + DPRINTF(("%s: uipaq_break: onoff=%x\n", device_xname(sc->sc_dev), + onoff)); req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SEND_BREAK; @@ -395,8 +397,7 @@ uipaq_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv |= config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uirda.c b/sys/dev/usb/uirda.c index 4542548489e..edd844ae1fa 100644 --- a/sys/dev/usb/uirda.c +++ b/sys/dev/usb/uirda.c @@ -1,4 +1,4 @@ -/* $NetBSD: uirda.c,v 1.39 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uirda.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.39 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -274,8 +274,7 @@ uirda_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("uirda_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); mutex_init(&sc->sc_wr_buf_lk, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_rd_buf_lk, MUTEX_DEFAULT, IPL_NONE); @@ -338,8 +337,7 @@ uirda_detach(device_t self, int flags) if (sc->sc_child != NULL) rv = config_detach(sc->sc_child, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_wr_buf_lk); mutex_destroy(&sc->sc_rd_buf_lk); diff --git a/sys/dev/usb/ukyopon.c b/sys/dev/usb/ukyopon.c index f0bdee09509..70bb578d1d4 100644 --- a/sys/dev/usb/ukyopon.c +++ b/sys/dev/usb/ukyopon.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukyopon.c,v 1.17 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ukyopon.c,v 1.18 2016/07/07 06:55:42 msaitoh 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.17 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.18 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,12 +96,13 @@ Static struct ucom_methods ukyopon_methods = { .ucom_write = NULL, }; -int ukyopon_match(device_t, cfdata_t, void *); -void ukyopon_attach(device_t, device_t, void *); -int ukyopon_detach(device_t, int); -int ukyopon_activate(device_t, enum devact); +int ukyopon_match(device_t, cfdata_t, void *); +void ukyopon_attach(device_t, device_t, void *); +int ukyopon_detach(device_t, int); +int ukyopon_activate(device_t, enum devact); extern struct cfdriver ukyopon_cd; -CFATTACH_DECL_NEW(ukyopon, sizeof(struct ukyopon_softc), ukyopon_match, ukyopon_attach, ukyopon_detach, ukyopon_activate); +CFATTACH_DECL_NEW(ukyopon, sizeof(struct ukyopon_softc), ukyopon_match, + ukyopon_attach, ukyopon_detach, ukyopon_activate); int ukyopon_match(device_t parent, cfdata_t match, void *aux) diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 06d59dd7975..1f4f5e13f38 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ulpt.c,v 1.96 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ulpt.c,v 1.97 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.96 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.97 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -151,8 +151,7 @@ int ulpt_do_read(struct ulpt_softc *, struct uio *, int); int ulpt_status(struct ulpt_softc *); void ulpt_reset(struct ulpt_softc *); int ulpt_statusmsg(u_char, struct ulpt_softc *); -void ulpt_read_cb(struct usbd_xfer *, void *, - usbd_status); +void ulpt_read_cb(struct usbd_xfer *, void *, usbd_status); void ulpt_tick(void *xsc); #if 0 @@ -163,10 +162,10 @@ void ieee1284_print_id(char *); #define ULPTFLAGS(s) (minor(s) & 0xe0) -int ulpt_match(device_t, cfdata_t, void *); -void ulpt_attach(device_t, device_t, void *); -int ulpt_detach(device_t, int); -int ulpt_activate(device_t, enum devact); +int ulpt_match(device_t, cfdata_t, void *); +void ulpt_attach(device_t, device_t, void *); +int ulpt_detach(device_t, int); +int ulpt_activate(device_t, enum devact); extern struct cfdriver ulpt_cd; @@ -318,8 +317,7 @@ ulpt_attach(device_t parent, device_t self, void *aux) } #endif - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTFN(1, ("ulpt_attach: sc=%p in=%d out=%d\n", sc, sc->sc_out, sc->sc_in)); @@ -372,8 +370,7 @@ ulpt_detach(device_t self, int flags) vdevgone(maj, mn, mn, VCHR); vdevgone(maj, mn | ULPT_NOPRIME , mn | ULPT_NOPRIME, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 8390098e183..216d70dbdcf 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $NetBSD: umass.c,v 1.155 2016/07/03 07:27:37 skrll Exp $ */ +/* $NetBSD: umass.c,v 1.156 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -124,7 +124,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.155 2016/07/03 07:27:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.156 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -220,8 +220,8 @@ int umass_detach(device_t, int); static void umass_childdet(device_t, device_t); int umass_activate(device_t, enum devact); extern struct cfdriver umass_cd; -CFATTACH_DECL2_NEW(umass, sizeof(struct umass_softc), umass_match, umass_attach, - umass_detach, umass_activate, NULL, umass_childdet); +CFATTACH_DECL2_NEW(umass, sizeof(struct umass_softc), umass_match, + umass_attach, umass_detach, umass_activate, NULL, umass_childdet); Static void umass_disco(struct umass_softc *sc); @@ -254,7 +254,8 @@ Static void umass_cbi_transfer(struct umass_softc *, int, void *, int, void *, Static void umass_cbi_reset(struct umass_softc *, int); Static void umass_cbi_state(struct usbd_xfer *, void *, usbd_status); -Static int umass_cbi_adsc(struct umass_softc *, char *, int, int, struct usbd_xfer *); +Static int umass_cbi_adsc(struct umass_softc *, char *, int, int, + struct usbd_xfer *); const struct umass_wire_methods umass_bbb_methods = { .wire_xfer = umass_bbb_transfer, @@ -537,7 +538,7 @@ umass_attach(device_t parent, device_t self, void *aux) DPRINTFM(UDMASS_USB, "sc %p: opening iface %p epaddr %d for BULKIN", sc, sc->sc_iface, sc->sc_epaddr[UMASS_BULKIN], 0); err = usbd_open_pipe(sc->sc_iface, sc->sc_epaddr[UMASS_BULKIN], - USBD_EXCLUSIVE_USE, &sc->sc_pipe[UMASS_BULKIN]); + USBD_EXCLUSIVE_USE, &sc->sc_pipe[UMASS_BULKIN]); if (err) { aprint_error_dev(self, "could not open %u-in pipe (bulk)\n", sc->sc_epaddr[UMASS_BULKIN]); @@ -557,7 +558,8 @@ umass_attach(device_t parent, device_t self, void *aux) * arriving concurrently. */ if (sc->sc_wire == UMASS_WPROTO_CBI_I) { - DPRINTFM(UDMASS_USB, "sc %p: opening iface %p epaddr %d for INTRIN", + DPRINTFM(UDMASS_USB, + "sc %p: opening iface %p epaddr %d for INTRIN", sc, sc->sc_iface, sc->sc_epaddr[UMASS_INTRIN], 0); err = usbd_open_pipe(sc->sc_iface, sc->sc_epaddr[UMASS_INTRIN], USBD_EXCLUSIVE_USE, &sc->sc_pipe[UMASS_INTRIN]); @@ -765,8 +767,7 @@ umass_attach(device_t parent, device_t self, void *aux) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -828,8 +829,7 @@ umass_detach(device_t self, int flags) umass_disco(sc); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_lock); cv_destroy(&sc->sc_detach_cv); @@ -1203,10 +1203,10 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, } else if (sc->transfer_dir == DIR_OUT) { memcpy(sc->dataout_buffer, sc->transfer_data, sc->transfer_datalen); - if (umass_setup_transfer(sc, sc->sc_pipe[UMASS_BULKOUT], - sc->dataout_buffer, sc->transfer_datalen, - 0,/* fixed length transfer */ - sc->transfer_xfer[XFER_BBB_DATAOUT])) + if (umass_setup_transfer(sc, + sc->sc_pipe[UMASS_BULKOUT], sc->dataout_buffer, + sc->transfer_datalen, 0,/* fixed length transfer */ + sc->transfer_xfer[XFER_BBB_DATAOUT])) umass_bbb_reset(sc, STATUS_WIRE_FAILED); return; @@ -1301,8 +1301,8 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, case TSTATE_BBB_STATUS2: /* second attempt */ /* Status transfer, error handling */ if (err) { - DPRINTFM(UDMASS_BBB, "sc %p Failed to read CSW " - "err %d (state %d)", sc, err, sc->transfer_state, 0); + DPRINTFM(UDMASS_BBB, "sc %p Failed to read CSW err %d " + "(state %d)", sc, err, sc->transfer_state, 0); /* If this was the first attempt at fetching the CSW * retry it, otherwise fail. @@ -1594,7 +1594,8 @@ umass_cbi_transfer(struct umass_softc *sc, int lun, sc->transfer_state = TSTATE_CBI_COMMAND; /* Send the Command Block from host to device via control endpoint. */ - if (umass_cbi_adsc(sc, cmd, cmdlen, flags, sc->transfer_xfer[XFER_CBI_CB])) + if (umass_cbi_adsc(sc, cmd, cmdlen, flags, + sc->transfer_xfer[XFER_CBI_CB])) umass_cbi_reset(sc, STATUS_WIRE_FAILED); } @@ -1809,7 +1810,8 @@ umass_cbi_state(struct usbd_xfer *xfer, void *priv, sc->transfer_state = TSTATE_IDLE; sc->transfer_cb(sc, sc->transfer_priv, - sc->transfer_datalen - sc->transfer_actlen, status); + sc->transfer_datalen - sc->transfer_actlen, + status); } } return; diff --git a/sys/dev/usb/umcs.c b/sys/dev/usb/umcs.c index 9792e25e60d..c4ad74c6e35 100644 --- a/sys/dev/usb/umcs.c +++ b/sys/dev/usb/umcs.c @@ -1,4 +1,4 @@ -/* $NetBSD: umcs.c,v 1.9 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umcs.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $ */ /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */ /*- @@ -41,7 +41,7 @@ * */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.9 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -282,8 +282,7 @@ umcs7840_attach(device_t parent, device_t self, void *aux) usb_init_task(&sc->sc_change_task, umcs7840_change_task, sc, USB_TASKQ_MPSAFE); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); memset(&ucaa, 0, sizeof(ucaa)); ucaa.ucaa_ibufsize = 256; @@ -530,8 +529,7 @@ umcs7840_detach(device_t self, int flags) } } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c index 0c4443b1f91..85164616328 100644 --- a/sys/dev/usb/umct.c +++ b/sys/dev/usb/umct.c @@ -1,4 +1,4 @@ -/* $NetBSD: umct.c,v 1.34 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umct.c,v 1.35 2016/07/07 06:55:42 msaitoh 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.34 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -296,8 +296,7 @@ umct_attach(device_t parent, device_t self, void *aux) umct_init(sc); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("umct: in=0x%x out=0x%x intr=0x%x\n", ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number)); @@ -335,8 +334,7 @@ umct_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index f8762c2e496..f27a5ce6877 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $NetBSD: umidi.c,v 1.70 2016/05/07 08:09:43 mrg Exp $ */ +/* $NetBSD: umidi.c,v 1.71 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.70 2016/05/07 08:09:43 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.71 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -397,8 +397,7 @@ umidi_attach(device_t parent, device_t self, void *aux) dump_sc(sc); #endif - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, - sc->sc_udev, sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -467,8 +466,7 @@ umidi_detach(device_t self, int flags) free_all_jacks(sc); free_all_endpoints(sc); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_lock); cv_destroy(&sc->sc_detach_cv); @@ -696,7 +694,8 @@ alloc_pipe(struct umidi_endpoint *ep) } ep->buffer = usbd_get_buffer(ep->xfer); ep->next_slot = ep->buffer; - ep->solicit_cookie = softint_establish(SOFTINT_CLOCK | SOFTINT_MPSAFE, out_solicit, ep); + ep->solicit_cookie = softint_establish(SOFTINT_CLOCK | SOFTINT_MPSAFE, + out_solicit, ep); quit: return err; } @@ -800,8 +799,8 @@ alloc_all_endpoints_fixed_ep(struct umidi_softc *sc) } if (UE_GET_XFERTYPE(epd->bmAttributes)!=UE_BULK || UE_GET_DIR(epd->bEndpointAddress)!=UE_DIR_OUT) { - aprint_error_dev(sc->sc_dev, "illegal endpoint(out:%d)\n", - fp->out_ep[i].ep); + aprint_error_dev(sc->sc_dev, + "illegal endpoint(out:%d)\n", fp->out_ep[i].ep); err = USBD_INVAL; goto error; } @@ -1084,8 +1083,9 @@ alloc_all_jacks(struct umidi_softc *sc) cn_spec = NULL; /* allocate/initialize structures */ - sc->sc_jacks = kmem_zalloc(sizeof(*sc->sc_out_jacks)*(sc->sc_in_num_jacks+ - sc->sc_out_num_jacks), KM_SLEEP); + sc->sc_jacks = + kmem_zalloc(sizeof(*sc->sc_out_jacks)*(sc->sc_in_num_jacks + + sc->sc_out_num_jacks), KM_SLEEP); if (!sc->sc_jacks) return USBD_NOMEM; sc->sc_out_jacks = @@ -1156,7 +1156,8 @@ free_all_jacks(struct umidi_softc *sc) mutex_enter(&sc->sc_lock); jacks = sc->sc_jacks; - len = sizeof(*sc->sc_out_jacks)*(sc->sc_in_num_jacks+sc->sc_out_num_jacks); + len = sizeof(*sc->sc_out_jacks) + * (sc->sc_in_num_jacks + sc->sc_out_num_jacks); sc->sc_jacks = sc->sc_in_jacks = sc->sc_out_jacks = NULL; mutex_exit(&sc->sc_lock); @@ -1737,9 +1738,9 @@ out_jack_output(struct umidi_jack *out_jack, u_char *src, int len, int cin) if (umididebug >= 100) microtime(&umidi_tv); #endif - DPRINTFN(100, ("umidi out: %"PRIu64".%06"PRIu64"s ep=%p cn=%d len=%d cin=%#x\n", - umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, - ep, out_jack->cable_number, len, cin)); + DPRINTFN(100, ("umidi out: %"PRIu64".%06"PRIu64 + "s ep=%p cn=%d len=%d cin=%#x\n", umidi_tv.tv_sec%100, + (uint64_t)umidi_tv.tv_usec, ep, out_jack->cable_number, len, cin)); packet = *ep->next_slot++; KASSERT(ep->buffer_size >= @@ -1890,9 +1891,10 @@ out_intr(struct usbd_xfer *xfer, void *priv, #endif usbd_get_xfer_status(xfer, NULL, NULL, &count, NULL); if (0 == count % UMIDI_PACKET_SIZE) { - DPRINTFN(200,("%s: %"PRIu64".%06"PRIu64"s out ep %p xfer length %u\n", - device_xname(ep->sc->sc_dev), - umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, ep, count)); + DPRINTFN(200, ("%s: %"PRIu64".%06"PRIu64"s out ep %p xfer " + "length %u\n", device_xname(ep->sc->sc_dev), + umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, ep, + count)); } else { DPRINTF(("%s: output endpoint %p odd transfer length %u\n", device_xname(ep->sc->sc_dev), ep, count)); diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index 496806e95be..f6b185cab4a 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $NetBSD: umodem.c,v 1.68 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umodem.c,v 1.69 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.68 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.69 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,10 +81,10 @@ Static struct ucom_methods umodem_methods = { .ucom_write = NULL, }; -int umodem_match(device_t, cfdata_t, void *); -void umodem_attach(device_t, device_t, void *); -int umodem_detach(device_t, int); -int umodem_activate(device_t, enum devact); +int umodem_match(device_t, cfdata_t, void *); +void umodem_attach(device_t, device_t, void *); +int umodem_detach(device_t, int); +int umodem_activate(device_t, enum devact); extern struct cfdriver umodem_cd; diff --git a/sys/dev/usb/umodem_common.c b/sys/dev/usb/umodem_common.c index b39baf5af13..3b270610201 100644 --- a/sys/dev/usb/umodem_common.c +++ b/sys/dev/usb/umodem_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: umodem_common.c,v 1.23 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umodem_common.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.23 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -243,8 +243,7 @@ umodem_common_attach(device_t self, struct umodem_softc *sc, ucaa->ucaa_iface = sc->sc_data_iface; ucaa->ucaa_arg = sc; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("umodem_common_attach: sc=%p\n", sc)); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, ucaa, @@ -676,8 +675,7 @@ umodem_common_detach(struct umodem_softc *sc, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 4ac0314d7e1..4d977961600 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uplcom.c,v 1.78 2016/05/11 06:38:04 skrll Exp $ */ +/* $NetBSD: uplcom.c,v 1.79 2016/07/07 06:55:42 msaitoh 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.78 2016/05/11 06:38:04 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.79 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -351,8 +351,8 @@ uplcom_attach(device_t parent, device_t self, void *aux) err = usbd_device2interface_handle(dev, UPLCOM_SECOND_IFACE_INDEX, &sc->sc_iface); if (err) { - aprint_error("\n%s: failed to get second interface, err=%s\n", - devname, usbd_errstr(err)); + aprint_error("\n%s: failed to get second interface, " + "err=%s\n", devname, usbd_errstr(err)); sc->sc_dying = 1; return; } @@ -414,8 +414,7 @@ uplcom_attach(device_t parent, device_t self, void *aux) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("uplcom: in=0x%x out=0x%x intr=0x%x\n", ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number )); @@ -456,8 +455,7 @@ uplcom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); if (rv == 0) pmf_device_deregister(self); @@ -759,7 +757,8 @@ uplcom_param(void *addr, int portno, struct termios *t) } Static usbd_status -uplcom_vendor_control_write(struct usbd_device *dev, uint16_t value, uint16_t index) +uplcom_vendor_control_write(struct usbd_device *dev, uint16_t value, + uint16_t index) { usb_device_request_t req; usbd_status err; @@ -842,8 +841,7 @@ uplcom_close(void *addr, int portno) } void -uplcom_intr(struct usbd_xfer *xfer, void *priv, - usbd_status status) +uplcom_intr(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct uplcom_softc *sc = priv; u_char *buf = sc->sc_intr_buf; @@ -862,7 +860,8 @@ uplcom_intr(struct usbd_xfer *xfer, void *priv, return; } - DPRINTF(("%s: uplcom status = %02x\n", device_xname(sc->sc_dev), buf[8])); + DPRINTF(("%s: uplcom status = %02x\n", device_xname(sc->sc_dev), + buf[8])); sc->sc_lsr = sc->sc_msr = 0; pstatus = buf[8]; diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 5d25a983374..116dbb18b20 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -1,4 +1,4 @@ -/* $NetBSD: urio.c,v 1.43 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: urio.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.43 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -122,12 +122,13 @@ static const struct usb_devno urio_devs[] = { }; #define urio_lookup(v, p) usb_lookup(urio_devs, v, p) -int urio_match(device_t, cfdata_t, void *); -void urio_attach(device_t, device_t, void *); -int urio_detach(device_t, int); -int urio_activate(device_t, enum devact); +int urio_match(device_t, cfdata_t, void *); +void urio_attach(device_t, device_t, void *); +int urio_detach(device_t, int); +int urio_activate(device_t, enum devact); extern struct cfdriver urio_cd; -CFATTACH_DECL_NEW(urio, sizeof(struct urio_softc), urio_match, urio_attach, urio_detach, urio_activate); +CFATTACH_DECL_NEW(urio, sizeof(struct urio_softc), urio_match, urio_attach, + urio_detach, urio_activate); int urio_match(device_t parent, cfdata_t match, void *aux) @@ -206,8 +207,7 @@ urio_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("urio_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; } @@ -248,8 +248,7 @@ urio_detach(device_t self, int flags) mn = device_unit(self); vdevgone(maj, mn, mn, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 1e8e9bd3f4d..ee9eba31646 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: uscanner.c,v 1.76 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uscanner.c,v 1.77 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.76 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.77 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -355,8 +355,7 @@ uscanner_attach(device_t parent, device_t self, void *aux) sc->sc_bulkout = ed_bulkout->bEndpointAddress; selinit(&sc->sc_selq); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; } @@ -636,8 +635,7 @@ uscanner_detach(device_t self, int flags) mn = device_unit(self) * USB_MAX_ENDPOINTS; vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); seldestroy(&sc->sc_selq); return 0; diff --git a/sys/dev/usb/uslsa.c b/sys/dev/usb/uslsa.c index 74f5885eb6e..f125c59e79a 100644 --- a/sys/dev/usb/uslsa.c +++ b/sys/dev/usb/uslsa.c @@ -1,4 +1,4 @@ -/* $NetBSD: uslsa.c,v 1.20 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uslsa.c,v 1.21 2016/07/07 06:55:42 msaitoh Exp $ */ /* from ugensa.c */ @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.20 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.21 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -156,11 +156,11 @@ uslsa_match(device_t parent, cfdata_t match, void *aux) { const struct usbif_attach_arg *uiaa = aux; - if (usb_lookup(uslsa_devs, uiaa->uiaa_vendor, uiaa->uiaa_product) != NULL) { + if (usb_lookup(uslsa_devs, uiaa->uiaa_vendor, uiaa->uiaa_product) + != NULL) return UMATCH_VENDOR_PRODUCT; - } else { + else return UMATCH_NONE; - } } static void @@ -202,8 +202,7 @@ uslsa_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_methods = &uslsa_methods; ucaa.ucaa_arg = sc; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1; for (i = 0; i < id->bNumEndpoints; i++) { @@ -278,8 +277,7 @@ uslsa_detach(device_t self, int flags) rv = config_detach(sc->sc_subdev, flags); } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (rv); } @@ -348,7 +346,8 @@ uslsa_set(void *vsc, int portno, int reg, int onoff) sc = vsc; - DPRINTF((sc->sc_dev, "%s(%p, %d, %d, %d)\n", __func__, vsc, portno, reg, onoff)); + DPRINTF((sc->sc_dev, "%s(%p, %d, %d, %d)\n", __func__, vsc, portno, + reg, onoff)); if (sc->sc_dying) { return; @@ -415,7 +414,8 @@ uslsa_param(void *vsc, int portno, struct termios *t) __func__, baud, usbd_errstr(status)); value = SLSA_RV_BAUDDIV(t->c_ospeed); - if ((ret = uslsa_request_set(sc, SLSA_R_SET_BAUDDIV, value)) != 0) { + if ((ret = uslsa_request_set(sc, SLSA_R_SET_BAUDDIV, value)) + != 0) { device_printf(sc->sc_dev, "%s: SET_BAUDDIV failed\n", __func__); return ret; diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index d82257aa6a1..2cd31e93498 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: usscanner.c,v 1.39 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: usscanner.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.39 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $"); #include "scsibus.h" #include <sys/param.h> @@ -198,8 +198,8 @@ usscanner_attach(device_t parent, device_t self, void *aux) err = usbd_set_config_no(dev, USSCANNER_CONFIG_NO, 1); if (err) { - aprint_error_dev(self, "failed to set configuration" - ", err=%s\n", usbd_errstr(err)); + aprint_error_dev(self, "failed to set configuration, err=%s\n", + usbd_errstr(err)); return; } @@ -326,8 +326,7 @@ usscanner_attach(device_t parent, device_t self, void *aux) sc->sc_channel.chan_nluns = 1; sc->sc_channel.chan_id = USSCANNER_SCSIID_HOST; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_child = config_found(sc->sc_dev, &sc->sc_channel, scsiprint); @@ -385,8 +384,7 @@ usscanner_detach(device_t self, int flags) else rv = 0; - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } @@ -471,8 +469,7 @@ usscanner_sense(struct usscanner_softc *sc) } Static void -usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; int s; @@ -484,7 +481,8 @@ usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, printf("%s: !UAS_STATUS\n", device_xname(sc->sc_dev)); } if (sc->sc_status != 0) { - printf("%s: status byte=0x%02x\n", device_xname(sc->sc_dev), sc->sc_status); + printf("%s: status byte=0x%02x\n", device_xname(sc->sc_dev), + sc->sc_status); } #endif /* XXX what should we do on non-0 status */ @@ -499,8 +497,7 @@ usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_data_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_data_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -539,8 +536,7 @@ usscanner_data_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_sensedata_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_sensedata_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -593,8 +589,7 @@ usscanner_done(struct usscanner_softc *sc) } Static void -usscanner_sensecmd_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_sensecmd_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -637,8 +632,7 @@ usscanner_sensecmd_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_cmd_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_cmd_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -699,7 +693,8 @@ usscanner_cmd_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, void *arg) +usscanner_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, + void *arg) { struct scsipi_xfer *xs; struct usscanner_softc *sc = diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c index 63c49a337e5..6d66d5b0fd3 100644 --- a/sys/dev/usb/ustir.c +++ b/sys/dev/usb/ustir.c @@ -1,4 +1,4 @@ -/* $NetBSD: ustir.c,v 1.34 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ustir.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.34 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,8 +289,7 @@ ustir_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("ustir_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ia.ia_type = IR_TYPE_IRFRAME; ia.ia_methods = &ustir_methods; @@ -366,8 +365,7 @@ ustir_detach(device_t self, int flags) if (sc->sc_child != NULL) rv = config_detach(sc->sc_child, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); seldestroy(&sc->sc_rd_sel); seldestroy(&sc->sc_wr_sel); diff --git a/sys/dev/usb/utoppy.c b/sys/dev/usb/utoppy.c index 0cc5daf7f96..0763c601f09 100644 --- a/sys/dev/usb/utoppy.c +++ b/sys/dev/usb/utoppy.c @@ -1,4 +1,4 @@ -/* $NetBSD: utoppy.c,v 1.25 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: utoppy.c,v 1.26 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.25 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.26 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -194,12 +194,13 @@ const struct cdevsw utoppy_cdevsw = { #define UTOPPYUNIT(n) (minor(n)) -int utoppy_match(device_t, cfdata_t, void *); -void utoppy_attach(device_t, device_t, void *); -int utoppy_detach(device_t, int); -int utoppy_activate(device_t, enum devact); +int utoppy_match(device_t, cfdata_t, void *); +void utoppy_attach(device_t, device_t, void *); +int utoppy_detach(device_t, int); +int utoppy_activate(device_t, enum devact); extern struct cfdriver utoppy_cd; -CFATTACH_DECL_NEW(utoppy, sizeof(struct utoppy_softc), utoppy_match, utoppy_attach, utoppy_detach, utoppy_activate); +CFATTACH_DECL_NEW(utoppy, sizeof(struct utoppy_softc), utoppy_match, + utoppy_attach, utoppy_detach, utoppy_activate); int utoppy_match(device_t parent, cfdata_t match, void *aux) @@ -321,8 +322,7 @@ utoppy_attach(device_t parent, device_t self, void *aux) sc->sc_out_buf = usbd_get_buffer(sc->sc_out_xfer); sc->sc_in_buf = usbd_get_buffer(sc->sc_in_xfer); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -382,8 +382,7 @@ utoppy_detach(device_t self, int flags) mn = device_unit(self); vdevgone(maj, mn, mn, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } @@ -577,7 +576,8 @@ utoppy_send_packet(struct utoppy_softc *sc, uint16_t cmd, uint32_t timeout) if (len >= UTOPPY_BSIZE) { DPRINTF(UTOPPY_DBG_SEND_PACKET, ("%s: utoppy_send_packet: " - "packet too big (%d)\n", device_xname(sc->sc_dev), (int)len)); + "packet too big (%d)\n", device_xname(sc->sc_dev), + (int)len)); return EINVAL; } @@ -645,7 +645,8 @@ utoppy_send_packet(struct utoppy_softc *sc, uint16_t cmd, uint32_t timeout) } while (err == 0 && len); DPRINTF(UTOPPY_DBG_SEND_PACKET, ("%s: utoppy_send_packet: " - "usbd_bulk_transfer() returned %d.\n", device_xname(sc->sc_dev),err)); + "usbd_bulk_transfer() returned %d.\n", + device_xname(sc->sc_dev),err)); return err ? utoppy_usbd_status2errno(err) : 0; } @@ -1400,8 +1401,7 @@ utoppyopen(dev_t dev, int flag, int mode, } int -utoppyclose(dev_t dev, int flag, int mode, - struct lwp *l) +utoppyclose(dev_t dev, int flag, int mode, struct lwp *l) { struct utoppy_softc *sc; usbd_status err; @@ -1413,8 +1413,8 @@ utoppyclose(dev_t dev, int flag, int mode, if (sc->sc_state < UTOPPY_STATE_IDLE) { /* We are being forced to close before the open completed. */ - DPRINTF(UTOPPY_DBG_CLOSE, ("%s: utoppyclose: not properly open:" - " %s\n", device_xname(sc->sc_dev), + DPRINTF(UTOPPY_DBG_CLOSE, ("%s: utoppyclose: not properly " + "open: %s\n", device_xname(sc->sc_dev), utoppy_state_string(sc->sc_state))); return 0; } @@ -1560,8 +1560,8 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) sc->sc_refcnt++; err = 0; - DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: PRE-WRITEFILE: resid %ld, " - "wr_size %lld, wr_offset %lld\n", device_xname(sc->sc_dev), + DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: PRE-WRITEFILE: resid " + "%ld, wr_size %lld, wr_offset %lld\n", device_xname(sc->sc_dev), (u_long)uio->uio_resid, sc->sc_wr_size, sc->sc_wr_offset)); while (sc->sc_state == UTOPPY_STATE_WRITEFILE && @@ -1578,8 +1578,8 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) err = uiomove(utoppy_current_ptr(sc->sc_out_data), len, uio); if (err) { - DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: uiomove() " - "returned %d\n", device_xname(sc->sc_dev), err)); + DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: uiomove()" + " returned %d\n", device_xname(sc->sc_dev), err)); break; } @@ -1607,9 +1607,10 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) sc->sc_wr_size -= len; } - DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: POST-WRITEFILE: resid %ld," - " wr_size %lld, wr_offset %lld, err %d\n", device_xname(sc->sc_dev), - (u_long)uio->uio_resid, sc->sc_wr_size, sc->sc_wr_offset, err)); + DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: POST-WRITEFILE: resid " + "%ld, wr_size %lld, wr_offset %lld, err %d\n", + device_xname(sc->sc_dev), (u_long)uio->uio_resid, sc->sc_wr_size, + sc->sc_wr_offset, err)); if (err == 0 && sc->sc_wr_size == 0) { DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: sending " @@ -1627,7 +1628,8 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) sc->sc_state = UTOPPY_STATE_IDLE; DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: state %s\n", - device_xname(sc->sc_dev), utoppy_state_string(sc->sc_state))); + device_xname(sc->sc_dev), + utoppy_state_string(sc->sc_state))); } if (--sc->sc_refcnt < 0) @@ -1669,8 +1671,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, err = 0; sc->sc_turbo_mode = *((int *)data) ? 1 : 0; DPRINTF(UTOPPY_DBG_IOCTL, ("%s: utoppyioctl: UTOPPYIOTURBO: " - "%s\n", device_xname(sc->sc_dev), sc->sc_turbo_mode ? "On" : - "Off")); + "%s\n", device_xname(sc->sc_dev), + sc->sc_turbo_mode ? "On" : "Off")); break; case UTOPPYIOCANCEL: @@ -1709,8 +1711,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, if ((err = utoppy_add_path(sc, ur->ur_new_path, 1)) != 0) break; - err = utoppy_command(sc, UTOPPY_CMD_RENAME, UTOPPY_LONG_TIMEOUT, - &resp); + err = utoppy_command(sc, UTOPPY_CMD_RENAME, + UTOPPY_LONG_TIMEOUT, &resp); if (err) break; @@ -1785,8 +1787,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, urf = (struct utoppy_readfile *)data; DPRINTF(UTOPPY_DBG_IOCTL,("%s: utoppyioctl: UTOPPYIOREADFILE " - "%s, offset %lld\n", device_xname(sc->sc_dev), urf->ur_path, - urf->ur_offset)); + "%s, offset %lld\n", device_xname(sc->sc_dev), + urf->ur_path, urf->ur_offset)); if ((err = utoppy_turbo_mode(sc, sc->sc_turbo_mode)) != 0) break; @@ -1823,8 +1825,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, uwfp = utoppy_current_ptr(sc->sc_out_data); if ((err = utoppy_add_path(sc, uw->uw_path, 1)) != 0) { - DPRINTF(UTOPPY_DBG_WRITE,("%s: utoppyioctl: add_path() " - "returned %d\n", device_xname(sc->sc_dev), err)); + DPRINTF(UTOPPY_DBG_WRITE,("%s: utoppyioctl: add_path()" + " returned %d\n", device_xname(sc->sc_dev), err)); break; } diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 6586d2faa69..441a8e8bd30 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvideo.c,v 1.42 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uvideo.c,v 1.43 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2008 Patrick Mahoney @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.42 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.43 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -608,8 +608,7 @@ uvideo_attach(device_t parent, device_t self, void *aux) } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -692,8 +691,7 @@ uvideo_detach(device_t self, int flags) if (sc->sc_videodev != NULL) rv = config_detach(sc->sc_videodev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); usbd_devinfo_free(sc->sc_devname); diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index 68334e41096..f11a7bcd571 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvisor.c,v 1.46 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uvisor.c,v 1.47 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.46 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.47 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -281,8 +281,7 @@ uvisor_attach(device_t parent, device_t self, void *aux) goto bad; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (sc->sc_flags & VISOR) { sc->sc_numcon = UGETW(coninfo.num_ports); diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index 34d432b6867..900a3e9e85d 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvscom.c,v 1.29 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uvscom.c,v 1.30 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.29 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.30 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -355,11 +355,10 @@ uvscom_attach(device_t parent, device_t self, void *aux) DPRINTF(("uvscom: in = 0x%x out = 0x%x intr = 0x%x\n", ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("uplcom: in=0x%x out=0x%x intr=0x%x\n", - ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number )); + ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number )); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -396,8 +395,7 @@ uvscom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } |
