 @@ -1,34 +1,34 @@
-/*	$NetBSD: moscom.c,v 1.8.14.6 2015/03/21 11:33:37 skrll Exp $	*/
+/*	$NetBSD: moscom.c,v 1.8.14.7 2016/04/16 13:22:00 skrll Exp $	*/
 /*	$OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.6 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.7 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -187,100 +187,100 @@ moscom_match(device_t parent, cfdata_t m
+{
 	struct usb_attach_arg *uaa = aux;
 	return (moscom_lookup(uaa->uaa_vendor, uaa->uaa_product) != NULL ?
 		UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+}
 void
 moscom_attach(device_t parent, device_t self, void *aux)
+{
 	struct moscom_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	usbd_status error;
 	int i;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_dev = self;
-	memset(&uca, 0, sizeof(uca));
+	memset(&ucaa, 0, sizeof(ucaa));
 	sc->sc_udev = uaa->uaa_device;
 	if (usbd_set_config_index(sc->sc_udev, MOSCOM_CONFIG_NO, 1) != 0) {
 		aprint_error_dev(self, "could not set configuration no\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	/* get the first interface handle */
 	error = usbd_device2interface_handle(sc->sc_udev, MOSCOM_IFACE_NO,
 	    &sc->sc_iface);
 	if (error != 0) {
 		aprint_error_dev(self, "could not get interface handle\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	id = usbd_get_interface_descriptor(sc->sc_iface);
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "no endpoint descriptor found for %d\n", i);
 			sc->sc_dying = 1;
 			return;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK)
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK)
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
+	}
-	if (uca.bulkin == -1 || uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkin == -1 || ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "missing endpoint\n");
 		sc->sc_dying = 1;
 		return;
+	}
-	uca.ibufsize = MOSCOMBUFSZ;
+	ucaa.ucaa_ibufsize = MOSCOMBUFSZ;
-	uca.obufsize = MOSCOMBUFSZ;
+	ucaa.ucaa_obufsize = MOSCOMBUFSZ;
-	uca.ibufsizepad = MOSCOMBUFSZ;
+	ucaa.ucaa_ibufsizepad = MOSCOMBUFSZ;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = sc->sc_udev;
+	ucaa.ucaa_device = sc->sc_udev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &moscom_methods;
+	ucaa.ucaa_methods = &moscom_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 	    sc->sc_dev);
-	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	return;
+}
 void
 moscom_childdet(device_t self, device_t child)
+{
 	struct moscom_softc *sc = device_private(self);
 	KASSERT(sc->sc_subdev == child);
 	sc->sc_subdev = NULL;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: u3g.c,v 1.31.2.10 2015/10/06 21:32:15 skrll Exp $	*/
+/*	$NetBSD: u3g.c,v 1.31.2.11 2016/04/16 13:22:00 skrll Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -40,27 +40,27 @@
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  * $FreeBSD$
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.10 2015/10/06 21:32:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.11 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdi_util.h>
 @@ -718,102 +718,102 @@ u3g_match(device_t parent, cfdata_t matc
 	return id->bInterfaceClass == UICLASS_VENDOR ?
 	    UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
+}
 static void
 u3g_attach(device_t parent, device_t self, void *aux)
+{
 	struct u3g_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = aux;
 	struct usbd_device *dev = uiaa->uiaa_device;
 	struct usbd_interface *iface;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	usbd_status error;
 	int n, intr_address, intr_size;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	sc->sc_dev = self;
 	sc->sc_dying = false;
 	sc->sc_udev = dev;
 	error = usbd_device2interface_handle(dev, uiaa->uiaa_ifaceno, &iface);
 	if (error) {
 		aprint_error_dev(self, "failed to get interface, err=%s\n",
 		    usbd_errstr(error));
 		return;
+	}
 	id = usbd_get_interface_descriptor(iface);
-	uca.info = "3G Modem";
+	ucaa.ucaa_info = "3G Modem";
-	uca.ibufsize = U3G_BUFF_SIZE;
+	ucaa.ucaa_ibufsize = U3G_BUFF_SIZE;
-	uca.obufsize = U3G_BUFF_SIZE;
+	ucaa.ucaa_obufsize = U3G_BUFF_SIZE;
-	uca.ibufsizepad = U3G_BUFF_SIZE;
+	ucaa.ucaa_ibufsizepad = U3G_BUFF_SIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = iface;
+	ucaa.ucaa_iface = iface;
-	uca.methods = &u3g_methods;
+	ucaa.ucaa_methods = &u3g_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.portno = -1;
+	ucaa.ucaa_portno = -1;
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	sc->sc_ifaceno = uiaa->uiaa_ifaceno;
 	intr_address = -1;
 	intr_size = 0;
 	for (n = 0; n < id->bNumEndpoints; n++) {
 		ed = usbd_interface2endpoint_descriptor(iface, n);
 		if (ed == NULL) {
 			aprint_error_dev(self, "no endpoint descriptor "
 			    "for %d (interface: %d)\n", n, sc->sc_ifaceno);
 			sc->sc_dying = true;
 			return;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) {
 			intr_address = ed->bEndpointAddress;
 			intr_size = UGETW(ed->wMaxPacketSize);
 		} else
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		} else
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
+		}
-		if (uca.bulkin != -1 && uca.bulkout != -1) {
+		if (ucaa.ucaa_bulkin != -1 && ucaa.ucaa_bulkout != -1) {
 			struct u3g_com *com;
 			if (sc->sc_ncom == __arraycount(sc->sc_com)) {
 				aprint_error_dev(self, "Need to configure "
 				    "more than %zu ttys", sc->sc_ncom);
 				continue;
+			}
-			uca.portno = sc->sc_ncom++;
+			ucaa.ucaa_portno = sc->sc_ncom++;
-			com = &sc->sc_com[uca.portno];
+			com = &sc->sc_com[ucaa.ucaa_portno];
 			com->c_outpins = 0;
 			com->c_msr = UMSR_DSR | UMSR_CTS | UMSR_DCD;
 			com->c_open = false;
 			com->c_purging = false;
 			com->c_dev = config_found_sm_loc(self, "ucombus",
-				NULL, &uca, ucomprint, ucomsubmatch);
+				NULL, &ucaa, ucomprint, ucomsubmatch);
-			uca.bulkin = -1;
+			ucaa.ucaa_bulkin = -1;
-			uca.bulkout = -1;
+			ucaa.ucaa_bulkout = -1;
+		}
+	}
 	if (sc->sc_ncom == 0) {
 		aprint_error_dev(self, "Missing bulk in/out for interface %d\n",
 		    sc->sc_ifaceno);
 		sc->sc_dying = true;
 		return;
+	}
 	/*
 	 * If the interface has an interrupt pipe, open it immediately so
 	 * that we can track input pin state changes regardless of whether

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uark.c,v 1.6.14.4 2015/09/28 16:24:19 skrll Exp $	*/
+/*	$NetBSD: uark.c,v 1.6.14.5 2016/04/16 13:22:00 skrll Exp $	*/
 /*	$OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $	*/
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -89,49 +89,49 @@ struct ucom_methods uark_methods = {
 };
 static const struct usb_devno uark_devs[] = {
 	{ USB_VENDOR_ARKMICROCHIPS, USB_PRODUCT_ARKMICROCHIPS_USBSERIAL },
 };
 int             uark_match(device_t, cfdata_t, void *);
 void            uark_attach(device_t, device_t, void *);
 int             uark_detach(device_t, int);
 int             uark_activate(device_t, enum devact);
 extern struct cfdriver uark_cd;
 CFATTACH_DECL_NEW(uark, sizeof(struct uark_softc), uark_match, uark_attach, uark_detach, uark_activate);
 int
 uark_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	return (usb_lookup(uark_devs, uaa->uaa_vendor, uaa->uaa_product) != NULL) ?
 	    UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
+}
 void
 uark_attach(device_t parent, device_t self, void *aux)
+{
 	struct uark_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	char *devinfop;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	usbd_status error;
 	int i;
-	memset(&uca, 0, sizeof(uca));
+	memset(&ucaa, 0, sizeof(ucaa));
 	sc->sc_dev = self;
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_udev = dev;
 	if (usbd_set_config_index(sc->sc_udev, UARK_CONFIG_NO, 1) != 0) {
 		aprint_error_dev(self, "could not set configuration no\n");
 		sc->sc_dying = 1;
 @@ -139,64 +139,64 @@ uark_attach(device_t parent, device_t se
+	}
 	/* get the first interface handle */
 	error = usbd_device2interface_handle(sc->sc_udev, UARK_IFACE_NO,
 	    &sc->sc_iface);
 	if (error != 0) {
 		aprint_error_dev(self, "could not get interface handle\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	id = usbd_get_interface_descriptor(sc->sc_iface);
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self, "no endpoint descriptor found for %d\n",
 			    i);
 			sc->sc_dying = 1;
 			return;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK)
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK)
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
+	}
-	if (uca.bulkin == -1 || uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkin == -1 || ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "missing endpoint\n");
 		sc->sc_dying = 1;
 		return;
+	}
-	uca.ibufsize = UARKBUFSZ;
+	ucaa.ucaa_ibufsize = UARKBUFSZ;
-	uca.obufsize = UARKBUFSZ;
+	ucaa.ucaa_obufsize = UARKBUFSZ;
-	uca.ibufsizepad = UARKBUFSZ;
+	ucaa.ucaa_ibufsizepad = UARKBUFSZ;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = sc->sc_udev;
+	ucaa.ucaa_device = sc->sc_udev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &uark_methods;
+	ucaa.ucaa_methods = &uark_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 	    sc->sc_dev);
-	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	return;
+}
 int
 uark_detach(device_t self, int flags)
+{
 	struct uark_softc *sc = device_private(self);
 	int rv = 0;
 	sc->sc_dying = 1;
 	if (sc->sc_subdev != NULL) {
 @@ -308,27 +308,27 @@ uark_param(void *vsc, int portno, struct
 		/*  xon/xoff flow ctl */
 	} else {
 		/* disable flow ctl */
+	}
 #endif
 	return (0);
+}
 void
 uark_get_status(void *vsc, int portno, u_char *lsr, u_char *msr)
+{
 	struct uark_softc *sc = vsc;
 	if (msr != NULL)
 		*msr = sc->sc_msr;
 	if (lsr != NULL)
 		*lsr = sc->sc_lsr;
+}
 void
 uark_break(void *vsc, int portno, int onoff)
+{
 #if 0
 	struct uark_softc *sc = vsc;
 #ifdef UARK_DEBUG

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ubsa.c,v 1.30.16.6 2015/12/28 08:28:11 skrll Exp $	*/
+/*	$NetBSD: ubsa.c,v 1.30.16.7 2016/04/16 13:22:00 skrll Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -44,27 +44,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.30.16.6 2015/12/28 08:28:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.30.16.7 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 @@ -146,27 +146,27 @@ ubsa_match(device_t parent, cfdata_t mat
+}
 void
 ubsa_attach(device_t parent, device_t self, void *aux)
+{
 	struct ubsa_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	usb_config_descriptor_t *cdesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	usbd_status err;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	int i;
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
         sc->sc_udev = dev;
 	sc->sc_config_index = UBSA_DEFAULT_CONFIG_INDEX;
 @@ -222,81 +222,81 @@ ubsa_attach(device_t parent, device_t se
 	err = usbd_device2interface_handle(dev, UBSA_IFACE_INDEX_OFFSET,
 			 &sc->sc_iface[0]);
 	if (err) {
 		/* can not get main interface */
 		sc->sc_dying = 1;
 		goto error;
+	}
 	/* Find the endpoints */
 	id = usbd_get_interface_descriptor(sc->sc_iface[0]);
 	sc->sc_iface_number[0] = id->bInterfaceNumber;
 	/* initialize endpoints */
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface[0], i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			     "no endpoint descriptor for %d\n", i);
 			break;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) {
 			sc->sc_intr_number = ed->bEndpointAddress;
 			sc->sc_isize = UGETW(ed->wMaxPacketSize);
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
-			uca.ibufsize = UGETW(ed->wMaxPacketSize);
+			ucaa.ucaa_ibufsize = UGETW(ed->wMaxPacketSize);
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
-			uca.obufsize = UGETW(ed->wMaxPacketSize);
+			ucaa.ucaa_obufsize = UGETW(ed->wMaxPacketSize);
+		}
 	} /* end of Endpoint loop */
 	if (sc->sc_intr_number == -1) {
 		aprint_error_dev(self, "Could not find interrupt in\n");
 		sc->sc_dying = 1;
 		goto error;
+	}
-	if (uca.bulkin == -1) {
+	if (ucaa.ucaa_bulkin == -1) {
 		aprint_error_dev(self, "Could not find data bulk in\n");
 		sc->sc_dying = 1;
 		goto error;
+	}
-	if (uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "Could not find data bulk out\n");
 		sc->sc_dying = 1;
 		goto error;
+	}
-	uca.portno = 0;
+	ucaa.ucaa_portno = 0;
 	/* bulkin, bulkout set above */
-	uca.ibufsizepad = uca.ibufsize;
+	ucaa.ucaa_ibufsizepad = ucaa.ucaa_ibufsize;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = sc->sc_iface[0];
+	ucaa.ucaa_iface = sc->sc_iface[0];
-	uca.methods = &ubsa_methods;
+	ucaa.ucaa_methods = &ubsa_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	DPRINTF(("ubsa: int#=%d, in = 0x%x, out = 0x%x, intr = 0x%x\n",
-    		i, uca.bulkin, uca.bulkout, sc->sc_intr_number));
+    		i, ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number));
-	sc->sc_subdevs[0] = config_found_sm_loc(self, "ucombus", NULL, &uca,
+	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);
 	return;
 error:
 	return;
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uchcom.c,v 1.13.6.7 2016/03/20 09:15:07 skrll Exp $	*/
+/*	$NetBSD: uchcom.c,v 1.13.6.8 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Takuya SHIOZAKI (tshiozak@netbsd.org).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.7 2016/03/20 09:15:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.8 2016/04/16 13:22:00 skrll Exp $");
 /*
  * driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 @@ -233,27 +233,27 @@ uchcom_match(device_t parent, cfdata_t m
 	return (uchcom_lookup(uaa->uaa_vendor, uaa->uaa_product) != NULL ?
 		UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+}
 void
 uchcom_attach(device_t parent, device_t self, void *aux)
+{
 	struct uchcom_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	char *devinfop;
 	struct uchcom_endpoints endpoints;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_dev = self;
         sc->sc_udev = dev;
 	sc->sc_dying = 0;
 	sc->sc_dtr = sc->sc_rts = -1;
 	sc->sc_lsr = sc->sc_msr = 0;
 @@ -272,43 +272,43 @@ uchcom_attach(device_t parent, device_t
 		break;
+	}
 	if (find_ifaces(sc, &sc->sc_iface))
 		goto failed;
 	if (find_endpoints(sc, &endpoints))
 		goto failed;
 	sc->sc_intr_endpoint = endpoints.ep_intr;
 	sc->sc_intr_size = endpoints.ep_intr_size;
 	/* setup ucom layer */
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	uca.bulkin = endpoints.ep_bulkin;
+	ucaa.ucaa_bulkin = endpoints.ep_bulkin;
-	uca.bulkout = endpoints.ep_bulkout;
+	ucaa.ucaa_bulkout = endpoints.ep_bulkout;
-	uca.ibufsize = UCHCOMIBUFSIZE;
+	ucaa.ucaa_ibufsize = UCHCOMIBUFSIZE;
-	uca.obufsize = UCHCOMOBUFSIZE;
+	ucaa.ucaa_obufsize = UCHCOMOBUFSIZE;
-	uca.ibufsizepad = UCHCOMIBUFSIZE;
+	ucaa.ucaa_ibufsizepad = UCHCOMIBUFSIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &uchcom_methods;
+	ucaa.ucaa_methods = &uchcom_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 			   sc->sc_dev);
-	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	return;
 failed:
 	sc->sc_dying = 1;
 	return;
+}
 void
 uchcom_childdet(device_t self, device_t child)
+{
 	struct uchcom_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ucom.c,v 1.108.2.12 2016/02/06 07:59:26 skrll Exp $	*/
+/*	$NetBSD: ucom.c,v 1.108.2.13 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -24,27 +24,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This code is very heavily based on the 16550 driver, com.c.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.12 2016/02/06 07:59:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.13 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 @@ -241,49 +241,50 @@ extern struct cfdriver ucom_cd;
 CFATTACH_DECL_NEW(ucom, sizeof(struct ucom_softc), ucom_match, ucom_attach,
     ucom_detach, ucom_activate);
 int
 ucom_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 void
 ucom_attach(device_t parent, device_t self, void *aux)
+{
 	struct ucom_softc *sc = device_private(self);
-	struct ucom_attach_args *uca = aux;
+	struct ucom_attach_args *ucaa = aux;
 	struct tty *tp;
 	UCOMHIST_FUNC(); UCOMHIST_CALLED();
-	if (uca->info != NULL)
+	if (ucaa->ucaa_info != NULL)
-		aprint_normal(": %s", uca->info);
+		aprint_normal(": %s", ucaa->ucaa_info);
 	aprint_normal("\n");
-	prop_dictionary_set_int32(device_properties(self), "port", uca->portno);
+	prop_dictionary_set_int32(device_properties(self), "port",
 	    ucaa->ucaa_portno);
 	sc->sc_dev = self;
-	sc->sc_udev = uca->device;
+	sc->sc_udev = ucaa->ucaa_device;
-	sc->sc_iface = uca->iface;
+	sc->sc_iface = ucaa->ucaa_iface;
-	sc->sc_bulkout_no = uca->bulkout;
+	sc->sc_bulkout_no = ucaa->ucaa_bulkout;
-	sc->sc_bulkin_no = uca->bulkin;
+	sc->sc_bulkin_no = ucaa->ucaa_bulkin;
-	sc->sc_ibufsize = uca->ibufsize;
+	sc->sc_ibufsize = ucaa->ucaa_ibufsize;
-	sc->sc_ibufsizepad = uca->ibufsizepad;
+	sc->sc_ibufsizepad = ucaa->ucaa_ibufsizepad;
-	sc->sc_obufsize = uca->obufsize;
+	sc->sc_obufsize = ucaa->ucaa_obufsize;
-	sc->sc_opkthdrlen = uca->opkthdrlen;
+	sc->sc_opkthdrlen = ucaa->ucaa_opkthdrlen;
-	sc->sc_methods = uca->methods;
+	sc->sc_methods = ucaa->ucaa_methods;
-	sc->sc_parent = uca->arg;
+	sc->sc_parent = ucaa->ucaa_arg;
-	sc->sc_portno = uca->portno;
+	sc->sc_portno = ucaa->ucaa_portno;
 	sc->sc_lsr = 0;
 	sc->sc_msr = 0;
 	sc->sc_mcr = 0;
 	sc->sc_tx_stopped = 0;
 	sc->sc_swflags = 0;
 	sc->sc_opening = 0;
 	sc->sc_refcnt = 0;
 	sc->sc_dying = 0;
 	sc->sc_si = softint_establish(SOFTINT_USB, ucom_softintr, sc);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	cv_init(&sc->sc_opencv, "ucomopen");
 @@ -1483,34 +1484,34 @@ ucom_cleanup(struct ucom_softc *sc)
 		struct usbd_pipe *bulkout_pipe = sc->sc_bulkout_pipe;
 		sc->sc_bulkout_pipe = NULL;
 		mutex_exit(&sc->sc_lock);
 		usbd_abort_pipe(bulkout_pipe);
 		mutex_enter(&sc->sc_lock);
+	}
+}
 #endif /* NUCOM > 0 */
 int
 ucomprint(void *aux, const char *pnp)
+{
-	struct ucom_attach_args *uca = aux;
+	struct ucom_attach_args *ucaa = aux;
 	if (pnp)
 		aprint_normal("ucom at %s", pnp);
-	if (uca->portno != UCOM_UNK_PORTNO)
+	if (ucaa->ucaa_portno != UCOM_UNK_PORTNO)
-		aprint_normal(" portno %d", uca->portno);
+		aprint_normal(" portno %d", ucaa->ucaa_portno);
 	return UNCONF;
+}
 int
 ucomsubmatch(device_t parent, cfdata_t cf,
 	     const int *ldesc, void *aux)
+{
-	struct ucom_attach_args *uca = aux;
+	struct ucom_attach_args *ucaa = aux;
-	if (uca->portno != UCOM_UNK_PORTNO &&
+	if (ucaa->ucaa_portno != UCOM_UNK_PORTNO &&
 	    cf->cf_loc[UCOMBUSCF_PORTNO] != UCOMBUSCF_PORTNO_DEFAULT &&
-	    cf->cf_loc[UCOMBUSCF_PORTNO] != uca->portno)
+	    cf->cf_loc[UCOMBUSCF_PORTNO] != ucaa->ucaa_portno)
 		return 0;
 	return config_match(parent, cf, aux);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ucomvar.h,v 1.20.24.3 2015/03/19 17:26:43 skrll Exp $	*/
+/*	$NetBSD: ucomvar.h,v 1.20.24.4 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -80,30 +80,30 @@ struct ucom_methods {
 /* modem status register */
 /* All deltas are from the last read of the MSR. */
 #define	UMSR_DCD	0x80	/* Current Data Carrier Detect */
 #define	UMSR_RI		0x40	/* Current Ring Indicator */
 #define	UMSR_DSR	0x20	/* Current Data Set Ready */
 #define	UMSR_CTS	0x10	/* Current Clear to Send */
 #define	UMSR_DDCD	0x08	/* DCD has changed state */
 #define	UMSR_TERI	0x04	/* RI has toggled low to high */
 #define	UMSR_DDSR	0x02	/* DSR has changed state */
 #define	UMSR_DCTS	0x01	/* CTS has changed state */
 struct ucom_attach_args {
-	int portno;
+	int ucaa_portno;
-	int bulkin;
+	int ucaa_bulkin;
-	int bulkout;
+	int ucaa_bulkout;
-	u_int ibufsize;
+	u_int ucaa_ibufsize;
-	u_int ibufsizepad;
+	u_int ucaa_ibufsizepad;
-	u_int obufsize;
+	u_int ucaa_obufsize;
-	u_int opkthdrlen;
+	u_int ucaa_opkthdrlen;
-	const char *info;	/* attach message */
+	const char *ucaa_info;	/* attach message */
-	struct usbd_device *device;
+	struct usbd_device *ucaa_device;
-	struct usbd_interface *iface;
+	struct usbd_interface *ucaa_iface;
-	const struct ucom_methods *methods;
+	const struct ucom_methods *ucaa_methods;
-	void *arg;
+	void *ucaa_arg;
 };
 int ucomprint(void *, const char *);
 int ucomsubmatch(device_t t, cfdata_t, const int *, void *);
 void ucom_status_change(struct ucom_softc *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uftdi.c,v 1.59.6.8 2015/04/06 15:18:13 skrll Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.59.6.9 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.6.8 2015/04/06 15:18:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.6.9 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -197,27 +197,27 @@ void
 uftdi_attach(device_t parent, device_t self, void *aux)
+{
 	struct uftdi_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	struct usbd_interface *iface;
 	usb_device_descriptor_t *ddesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	const char *devname = device_xname(self);
 	int i,idx;
 	usbd_status err;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	DPRINTFN(10,("\nuftdi_attach: sc=%p\n", sc));
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	/* Move the device into the configured state. */
 	err = usbd_set_config_index(dev, UFTDI_CONFIG_INDEX, 1);
 	if (err) {
 @@ -257,92 +257,92 @@ uftdi_attach(device_t parent, device_t s
 	for (idx = UFTDI_IFACE_INDEX; idx < sc->sc_numports; idx++) {
 		err = usbd_device2interface_handle(dev, idx, &iface);
 		if (err) {
 			aprint_error(
 			    "\n%s: failed to get interface idx=%d, err=%s\n",
 			    devname, idx, usbd_errstr(err));
 			goto bad;
+		}
 		id = usbd_get_interface_descriptor(iface);
 		sc->sc_iface[idx] = iface;
-		uca.bulkin = uca.bulkout = -1;
+		ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
-		uca.ibufsize = uca.obufsize = 0;
+		ucaa.ucaa_ibufsize = ucaa.ucaa_obufsize = 0;
 		for (i = 0; i < id->bNumEndpoints; i++) {
 			int addr, dir, attr;
 			ed = usbd_interface2endpoint_descriptor(iface, i);
 			if (ed == NULL) {
 				aprint_error_dev(self,
 				    "could not read endpoint descriptor: %s\n",
 				    usbd_errstr(err));
 				goto bad;
+			}
 			addr = ed->bEndpointAddress;
 			dir = UE_GET_DIR(ed->bEndpointAddress);
 			attr = ed->bmAttributes & UE_XFERTYPE;
 			if (dir == UE_DIR_IN && attr == UE_BULK) {
-				uca.bulkin = addr;
+				ucaa.ucaa_bulkin = addr;
-				uca.ibufsize = UGETW(ed->wMaxPacketSize);
+				ucaa.ucaa_ibufsize = UGETW(ed->wMaxPacketSize);
-				if (uca.ibufsize >= UFTDI_MAX_IBUFSIZE)
+				if (ucaa.ucaa_ibufsize >= UFTDI_MAX_IBUFSIZE)
-					uca.ibufsize = UFTDI_MAX_IBUFSIZE;
+					ucaa.ucaa_ibufsize = UFTDI_MAX_IBUFSIZE;
 			} else if (dir == UE_DIR_OUT && attr == UE_BULK) {
-				uca.bulkout = addr;
+				ucaa.ucaa_bulkout = addr;
-				uca.obufsize = UGETW(ed->wMaxPacketSize)
+				ucaa.ucaa_obufsize = UGETW(ed->wMaxPacketSize)
 				    - sc->sc_hdrlen;
-				if (uca.obufsize >= UFTDI_MAX_OBUFSIZE)
+				if (ucaa.ucaa_obufsize >= UFTDI_MAX_OBUFSIZE)
-					uca.obufsize = UFTDI_MAX_OBUFSIZE;
+					ucaa.ucaa_obufsize = UFTDI_MAX_OBUFSIZE;
 				/* Limit length if we have a 6-bit header.  */
 				if ((sc->sc_hdrlen > 0) &&
-				    (uca.obufsize > UFTDIOBUFSIZE))
+				    (ucaa.ucaa_obufsize > UFTDIOBUFSIZE))
-					uca.obufsize = UFTDIOBUFSIZE;
+					ucaa.ucaa_obufsize = UFTDIOBUFSIZE;
 			} else {
 				aprint_error_dev(self,
 				    "unexpected endpoint\n");
 				goto bad;
+			}
+		}
-		if (uca.bulkin == -1) {
+		if (ucaa.ucaa_bulkin == -1) {
 			aprint_error_dev(self,
 			    "Could not find data bulk in\n");
 			goto bad;
+		}
-		if (uca.bulkout == -1) {
+		if (ucaa.ucaa_bulkout == -1) {
 			aprint_error_dev(self,
 			    "Could not find data bulk out\n");
 			goto bad;
+		}
-		uca.portno = FTDI_PIT_SIOA + idx;
+		ucaa.ucaa_portno = FTDI_PIT_SIOA + idx;
-		/* bulkin, bulkout set above */
+		/* ucaa_bulkin, ucaa_bulkout set above */
-		if (uca.ibufsize == 0)
+		if (ucaa.ucaa_ibufsize == 0)
-			uca.ibufsize = UFTDIIBUFSIZE;
+			ucaa.ucaa_ibufsize = UFTDIIBUFSIZE;
-		uca.ibufsizepad = uca.ibufsize;
+		ucaa.ucaa_ibufsizepad = ucaa.ucaa_ibufsize;
-		if (uca.obufsize == 0)
+		if (ucaa.ucaa_obufsize == 0)
-			uca.obufsize = UFTDIOBUFSIZE - sc->sc_hdrlen;
+			ucaa.ucaa_obufsize = UFTDIOBUFSIZE - sc->sc_hdrlen;
-		uca.opkthdrlen = sc->sc_hdrlen;
+		ucaa.ucaa_opkthdrlen = sc->sc_hdrlen;
-		uca.device = dev;
+		ucaa.ucaa_device = dev;
-		uca.iface = iface;
+		ucaa.ucaa_iface = iface;
-		uca.methods = &uftdi_methods;
+		ucaa.ucaa_methods = &uftdi_methods;
-		uca.arg = sc;
+		ucaa.ucaa_arg = sc;
-		uca.info = NULL;
+		ucaa.ucaa_info = NULL;
 		DPRINTF(("uftdi: in=0x%x out=0x%x isize=0x%x osize=0x%x\n",
-			uca.bulkin, uca.bulkout,
+			ucaa.ucaa_bulkin, ucaa.ucaa_bulkout,
-			uca.ibufsize, uca.obufsize));
+			ucaa.ucaa_ibufsize, ucaa.ucaa_obufsize));
 		sc->sc_subdev[idx] = config_found_sm_loc(self, "ucombus", NULL,
-		    &uca, ucomprint, ucomsubmatch);
+		    &ucaa, ucomprint, ucomsubmatch);
+	}
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 			   sc->sc_dev);
 	return;
 bad:
 	DPRINTF(("uftdi_attach: ATTACH ERROR\n"));
 	sc->sc_dying = 1;
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ugensa.c,v 1.31.6.6 2015/03/21 11:33:37 skrll Exp $	*/
+/*	$NetBSD: ugensa.c,v 1.31.6.7 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland C. Dowdeswell <elric@netbsd.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.31.6.6 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.31.6.7 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -136,27 +136,27 @@ ugensa_match(device_t parent, cfdata_t m
 void
 ugensa_attach(device_t parent, device_t self, void *aux)
+{
 	struct ugensa_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	struct usbd_interface *iface;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	const char *devname = device_xname(self);
 	usbd_status err;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	int i;
 	DPRINTFN(10,("\nugensa_attach: sc=%p\n", sc));
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 @@ -174,80 +174,81 @@ ugensa_attach(device_t parent, device_t
 		       devname, usbd_errstr(err));
 		goto bad;
+	}
 	if (ugensa_lookup(uaa->uaa_vendor, uaa->uaa_product)->ugensa_flags & UNTESTED)
 		aprint_normal_dev(self, "WARNING: This device is marked as "
 		    "untested. Please submit a report via send-pr(1).\n");
 	id = usbd_get_interface_descriptor(iface);
 	sc->sc_udev = dev;
 	sc->sc_iface = iface;
-	uca.info = "Generic Serial Device";
+	ucaa.ucaa_info = "Generic Serial Device";
-	uca.ibufsize = UGENSA_BUFSIZE;
+	ucaa.ucaa_ibufsize = UGENSA_BUFSIZE;
-	uca.obufsize = UGENSA_BUFSIZE;
+	ucaa.ucaa_obufsize = UGENSA_BUFSIZE;
-	uca.ibufsizepad = UGENSA_BUFSIZE;
+	ucaa.ucaa_ibufsizepad = UGENSA_BUFSIZE;
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = iface;
+	ucaa.ucaa_iface = iface;
-	uca.methods = &ugensa_methods;
+	ucaa.ucaa_methods = &ugensa_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 			   sc->sc_dev);
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		int addr, dir, attr;
 		ed = usbd_interface2endpoint_descriptor(iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "could not read endpoint descriptor: %s\n",
 			    usbd_errstr(err));
 			goto bad;
+		}
 		addr = ed->bEndpointAddress;
 		dir = UE_GET_DIR(ed->bEndpointAddress);
 		attr = ed->bmAttributes & UE_XFERTYPE;
 		if (attr == UE_BULK) {
-			if (uca.bulkin == -1 && dir == UE_DIR_IN) {
+			if (ucaa.ucaa_bulkin == -1 && dir == UE_DIR_IN) {
 				DPRINTF(("%s: Bulk in %d\n", devname, i));
-				uca.bulkin = addr;
+				ucaa.ucaa_bulkin = addr;
 				continue;
+			}
-			if (uca.bulkout == -1 && dir == UE_DIR_OUT) {
+			if (ucaa.ucaa_bulkout == -1 && dir == UE_DIR_OUT) {
 				DPRINTF(("%s: Bulk out %d\n", devname, i));
-				uca.bulkout = addr;
+				ucaa.ucaa_bulkout = addr;
 				continue;
+			}
+		}
 		aprint_error_dev(self, "unexpected endpoint\n");
+	}
-	if (uca.bulkin == -1) {
+	if (ucaa.ucaa_bulkin == -1) {
 		aprint_error_dev(self, "Could not find data bulk in\n");
 		goto bad;
+	}
-	if (uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "Could not find data bulk out\n");
 		goto bad;
+	}
-	DPRINTF(("ugensa: in=0x%x out=0x%x\n", uca.bulkin, uca.bulkout));
+	DPRINTF(("ugensa: in=0x%x out=0x%x\n", ucaa.ucaa_bulkin,
-	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &uca,
+	    ucaa.ucaa_bulkout));
 	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	return;
 bad:
 	DPRINTF(("ugensa_attach: ATTACH ERROR\n"));
 	sc->sc_dying = 1;
 	return;
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhmodem.c,v 1.13.24.7 2015/03/21 11:33:37 skrll Exp $	*/
+/*	$NetBSD: uhmodem.c,v 1.13.24.8 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 2008 Yojiro UO <yuo@nui.org>.
  * All rights reserved.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -61,27 +61,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.13.24.7 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.13.24.8 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 @@ -188,27 +188,27 @@ uhmodem_match(device_t parent, cfdata_t
+}
 void
 uhmodem_attach(device_t parent, device_t self, void *aux)
+{
 	struct uhmodem_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = aux;
 	struct usbd_device *dev = uiaa->uiaa_device;
 	usb_config_descriptor_t *cdesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	usbd_status err;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	int i;
 	int j;
 	char comname[16];
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_ubsa.sc_dev = self;
 	sc->sc_ubsa.sc_udev = dev;
 @@ -273,105 +273,106 @@ uhmodem_attach(device_t parent, device_t
 			if (i == 0){
 				/* can not get main interface */
 				sc->sc_ubsa.sc_dying = 1;
 				goto error;
 			} else
 				break;
+		}
 		/* Find the endpoints */
 		id = usbd_get_interface_descriptor(sc->sc_ubsa.sc_iface[i]);
 		sc->sc_ubsa.sc_iface_number[i] = id->bInterfaceNumber;
 		/* initialize endpoints */
-		uca.bulkin = uca.bulkout = -1;
+		ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 		for (j = 0; j < id->bNumEndpoints; j++) {
 			ed = usbd_interface2endpoint_descriptor(
 				sc->sc_ubsa.sc_iface[i], j);
 			if (ed == NULL) {
 				aprint_error_dev(self,
 				    "no endpoint descriptor for %d "
 				    "(interface: %d)\n", j, i);
 				break;
+			}
 			if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 			    UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) {
 				sc->sc_ubsa.sc_intr_number = ed->bEndpointAddress;
 				sc->sc_ubsa.sc_isize = UGETW(ed->wMaxPacketSize);
 			} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 			    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-				uca.bulkin = ed->bEndpointAddress;
+				ucaa.ucaa_bulkin = ed->bEndpointAddress;
 			} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 			    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-				uca.bulkout = ed->bEndpointAddress;
+				ucaa.ucaa_bulkout = ed->bEndpointAddress;
+			}
 		} /* end of Endpoint loop */
 		if (sc->sc_ubsa.sc_intr_number == -1) {
 			aprint_error_dev(self, "HUAWEI E220 need to re-attach "
 			    "to enable modem function\n");
 			if (i == 0) {
 				/* could not get intr for main tty */
 				sc->sc_ubsa.sc_dying = 1;
 				goto error;
 			} else
 				break;
+		}
-		if (uca.bulkin == -1) {
+		if (ucaa.ucaa_bulkin == -1) {
 			aprint_error_dev(self,
 			    "Could not find data bulk in\n");
 			sc->sc_ubsa.sc_dying = 1;
 			goto error;
+		}
-		if (uca.bulkout == -1) {
+		if (ucaa.ucaa_bulkout == -1) {
 			aprint_error_dev(self,
 			    "Could not find data bulk out\n");
 			sc->sc_ubsa.sc_dying = 1;
 			goto error;
+		}
 		switch (i) {
 		case 0:
 			snprintf(comname, sizeof(comname), "modem");
 			break;
 		case 1:
 			snprintf(comname, sizeof(comname), "alt#1");
 			break;
 		case 2:
 			snprintf(comname, sizeof(comname), "alt#2");
 			break;
 		default:
 			snprintf(comname, sizeof(comname), "int#%d", i);
 			break;
+		}
-		uca.portno = i;
+		ucaa.ucaa_portno = i;
-		/* bulkin, bulkout set above */
+		/* ucaa_bulkin, ucaa_bulkout set above */
-		uca.ibufsize = UHMODEMIBUFSIZE;
+		ucaa.ucaa_ibufsize = UHMODEMIBUFSIZE;
-		uca.obufsize = UHMODEMOBUFSIZE;
+		ucaa.ucaa_obufsize = UHMODEMOBUFSIZE;
-		uca.ibufsizepad = UHMODEMIBUFSIZE;
+		ucaa.ucaa_ibufsizepad = UHMODEMIBUFSIZE;
-		uca.opkthdrlen = 0;
+		ucaa.ucaa_opkthdrlen = 0;
-		uca.device = dev;
+		ucaa.ucaa_device = dev;
-		uca.iface = sc->sc_ubsa.sc_iface[i];
+		ucaa.ucaa_iface = sc->sc_ubsa.sc_iface[i];
-		uca.methods = &uhmodem_methods;
+		ucaa.ucaa_methods = &uhmodem_methods;
-		uca.arg = &sc->sc_ubsa;
+		ucaa.ucaa_arg = &sc->sc_ubsa;
-		uca.info = comname;
+		ucaa.ucaa_info = comname;
 		DPRINTF(("uhmodem: int#=%d, in = 0x%x, out = 0x%x, intr = 0x%x\n",
-	    		i, uca.bulkin, uca.bulkout, sc->sc_ubsa.sc_intr_number));
+		    i, ucaa.ucaa_bulkin, ucaa.ucaa_bulkout,
 		    sc->sc_ubsa.sc_intr_number));
 		sc->sc_ubsa.sc_subdevs[i] = config_found_sm_loc(self, "ucombus", NULL,
-				 &uca, ucomprint, ucomsubmatch);
+				 &ucaa, ucomprint, ucomsubmatch);
 		/* issue endpoint halt to each interface */
 		err = uhmodem_endpointhalt(&sc->sc_ubsa, i);
 		if (err)
 			aprint_error("%s: endpointhalt fail\n", __func__);
 		else
 			usbd_delay_ms(sc->sc_ubsa.sc_udev, 50);
 	} /* end of Interface loop */
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_ubsa.sc_udev,
 			   sc->sc_ubsa.sc_dev);
 	return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipaq.c,v 1.19.14.6 2015/03/21 11:33:37 skrll Exp $	*/
+/*	$NetBSD: uipaq.c,v 1.19.14.7 2016/04/16 13:22:00 skrll Exp $	*/
 /*	$OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $	*/
 /*
  * Copyright (c) 2000-2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -32,27 +32,27 @@
  */
 /*
  * iPAQ driver
+ *
  * 19 July 2003:	Incorporated changes suggested by Sam Lawrance from
  * 			the uppc module
+ *
+ *
  * Contact isis@cs.umd.edu if you have any questions/comments about this driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.19.14.6 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.19.14.7 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbcdc.h>	/*UCDC_* stuff */
 #include <dev/usb/usbdi.h>
 @@ -151,27 +151,27 @@ uipaq_match(device_t parent, cfdata_t ma
 void
 uipaq_attach(device_t parent, device_t self, void *aux)
+{
 	struct uipaq_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	struct usbd_interface *iface;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	const char *devname = device_xname(self);
 	int i;
 	usbd_status err;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	DPRINTFN(10,("\nuipaq_attach: sc=%p\n", sc));
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	/* Move the device into the configured state. */
 @@ -186,70 +186,70 @@ uipaq_attach(device_t parent, device_t s
 	if (err) {
 		aprint_error("\n%s: failed to get interface, err=%s\n",
 		    devname, usbd_errstr(err));
 		goto bad;
+	}
 	sc->sc_flags = uipaq_lookup(uaa->uaa_vendor, uaa->uaa_product)->uv_flags;
 	id = usbd_get_interface_descriptor(iface);
 	sc->sc_udev = dev;
 	sc->sc_iface = iface;
-	uca.ibufsize = UIPAQIBUFSIZE;
+	ucaa.ucaa_ibufsize = UIPAQIBUFSIZE;
-	uca.obufsize = UIPAQOBUFSIZE;
+	ucaa.ucaa_obufsize = UIPAQOBUFSIZE;
-	uca.ibufsizepad = UIPAQIBUFSIZE;
+	ucaa.ucaa_ibufsizepad = UIPAQIBUFSIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = iface;
+	ucaa.ucaa_iface = iface;
-	uca.methods = &uipaq_methods;
+	ucaa.ucaa_methods = &uipaq_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	uca.info = "Generic";
+	ucaa.ucaa_info = "Generic";
 /*	err = uipaq_init(sc);
 	if (err) {
 		printf("%s: init failed, %s\n", device_xname(sc->sc_dev),
 		    usbd_errstr(err));
 		goto bad;
 	}*/
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 	    sc->sc_dev);
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	for (i=0; i<id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "no endpoint descriptor for %d\n", i);
 			goto bad;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 		    (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
+		}
+	}
-	if (uca.bulkin == -1 || uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkin == -1 || ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "no proper endpoints found (%d,%d) \n",
-		    uca.bulkin, uca.bulkout);
+		    ucaa.ucaa_bulkin, ucaa.ucaa_bulkout);
 		return;
+	}
-	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	return;
 bad:
 	DPRINTF(("uipaq_attach: ATTACH ERROR\n"));
 	sc->sc_dying = 1;
 	return;
+}
 void
 uipaq_dtr(struct uipaq_softc* sc, int onoff)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ukyopon.c,v 1.16.16.5 2015/09/29 11:38:29 skrll Exp $	*/
+/*	$NetBSD: ukyopon.c,v 1.16.16.6 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by ITOH Yasufumi.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -24,27 +24,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.16.5 2015/09/29 11:38:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.16.6 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 @@ -112,35 +112,35 @@ ukyopon_match(device_t parent, cfdata_t
 	    uiaa->uiaa_product == USB_PRODUCT_KYOCERA_AHK3001V &&
 	    (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX ||
 	     uiaa->uiaa_ifaceno == UKYOPON_DATA_IFACE_INDEX))
 		return (UMATCH_VENDOR_PRODUCT);
 	return (UMATCH_NONE);
+}
 void
 ukyopon_attach(device_t parent, device_t self, void *aux)
+{
 	struct ukyopon_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = aux;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
-	uca.portno = (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX) ?
+	ucaa.ucaa_portno = (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX) ?
 		UKYOPON_PORT_MODEM : UKYOPON_PORT_DATA;
-	uca.methods = &ukyopon_methods;
+	ucaa.ucaa_methods = &ukyopon_methods;
-	uca.info = (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX) ?
+	ucaa.ucaa_info = (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX) ?
 	    "modem port" : "data transfer port";
-	if (umodem_common_attach(self, &sc->sc_umodem, uiaa, &uca))
+	if (umodem_common_attach(self, &sc->sc_umodem, uiaa, &ucaa))
 		return;
 	return;
+}
 Static void
 ukyopon_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
+{
 	struct ukyopon_softc *sc = addr;
 	/*
 	 * The device doesn't set DCD (Data Carrier Detect) bit properly.
 	 * Assume DCD is always present.
 	 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: umcs.c,v 1.8.2.5 2015/09/29 11:38:29 skrll Exp $ */
+/* $NetBSD: umcs.c,v 1.8.2.6 2016/04/16 13:22:00 skrll Exp $ */
 /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
 /*-
  * Copyright (c) 2010 Lev Serebryakov <lev@FreeBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -31,27 +31,27 @@
  * This driver supports several multiport USB-to-RS232 serial adapters driven
  * by MosChip mos7820 and mos7840, bridge chips.
  * The adapters are sold under many different brand names.
+ *
  * Datasheets are available at MosChip www site at
  * http://www.moschip.com.  The datasheets don't contain full
  * programming information for the chip.
+ *
  * It is nornal to have only two enabled ports in devices, based on
  * quad-port mos7840.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8.2.5 2015/09/29 11:38:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8.2.6 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 @@ -177,27 +177,27 @@ umcs7840_match(device_t dev, cfdata_t ma
 	return umcs7840_lookup(uaa->uaa_vendor, uaa->uaa_product) != NULL ?
 		UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
+}
 static void
 umcs7840_attach(device_t parent, device_t self, void *aux)
+{
 	struct umcs7840_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	int error, i, intr_addr;
 	uint8_t data;
 	sc->sc_dev = self;
 	sc->sc_udev = uaa->uaa_device;
 	if (usbd_set_config_index(sc->sc_udev, MCS7840_CONFIG_INDEX, 1) != 0) {
 		aprint_error(": could not set configuration no\n");
 		return;
+	}
 	/* get the first interface handle */
 	error = usbd_device2interface_handle(sc->sc_udev, MCS7840_IFACE_INDEX,
 @@ -275,71 +275,71 @@ umcs7840_attach(device_t parent, device_
 		    sc->sc_intr_buflen, umcs7840_intr, 100);
 	if (error) {
 		aprint_error_dev(self, "cannot open interrupt pipe "
 		    "(addr %d)\n", intr_addr);
 		return;
+	}
 	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);
-	memset(&uca, 0, sizeof(uca));
+	memset(&ucaa, 0, sizeof(ucaa));
-	uca.ibufsize = 256;
+	ucaa.ucaa_ibufsize = 256;
-	uca.obufsize = 256;
+	ucaa.ucaa_obufsize = 256;
-	uca.ibufsizepad = 256;
+	ucaa.ucaa_ibufsizepad = 256;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = sc->sc_udev;
+	ucaa.ucaa_device = sc->sc_udev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &umcs7840_methods;
+	ucaa.ucaa_methods = &umcs7840_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
 	for (i = 0; i < sc->sc_numports; i++) {
-		uca.bulkin = uca.bulkout = -1;
+		ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 		/*
 		 * On four port cards, endpoints are 0/1 for first,
 		 * 2/3 for second, ...
 		 * On two port cards, they are 0/1 for first, 4/5 for second.
 		 * On single port, just 0/1 will be used.
 		 */
 		int phyport = i * (sc->sc_numports == 2 ? 2 : 1);
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface,
 			phyport*2);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "no bulk in endpoint found for %d\n", i);
 			return;
+		}
-		uca.bulkin = ed->bEndpointAddress;
+		ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface,
 			phyport*2 + 1);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "no bulk out endpoint found for %d\n", i);
 			return;
+		}
-		uca.bulkout = ed->bEndpointAddress;
+		ucaa.ucaa_bulkout = ed->bEndpointAddress;
-		uca.portno = i;
+		ucaa.ucaa_portno = i;
 		DPRINTF(("port %d physical port %d bulk-in %d bulk-out %d\n",
-		    i, phyport, uca.bulkin, uca.bulkout));
+		    i, phyport, ucaa.ucaa_bulkin, ucaa.ucaa_bulkout));
 		sc->sc_ports[i].sc_port_phys = phyport;
 		sc->sc_ports[i].sc_port_ucom =
-		    config_found_sm_loc(self, "ucombus", NULL, &uca,
+		    config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
+	}
+}
 static int
 umcs7840_get_reg(struct umcs7840_softc *sc, uint8_t reg, uint8_t *data)
+{
 	usb_device_request_t req;
 	int err;
 	req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = MCS7840_RDREQ;
 	USETW(req.wValue, 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umct.c,v 1.32.24.10 2015/12/27 12:09:59 skrll Exp $	*/
+/*	$NetBSD: umct.c,v 1.32.24.11 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ichiro FUKUHARA (ichiro@ichiro.org).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -25,27 +25,27 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * MCT USB-RS232 Interface Controller
  * http://www.mct.com.tw/prod/rs232.html
  * http://www.dlink.com/products/usb/dsbs25
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.10 2015/12/27 12:09:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.11 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 @@ -167,44 +167,44 @@ umct_match(device_t parent, cfdata_t mat
 void
 umct_attach(device_t parent, device_t self, void *aux)
+{
 	struct umct_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	usb_config_descriptor_t *cdesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	usbd_status err;
 	int i;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_udev = dev;
 	sc->sc_product = uaa->uaa_product;
 	DPRINTF(("\n\numct attach: sc=%p\n", sc));
 	/* initialize endpoints */
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	sc->sc_intr_number = -1;
 	sc->sc_intr_pipe = NULL;
 	/* Move the device into the configured state. */
 	err = usbd_set_config_index(dev, UMCT_CONFIG_INDEX, 1);
 	if (err) {
 		aprint_error_dev(self, "failed to set configuration, err=%s\n",
 		    usbd_errstr(err));
 		sc->sc_dying = 1;
 		return;
+	}
 	/* get the config descriptor */
 @@ -239,79 +239,79 @@ umct_attach(device_t parent, device_t se
 			    "no endpoint descriptor for %d\n", i);
 			sc->sc_dying = 1;
 			return;
+		}
 		/*
 		 * The Bulkin endpoint is marked as an interrupt. Since
 		 * we can't rely on the endpoint descriptor order, we'll
 		 * check the wMaxPacketSize field to differentiate.
 		 */
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT &&
 		    UGETW(ed->wMaxPacketSize) != 0x2) {
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) {
 			sc->sc_intr_number = ed->bEndpointAddress;
 			sc->sc_isize = UGETW(ed->wMaxPacketSize);
+		}
+	}
-	if (uca.bulkin == -1) {
+	if (ucaa.ucaa_bulkin == -1) {
 		aprint_error_dev(self, "Could not find data bulk in\n");
 		sc->sc_dying = 1;
 		return;
+	}
-	if (uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "Could not find data bulk out\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	if (sc->sc_intr_number == -1) {
 		aprint_error_dev(self, "Could not find interrupt in\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	sc->sc_dtr = sc->sc_rts = 0;
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	/* bulkin, bulkout set above */
+	/* ucaa_bulkin, ucaa_bulkout set above */
-	uca.ibufsize = UMCTIBUFSIZE;
+	ucaa.ucaa_ibufsize = UMCTIBUFSIZE;
 	if (sc->sc_product == USB_PRODUCT_MCT_SITECOM_USB232)
-		uca.obufsize = 16; /* device is broken */
+		ucaa.ucaa_obufsize = 16; /* device is broken */
 	else
-		uca.obufsize = UMCTOBUFSIZE;
+		ucaa.ucaa_obufsize = UMCTOBUFSIZE;
-	uca.ibufsizepad = UMCTIBUFSIZE;
+	ucaa.ucaa_ibufsizepad = UMCTIBUFSIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &umct_methods;
+	ucaa.ucaa_methods = &umct_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	umct_init(sc);
 	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",
-			uca.bulkin, uca.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, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	return;
+}
 void
 umct_childdet(device_t self, device_t child)
+{
 	struct umct_softc *sc = device_private(self);
 	KASSERT(sc->sc_subdev == child);
 	sc->sc_subdev = NULL;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umodem.c,v 1.66.4.5 2015/09/22 12:06:01 skrll Exp $	*/
+/*	$NetBSD: umodem.c,v 1.66.4.6 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -34,27 +34,27 @@
  * Comm Class spec:  http://www.usb.org/developers/devclass_docs/usbccs10.pdf
  *                   http://www.usb.org/developers/devclass_docs/usbcdc11.pdf
  */
 /*
  * TODO:
  * - Add error recovery in various places; the big problem is what
  *   to do in a callback if there is an error.
  * - Implement a Call Device for modems without multiplexed commands.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.5 2015/09/22 12:06:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.6 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 @@ -105,36 +105,36 @@ umodem_match(device_t parent, cfdata_t m
 	id = usbd_get_interface_descriptor(uiaa->uiaa_iface);
 	if (umodem_get_caps(uiaa->uiaa_device, &cm, &acm, id) == -1)
 		return UMATCH_NONE;
 	return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO;
+}
 //
 void
 umodem_attach(device_t parent, device_t self, void *aux)
+{
 	struct umodem_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = aux;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	uca.methods = &umodem_methods;
+	ucaa.ucaa_methods = &umodem_methods;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler");
-	if (umodem_common_attach(self, sc, uiaa, &uca))
+	if (umodem_common_attach(self, sc, uiaa, &ucaa))
 		return;
 	return;
+}
 int
 umodem_activate(device_t self, enum devact act)
+{
 	struct umodem_softc *sc = device_private(self);
 	return umodem_common_activate(sc, act);
+}
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umodem_common.c,v 1.22.38.5 2015/03/21 11:33:37 skrll Exp $	*/
+/*	$NetBSD: umodem_common.c,v 1.22.38.6 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -34,27 +34,27 @@
  * Comm Class spec:  http://www.usb.org/developers/devclass_docs/usbccs10.pdf
  *                   http://www.usb.org/developers/devclass_docs/usbcdc11.pdf
  */
 /*
  * TODO:
  * - Add error recovery in various places; the big problem is what
  *   to do in a callback if there is an error.
  * - Implement a Call Device for modems without multiplexed commands.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.22.38.5 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.22.38.6 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 @@ -93,27 +93,27 @@ int	umodemdebug = 0;
 Static usbd_status umodem_set_comm_feature(struct umodem_softc *,
 					   int, int);
 Static usbd_status umodem_set_line_coding(struct umodem_softc *,
 					  usb_cdc_line_state_t *);
 Static void	umodem_dtr(struct umodem_softc *, int);
 Static void	umodem_rts(struct umodem_softc *, int);
 Static void	umodem_break(struct umodem_softc *, int);
 Static void	umodem_set_line_state(struct umodem_softc *);
 Static void	umodem_intr(struct usbd_xfer *, void *, usbd_status);
 int
 umodem_common_attach(device_t self, struct umodem_softc *sc,
-		     struct usbif_attach_arg *uiaa, struct ucom_attach_args *uca)
+    struct usbif_attach_arg *uiaa, struct ucom_attach_args *ucaa)
+{
 	struct usbd_device *dev = uiaa->uiaa_device;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	usbd_status err;
 	int data_ifcno;
 	int i;
 	sc->sc_dev = self;
 	sc->sc_udev = dev;
 	sc->sc_ctl_iface = uiaa->uiaa_iface;
 @@ -151,50 +151,50 @@ umodem_common_attach(device_t self, stru
 				uiaa->uiaa_ifaces[i] = NULL;
+			}
+		}
+	}
 	if (sc->sc_data_iface == NULL) {
 		aprint_error_dev(self, "no data interface\n");
 		goto bad;
+	}
 	/*
 	 * Find the bulk endpoints.
 	 * Iterate over all endpoints in the data interface and take note.
 	 */
-	uca->bulkin = uca->bulkout = -1;
+	ucaa->ucaa_bulkin = ucaa->ucaa_bulkout = -1;
 	id = usbd_get_interface_descriptor(sc->sc_data_iface);
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(sc->sc_data_iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "no endpoint descriptor for %d\n)", i);
 			goto bad;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
-			uca->bulkin = ed->bEndpointAddress;
+			ucaa->ucaa_bulkin = ed->bEndpointAddress;
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 			   (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
-			uca->bulkout = ed->bEndpointAddress;
+			ucaa->ucaa_bulkout = ed->bEndpointAddress;
+		}
+	}
-	if (uca->bulkin == -1) {
+	if (ucaa->ucaa_bulkin == -1) {
 		aprint_error_dev(self, "Could not find data bulk in\n");
 		goto bad;
+	}
-	if (uca->bulkout == -1) {
+	if (ucaa->ucaa_bulkout == -1) {
 		aprint_error_dev(self, "Could not find data bulk out\n");
 		goto bad;
+	}
 	if (usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_ASSUME_CM_OVER_DATA) {
 		sc->sc_cm_over_data = 1;
 	} else {
 		if (sc->sc_cm_cap & USB_CDC_CM_OVER_DATA) {
 			if (sc->sc_acm_cap & USB_CDC_ACM_HAS_FEATURE)
 				err = umodem_set_comm_feature(sc,
 				    UCDC_ABSTRACT_STATE, UCDC_DATA_MULTIPLEXED);
 			else
 				err = 0;
 @@ -224,40 +224,40 @@ umodem_common_attach(device_t self, stru
 		if (ed == NULL)
 			continue;
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    (ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT) {
 			aprint_error_dev(self,
 			    "status change notification available\n");
 			sc->sc_ctl_notify = ed->bEndpointAddress;
+		}
+	}
 	sc->sc_dtr = -1;
-	/* bulkin, bulkout set above */
+	/* ucaa_bulkin, ucaa_bulkout set above */
-	uca->ibufsize = UMODEMIBUFSIZE;
+	ucaa->ucaa_ibufsize = UMODEMIBUFSIZE;
-	uca->obufsize = UMODEMOBUFSIZE;
+	ucaa->ucaa_obufsize = UMODEMOBUFSIZE;
-	uca->ibufsizepad = UMODEMIBUFSIZE;
+	ucaa->ucaa_ibufsizepad = UMODEMIBUFSIZE;
-	uca->opkthdrlen = 0;
+	ucaa->ucaa_opkthdrlen = 0;
-	uca->device = sc->sc_udev;
+	ucaa->ucaa_device = sc->sc_udev;
-	uca->iface = sc->sc_data_iface;
+	ucaa->ucaa_iface = sc->sc_data_iface;
-	uca->arg = sc;
+	ucaa->ucaa_arg = sc;
 	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, uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, ucaa,
 					    ucomprint, ucomsubmatch);
 	return 0;
  bad:
 	sc->sc_dying = 1;
 	return 1;
+}
 int
 umodem_open(void *addr, int portno)
+{
 	struct umodem_softc *sc = addr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uplcom.c,v 1.74.4.10 2015/12/27 12:09:59 skrll Exp $	*/
+/*	$NetBSD: uplcom.c,v 1.74.4.11 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ichiro FUKUHARA (ichiro@ichiro.org).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -24,27 +24,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * General information: http://www.prolific.com.tw/fr_pl2303.htm
  * http://www.hitachi-hitec.com/jyouhou/prolific/2303.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.4.10 2015/12/27 12:09:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.4.11 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/poll.h>
 @@ -218,43 +218,43 @@ void
 uplcom_attach(device_t parent, device_t self, void *aux)
+{
 	struct uplcom_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	usb_device_descriptor_t *ddesc;
 	usb_config_descriptor_t *cdesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	const char *devname = device_xname(self);
 	usbd_status err;
 	int i;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_udev = dev;
 	DPRINTF(("\n\nuplcom attach: sc=%p\n", sc));
 	/* initialize endpoints */
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	sc->sc_intr_number = -1;
 	sc->sc_intr_pipe = NULL;
 	/* Move the device into the configured state. */
 	err = usbd_set_config_index(dev, UPLCOM_CONFIG_INDEX, 1);
 	if (err) {
 		aprint_error("\n%s: failed to set configuration, err=%s\n",
 			devname, usbd_errstr(err));
 		sc->sc_dying = 1;
 		return;
+	}
 	/* determine chip type */
 @@ -360,72 +360,72 @@ uplcom_attach(device_t parent, device_t
 	sc->sc_iface_number = id->bInterfaceNumber;
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "no endpoint descriptor for %d\n", i);
 			sc->sc_dying = 1;
 			return;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
+		}
+	}
-	if (uca.bulkin == -1) {
+	if (ucaa.ucaa_bulkin == -1) {
 		aprint_error_dev(self, "Could not find data bulk in\n");
 		sc->sc_dying = 1;
 		return;
+	}
-	if (uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "Could not find data bulk out\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	sc->sc_dtr = sc->sc_rts = -1;
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	/* bulkin, bulkout set above */
+	/* ucaa_bulkin, ucaa_bulkout set above */
-	uca.ibufsize = UPLCOMIBUFSIZE;
+	ucaa.ucaa_ibufsize = UPLCOMIBUFSIZE;
-	uca.obufsize = UPLCOMOBUFSIZE;
+	ucaa.ucaa_obufsize = UPLCOMOBUFSIZE;
-	uca.ibufsizepad = UPLCOMIBUFSIZE;
+	ucaa.ucaa_ibufsizepad = UPLCOMIBUFSIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &uplcom_methods;
+	ucaa.ucaa_methods = &uplcom_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	err = uplcom_reset(sc);
 	if (err) {
 		aprint_error_dev(self, "reset failed, %s\n", usbd_errstr(err));
 		sc->sc_dying = 1;
 		return;
+	}
 	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",
-			uca.bulkin, uca.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, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	return;
+}
 void
 uplcom_childdet(device_t self, device_t child)
+{
 	struct uplcom_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.162.2.45 2016/03/25 08:32:57 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.162.2.46 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology, Matthew R. Green (mrg@eterna.com.au),
  * and Nick Hudson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.45 2016/03/25 08:32:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.46 2016/04/16 13:22:00 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_compat_netbsd.h"
 #include "usb_dma.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 @@ -530,27 +530,28 @@ usbd_create_xfer(struct usbd_pipe *pipe,
 		int err = xfer->ux_methods->upm_init(xfer);
 		if (err) {
 			if (buf)
 				usbd_free_buffer(xfer);
 			usbd_free_xfer(xfer);
 			return err;
+		}
+	}
 	*xp = xfer;
 	return 0;
+}
-void usbd_destroy_xfer(struct usbd_xfer *xfer)
+void
 usbd_destroy_xfer(struct usbd_xfer *xfer)
+{
 	if (xfer->ux_methods->upm_fini) {
 		xfer->ux_methods->upm_fini(xfer);
+	}
 	usbd_free_xfer(xfer);
+}
 void
 usbd_setup_xfer(struct usbd_xfer *xfer, void *priv, void *buffer,
     uint32_t length, uint16_t flags, uint32_t timeout, usbd_callback callback)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: uslsa.c,v 1.19.6.3 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: uslsa.c,v 1.19.6.4 2016/04/16 13:22:00 skrll Exp $ */
 /* from ugensa.c */
 /*
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland C. Dowdeswell <elric@netbsd.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -48,27 +48,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.19.6.3 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.19.6.4 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -161,91 +161,91 @@ uslsa_match(device_t parent, cfdata_t ma
 	} else {
 		return UMATCH_NONE;
+	}
+}
 static void
 uslsa_attach(device_t parent, device_t self, void *aux)
+{
 	struct uslsa_softc *sc;
 	const struct usbif_attach_arg *uiaa = aux;
 	const usb_interface_descriptor_t *id;
 	const usb_endpoint_descriptor_t *ed;
 	char *devinfop;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	int i;
 	sc = device_private(self);
 	sc->sc_dev = self;
 	sc->sc_udev = uiaa->uiaa_device;
 	sc->sc_iface = uiaa->uiaa_iface;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	id = usbd_get_interface_descriptor(sc->sc_iface);
 	sc->sc_ifnum = id->bInterfaceNumber;
-	uca.info = "Silicon Labs CP210x";
+	ucaa.ucaa_info = "Silicon Labs CP210x";
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	uca.ibufsize = USLSA_BUFSIZE;
+	ucaa.ucaa_ibufsize = USLSA_BUFSIZE;
-	uca.obufsize = USLSA_BUFSIZE;
+	ucaa.ucaa_obufsize = USLSA_BUFSIZE;
-	uca.ibufsizepad = USLSA_BUFSIZE;
+	ucaa.ucaa_ibufsizepad = USLSA_BUFSIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = sc->sc_udev;
+	ucaa.ucaa_device = sc->sc_udev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &uslsa_methods;
+	ucaa.ucaa_methods = &uslsa_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 	                   sc->sc_dev);
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		int addr, dir, attr;
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "could not read endpoint descriptor\n");
 			sc->sc_dying = true;
 			return;
+		}
 		addr = ed->bEndpointAddress;
 		dir = UE_GET_DIR(ed->bEndpointAddress);
 		attr = ed->bmAttributes & UE_XFERTYPE;
 		if (dir == UE_DIR_IN && attr == UE_BULK) {
-			uca.bulkin = addr;
+			ucaa.ucaa_bulkin = addr;
 		} else if (dir == UE_DIR_OUT && attr == UE_BULK) {
-			uca.bulkout = addr;
+			ucaa.ucaa_bulkout = addr;
 		} else {
 			aprint_error_dev(self, "unexpected endpoint\n");
+		}
+	}
 	aprint_debug_dev(sc->sc_dev, "EPs: in=%#x out=%#x\n",
-		uca.bulkin, uca.bulkout);
+		ucaa.ucaa_bulkin, ucaa.ucaa_bulkout);
-	if ((uca.bulkin == -1) || (uca.bulkout == -1)) {
+	if ((ucaa.ucaa_bulkin == -1) || (ucaa.ucaa_bulkout == -1)) {
 		aprint_error_dev(self, "could not find endpoints\n");
 		sc->sc_dying = true;
 		return;
+	}
-	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 	                                    ucomprint, ucomsubmatch);
 	return;
+}
 static int
 uslsa_activate(device_t self, enum devact act)
+{
 	struct uslsa_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = true;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvisor.c,v 1.45.24.6 2015/09/29 11:38:29 skrll Exp $	*/
+/*	$NetBSD: uvisor.c,v 1.45.24.7 2016/04/16 13:22:00 skrll Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Handspring Visor (Palmpilot compatible PDA) driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.45.24.6 2015/09/29 11:38:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.45.24.7 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -215,27 +215,27 @@ uvisor_attach(device_t parent, device_t
+{
 	struct uvisor_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	struct usbd_interface *iface;
 	usb_interface_descriptor_t *id;
 	struct uvisor_connection_info coninfo;
 	struct uvisor_palm_connection_info palmconinfo;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	const char *devname = device_xname(self);
 	int i, j, hasin, hasout, port;
 	usbd_status err;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	DPRINTFN(10,("\nuvisor_attach: sc=%p\n", sc));
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	/* Move the device into the configured state. */
 @@ -256,123 +256,123 @@ uvisor_attach(device_t parent, device_t
 	sc->sc_flags = uvisor_lookup(uaa->uaa_vendor, uaa->uaa_product)->uv_flags;
 	if ((sc->sc_flags & (VISOR | PALM4)) == 0) {
 		aprint_error_dev(self,
 		    "init failed, device type is neither visor nor palm\n");
 		goto bad;
+	}
 	id = usbd_get_interface_descriptor(iface);
 	sc->sc_udev = dev;
 	sc->sc_iface = iface;
-	uca.ibufsize = UVISORIBUFSIZE;
+	ucaa.ucaa_ibufsize = UVISORIBUFSIZE;
-	uca.obufsize = UVISOROBUFSIZE;
+	ucaa.ucaa_obufsize = UVISOROBUFSIZE;
-	uca.ibufsizepad = UVISORIBUFSIZE;
+	ucaa.ucaa_ibufsizepad = UVISORIBUFSIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = iface;
+	ucaa.ucaa_iface = iface;
-	uca.methods = &uvisor_methods;
+	ucaa.ucaa_methods = &uvisor_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
 	err = uvisor_init(sc, &coninfo, &palmconinfo);
 	if (err) {
 		aprint_error_dev(self, "init failed, %s\n", usbd_errstr(err));
 		goto bad;
+	}
 	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);
 		if (sc->sc_numcon > UVISOR_MAX_CONN)
 			sc->sc_numcon = UVISOR_MAX_CONN;
 		/* Attach a ucom for each connection. */
 		for (i = 0; i < sc->sc_numcon; ++i) {
 			switch (coninfo.connections[i].port_function_id) {
 			case UVISOR_FUNCTION_GENERIC:
-				uca.info = "Generic";
+				ucaa.ucaa_info = "Generic";
 				break;
 			case UVISOR_FUNCTION_DEBUGGER:
-				uca.info = "Debugger";
+				ucaa.ucaa_info = "Debugger";
 				break;
 			case UVISOR_FUNCTION_HOTSYNC:
-				uca.info = "HotSync";
+				ucaa.ucaa_info = "HotSync";
 				break;
 			case UVISOR_FUNCTION_REMOTE_FILE_SYS:
-				uca.info = "Remote File System";
+				ucaa.ucaa_info = "Remote File System";
 				break;
 			default:
-				uca.info = "unknown";
+				ucaa.ucaa_info = "unknown";
 				break;
+			}
 			port = coninfo.connections[i].port;
-			uca.portno = port;
+			ucaa.ucaa_portno = port;
-			uca.bulkin = port | UE_DIR_IN;
+			ucaa.ucaa_bulkin = port | UE_DIR_IN;
-			uca.bulkout = port | UE_DIR_OUT;
+			ucaa.ucaa_bulkout = port | UE_DIR_OUT;
 			/* Verify that endpoints exist. */
 			hasin = 0;
 			hasout = 0;
 			for (j = 0; j < id->bNumEndpoints; j++) {
 				ed = usbd_interface2endpoint_descriptor(iface, j);
 				if (ed == NULL)
 					break;
 				if (UE_GET_ADDR(ed->bEndpointAddress) == port &&
 				    (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
 					if (UE_GET_DIR(ed->bEndpointAddress)
 					    == UE_DIR_IN)
 						hasin++;
 					else
 						hasout++;
+				}
+			}
 			if (hasin == 1 && hasout == 1)
 				sc->sc_subdevs[i] = config_found_sm_loc(self,
-					"ucombus", NULL, &uca,
+					"ucombus", NULL, &ucaa,
 					ucomprint, ucomsubmatch);
 			else
 				aprint_error_dev(self,
 				    "no proper endpoints for port %d (%d,%d)\n",
 				    port, hasin, hasout);
+		}
 	} else {
 		sc->sc_numcon = palmconinfo.num_ports;
 		if (sc->sc_numcon > UVISOR_MAX_CONN)
 			sc->sc_numcon = UVISOR_MAX_CONN;
 		/* Attach a ucom for each connection. */
 		for (i = 0; i < sc->sc_numcon; ++i) {
 			/*
 			 * XXX this should copy out 4-char string from the
 			 * XXX port_function_id, but where would the string go?
-			 * XXX uca.info is a const char *, not an array.
+			 * XXX ucaa.ucaa_info is a const char *, not an array.
 			 */
-			uca.info = "sync";
+			ucaa.ucaa_info = "sync";
-			uca.portno = i;
+			ucaa.ucaa_portno = i;
 			if (palmconinfo.endpoint_numbers_different) {
 				port = palmconinfo.connections[i].end_point_info;
-				uca.bulkin = (port >> 4) | UE_DIR_IN;
+				ucaa.ucaa_bulkin = (port >> 4) | UE_DIR_IN;
-				uca.bulkout = (port & 0xf) | UE_DIR_OUT;
+				ucaa.ucaa_bulkout = (port & 0xf) | UE_DIR_OUT;
 			} else {
 				port = palmconinfo.connections[i].port;
-				uca.bulkin = port | UE_DIR_IN;
+				ucaa.ucaa_bulkin = port | UE_DIR_IN;
-				uca.bulkout = port | UE_DIR_OUT;
+				ucaa.ucaa_bulkout = port | UE_DIR_OUT;
+			}
 			sc->sc_subdevs[i] = config_found_sm_loc(self, "ucombus",
-				NULL, &uca, ucomprint, ucomsubmatch);
+				NULL, &ucaa, ucomprint, ucomsubmatch);
+		}
+	}
 	return;
 bad:
 	DPRINTF(("uvisor_attach: ATTACH ERROR\n"));
 	sc->sc_dying = 1;
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvscom.c,v 1.28.16.6 2015/03/21 11:33:37 skrll Exp $	*/
+/*	$NetBSD: uvscom.c,v 1.28.16.7 2016/04/16 13:22:00 skrll Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -25,27 +25,27 @@
  * SUCH DAMAGE.
+ *
  * $FreeBSD: src/sys/dev/usb/uvscom.c,v 1.1 2002/03/18 18:23:39 joe Exp $
  */
 /*
  * uvscom: SUNTAC Slipper U VS-10U driver.
  * Slipper U is a PC card to USB converter for data communication card
  * adapter.  It supports DDI Pocket's Air H" C@rd, C@rd H" 64, NTT's P-in,
  * P-in m@ater and various data communication card adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.6 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.7 2016/04/16 13:22:00 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/poll.h>
 @@ -229,42 +229,42 @@ uvscom_match(device_t parent, cfdata_t m
 void
 uvscom_attach(device_t parent, device_t self, void *aux)
+{
 	struct uvscom_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	usb_config_descriptor_t *cdesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	usbd_status err;
 	int i;
-	struct ucom_attach_args uca;
+	struct ucom_attach_args ucaa;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_dev = self;
         sc->sc_udev = dev;
 	DPRINTF(("uvscom attach: sc = %p\n", sc));
 	/* initialize endpoints */
-	uca.bulkin = uca.bulkout = -1;
+	ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
 	sc->sc_intr_number = -1;
 	sc->sc_intr_pipe = NULL;
 	/* Move the device into the configured state. */
 	err = usbd_set_config_index(dev, UVSCOM_CONFIG_INDEX, 1);
 	if (err) {
 		aprint_error_dev(self, "failed to set configuration, err=%s\n",
 		    usbd_errstr(err));
 		sc->sc_dying = 1;
 		return;
+	}
 	/* get the config descriptor */
 @@ -292,85 +292,85 @@ uvscom_attach(device_t parent, device_t
 	/* Find endpoints */
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
 		if (ed == NULL) {
 			aprint_error_dev(self,
 			    "no endpoint descriptor for %d\n", i);
 			sc->sc_dying = 1;
 			return;
+		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkin = ed->bEndpointAddress;
+			ucaa.ucaa_bulkin = ed->bEndpointAddress;
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
 			   UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			uca.bulkout = ed->bEndpointAddress;
+			ucaa.ucaa_bulkout = ed->bEndpointAddress;
 		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
 			   UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) {
 			sc->sc_intr_number = ed->bEndpointAddress;
 			sc->sc_isize = UGETW(ed->wMaxPacketSize);
+		}
+	}
-	if (uca.bulkin == -1) {
+	if (ucaa.ucaa_bulkin == -1) {
 		aprint_error_dev(self, "Could not find data bulk in\n");
 		sc->sc_dying = 1;
 		return;
+	}
-	if (uca.bulkout == -1) {
+	if (ucaa.ucaa_bulkout == -1) {
 		aprint_error_dev(self, "Could not find data bulk out\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	if (sc->sc_intr_number == -1) {
 		aprint_error_dev(self, "Could not find interrupt in\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	sc->sc_dtr = sc->sc_rts = 0;
 	sc->sc_lcr = UVSCOM_LINE_INIT;
-	uca.portno = UCOM_UNK_PORTNO;
+	ucaa.ucaa_portno = UCOM_UNK_PORTNO;
-	/* bulkin, bulkout set above */
+	/* ucaa_bulkin, ucaa_bulkout set above */
-	uca.ibufsize = UVSCOMIBUFSIZE;
+	ucaa.ucaa_ibufsize = UVSCOMIBUFSIZE;
-	uca.obufsize = UVSCOMOBUFSIZE;
+	ucaa.ucaa_obufsize = UVSCOMOBUFSIZE;
-	uca.ibufsizepad = UVSCOMIBUFSIZE;
+	ucaa.ucaa_ibufsizepad = UVSCOMIBUFSIZE;
-	uca.opkthdrlen = 0;
+	ucaa.ucaa_opkthdrlen = 0;
-	uca.device = dev;
+	ucaa.ucaa_device = dev;
-	uca.iface = sc->sc_iface;
+	ucaa.ucaa_iface = sc->sc_iface;
-	uca.methods = &uvscom_methods;
+	ucaa.ucaa_methods = &uvscom_methods;
-	uca.arg = sc;
+	ucaa.ucaa_arg = sc;
-	uca.info = NULL;
+	ucaa.ucaa_info = NULL;
 	err = uvscom_reset(sc);
 	if (err) {
 		aprint_error_dev(self, "reset failed, %s\n", usbd_errstr(err));
 		sc->sc_dying = 1;
 		return;
+	}
 	DPRINTF(("uvscom: in = 0x%x out = 0x%x intr = 0x%x\n",
-		 uca.bulkin, uca.bulkout, sc->sc_intr_number));
+		 ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number));
 	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",
-			uca.bulkin, uca.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, &uca,
+	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
 	return;
+}
 void
 uvscom_childdet(device_t self, device_t child)
+{
 	struct uvscom_softc *sc = device_private(self);
 	KASSERT(sc->sc_subdev == child);
 	sc->sc_subdev = NULL;
+}