 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhub.c,v 1.126.2.23 2016/02/16 08:02:49 skrll Exp $	*/
+/*	$NetBSD: uhub.c,v 1.126.2.24 2016/03/29 08:42:41 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $	*/
 /*	$OpenBSD: uhub.c,v 1.86 2015/06/29 18:27:40 mpi Exp $ */
 /*
  * Copyright (c) 1998, 2004 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
 @@ -27,27 +27,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.
  */
 /*
  * USB spec: http://www.usb.org/developers/docs/usbspec.zip
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.23 2016/02/16 08:02:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.24 2016/03/29 08:42:41 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <dev/usb/usb.h>
 @@ -88,40 +88,40 @@ SYSCTL_SETUP(sysctl_hw_uhub_setup, "sysc
 fail:
 	aprint_error("%s: sysctl_createv failed (err = %d)\n", __func__, err);
+}
 #endif /* UHUB_DEBUG */
 #endif /* USB_DEBUG */
 #define DPRINTF(FMT,A,B,C,D)	USBHIST_LOGN(uhubdebug,1,FMT,A,B,C,D)
 #define DPRINTFN(N,FMT,A,B,C,D)	USBHIST_LOGN(uhubdebug,N,FMT,A,B,C,D)
 #define UHUBHIST_FUNC() USBHIST_FUNC()
 #define UHUBHIST_CALLED(name) USBHIST_CALLED(uhubdebug)
 struct uhub_softc {
-	device_t		sc_dev;		/* base device */
+	device_t		 sc_dev;	/* base device */
-	struct usbd_device *	sc_hub;		/* USB device */
+	struct usbd_device	*sc_hub;	/* USB device */
-	int			sc_proto;	/* device protocol */
+	int			 sc_proto;	/* device protocol */
-	struct usbd_pipe *	sc_ipipe;	/* interrupt pipe */
+	struct usbd_pipe	*sc_ipipe;	/* interrupt pipe */
-	kmutex_t		sc_lock;
+	kmutex_t		 sc_lock;
 	uint8_t			*sc_statusbuf;
 	uint8_t			*sc_statuspend;
 	uint8_t			*sc_status;
-	size_t			sc_statuslen;
+	size_t			 sc_statuslen;
-	int			sc_explorepending;
+	int			 sc_explorepending;
-	u_char			sc_running;
+	u_char			 sc_running;
 };
 #define UHUB_IS_HIGH_SPEED(sc) \
     ((sc)->sc_proto == UDPROTO_HSHUBSTT || (sc)->sc_proto == UDPROTO_HSHUBMTT)
 #define UHUB_IS_SINGLE_TT(sc) ((sc)->sc_proto == UDPROTO_HSHUBSTT)
 #define PORTSTAT_ISSET(sc, port) \
 	((sc)->sc_status[(port) / 8] & (1 << ((port) % 8)))
 Static usbd_status uhub_explore(struct usbd_device *);
 Static void uhub_intr(struct usbd_xfer *, void *, usbd_status);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdivar.h,v 1.109.2.25 2016/03/17 09:04:53 skrll Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.109.2.26 2016/03/29 08:42:41 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2012 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 and Matthew R. Green (mrg@eterna.com.au).
+ *
  * 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
 @@ -142,146 +142,153 @@ struct usbd_hub {
 struct usbd_bus {
 	/* Filled by HC driver */
 	void			*ub_hcpriv;
 	int			ub_revision;	/* USB revision */
 #define USBREV_UNKNOWN	0
 #define USBREV_PRE_1_0	1
 #define USBREV_1_0	2
 #define USBREV_1_1	3
 #define USBREV_2_0	4
 #define USBREV_3_0	5
 #define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0", "3.0" }
-	const struct usbd_bus_methods *ub_methods;
+	const struct usbd_bus_methods
 			       *ub_methods;
 	uint32_t		ub_pipesize;	/* size of a pipe struct */
 	bool			ub_usedma;	/* Does this HC support DMA */
 	int			ub_dmaflags;
 	bus_dma_tag_t		ub_dmatag;	/* DMA tag */
 	/* Filled by usb driver */
-	kmutex_t		*ub_lock;
+	kmutex_t	       *ub_lock;
-	struct usbd_device      *ub_roothub;
+	struct usbd_device     *ub_roothub;
 	uint8_t			ub_rhaddr;	/* roothub address */
 	uint8_t			ub_rhconf;	/* roothub configuration */
-	struct usbd_device *	ub_devices[USB_MAX_DEVICES];
+	struct usbd_device     *ub_devices[USB_MAX_DEVICES];
 	kcondvar_t              ub_needsexplore_cv;
 	char			ub_needsexplore;/* a hub a signalled a change */
 	char			ub_usepolling;
 	device_t		ub_usbctl;
 	struct usb_device_stats	ub_stats;
 	void		       *ub_soft; /* soft interrupt cookie */
 };
 struct usbd_device {
 	struct usbd_bus	       *ud_bus;		/* our controller */
 	struct usbd_pipe       *ud_pipe0;	/* pipe 0 */
 	uint8_t			ud_addr;	/* device addess */
 	uint8_t			ud_config;	/* current configuration # */
 	uint8_t			ud_depth;	/* distance from root hub */
 	uint8_t			ud_speed;	/* low/full/high speed */
 	uint8_t			ud_selfpowered;	/* flag for self powered */
 	uint16_t		ud_power;	/* mA the device uses */
 	int16_t			ud_langid;	/* language for strings */
 #define USBD_NOLANG (-1)
 	usb_event_cookie_t	ud_cookie;	/* unique connection id */
 	struct usbd_port       *ud_powersrc;	/* upstream hub port, or 0 */
 	struct usbd_device     *ud_myhub;	/* upstream hub */
 	struct usbd_port       *ud_myhsport;	/* closest high speed port */
 	struct usbd_endpoint	ud_ep0;		/* for pipe 0 */
-	usb_endpoint_descriptor_t ud_ep0desc;	/* for pipe 0 */
+	usb_endpoint_descriptor_t
 				ud_ep0desc;	/* for pipe 0 */
 	struct usbd_interface  *ud_ifaces;	/* array of all interfaces */
 	usb_device_descriptor_t ud_ddesc;	/* device descriptor */
 	usb_config_descriptor_t *ud_cdesc;	/* full config descr */
 	usb_bos_descriptor_t	*ud_bdesc;	/* full BOS descr */
-	const struct usbd_quirks     *ud_quirks;/* device quirks, always set */
+	const struct usbd_quirks
 			       *ud_quirks;	/* device quirks, always set */
 	struct usbd_hub	       *ud_hub;		/* only if this is a hub */
 	int			ud_subdevlen;	/* array length of following */
 	device_t	       *ud_subdevs;	/* sub-devices */
 	int			ud_nifaces_claimed; /* number of ifaces in use */
 	void		       *ud_hcpriv;
 	char		       *ud_serial;	/* serial number, can be NULL */
 	char		       *ud_vendor;	/* vendor string, can be NULL */
 	char		       *ud_product;	/* product string can be NULL */
 };
 struct usbd_interface {
 	struct usbd_device     *ui_dev;
-	usb_interface_descriptor_t *ui_idesc;
+	usb_interface_descriptor_t
 			       *ui_idesc;
 	int			ui_index;
 	int			ui_altindex;
 	struct usbd_endpoint   *ui_endpoints;
 	void		       *ui_priv;
 	LIST_HEAD(, usbd_pipe)	ui_pipes;
 };
 struct usbd_pipe {
 	struct usbd_interface  *up_iface;
 	struct usbd_device     *up_dev;
 	struct usbd_endpoint   *up_endpoint;
 	char			up_running;
 	char			up_aborting;
 	bool			up_serialise;
-	SIMPLEQ_HEAD(, usbd_xfer) up_queue;
+	SIMPLEQ_HEAD(, usbd_xfer)
 			        up_queue;
 	LIST_ENTRY(usbd_pipe)	up_next;
 	struct usb_task		up_async_task;
 	struct usbd_xfer       *up_intrxfer; /* used for repeating requests */
 	char			up_repeat;
 	int			up_interval;
 	uint8_t			up_flags;
 	/* Filled by HC driver. */
-	const struct usbd_pipe_methods *up_methods;
+	const struct usbd_pipe_methods
 			       *up_methods;
 };
 struct usbd_xfer {
 	struct usbd_pipe       *ux_pipe;
 	void		       *ux_priv;
 	void		       *ux_buffer;
 	kcondvar_t		ux_cv;
 	uint32_t		ux_length;
 	uint32_t		ux_actlen;
 	uint16_t		ux_flags;
 	uint32_t		ux_timeout;
 	usbd_status		ux_status;
 	usbd_callback		ux_callback;
 	volatile uint8_t	ux_done;
 	uint8_t			ux_state;	/* used for DIAGNOSTIC */
 #define XFER_FREE 0x46
 #define XFER_BUSY 0x55
 #define XFER_ONQU 0x9e
 	/* For control pipe */
 	usb_device_request_t	ux_request;
 	/* For isoc */
-	uint16_t		*ux_frlengths;
+	uint16_t	       *ux_frlengths;
 	int			ux_nframes;
 	const struct usbd_pipe_methods *ux_methods;
 	/* For memory allocation and softc */
 	struct usbd_bus        *ux_bus;
 	usb_dma_t		ux_dmabuf;
 	void		       *ux_buf;
 	uint32_t		ux_bufsize;
 	uint8_t			ux_rqflags;
 #define URQ_REQUEST	0x01
-	SIMPLEQ_ENTRY(usbd_xfer) ux_next;
+	SIMPLEQ_ENTRY(usbd_xfer)
 				ux_next;
 	void		       *ux_hcpriv;	/* private use by the HC driver */
 	uint8_t			ux_hcflags;	/* private use by the HC driver */
 #define UXFER_ABORTING	0x01	/* xfer is aborting. */
 #define UXFER_ABORTWAIT	0x02	/* abort completion is being awaited. */
 	kcondvar_t		ux_hccv;	/* private use by the HC driver */
 	struct callout		ux_callout;
 };
 void usbd_init(void);
 void usbd_finish(void);