 @@ -1,34 +1,34 @@
-/*	$NetBSD: moscom.c,v 1.8.14.1 2014/12/06 08:37:30 skrll Exp $	*/
+/*	$NetBSD: moscom.c,v 1.8.14.2 2014/12/23 11:10:41 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.1 2014/12/06 08:37:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.2 2014/12/23 11:10:41 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>
 @@ -57,31 +57,31 @@ __KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1
 #define MOSCOM_DIV_LO		0x08
 #define MOSCOM_DIV_HI		0x09
 #define MOSCOM_EFR		0x0a
 #define	MOSCOM_XON1		0x0b
 #define MOSCOM_XON2		0x0c
 #define MOSCOM_XOFF1		0x0d
 #define MOSCOM_XOFF2		0x0e
 #define MOSCOM_BAUDLO		0x00
 #define MOSCOM_BAUDHI		0x01
 #define MOSCOM_INT_RXEN		0x01
 #define MOSCOM_INT_TXEN		0x02
 #define MOSCOM_INT_RSEN		0x04
 #define MOSCOM_INT_MDMEM	0x08
 #define MOSCOM_INT_SLEEP	0x10
 #define MOSCOM_INT_XOFF		0x20
 #define MOSCOM_INT_RTS		0x40
 #define MOSCOM_FIFO_EN		0x01
 #define MOSCOM_FIFO_RXCLR	0x02
 #define MOSCOM_FIFO_TXCLR	0x04
 #define MOSCOM_FIFO_DMA_BLK	0x08
 #define MOSCOM_FIFO_TXLVL_MASK	0x30
 #define MOSCOM_FIFO_TXLVL_8	0x00
 #define MOSCOM_FIFO_TXLVL_16	0x10
 #define MOSCOM_FIFO_TXLVL_32	0x20
 #define MOSCOM_FIFO_TXLVL_56	0x30
 #define MOSCOM_FIFO_RXLVL_MASK	0xc0
 #define MOSCOM_FIFO_RXLVL_8	0x00
 #define MOSCOM_FIFO_RXLVL_16	0x40
 @@ -143,65 +143,65 @@ struct moscom_softc {
 	device_t		 sc_subdev;
 	u_char			 sc_msr;
 	u_char			 sc_lsr;
 	u_char			 sc_lcr;
 	u_char			 sc_dying;
 };
 void	moscom_get_status(void *, int, u_char *, u_char *);
 void	moscom_set(void *, int, int, int);
 int	moscom_param(void *, int, struct termios *);
 int	moscom_open(void *, int);
 int	moscom_cmd(struct moscom_softc *, int, int);
 struct ucom_methods moscom_methods = {
 	.ucom_get_status = NULL,
 	.ucom_set = moscom_set,
 	.ucom_param = moscom_param,
 	.ucom_ioctl = NULL,
 	.ucom_open = moscom_open,
 	.ucom_close = NULL,
 	.ucom_read = NULL,
 	.ucom_write = NULL,
 };
 static const struct usb_devno moscom_devs[] = {
 	{ USB_VENDOR_MOSCHIP,		USB_PRODUCT_MOSCHIP_MCS7703 },
 	{ USB_VENDOR_MOSCHIP,		USB_PRODUCT_MOSCHIP_MCS7840 },
 	{ USB_VENDOR_ATEN,		USB_PRODUCT_ATEN_UC2324 }
 };
 #define moscom_lookup(v, p) usb_lookup(moscom_devs, v, p)
 int moscom_match(device_t, cfdata_t, void *);
 void moscom_attach(device_t, device_t, void *);
 void moscom_childdet(device_t, device_t);
 int moscom_detach(device_t, int);
 int moscom_activate(device_t, enum devact);
 CFATTACH_DECL2_NEW(moscom, sizeof(struct moscom_softc), moscom_match,
     moscom_attach, moscom_detach, moscom_activate, NULL, moscom_childdet);
 int
 moscom_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	return (moscom_lookup(uaa->vendor, 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;
 	usbd_device_handle dev = uaa->device;
 	struct ucom_attach_args uca;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	usbd_status error;
 	int i;
 	aprint_naive("\n");
 @@ -259,43 +259,43 @@ moscom_attach(device_t parent, device_t
 	uca.ibufsize = MOSCOMBUFSZ;
 	uca.obufsize = MOSCOMBUFSZ;
 	uca.ibufsizepad = MOSCOMBUFSZ;
 	uca.opkthdrlen = 0;
 	uca.device = sc->sc_udev;
 	uca.iface = sc->sc_iface;
 	uca.methods = &moscom_methods;
 	uca.arg = sc;
 	uca.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,
 					    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;
+}
 int
 moscom_detach(device_t self, int flags)
+{
 	struct moscom_softc *sc = device_private(self);
 	int rv = 0;
 	sc->sc_dying = 1;
 	if (sc->sc_subdev != NULL)
 		rv = config_detach(sc->sc_subdev, flags);
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
 			   sc->sc_dev);
 	return (rv);
 @@ -317,30 +317,30 @@ moscom_activate(device_t self, enum deva
 int
 moscom_open(void *vsc, int portno)
+{
 	struct moscom_softc *sc = vsc;
 	usb_device_request_t req;
 	if (sc->sc_dying)
 		return (EIO);
 	/* Purge FIFOs or odd things happen */
 	if (moscom_cmd(sc, MOSCOM_FIFO, 0x00) != 0)
 		return (EIO);
 	if (moscom_cmd(sc, MOSCOM_FIFO, MOSCOM_FIFO_EN |
 	    MOSCOM_FIFO_RXCLR | MOSCOM_FIFO_TXCLR |
 	    MOSCOM_FIFO_DMA_BLK | MOSCOM_FIFO_RXLVL_MASK) != 0)
 		return (EIO);
 	/* Magic tell device we're ready for data command */
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = MOSCOM_WRITE;
 	USETW(req.wValue, 0x08);
 	USETW(req.wIndex, MOSCOM_INT);
 	USETW(req.wLength, 0);
 	if (usbd_do_request(sc->sc_udev, &req, NULL) != 0)
 		return (EIO);
 	return (0);
+}
 @@ -426,37 +426,37 @@ moscom_param(void *vsc, int portno, stru
 		/*  xon/xoff flow ctl */
 	} else {
 		/* disable flow ctl */
+	}
 #endif
 	return (0);
+}
 void
 moscom_get_status(void *vsc, int portno, u_char *lsr, u_char *msr)
+{
 	struct moscom_softc *sc = vsc;
 	if (msr != NULL)
 		*msr = sc->sc_msr;
 	if (lsr != NULL)
 		*lsr = sc->sc_lsr;
+}
 int
 moscom_cmd(struct moscom_softc *sc, int reg, int val)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = MOSCOM_WRITE;
 	USETW(req.wValue, val + MOSCOM_UART_REG);
 	USETW(req.wIndex, reg);
 	USETW(req.wLength, 0);
 	err = usbd_do_request(sc->sc_udev, &req, NULL);
 	if (err)
 		return (EIO);
 	else
 		return (0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umodem.c,v 1.66.4.1 2014/12/06 08:37:30 skrll Exp $	*/
+/*	$NetBSD: umodem.c,v 1.66.4.2 2014/12/23 11:10:41 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.1 2014/12/06 08:37:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.2 2014/12/23 11:10:41 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>
 @@ -81,73 +81,73 @@ Static struct ucom_methods umodem_method
 	.ucom_write = NULL,
 };
 int             umodem_match(device_t, cfdata_t, void *);
 void            umodem_attach(device_t, device_t, void *);
 int             umodem_detach(device_t, int);
 int             umodem_activate(device_t, enum devact);
 extern struct cfdriver umodem_cd;
 CFATTACH_DECL_NEW(umodem, sizeof(struct umodem_softc), umodem_match,
     umodem_attach, umodem_detach, umodem_activate);
 int
 umodem_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usbif_attach_arg *uaa = aux;
 	usb_interface_descriptor_t *id;
 	int cm, acm;
 	id = usbd_get_interface_descriptor(uaa->iface);
 	if (uaa->subclass != UISUBCLASS_ABSTRACT_CONTROL_MODEL &&
 	    (id->bInterfaceClass == UICLASS_CDC_DATA &&
 	     id->bInterfaceSubClass == UISUBCLASS_DATA))
 		return (UMATCH_IFACECLASS_IFACESUBCLASS);
 	if (uaa->class != UICLASS_CDC ||
 	    uaa->subclass != UISUBCLASS_ABSTRACT_CONTROL_MODEL ||
 	    !(uaa->proto == UIPROTO_CDC_NOCLASS || uaa->proto == UIPROTO_CDC_AT))
 		return (UMATCH_NONE);
 	if (umodem_get_caps(uaa->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 *uaa = aux;
 	struct ucom_attach_args uca;
 	uca.portno = UCOM_UNK_PORTNO;
 	uca.methods = &umodem_methods;
 	uca.info = NULL;
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler");
 	if (umodem_common_attach(self, sc, uaa, &uca))
 		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
 umodem_detach(device_t self, int flags)
+{
 	struct umodem_softc *sc = device_private(self);
 	pmf_device_deregister(self);
 	return umodem_common_detach(sc, flags);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvscom.c,v 1.28.16.2 2014/12/06 08:37:30 skrll Exp $	*/
+/*	$NetBSD: uvscom.c,v 1.28.16.3 2014/12/23 11:10:41 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.2 2014/12/06 08:37:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.3 2014/12/23 11:10:41 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>
 @@ -208,36 +208,36 @@ static const struct usb_devno uvscom_dev
 	{ USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U },
 };
 #define uvscom_lookup(v, p) usb_lookup(uvscom_devs, v, p)
 int uvscom_match(device_t, cfdata_t, void *);
 void uvscom_attach(device_t, device_t, void *);
 void uvscom_childdet(device_t, device_t);
 int uvscom_detach(device_t, int);
 int uvscom_activate(device_t, enum devact);
 extern struct cfdriver uvscom_cd;
 CFATTACH_DECL2_NEW(uvscom, sizeof(struct uvscom_softc), uvscom_match,
     uvscom_attach, uvscom_detach, uvscom_activate, NULL, uvscom_childdet);
 int
 uvscom_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	return (uvscom_lookup(uaa->vendor, uaa->product) != NULL ?
 		UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+}
 void
 uvscom_attach(device_t parent, device_t self, void *aux)
+{
 	struct uvscom_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	usbd_device_handle dev = 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;
 @@ -365,27 +365,27 @@ uvscom_attach(device_t parent, device_t
 	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;
+}
 int
 uvscom_detach(device_t self, int flags)
+{
 	struct uvscom_softc *sc = device_private(self);
 	int rv = 0;
 	DPRINTF(("uvscom_detach: sc = %p\n", sc));
 	sc->sc_dying = 1;
 	if (sc->sc_intr_pipe != NULL) {
 		usbd_abort_pipe(sc->sc_intr_pipe);
 		usbd_close_pipe(sc->sc_intr_pipe);
 		kmem_free(sc->sc_intr_buf, sc->sc_isize);