 @@ -1,1579 +1,1572 @@
-/*	$NetBSD: usb_subr.c,v 1.180.6.1.2.3 2011/12/08 10:41:28 mrg Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.180.6.1.2.4 2011/12/08 22:04:56 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma 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
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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: usb_subr.c,v 1.180.6.1.2.3 2011/12/08 10:41:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.180.6.1.2.4 2011/12/08 22:04:56 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_usbverbose.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <sys/module.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/usb_verbose.h>
 #include "locators.h"
 #ifdef USB_DEBUG
 #define DPRINTF(x)	if (usbdebug) printf x
 #define DPRINTFN(n,x)	if (usbdebug>(n)) printf x
 extern int usbdebug;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 MALLOC_DEFINE(M_USB, "USB", "USB misc. memory");
 MALLOC_DEFINE(M_USBDEV, "USB device", "USB device driver");
 MALLOC_DEFINE(M_USBHC, "USB HC", "USB host controller");
 Static usbd_status usbd_set_config(usbd_device_handle, int);
 Static void usbd_devinfo(usbd_device_handle, int, char *, size_t);
 Static void usbd_devinfo_vp(usbd_device_handle, char *, size_t, char *, size_t,
     int, int);
 Static int usbd_getnewaddr(usbd_bus_handle);
 Static int usbd_print(void *, const char *);
 Static int usbd_ifprint(void *, const char *);
 Static void usbd_free_iface_data(usbd_device_handle, int);
 Static void usbd_kill_pipe(usbd_pipe_handle);
 usbd_status usbd_attach_roothub(device_t, usbd_device_handle);
 Static usbd_status usbd_probe_and_attach(device_t, usbd_device_handle, int,
     int);
 Static u_int32_t usb_cookie_no = 0;
 Static const char * const usbd_error_strs[] = {
 	"NORMAL_COMPLETION",
 	"IN_PROGRESS",
 	"PENDING_REQUESTS",
 	"NOT_STARTED",
 	"INVAL",
 	"NOMEM",
 	"CANCELLED",
 	"BAD_ADDRESS",
 	"IN_USE",
 	"NO_ADDR",
 	"SET_ADDR_FAILED",
 	"NO_POWER",
 	"TOO_DEEP",
 	"IOERROR",
 	"NOT_CONFIGURED",
 	"TIMEOUT",
 	"SHORT_XFER",
 	"STALLED",
 	"INTERRUPTED",
 	"XXX",
 };
 void usb_load_verbose(void);
 void get_usb_vendor_stub(char *, size_t, usb_vendor_id_t);
 void get_usb_product_stub(char *, size_t, usb_vendor_id_t, usb_product_id_t);
 void (*get_usb_vendor)(char *, size_t, usb_vendor_id_t) = get_usb_vendor_stub;
 void (*get_usb_product)(char *, size_t, usb_vendor_id_t, usb_product_id_t) =
 	get_usb_product_stub;
 int usb_verbose_loaded = 0;
 /*
  * Load the usbverbose module
  */
 void usb_load_verbose(void)
+{
 	if (usb_verbose_loaded == 0)
 		module_autoload("usbverbose", MODULE_CLASS_MISC);
+}
 void get_usb_vendor_stub(char *v, size_t l, usb_vendor_id_t v_id)
+{
 	usb_load_verbose();
 	if (usb_verbose_loaded)
 		get_usb_vendor(v, l, v_id);
+}
 void get_usb_product_stub(char *p, size_t l, usb_vendor_id_t v_id,
     usb_product_id_t p_id)
+{
 	usb_load_verbose();
 	if (usb_verbose_loaded)
 		get_usb_product(p, l, v_id, p_id);
+}
 const char *
 usbd_errstr(usbd_status err)
+{
 	static char buffer[5];
 	if (err < USBD_ERROR_MAX) {
 		return usbd_error_strs[err];
 	} else {
 		snprintf(buffer, sizeof buffer, "%d", err);
 		return buffer;
+	}
+}
 usbd_status
 usbd_get_string_desc(usbd_device_handle dev, int sindex, int langid,
 		     usb_string_descriptor_t *sdesc, int *sizep)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	int actlen;
 	req.bmRequestType = UT_READ_DEVICE;
 	req.bRequest = UR_GET_DESCRIPTOR;
 	USETW2(req.wValue, UDESC_STRING, sindex);
 	USETW(req.wIndex, langid);
 	USETW(req.wLength, 2);	/* only size byte first */
 	err = usbd_do_request_flags(dev, &req, sdesc, USBD_SHORT_XFER_OK,
 		&actlen, USBD_DEFAULT_TIMEOUT);
 	if (err)
 		return (err);
 	if (actlen < 2)
 		return (USBD_SHORT_XFER);
 	USETW(req.wLength, sdesc->bLength);	/* the whole string */
  	err = usbd_do_request_flags(dev, &req, sdesc, USBD_SHORT_XFER_OK,
  		&actlen, USBD_DEFAULT_TIMEOUT);
 	if (err)
 		return (err);
 	if (actlen != sdesc->bLength) {
 		DPRINTFN(-1, ("usbd_get_string_desc: expected %d, got %d\n",
 		    sdesc->bLength, actlen));
+	}
 	*sizep = actlen;
 	return (USBD_NORMAL_COMPLETION);
+}
 static void
 usbd_trim_spaces(char *p)
+{
 	char *q, *e;
 	q = e = p;
 	while (*q == ' ')		/* skip leading spaces */
 		q++;
 	while ((*p = *q++))		/* copy string */
 		if (*p++ != ' ')	/* remember last non-space */
 			e = p;
 	*e = '\0';			/* kill trailing spaces */
+}
 Static void
 usbd_devinfo_vp(usbd_device_handle dev, char *v, size_t vl, char *p,
     size_t pl, int usedev, int useencoded)
+{
 	usb_device_descriptor_t *udd = &dev->ddesc;
 	if (dev == NULL)
 		return;
 	v[0] = p[0] = '\0';
 	if (usedev) {
 		if (usbd_get_string0(dev, udd->iManufacturer, v, useencoded) ==
 		    USBD_NORMAL_COMPLETION)
 			usbd_trim_spaces(v);
 		if (usbd_get_string0(dev, udd->iProduct, p, useencoded) ==
 		    USBD_NORMAL_COMPLETION)
 			usbd_trim_spaces(p);
+	}
 	if (v[0] == '\0')
 		get_usb_vendor(v, vl, UGETW(udd->idVendor));
 	if (p[0] == '\0')
 		get_usb_product(p, pl, UGETW(udd->idVendor),
 		    UGETW(udd->idProduct));
 	if (v[0] == '\0')
 		snprintf(v, vl, "vendor 0x%04x", UGETW(udd->idVendor));
 	if (p[0] == '\0')
 		snprintf(p, pl, "product 0x%04x", UGETW(udd->idProduct));
+}
 int
 usbd_printBCD(char *cp, size_t l, int bcd)
+{
 	return snprintf(cp, l, "%x.%02x", bcd >> 8, bcd & 0xff);
+}
 Static void
 usbd_devinfo(usbd_device_handle dev, int showclass, char *cp, size_t l)
+{
 	usb_device_descriptor_t *udd = &dev->ddesc;
 	char *vendor, *product;
 	int bcdDevice, bcdUSB;
 	char *ep;
 	vendor = malloc(USB_MAX_ENCODED_STRING_LEN * 2, M_USB, M_NOWAIT);
 	if (vendor == NULL) {
 		*cp = '\0';
 		return;
+	}
 	product = &vendor[USB_MAX_ENCODED_STRING_LEN];
 	ep = cp + l;
 	usbd_devinfo_vp(dev, vendor, USB_MAX_ENCODED_STRING_LEN,
 	    product, USB_MAX_ENCODED_STRING_LEN, 1, 1);
 	cp += snprintf(cp, ep - cp, "%s %s", vendor, product);
 	if (showclass)
 		cp += snprintf(cp, ep - cp, ", class %d/%d",
 		    udd->bDeviceClass, udd->bDeviceSubClass);
 	bcdUSB = UGETW(udd->bcdUSB);
 	bcdDevice = UGETW(udd->bcdDevice);
 	cp += snprintf(cp, ep - cp, ", rev ");
 	cp += usbd_printBCD(cp, ep - cp, bcdUSB);
 	*cp++ = '/';
 	cp += usbd_printBCD(cp, ep - cp, bcdDevice);
 	cp += snprintf(cp, ep - cp, ", addr %d", dev->address);
 	*cp = 0;
 	free(vendor, M_USB);
+}
 char *
 usbd_devinfo_alloc(usbd_device_handle dev, int showclass)
+{
 	char *devinfop;
 	devinfop = malloc(DEVINFOSIZE, M_TEMP, M_WAITOK);
 	usbd_devinfo(dev, showclass, devinfop, DEVINFOSIZE);
 	return devinfop;
+}
 void
 usbd_devinfo_free(char *devinfop)
+{
 	free(devinfop, M_TEMP);
+}
 /* Delay for a certain number of ms */
 void
 usb_delay_ms(usbd_bus_handle bus, u_int ms)
+{
 	/* Wait at least two clock ticks so we know the time has passed. */
 	if (bus->use_polling || cold)
 		delay((ms+1) * 1000);
 	else
 		tsleep(&ms, PRIBIO, "usbdly", (ms*hz+999)/1000 + 1);
+}
 /* Delay given a device handle. */
 void
 usbd_delay_ms(usbd_device_handle dev, u_int ms)
+{
 	usb_delay_ms(dev->bus, ms);
+}
 usbd_status
 usbd_reset_port(usbd_device_handle dev, int port, usb_port_status_t *ps)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	int n;
 	req.bmRequestType = UT_WRITE_CLASS_OTHER;
 	req.bRequest = UR_SET_FEATURE;
 	USETW(req.wValue, UHF_PORT_RESET);
 	USETW(req.wIndex, port);
 	USETW(req.wLength, 0);
 	err = usbd_do_request(dev, &req, 0);
 	DPRINTFN(1,("usbd_reset_port: port %d reset done, error=%s\n",
 		    port, usbd_errstr(err)));
 	if (err)
 		return (err);
 	n = 10;
 	do {
 		/* Wait for device to recover from reset. */
 		usbd_delay_ms(dev, USB_PORT_RESET_DELAY);
 		err = usbd_get_port_status(dev, port, ps);
 		if (err) {
 			DPRINTF(("usbd_reset_port: get status failed %d\n",
 				 err));
 			return (err);
+		}
 		/* If the device disappeared, just give up. */
 		if (!(UGETW(ps->wPortStatus) & UPS_CURRENT_CONNECT_STATUS))
 			return (USBD_NORMAL_COMPLETION);
 	} while ((UGETW(ps->wPortChange) & UPS_C_PORT_RESET) == 0 && --n > 0);
 	if (n == 0)
 		return (USBD_TIMEOUT);
 	err = usbd_clear_port_feature(dev, port, UHF_C_PORT_RESET);
 #ifdef USB_DEBUG
 	if (err)
 		DPRINTF(("usbd_reset_port: clear port feature failed %d\n",
 			 err));
 #endif
 	/* Wait for the device to recover from reset. */
 	usbd_delay_ms(dev, USB_PORT_RESET_RECOVERY);
 	return (err);
+}
 usb_interface_descriptor_t *
 usbd_find_idesc(usb_config_descriptor_t *cd, int ifaceidx, int altidx)
+{
 	char *p = (char *)cd;
 	char *end = p + UGETW(cd->wTotalLength);
 	usb_interface_descriptor_t *d;
 	int curidx, lastidx, curaidx = 0;
 	for (curidx = lastidx = -1; p < end; ) {
 		d = (usb_interface_descriptor_t *)p;
 		DPRINTFN(4,("usbd_find_idesc: idx=%d(%d) altidx=%d(%d) len=%d "
 			    "type=%d\n",
 			    ifaceidx, curidx, altidx, curaidx,
 			    d->bLength, d->bDescriptorType));
 		if (d->bLength == 0) /* bad descriptor */
 			break;
 		p += d->bLength;
 		if (p <= end && d->bDescriptorType == UDESC_INTERFACE) {
 			if (d->bInterfaceNumber != lastidx) {
 				lastidx = d->bInterfaceNumber;
 				curidx++;
 				curaidx = 0;
 			} else
 				curaidx++;
 			if (ifaceidx == curidx && altidx == curaidx)
 				return (d);
+		}
+	}
 	return (NULL);
+}
 usb_endpoint_descriptor_t *
 usbd_find_edesc(usb_config_descriptor_t *cd, int ifaceidx, int altidx,
 		int endptidx)
+{
 	char *p = (char *)cd;
 	char *end = p + UGETW(cd->wTotalLength);
 	usb_interface_descriptor_t *d;
 	usb_endpoint_descriptor_t *e;
 	int curidx;
 	d = usbd_find_idesc(cd, ifaceidx, altidx);
 	if (d == NULL)
 		return (NULL);
 	if (endptidx >= d->bNumEndpoints) /* quick exit */
 		return (NULL);
 	curidx = -1;
 	for (p = (char *)d + d->bLength; p < end; ) {
 		e = (usb_endpoint_descriptor_t *)p;
 		if (e->bLength == 0) /* bad descriptor */
 			break;
 		p += e->bLength;
 		if (p <= end && e->bDescriptorType == UDESC_INTERFACE)
 			return (NULL);
 		if (p <= end && e->bDescriptorType == UDESC_ENDPOINT) {
 			curidx++;
 			if (curidx == endptidx)
 				return (e);
+		}
+	}
 	return (NULL);
+}
 usbd_status
 usbd_fill_iface_data(usbd_device_handle dev, int ifaceidx, int altidx)
+{
 	usbd_interface_handle ifc = &dev->ifaces[ifaceidx];
 	usb_interface_descriptor_t *idesc;
 	char *p, *end;
 	int endpt, nendpt;
 	DPRINTFN(4,("usbd_fill_iface_data: ifaceidx=%d altidx=%d\n",
 		    ifaceidx, altidx));
 	idesc = usbd_find_idesc(dev->cdesc, ifaceidx, altidx);
 	if (idesc == NULL)
 		return (USBD_INVAL);
 	ifc->device = dev;
 	ifc->idesc = idesc;
 	ifc->index = ifaceidx;
 	ifc->altindex = altidx;
 	nendpt = ifc->idesc->bNumEndpoints;
 	DPRINTFN(4,("usbd_fill_iface_data: found idesc nendpt=%d\n", nendpt));
 	if (nendpt != 0) {
 		ifc->endpoints = malloc(nendpt * sizeof(struct usbd_endpoint),
 					M_USB, M_NOWAIT);
 		if (ifc->endpoints == NULL)
 			return (USBD_NOMEM);
 	} else
 		ifc->endpoints = NULL;
 	ifc->priv = NULL;
 	p = (char *)ifc->idesc + ifc->idesc->bLength;
 	end = (char *)dev->cdesc + UGETW(dev->cdesc->wTotalLength);
 #define ed ((usb_endpoint_descriptor_t *)p)
 	for (endpt = 0; endpt < nendpt; endpt++) {
 		DPRINTFN(10,("usbd_fill_iface_data: endpt=%d\n", endpt));
 		for (; p < end; p += ed->bLength) {
 			DPRINTFN(10,("usbd_fill_iface_data: p=%p end=%p "
 				     "len=%d type=%d\n",
 				 p, end, ed->bLength, ed->bDescriptorType));
 			if (p + ed->bLength <= end && ed->bLength != 0 &&
 			    ed->bDescriptorType == UDESC_ENDPOINT)
 				goto found;
 			if (ed->bLength == 0 ||
 			    ed->bDescriptorType == UDESC_INTERFACE)
 				break;
+		}
 		/* passed end, or bad desc */
 		printf("usbd_fill_iface_data: bad descriptor(s): %s\n",
 		       ed->bLength == 0 ? "0 length" :
 		       ed->bDescriptorType == UDESC_INTERFACE ? "iface desc":
 		       "out of data");
 		goto bad;
 	found:
 		ifc->endpoints[endpt].edesc = ed;
 		if (dev->speed == USB_SPEED_HIGH) {
 			u_int mps;
 			/* Control and bulk endpoints have max packet limits. */
 			switch (UE_GET_XFERTYPE(ed->bmAttributes)) {
 			case UE_CONTROL:
 				mps = USB_2_MAX_CTRL_PACKET;
 				goto check;
 			case UE_BULK:
 				mps = USB_2_MAX_BULK_PACKET;
 			check:
 				if (UGETW(ed->wMaxPacketSize) != mps) {
 					USETW(ed->wMaxPacketSize, mps);
 #ifdef DIAGNOSTIC
 					printf("usbd_fill_iface_data: bad max "
 					       "packet size\n");
 #endif
+				}
 				break;
 			default:
 				break;
+			}
+		}
 		ifc->endpoints[endpt].refcnt = 0;
 		ifc->endpoints[endpt].datatoggle = 0;
 		p += ed->bLength;
+	}
 #undef ed
 	LIST_INIT(&ifc->pipes);
 	return (USBD_NORMAL_COMPLETION);
  bad:
 	if (ifc->endpoints != NULL) {
 		free(ifc->endpoints, M_USB);
 		ifc->endpoints = NULL;
+	}
 	return (USBD_INVAL);
+}
 void
 usbd_free_iface_data(usbd_device_handle dev, int ifcno)
+{
 	usbd_interface_handle ifc = &dev->ifaces[ifcno];
 	if (ifc->endpoints)
 		free(ifc->endpoints, M_USB);
+}
 Static usbd_status
 usbd_set_config(usbd_device_handle dev, int conf)
+{
 	usb_device_request_t req;
 	req.bmRequestType = UT_WRITE_DEVICE;
 	req.bRequest = UR_SET_CONFIG;
 	USETW(req.wValue, conf);
 	USETW(req.wIndex, 0);
 	USETW(req.wLength, 0);
 	return (usbd_do_request(dev, &req, 0));
+}
 usbd_status
 usbd_set_config_no(usbd_device_handle dev, int no, int msg)
+{
 	int index;
 	usb_config_descriptor_t cd;
 	usbd_status err;
 	if (no == USB_UNCONFIG_NO)
 		return (usbd_set_config_index(dev, USB_UNCONFIG_INDEX, msg));
 	DPRINTFN(5,("usbd_set_config_no: %d\n", no));
 	/* Figure out what config index to use. */
 	for (index = 0; index < dev->ddesc.bNumConfigurations; index++) {
 		err = usbd_get_config_desc(dev, index, &cd);
 		if (err)
 			return (err);
 		if (cd.bConfigurationValue == no)
 			return (usbd_set_config_index(dev, index, msg));
+	}
 	return (USBD_INVAL);
+}
 usbd_status
 usbd_set_config_index(usbd_device_handle dev, int index, int msg)
+{
 	usb_config_descriptor_t cd, *cdp;
 	usbd_status err;
 	int i, ifcidx, nifc, len, selfpowered, power;
 	DPRINTFN(5,("usbd_set_config_index: dev=%p index=%d\n", dev, index));
 	if (index >= dev->ddesc.bNumConfigurations &&
 	    index != USB_UNCONFIG_INDEX) {
 		/* panic? */
 		printf("usbd_set_config_index: illegal index\n");
 		return (USBD_INVAL);
+	}
 	/* XXX check that all interfaces are idle */
 	if (dev->config != USB_UNCONFIG_NO) {
 		DPRINTF(("usbd_set_config_index: free old config\n"));
 		/* Free all configuration data structures. */
 		nifc = dev->cdesc->bNumInterface;
 		for (ifcidx = 0; ifcidx < nifc; ifcidx++)
 			usbd_free_iface_data(dev, ifcidx);
 		free(dev->ifaces, M_USB);
 		free(dev->cdesc, M_USB);
 		dev->ifaces = NULL;
 		dev->cdesc = NULL;
 		dev->config = USB_UNCONFIG_NO;
+	}
 	if (index == USB_UNCONFIG_INDEX) {
 		/* We are unconfiguring the device, so leave unallocated. */
 		DPRINTF(("usbd_set_config_index: set config 0\n"));
 		err = usbd_set_config(dev, USB_UNCONFIG_NO);
 		if (err) {
 			DPRINTF(("usbd_set_config_index: setting config=0 "
 				 "failed, error=%s\n", usbd_errstr(err)));
+		}
 		return (err);
+	}
 	/* Get the short descriptor. */
 	err = usbd_get_config_desc(dev, index, &cd);
 	if (err) {
 		DPRINTF(("usbd_set_config_index: get_config_desc=%d\n", err));
 		return (err);
+	}
 	len = UGETW(cd.wTotalLength);
 	cdp = malloc(len, M_USB, M_NOWAIT);
 	if (cdp == NULL)
 		return (USBD_NOMEM);
 	/* Get the full descriptor.  Try a few times for slow devices. */
 	for (i = 0; i < 3; i++) {
 		err = usbd_get_desc(dev, UDESC_CONFIG, index, len, cdp);
 		if (!err)
 			break;
 		usbd_delay_ms(dev, 200);
+	}
 	if (err) {
 		DPRINTF(("usbd_set_config_index: get_desc=%d\n", err));
 		goto bad;
+	}
 	if (cdp->bDescriptorType != UDESC_CONFIG) {
 		DPRINTFN(-1,("usbd_set_config_index: bad desc %d\n",
 			     cdp->bDescriptorType));
 		err = USBD_INVAL;
 		goto bad;
+	}
 	/*
 	 * Figure out if the device is self or bus powered.
 	 */
 #if 0 /* XXX various devices don't report the power state correctly */
 	selfpowered = 0;
 	err = usbd_get_device_status(dev, &ds);
 	if (!err && (UGETW(ds.wStatus) & UDS_SELF_POWERED))
 		selfpowered = 1;
 #endif
 	/*
 	 * Use the power state in the configuration we are going
 	 * to set. This doesn't necessarily reflect the actual
 	 * power state of the device; the driver can control this
 	 * by choosing the appropriate configuration.
 	 */
 	selfpowered = !!(cdp->bmAttributes & UC_SELF_POWERED);
 	DPRINTF(("usbd_set_config_index: (addr %d) cno=%d attr=0x%02x, "
 		 "selfpowered=%d, power=%d\n",
 		 cdp->bConfigurationValue, dev->address, cdp->bmAttributes,
 		 selfpowered, cdp->bMaxPower * 2));
 	/* Check if we have enough power. */
 #if 0 /* this is a no-op, see above */
 	if ((cdp->bmAttributes & UC_SELF_POWERED) && !selfpowered) {
 		if (msg)
 			printf("%s: device addr %d (config %d): "
 				 "can't set self powered configuration\n",
 			       device_xname(dev->bus->bdev), dev->address,
 			       cdp->bConfigurationValue);
 		err = USBD_NO_POWER;
 		goto bad;
+	}
 #endif
 #ifdef USB_DEBUG
 	if (dev->powersrc == NULL) {
 		DPRINTF(("usbd_set_config_index: No power source?\n"));
 		err = USBD_IOERROR;
 		goto bad;
+	}
 #endif
 	power = cdp->bMaxPower * 2;
 	if (power > dev->powersrc->power) {
 		DPRINTF(("power exceeded %d %d\n", power,dev->powersrc->power));
 		/* XXX print nicer message. */
 		if (msg)
 			printf("%s: device addr %d (config %d) exceeds power "
 				 "budget, %d mA > %d mA\n",
 			       device_xname(dev->bus->usbctl), dev->address,
 			       cdp->bConfigurationValue,
 			       power, dev->powersrc->power);
 		err = USBD_NO_POWER;
 		goto bad;
+	}
 	dev->power = power;
 	dev->self_powered = selfpowered;
 	/* Set the actual configuration value. */
 	DPRINTF(("usbd_set_config_index: set config %d\n",
 		 cdp->bConfigurationValue));
 	err = usbd_set_config(dev, cdp->bConfigurationValue);
 	if (err) {
 		DPRINTF(("usbd_set_config_index: setting config=%d failed, "
 			 "error=%s\n",
 			 cdp->bConfigurationValue, usbd_errstr(err)));
 		goto bad;
+	}
 	/* Allocate and fill interface data. */
 	nifc = cdp->bNumInterface;
 	dev->ifaces = malloc(nifc * sizeof(struct usbd_interface),
 			     M_USB, M_NOWAIT);
 	if (dev->ifaces == NULL) {
 		err = USBD_NOMEM;
 		goto bad;
+	}
 	DPRINTFN(5,("usbd_set_config_index: dev=%p cdesc=%p\n", dev, cdp));
 	dev->cdesc = cdp;
 	dev->config = cdp->bConfigurationValue;
 	for (ifcidx = 0; ifcidx < nifc; ifcidx++) {
 		err = usbd_fill_iface_data(dev, ifcidx, 0);
 		if (err) {
 			while (--ifcidx >= 0)
 				usbd_free_iface_data(dev, ifcidx);
 			goto bad;
+		}
+	}
 	return (USBD_NORMAL_COMPLETION);
  bad:
 	free(cdp, M_USB);
 	return (err);
+}
 /* XXX add function for alternate settings */
 usbd_status
 usbd_setup_pipe(usbd_device_handle dev, usbd_interface_handle iface,
 		struct usbd_endpoint *ep, int ival, usbd_pipe_handle *pipe)
+{
 	usbd_pipe_handle p;
 	usbd_status err;
 	DPRINTFN(1,("usbd_setup_pipe: dev=%p iface=%p ep=%p pipe=%p\n",
 		    dev, iface, ep, pipe));
 	p = malloc(dev->bus->pipe_size, M_USB, M_NOWAIT);
 	if (p == NULL)
 		return (USBD_NOMEM);
 	p->device = dev;
 	p->iface = iface;
 	p->endpoint = ep;
 	ep->refcnt++;
 	p->refcnt = 1;
 	p->intrxfer = 0;
 	p->running = 0;
 	p->aborting = 0;
 	p->repeat = 0;
 	p->interval = ival;
 	SIMPLEQ_INIT(&p->queue);
 	err = dev->bus->methods->open_pipe(p);
 	if (err) {
 		DPRINTFN(-1,("usbd_setup_pipe: endpoint=0x%x failed, error="
 			 "%s\n",
 			 ep->edesc->bEndpointAddress, usbd_errstr(err)));
 		free(p, M_USB);
 		return (err);
+	}
 #if 1
 	if (dev->bus->methods->get_locks) {
 		dev->bus->methods->get_locks(dev->bus, &p->intr_lock, &p->lock);
 	} else {
 		p->intr_lock = p->lock = NULL;
 #endif
 	*pipe = p;
 	return (USBD_NORMAL_COMPLETION);
+}
 /* Abort the device control pipe. */
 void
 usbd_kill_pipe(usbd_pipe_handle pipe)
+{
 	usbd_abort_pipe(pipe);
 	pipe->methods->close(pipe);
 	pipe->endpoint->refcnt--;
 	free(pipe, M_USB);
+}
 int
 usbd_getnewaddr(usbd_bus_handle bus)
+{
 	int addr;
 	for (addr = 1; addr < USB_MAX_DEVICES; addr++)
 		if (bus->devices[addr] == 0)
 			return (addr);
 	return (-1);
+}
 usbd_status
 usbd_attach_roothub(device_t parent, usbd_device_handle dev)
+{
 	struct usb_attach_arg uaa;
 	usb_device_descriptor_t *dd = &dev->ddesc;
 	device_t dv;
 	uaa.device = dev;
 	uaa.usegeneric = 0;
 	uaa.port = 0;
 	uaa.vendor = UGETW(dd->idVendor);
 	uaa.product = UGETW(dd->idProduct);
 	uaa.release = UGETW(dd->bcdDevice);
 	uaa.class = dd->bDeviceClass;
 	uaa.subclass = dd->bDeviceSubClass;
 	uaa.proto = dd->bDeviceProtocol;
 	dv = config_found_ia(parent, "usbroothubif", &uaa, 0);
 	if (dv) {
 		dev->subdevs = malloc(sizeof dv, M_USB, M_NOWAIT);
 		if (dev->subdevs == NULL)
 			return (USBD_NOMEM);
 		dev->subdevs[0] = dv;
 		dev->subdevlen = 1;
+	}
 	return (USBD_NORMAL_COMPLETION);
+}
 static usbd_status
 usbd_attachwholedevice(device_t parent, usbd_device_handle dev, int port,
 	int usegeneric)
+{
 	struct usb_attach_arg uaa;
 	usb_device_descriptor_t *dd = &dev->ddesc;
 	device_t dv;
 	int dlocs[USBDEVIFCF_NLOCS];
 	uaa.device = dev;
 	uaa.usegeneric = usegeneric;
 	uaa.port = port;
 	uaa.vendor = UGETW(dd->idVendor);
 	uaa.product = UGETW(dd->idProduct);
 	uaa.release = UGETW(dd->bcdDevice);
 	uaa.class = dd->bDeviceClass;
 	uaa.subclass = dd->bDeviceSubClass;
 	uaa.proto = dd->bDeviceProtocol;
 	dlocs[USBDEVIFCF_PORT] = uaa.port;
 	dlocs[USBDEVIFCF_VENDOR] = uaa.vendor;
 	dlocs[USBDEVIFCF_PRODUCT] = uaa.product;
 	dlocs[USBDEVIFCF_RELEASE] = uaa.release;
 	/* the rest is historical ballast */
 	dlocs[USBDEVIFCF_CONFIGURATION] = -1;
 	dlocs[USBDEVIFCF_INTERFACE] = -1;
 	dv = config_found_sm_loc(parent, "usbdevif", dlocs, &uaa, usbd_print,
 				 config_stdsubmatch);
 	if (dv) {
 		dev->subdevs = malloc(sizeof dv, M_USB, M_NOWAIT);
 		if (dev->subdevs == NULL)
 			return (USBD_NOMEM);
 		dev->subdevs[0] = dv;
 		dev->subdevlen = 1;
 		dev->nifaces_claimed = 1; /* XXX */
+	}
 	return (USBD_NORMAL_COMPLETION);
+}
 static usbd_status
 usbd_attachinterfaces(device_t parent, usbd_device_handle dev,
 		      int port, const int *locators)
+{
 	struct usbif_attach_arg uiaa;
 	int ilocs[USBIFIFCF_NLOCS];
 	usb_device_descriptor_t *dd = &dev->ddesc;
 	int nifaces;
 	usbd_interface_handle *ifaces;
 	int i, j, loc;
 	device_t dv;
 	nifaces = dev->cdesc->bNumInterface;
 	ifaces = malloc(nifaces * sizeof(*ifaces), M_USB, M_NOWAIT|M_ZERO);
 	if (!ifaces)
 		return (USBD_NOMEM);
 	for (i = 0; i < nifaces; i++)
 		if (!dev->subdevs[i])
 			ifaces[i] = &dev->ifaces[i];
 	uiaa.device = dev;
 	uiaa.port = port;
 	uiaa.vendor = UGETW(dd->idVendor);
 	uiaa.product = UGETW(dd->idProduct);
 	uiaa.release = UGETW(dd->bcdDevice);
 	uiaa.configno = dev->cdesc->bConfigurationValue;
 	uiaa.ifaces = ifaces;
 	uiaa.nifaces = nifaces;
 	ilocs[USBIFIFCF_PORT] = uiaa.port;
 	ilocs[USBIFIFCF_VENDOR] = uiaa.vendor;
 	ilocs[USBIFIFCF_PRODUCT] = uiaa.product;
 	ilocs[USBIFIFCF_RELEASE] = uiaa.release;
 	ilocs[USBIFIFCF_CONFIGURATION] = uiaa.configno;
 	for (i = 0; i < nifaces; i++) {
 		if (!ifaces[i])
 			continue; /* interface already claimed */
 		uiaa.iface = ifaces[i];
 		uiaa.class = ifaces[i]->idesc->bInterfaceClass;
 		uiaa.subclass = ifaces[i]->idesc->bInterfaceSubClass;
 		uiaa.proto = ifaces[i]->idesc->bInterfaceProtocol;
 		uiaa.ifaceno = ifaces[i]->idesc->bInterfaceNumber;
 		ilocs[USBIFIFCF_INTERFACE] = uiaa.ifaceno;
 		if (locators != NULL) {
 			loc = locators[USBIFIFCF_CONFIGURATION];
 			if (loc != USBIFIFCF_CONFIGURATION_DEFAULT &&
 			    loc != uiaa.configno)
 				continue;
 			loc = locators[USBIFIFCF_INTERFACE];
 			if (loc != USBIFIFCF_INTERFACE && loc != uiaa.ifaceno)
 				continue;
+		}
 		dv = config_found_sm_loc(parent, "usbifif", ilocs, &uiaa,
 					 usbd_ifprint, config_stdsubmatch);
 		if (!dv)
 			continue;
 		ifaces[i] = 0; /* claim */
 		/* account for ifaces claimed by the driver behind our back */
 		for (j = 0; j < nifaces; j++) {
 			if (!ifaces[j] && !dev->subdevs[j]) {
 				dev->subdevs[j] = dv;
 				dev->nifaces_claimed++;
+			}
+		}
+	}
 	free(ifaces, M_USB);
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_status
 usbd_probe_and_attach(device_t parent, usbd_device_handle dev,
                       int port, int addr)
+{
 	usb_device_descriptor_t *dd = &dev->ddesc;
 	int confi, nifaces;
 	usbd_status err;
 	/* First try with device specific drivers. */
 	DPRINTF(("usbd_probe_and_attach: trying device specific drivers\n"));
 	err = usbd_attachwholedevice(parent, dev, port, 0);
 	if (dev->nifaces_claimed || err)
 		return (err);
 	DPRINTF(("usbd_probe_and_attach: no device specific driver found\n"));
 	DPRINTF(("usbd_probe_and_attach: looping over %d configurations\n",
 		 dd->bNumConfigurations));
 	for (confi = 0; confi < dd->bNumConfigurations; confi++) {
 		DPRINTFN(1,("usbd_probe_and_attach: trying config idx=%d\n",
 			    confi));
 		err = usbd_set_config_index(dev, confi, 1);
 		if (err) {
 #ifdef USB_DEBUG
 			DPRINTF(("%s: port %d, set config at addr %d failed, "
 			    "error=%s\n", device_xname(parent), port,
 			    addr, usbd_errstr(err)));
 #else
 			printf("%s: port %d, set config at addr %d failed\n",
 			    device_xname(parent), port, addr);
 #endif
 			return (err);
+		}
 		nifaces = dev->cdesc->bNumInterface;
 		dev->subdevs = malloc(nifaces * sizeof(device_t), M_USB,
 				      M_NOWAIT|M_ZERO);
 		if (dev->subdevs == NULL)
 			return (USBD_NOMEM);
 		dev->subdevlen = nifaces;
 		err = usbd_attachinterfaces(parent, dev, port, NULL);
 		if (!dev->nifaces_claimed) {
 			free(dev->subdevs, M_USB);
 			dev->subdevs = 0;
 			dev->subdevlen = 0;
+		}
 		if (dev->nifaces_claimed || err)
 			return (err);
+	}
 	/* No interfaces were attached in any of the configurations. */
 	if (dd->bNumConfigurations > 1) /* don't change if only 1 config */
 		usbd_set_config_index(dev, 0, 0);
 	DPRINTF(("usbd_probe_and_attach: no interface drivers found\n"));
 	/* Finally try the generic driver. */
 	err = usbd_attachwholedevice(parent, dev, port, 1);
 	/*
 	 * The generic attach failed, but leave the device as it is.
 	 * We just did not find any drivers, that's all.  The device is
 	 * fully operational and not harming anyone.
 	 */
 	DPRINTF(("usbd_probe_and_attach: generic attach failed\n"));
 	return (USBD_NORMAL_COMPLETION);
+}
 /**
  * Called from uhub_rescan().  usbd_new_device() for the target dev must be
  * called before calling this.
  */
 usbd_status
 usbd_reattach_device(device_t parent, usbd_device_handle dev,
                      int port, const int *locators)
+{
 	int i, loc;
 	if (locators != NULL) {
 		loc = locators[USBIFIFCF_PORT];
 		if (loc != USBIFIFCF_PORT_DEFAULT && loc != port)
 			return USBD_NORMAL_COMPLETION;
 		loc = locators[USBIFIFCF_VENDOR];
 		if (loc != USBIFIFCF_VENDOR_DEFAULT &&
 		    loc != UGETW(dev->ddesc.idVendor))
 			return USBD_NORMAL_COMPLETION;
 		loc = locators[USBIFIFCF_PRODUCT];
 		if (loc != USBIFIFCF_PRODUCT_DEFAULT &&
 		    loc != UGETW(dev->ddesc.idProduct))
 			return USBD_NORMAL_COMPLETION;
 		loc = locators[USBIFIFCF_RELEASE];
 		if (loc != USBIFIFCF_RELEASE_DEFAULT &&
 		    loc != UGETW(dev->ddesc.bcdDevice))
 			return USBD_NORMAL_COMPLETION;
+	}
 	if (dev->subdevlen == 0) {
 		/* XXX: check USBIFIFCF_CONFIGURATION and
 		 * USBIFIFCF_INTERFACE too */
 		return usbd_probe_and_attach(parent, dev, port, dev->address);
 	} else if (dev->subdevlen != dev->cdesc->bNumInterface) {
 		/* device-specific or generic driver is already attached. */
 		return USBD_NORMAL_COMPLETION;
+	}
 	/* Does the device have unconfigured interfaces? */
 	for (i = 0; i < dev->subdevlen; i++) {
 		if (dev->subdevs[i] == NULL) {
 			break;
+		}
+	}
 	if (i >= dev->subdevlen)
 		return USBD_NORMAL_COMPLETION;
 	return usbd_attachinterfaces(parent, dev, port, locators);
+}
 /*
  * Get the first 8 bytes of the device descriptor.
  * Do as Windows does: try to read 64 bytes -- there are devices which
  * recognize the initial descriptor fetch (before the control endpoint's
  * MaxPacketSize is known by the host) by exactly this length.
  */
 static usbd_status
 usbd_get_initial_ddesc(usbd_device_handle dev, usb_device_descriptor_t *desc)
+{
 	usb_device_request_t req;
 	char buf[64];
 	int res, actlen;
 	req.bmRequestType = UT_READ_DEVICE;
 	req.bRequest = UR_GET_DESCRIPTOR;
 	USETW2(req.wValue, UDESC_DEVICE, 0);
 	USETW(req.wIndex, 0);
 	USETW(req.wLength, 64);
 	res = usbd_do_request_flags(dev, &req, buf, USBD_SHORT_XFER_OK,
 		&actlen, USBD_DEFAULT_TIMEOUT);
 	if (res)
 		return res;
 	if (actlen < 8)
 		return USBD_SHORT_XFER;
 	memcpy(desc, buf, 8);
 	return USBD_NORMAL_COMPLETION;
+}
 /*
  * Called when a new device has been put in the powered state,
  * but not yet in the addressed state.
  * Get initial descriptor, set the address, get full descriptor,
  * and attach a driver.
  */
 usbd_status
 usbd_new_device(device_t parent, usbd_bus_handle bus, int depth,
                 int speed, int port, struct usbd_port *up)
+{
 	usbd_device_handle dev, adev;
 	struct usbd_device *hub;
 	usb_device_descriptor_t *dd;
 	usb_port_status_t ps;
 	usbd_status err;
 	int addr;
 	int i;
 	int p;
 	DPRINTF(("usbd_new_device bus=%p port=%d depth=%d speed=%d\n",
 		 bus, port, depth, speed));
 	addr = usbd_getnewaddr(bus);
 	if (addr < 0) {
 		printf("%s: No free USB addresses, new device ignored.\n",
 		       device_xname(bus->usbctl));
 		return (USBD_NO_ADDR);
+	}
 	dev = malloc(sizeof *dev, M_USB, M_NOWAIT|M_ZERO);
 	if (dev == NULL)
 		return (USBD_NOMEM);
 	dev->bus = bus;
 	/* Set up default endpoint handle. */
 	dev->def_ep.edesc = &dev->def_ep_desc;
 	/* Set up default endpoint descriptor. */
 	dev->def_ep_desc.bLength = USB_ENDPOINT_DESCRIPTOR_SIZE;
 	dev->def_ep_desc.bDescriptorType = UDESC_ENDPOINT;
 	dev->def_ep_desc.bEndpointAddress = USB_CONTROL_ENDPOINT;
 	dev->def_ep_desc.bmAttributes = UE_CONTROL;
 	/*
 	 * temporary, will be fixed after first descriptor fetch
 	 * (which uses 64 bytes so it shouldn't be less),
 	 * highspeed devices must support 64 byte packets anyway
 	 */
 	USETW(dev->def_ep_desc.wMaxPacketSize, 64);
 	dev->def_ep_desc.bInterval = 0;
 	/* doesn't matter, just don't let it uninitialized */
 	dev->def_ep.datatoggle = 0;
 	dev->quirks = &usbd_no_quirk;
 	dev->address = USB_START_ADDR;
 	dev->ddesc.bMaxPacketSize = 0;
 	dev->depth = depth;
 	dev->powersrc = up;
 	dev->myhub = up->parent;
 	up->device = dev;
 	/* Locate port on upstream high speed hub */
 	for (adev = dev, hub = up->parent;
 	     hub != NULL && hub->speed != USB_SPEED_HIGH;
 	     adev = hub, hub = hub->myhub)
+		;
 	if (hub) {
 		for (p = 0; p < hub->hub->hubdesc.bNbrPorts; p++) {
 			if (hub->hub->ports[p].device == adev) {
 				dev->myhsport = &hub->hub->ports[p];
 				goto found;
+			}
+		}
 		panic("usbd_new_device: cannot find HS port\n");
 	found:
 		DPRINTFN(1,("usbd_new_device: high speed port %d\n", p));
 	} else {
 		dev->myhsport = NULL;
+	}
 	dev->speed = speed;
 	dev->langid = USBD_NOLANG;
 	dev->cookie.cookie = ++usb_cookie_no;
 	/* Establish the default pipe. */
 	err = usbd_setup_pipe(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
 			      &dev->default_pipe);
 	if (err) {
 		usbd_remove_device(dev, up);
 		return (err);
+	}
 	dd = &dev->ddesc;
 	/* Try a few times in case the device is slow (i.e. outside specs.) */
 	for (i = 0; i < 10; i++) {
 		/* Get the first 8 bytes of the device descriptor. */
 		err = usbd_get_initial_ddesc(dev, dd);
 		if (!err)
 			break;
 		usbd_delay_ms(dev, 200);
 		if ((i & 3) == 3)
 			usbd_reset_port(up->parent, port, &ps);
+	}
 	if (err) {
 		DPRINTFN(-1, ("usbd_new_device: addr=%d, getting first desc "
 			      "failed: %d\n", addr, err));
 		usbd_remove_device(dev, up);
 		return (err);
+	}
 	/* Windows resets the port here, do likewise */
 	if (up->parent)
 		usbd_reset_port(up->parent, port, &ps);
 	if (speed == USB_SPEED_HIGH) {
 		/* Max packet size must be 64 (sec 5.5.3). */
 		if (dd->bMaxPacketSize != USB_2_MAX_CTRL_PACKET) {
 #ifdef DIAGNOSTIC
 			printf("usbd_new_device: addr=%d bad max packet "
 			    "size=%d. adjusting to %d.\n",
 			    addr, dd->bMaxPacketSize, USB_2_MAX_CTRL_PACKET);
 #endif
 			dd->bMaxPacketSize = USB_2_MAX_CTRL_PACKET;
+		}
+	}
 	DPRINTF(("usbd_new_device: adding unit addr=%d, rev=%02x, class=%d, "
 		 "subclass=%d, protocol=%d, maxpacket=%d, len=%d, speed=%d\n",
 		 addr,UGETW(dd->bcdUSB), dd->bDeviceClass, dd->bDeviceSubClass,
 		 dd->bDeviceProtocol, dd->bMaxPacketSize, dd->bLength,
 		 dev->speed));
 	if (dd->bDescriptorType != UDESC_DEVICE) {
 		/* Illegal device descriptor */
 		DPRINTFN(-1,("usbd_new_device: illegal descriptor %d\n",
 			     dd->bDescriptorType));
 		usbd_remove_device(dev, up);
 		return (USBD_INVAL);
+	}
 	if (dd->bLength < USB_DEVICE_DESCRIPTOR_SIZE) {
 		DPRINTFN(-1,("usbd_new_device: bad length %d\n", dd->bLength));
 		usbd_remove_device(dev, up);
 		return (USBD_INVAL);
+	}
 	USETW(dev->def_ep_desc.wMaxPacketSize, dd->bMaxPacketSize);
 	/* Set the address */
 	DPRINTFN(5, ("usbd_new_device: setting device address=%d\n", addr));
 	err = usbd_set_address(dev, addr);
 	if (err) {
 		DPRINTFN(-1, ("usbd_new_device: set address %d failed\n", addr));
 		err = USBD_SET_ADDR_FAILED;
 		usbd_remove_device(dev, up);
 		return err;
+	}
 	/* Allow device time to set new address */
 	usbd_delay_ms(dev, USB_SET_ADDRESS_SETTLE);
 	dev->address = addr;	/* new device address now */
 	bus->devices[addr] = dev;
 	err = usbd_reload_device_desc(dev);
 	if (err) {
 		DPRINTFN(-1, ("usbd_new_device: addr=%d, getting full desc "
 			      "failed\n", addr));
 		usbd_remove_device(dev, up);
 		return (err);
+	}
 	/* Re-establish the default pipe with the new address. */
 	usbd_kill_pipe(dev->default_pipe);
 	err = usbd_setup_pipe(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
 	    &dev->default_pipe);
 	if (err) {
 		DPRINTFN(-1, ("usbd_new_device: setup default pipe failed\n"));
 		usbd_remove_device(dev, up);
 		return err;
+	}
 	/* Assume 100mA bus powered for now. Changed when configured. */
 	dev->power = USB_MIN_POWER;
 	dev->self_powered = 0;
 	DPRINTF(("usbd_new_device: new dev (addr %d), dev=%p, parent=%p\n",
 		 addr, dev, parent));
 	usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev);
 	if (port == 0) { /* root hub */
 		KASSERT(addr == 1);
 		usbd_attach_roothub(parent, dev);
 		return (USBD_NORMAL_COMPLETION);
+	}
 	err = usbd_probe_and_attach(parent, dev, port, addr);
 	if (err) {
 		usbd_remove_device(dev, up);
 		return (err);
+	}
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_status
 usbd_reload_device_desc(usbd_device_handle dev)
+{
 	usbd_status err;
 	/* Get the full device descriptor. */
 	err = usbd_get_device_desc(dev, &dev->ddesc);
 	if (err)
 		return (err);
 	/* Figure out what's wrong with this device. */
 	dev->quirks = usbd_find_quirk(&dev->ddesc);
 	return (USBD_NORMAL_COMPLETION);
+}
 void
 usbd_remove_device(usbd_device_handle dev, struct usbd_port *up)
+{
 	DPRINTF(("usbd_remove_device: %p\n", dev));
 	if (dev->default_pipe != NULL)
 		usbd_kill_pipe(dev->default_pipe);
 	up->device = NULL;
 	dev->bus->devices[dev->address] = NULL;
 	free(dev, M_USB);
+}
 int
 usbd_print(void *aux, const char *pnp)
+{
 	struct usb_attach_arg *uaa = aux;
 	DPRINTFN(15, ("usbd_print dev=%p\n", uaa->device));
 	if (pnp) {
 #define USB_DEVINFO 1024
 		char *devinfo;
 		if (!uaa->usegeneric)
 			return (QUIET);
 		devinfo = malloc(USB_DEVINFO, M_TEMP, M_WAITOK);
 		usbd_devinfo(uaa->device, 1, devinfo, USB_DEVINFO);
 		aprint_normal("%s, %s", devinfo, pnp);
 		free(devinfo, M_TEMP);
+	}
 	aprint_normal(" port %d", uaa->port);
 #if 0
 	/*
 	 * It gets very crowded with these locators on the attach line.
 	 * They are not really needed since they are printed in the clear
 	 * by each driver.
 	 */
 	if (uaa->vendor != UHUB_UNK_VENDOR)
 		aprint_normal(" vendor 0x%04x", uaa->vendor);
 	if (uaa->product != UHUB_UNK_PRODUCT)
 		aprint_normal(" product 0x%04x", uaa->product);
 	if (uaa->release != UHUB_UNK_RELEASE)
 		aprint_normal(" release 0x%04x", uaa->release);
 #endif
 	return (UNCONF);
+}
 int
 usbd_ifprint(void *aux, const char *pnp)
+{
 	struct usbif_attach_arg *uaa = aux;
 	DPRINTFN(15, ("usbd_print dev=%p\n", uaa->device));
 	if (pnp)
 		return (QUIET);
 	aprint_normal(" port %d", uaa->port);
 	aprint_normal(" configuration %d", uaa->configno);
 	aprint_normal(" interface %d", uaa->ifaceno);
 #if 0
 	/*
 	 * It gets very crowded with these locators on the attach line.
 	 * They are not really needed since they are printed in the clear
 	 * by each driver.
 	 */
 	if (uaa->vendor != UHUB_UNK_VENDOR)
 		aprint_normal(" vendor 0x%04x", uaa->vendor);
 	if (uaa->product != UHUB_UNK_PRODUCT)
 		aprint_normal(" product 0x%04x", uaa->product);
 	if (uaa->release != UHUB_UNK_RELEASE)
 		aprint_normal(" release 0x%04x", uaa->release);
 #endif
 	return (UNCONF);
+}
 void
 usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di,
 		     int usedev)
+{
 	struct usbd_port *p;
 	int i, j, err, s;
 	di->udi_bus = device_unit(dev->bus->usbctl);
 	di->udi_addr = dev->address;
 	di->udi_cookie = dev->cookie;
 	usbd_devinfo_vp(dev, di->udi_vendor, sizeof(di->udi_vendor),
 	    di->udi_product, sizeof(di->udi_product), usedev, 1);
 	usbd_printBCD(di->udi_release, sizeof(di->udi_release),
 	    UGETW(dev->ddesc.bcdDevice));
 	di->udi_serial[0] = 0;
 	if (usedev)
 		(void)usbd_get_string(dev, dev->ddesc.iSerialNumber,
 				      di->udi_serial);
 	di->udi_vendorNo = UGETW(dev->ddesc.idVendor);
 	di->udi_productNo = UGETW(dev->ddesc.idProduct);
 	di->udi_releaseNo = UGETW(dev->ddesc.bcdDevice);
 	di->udi_class = dev->ddesc.bDeviceClass;
 	di->udi_subclass = dev->ddesc.bDeviceSubClass;
 	di->udi_protocol = dev->ddesc.bDeviceProtocol;
 	di->udi_config = dev->config;
 	di->udi_power = dev->self_powered ? 0 : dev->power;
 	di->udi_speed = dev->speed;
 	if (dev->subdevlen > 0) {
 		for (i = 0, j = 0; i < dev->subdevlen &&
 			     j < USB_MAX_DEVNAMES; i++) {
 			if (!dev->subdevs[i])
 				continue;
 			strncpy(di->udi_devnames[j],
 			    device_xname(dev->subdevs[i]), USB_MAX_DEVNAMELEN);
 			di->udi_devnames[j][USB_MAX_DEVNAMELEN-1] = '\0';
 			j++;
+		}
 	} else {
 		j = 0;
+	}
 	for (/* j is set */; j < USB_MAX_DEVNAMES; j++)
 		di->udi_devnames[j][0] = 0;                 /* empty */
 	if (dev->hub) {
 		for (i = 0;
 		     i < sizeof(di->udi_ports) / sizeof(di->udi_ports[0]) &&
 			     i < dev->hub->hubdesc.bNbrPorts;
 		     i++) {
 			p = &dev->hub->ports[i];
 			if (p->device)
 				err = p->device->address;
 			else {
 				s = UGETW(p->status.wPortStatus);
 				if (s & UPS_PORT_ENABLED)
 					err = USB_PORT_ENABLED;
 				else if (s & UPS_SUSPEND)
 					err = USB_PORT_SUSPENDED;
 				else if (s & UPS_PORT_POWER)
 					err = USB_PORT_POWERED;
 				else
 					err = USB_PORT_DISABLED;
+			}
 			di->udi_ports[i] = err;
+		}
 		di->udi_nports = dev->hub->hubdesc.bNbrPorts;
 	} else
 		di->udi_nports = 0;
+}
 #ifdef COMPAT_30
 void
 usbd_fill_deviceinfo_old(usbd_device_handle dev, struct usb_device_info_old *di,
                          int usedev)
+{
 	struct usbd_port *p;
 	int i, j, err, s;
 	di->udi_bus = device_unit(dev->bus->usbctl);
 	di->udi_addr = dev->address;
 	di->udi_cookie = dev->cookie;
 	usbd_devinfo_vp(dev, di->udi_vendor, sizeof(di->udi_vendor),
 	    di->udi_product, sizeof(di->udi_product), usedev, 0);
 	usbd_printBCD(di->udi_release, sizeof(di->udi_release),
 	    UGETW(dev->ddesc.bcdDevice));
 	di->udi_vendorNo = UGETW(dev->ddesc.idVendor);
 	di->udi_productNo = UGETW(dev->ddesc.idProduct);
 	di->udi_releaseNo = UGETW(dev->ddesc.bcdDevice);
 	di->udi_class = dev->ddesc.bDeviceClass;
 	di->udi_subclass = dev->ddesc.bDeviceSubClass;
 	di->udi_protocol = dev->ddesc.bDeviceProtocol;
 	di->udi_config = dev->config;
 	di->udi_power = dev->self_powered ? 0 : dev->power;
 	di->udi_speed = dev->speed;
 	if (dev->subdevlen > 0) {
 		for (i = 0, j = 0; i < dev->subdevlen &&
 			     j < USB_MAX_DEVNAMES; i++) {
 			if (!dev->subdevs[i])
 				continue;
 			strncpy(di->udi_devnames[j],
 			    device_xname(dev->subdevs[i]), USB_MAX_DEVNAMELEN);
 			di->udi_devnames[j][USB_MAX_DEVNAMELEN-1] = '\0';
 			j++;
+		}
 	} else {
 		j = 0;
+	}
 	for (/* j is set */; j < USB_MAX_DEVNAMES; j++)
 		di->udi_devnames[j][0] = 0;		 /* empty */
 	if (dev->hub) {
 		for (i = 0;
 		     i < sizeof(di->udi_ports) / sizeof(di->udi_ports[0]) &&
 			     i < dev->hub->hubdesc.bNbrPorts;
 		     i++) {
 			p = &dev->hub->ports[i];
 			if (p->device)
 				err = p->device->address;
 			else {
 				s = UGETW(p->status.wPortStatus);
 				if (s & UPS_PORT_ENABLED)
 					err = USB_PORT_ENABLED;
 				else if (s & UPS_SUSPEND)
 					err = USB_PORT_SUSPENDED;
 				else if (s & UPS_PORT_POWER)
 					err = USB_PORT_POWERED;
 				else
 					err = USB_PORT_DISABLED;
+			}
 			di->udi_ports[i] = err;
+		}
 		di->udi_nports = dev->hub->hubdesc.bNbrPorts;
 	} else
 		di->udi_nports = 0;
+}
 #endif
 void
 usb_free_device(usbd_device_handle dev)
+{
 	int ifcidx, nifc;
 	if (dev->default_pipe != NULL)
 		usbd_kill_pipe(dev->default_pipe);
 	if (dev->ifaces != NULL) {
 		nifc = dev->cdesc->bNumInterface;
 		for (ifcidx = 0; ifcidx < nifc; ifcidx++)
 			usbd_free_iface_data(dev, ifcidx);
 		free(dev->ifaces, M_USB);
+	}
 	if (dev->cdesc != NULL)
 		free(dev->cdesc, M_USB);
 	if (dev->subdevlen > 0) {
 		free(dev->subdevs, M_USB);
 		dev->subdevlen = 0;
+	}
 	free(dev, M_USB);
+}
 /*
  * The general mechanism for detaching drivers works as follows: Each
  * driver is responsible for maintaining a reference count on the
  * number of outstanding references to its softc (e.g.  from
  * processing hanging in a read or write).  The detach method of the
  * driver decrements this counter and flags in the softc that the
  * driver is dying and then wakes any sleepers.  It then sleeps on the
  * softc.  Each place that can sleep must maintain the reference
  * count.  When the reference count drops to -1 (0 is the normal value
  * of the reference count) the a wakeup on the softc is performed
  * signaling to the detach waiter that all references are gone.
  */
 /*
  * Called from process context when we discover that a port has
  * been disconnected.
  */
 int
 usb_disconnect_port(struct usbd_port *up, device_t parent, int flags)
+{
 	usbd_device_handle dev = up->device;
 	device_t subdev;
 	char subdevname[16];
 	const char *hubname = device_xname(parent);
 	int i, rc;
 	DPRINTFN(3,("uhub_disconnect: up=%p dev=%p port=%d\n",
 		    up, dev, up->portno));
 	if (dev == NULL) {
 #ifdef DIAGNOSTIC
 		printf("usb_disconnect_port: no device\n");
 #endif
 		return 0;
+	}
 	if (dev->subdevlen > 0) {
 		DPRINTFN(3,("usb_disconnect_port: disconnect subdevs\n"));
 		for (i = 0; i < dev->subdevlen; i++) {
 			if ((subdev = dev->subdevs[i]) == NULL)
 				continue;
 			strlcpy(subdevname, device_xname(subdev),
 			    sizeof(subdevname));
 			if ((rc = config_detach(subdev, flags)) != 0)
 				return rc;
 			printf("%s: at %s", subdevname, hubname);
 			if (up->portno != 0)
 				printf(" port %d", up->portno);
 			printf(" (addr %d) disconnected\n", dev->address);
+		}
 		KASSERT(!dev->nifaces_claimed);
+	}
 	usbd_add_dev_event(USB_EVENT_DEVICE_DETACH, dev);
 	dev->bus->devices[dev->address] = NULL;
 	up->device = NULL;
 	usb_free_device(dev);
 	return 0;
+}

 @@ -1,1258 +1,1259 @@
-/*	$NetBSD: usbdi.c,v 1.134.2.1.2.3 2011/12/08 20:21:31 mrg Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.134.2.1.2.4 2011/12/08 22:04:56 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma 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
  *    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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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.134.2.1.2.3 2011/12/08 20:21:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.1.2.4 2011/12/08 22:04:56 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usb_quirks.h>
 /* UTF-8 encoding stuff */
 #include <fs/unicode.h>
 #ifdef USB_DEBUG
 #define DPRINTF(x)	if (usbdebug) printf x
 #define DPRINTFN(n,x)	if (usbdebug>(n)) printf x
 extern int usbdebug;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 Static usbd_status usbd_ar_pipe(usbd_pipe_handle pipe);
 Static void usbd_do_request_async_cb
 	(usbd_xfer_handle, usbd_private_handle, usbd_status);
 Static void usbd_start_next(usbd_pipe_handle pipe);
 Static usbd_status usbd_open_pipe_ival
 	(usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int);
 static inline int
 usbd_xfer_isread(usbd_xfer_handle xfer)
+{
 	if (xfer->rqflags & URQ_REQUEST)
 		return (xfer->request.bmRequestType & UT_READ);
 	else
 		return (xfer->pipe->endpoint->edesc->bEndpointAddress &
 			UE_DIR_IN);
+}
 #if defined(USB_DEBUG) || defined(EHCI_DEBUG)
 void
 usbd_dump_iface(struct usbd_interface *iface)
+{
 	printf("usbd_dump_iface: iface=%p\n", iface);
 	if (iface == NULL)
 		return;
 	printf(" device=%p idesc=%p index=%d altindex=%d priv=%p\n",
 	       iface->device, iface->idesc, iface->index, iface->altindex,
 	       iface->priv);
+}
 void
 usbd_dump_device(struct usbd_device *dev)
+{
 	printf("usbd_dump_device: dev=%p\n", dev);
 	if (dev == NULL)
 		return;
 	printf(" bus=%p default_pipe=%p\n", dev->bus, dev->default_pipe);
 	printf(" address=%d config=%d depth=%d speed=%d self_powered=%d "
 	       "power=%d langid=%d\n",
 	       dev->address, dev->config, dev->depth, dev->speed,
 	       dev->self_powered, dev->power, dev->langid);
+}
 void
 usbd_dump_endpoint(struct usbd_endpoint *endp)
+{
 	printf("usbd_dump_endpoint: endp=%p\n", endp);
 	if (endp == NULL)
 		return;
 	printf(" edesc=%p refcnt=%d\n", endp->edesc, endp->refcnt);
 	if (endp->edesc)
 		printf(" bEndpointAddress=0x%02x\n",
 		       endp->edesc->bEndpointAddress);
+}
 void
 usbd_dump_queue(usbd_pipe_handle pipe)
+{
 	usbd_xfer_handle xfer;
 	printf("usbd_dump_queue: pipe=%p\n", pipe);
 	SIMPLEQ_FOREACH(xfer, &pipe->queue, next) {
 		printf("  xfer=%p\n", xfer);
+	}
+}
 void
 usbd_dump_pipe(usbd_pipe_handle pipe)
+{
 	printf("usbd_dump_pipe: pipe=%p\n", pipe);
 	if (pipe == NULL)
 		return;
 	usbd_dump_iface(pipe->iface);
 	usbd_dump_device(pipe->device);
 	usbd_dump_endpoint(pipe->endpoint);
 	printf(" (usbd_dump_pipe:)\n refcnt=%d running=%d aborting=%d\n",
 	       pipe->refcnt, pipe->running, pipe->aborting);
 	printf(" intrxfer=%p, repeat=%d, interval=%d\n",
 	       pipe->intrxfer, pipe->repeat, pipe->interval);
+}
 #endif
 usbd_status
 usbd_open_pipe(usbd_interface_handle iface, u_int8_t address,
 	       u_int8_t flags, usbd_pipe_handle *pipe)
+{
 	return (usbd_open_pipe_ival(iface, address, flags, pipe,
 				    USBD_DEFAULT_INTERVAL));
+}
 usbd_status
 usbd_open_pipe_ival(usbd_interface_handle iface, u_int8_t address,
 		    u_int8_t flags, usbd_pipe_handle *pipe, int ival)
+{
 	usbd_pipe_handle p;
 	struct usbd_endpoint *ep;
 	usbd_status err;
 	int i;
 	DPRINTFN(3,("usbd_open_pipe: iface=%p address=0x%x flags=0x%x\n",
 		    iface, address, flags));
 	for (i = 0; i < iface->idesc->bNumEndpoints; i++) {
 		ep = &iface->endpoints[i];
 		if (ep->edesc == NULL)
 			return (USBD_IOERROR);
 		if (ep->edesc->bEndpointAddress == address)
 			goto found;
+	}
 	return (USBD_BAD_ADDRESS);
  found:
 	if ((flags & USBD_EXCLUSIVE_USE) && ep->refcnt != 0)
 		return (USBD_IN_USE);
 	err = usbd_setup_pipe(iface->device, iface, ep, ival, &p);
 	if (err)
 		return (err);
 	LIST_INSERT_HEAD(&iface->pipes, p, next);
 	*pipe = p;
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_status
 usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address,
 		    u_int8_t flags, usbd_pipe_handle *pipe,
 		    usbd_private_handle priv, void *buffer, u_int32_t len,
 		    usbd_callback cb, int ival)
+{
 	usbd_status err;
 	usbd_xfer_handle xfer;
 	usbd_pipe_handle ipipe;
 	DPRINTFN(3,("usbd_open_pipe_intr: address=0x%x flags=0x%x len=%d\n",
 		    address, flags, len));
 	err = usbd_open_pipe_ival(iface, address, USBD_EXCLUSIVE_USE,
 				  &ipipe, ival);
 	if (err)
 		return (err);
 	xfer = usbd_alloc_xfer(iface->device);
 	if (xfer == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	usbd_setup_xfer(xfer, ipipe, priv, buffer, len, flags,
 	    USBD_NO_TIMEOUT, cb);
 	ipipe->intrxfer = xfer;
 	ipipe->repeat = 1;
 	err = usbd_transfer(xfer);
 	*pipe = ipipe;
 	if (err != USBD_IN_PROGRESS)
 		goto bad2;
 	return (USBD_NORMAL_COMPLETION);
  bad2:
 	ipipe->intrxfer = NULL;
 	ipipe->repeat = 0;
 	usbd_free_xfer(xfer);
  bad1:
 	usbd_close_pipe(ipipe);
 	return (err);
+}
 usbd_status
 usbd_close_pipe(usbd_pipe_handle pipe)
+{
 	//int s;
 #ifdef DIAGNOSTIC
 	if (pipe == NULL) {
 		printf("usbd_close_pipe: pipe==NULL\n");
 		return (USBD_NORMAL_COMPLETION);
+	}
 #endif
 	//usbd_lock_pipe(pipe);
 	if (--pipe->refcnt != 0)
 		return (USBD_NORMAL_COMPLETION);
 	if (! SIMPLEQ_EMPTY(&pipe->queue))
 		return (USBD_PENDING_REQUESTS);
 	LIST_REMOVE(pipe, next);
 	pipe->endpoint->refcnt--;
 	pipe->methods->close(pipe);
 	//usbd_lock_pipe(pipe);
 	if (pipe->intrxfer != NULL)
 		usbd_free_xfer(pipe->intrxfer);
 	free(pipe, M_USB);
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_status
 usbd_transfer(usbd_xfer_handle xfer)
+{
 	usbd_pipe_handle pipe = xfer->pipe;
 	usb_dma_t *dmap = &xfer->dmabuf;
 	usbd_status err;
 	unsigned int size, flags;
 	int s;
 	DPRINTFN(5,("usbd_transfer: xfer=%p, flags=%#x, pipe=%p, running=%d\n",
 		    xfer, xfer->flags, pipe, pipe->running));
 #ifdef USB_DEBUG
 	if (usbdebug > 5)
 		usbd_dump_queue(pipe);
 #endif
 	xfer->done = 0;
 	if (pipe->aborting)
 		return (USBD_CANCELLED);
 	size = xfer->length;
 	/* If there is no buffer, allocate one. */
 	if (!(xfer->rqflags & URQ_DEV_DMABUF) && size != 0) {
 		struct usbd_bus *bus = pipe->device->bus;
 #ifdef DIAGNOSTIC
 		if (xfer->rqflags & URQ_AUTO_DMABUF)
 			printf("usbd_transfer: has old buffer!\n");
 #endif
 		err = bus->methods->allocm(bus, dmap, size);
 		if (err)
 			return (err);
 		xfer->rqflags |= URQ_AUTO_DMABUF;
+	}
 	flags = xfer->flags;
 	/* Copy data if going out. */
 	if (!(flags & USBD_NO_COPY) && size != 0 && !usbd_xfer_isread(xfer))
 		memcpy(KERNADDR(dmap, 0), xfer->buffer, size);
 	/* xfer is not valid after the transfer method unless synchronous */
 	err = pipe->methods->transfer(xfer);
 	if (err != USBD_IN_PROGRESS && err) {
 		/* The transfer has not been queued, so free buffer. */
 		if (xfer->rqflags & URQ_AUTO_DMABUF) {
 			struct usbd_bus *bus = pipe->device->bus;
 			bus->methods->freem(bus, &xfer->dmabuf);
 			xfer->rqflags &= ~URQ_AUTO_DMABUF;
+		}
+	}
 	if (!(flags & USBD_SYNCHRONOUS))
 		return (err);
 	/* Sync transfer, wait for completion. */
 	if (err != USBD_IN_PROGRESS)
 		return (err);
 	usbd_lock_pipe(pipe);
 	if (!xfer->done) {
 		if (pipe->device->bus->use_polling)
 			panic("usbd_transfer: not done");
-		if (pipe->lock)
+		if (pipe->device->bus->lock)
-			cv_wait(&xfer->cv, pipe->lock);
+			cv_wait(&xfer->cv, pipe->device->bus->lock);
 		else
 			tsleep(xfer, PRIBIO, "usbsyn", 0);
+	}
 	usbd_unlock_pipe(pipe);
 	return (xfer->status);
+}
 /* Like usbd_transfer(), but waits for completion. */
 usbd_status
 usbd_sync_transfer(usbd_xfer_handle xfer)
+{
 	xfer->flags |= USBD_SYNCHRONOUS;
 	return (usbd_transfer(xfer));
+}
 void *
 usbd_alloc_buffer(usbd_xfer_handle xfer, u_int32_t size)
+{
 	struct usbd_bus *bus = xfer->device->bus;
 	usbd_status err;
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & (URQ_DEV_DMABUF | URQ_AUTO_DMABUF))
 		printf("usbd_alloc_buffer: xfer already has a buffer\n");
 #endif
 	err = bus->methods->allocm(bus, &xfer->dmabuf, size);
 	if (err)
 		return (NULL);
 	xfer->rqflags |= URQ_DEV_DMABUF;
 	return (KERNADDR(&xfer->dmabuf, 0));
+}
 void
 usbd_free_buffer(usbd_xfer_handle xfer)
+{
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & (URQ_DEV_DMABUF | URQ_AUTO_DMABUF))) {
 		printf("usbd_free_buffer: no buffer\n");
 		return;
+	}
 #endif
 	xfer->rqflags &= ~(URQ_DEV_DMABUF | URQ_AUTO_DMABUF);
 	xfer->device->bus->methods->freem(xfer->device->bus, &xfer->dmabuf);
+}
 void *
 usbd_get_buffer(usbd_xfer_handle xfer)
+{
 	if (!(xfer->rqflags & URQ_DEV_DMABUF))
 		return (0);
 	return (KERNADDR(&xfer->dmabuf, 0));
+}
 usbd_xfer_handle
 usbd_alloc_xfer(usbd_device_handle dev)
+{
 	usbd_xfer_handle xfer;
 	xfer = dev->bus->methods->allocx(dev->bus);
 	if (xfer == NULL)
 		return (NULL);
 	xfer->device = dev;
 	callout_init(&xfer->timeout_handle, 0);
 	cv_init(&xfer->cv, "usbxfer");
 	cv_init(&xfer->hccv, "usbhcxfer");
 	DPRINTFN(5,("usbd_alloc_xfer() = %p\n", xfer));
 	return (xfer);
+}
 usbd_status
 usbd_free_xfer(usbd_xfer_handle xfer)
+{
 	DPRINTFN(5,("usbd_free_xfer: %p\n", xfer));
 	if (xfer->rqflags & (URQ_DEV_DMABUF | URQ_AUTO_DMABUF))
 		usbd_free_buffer(xfer);
 #if defined(DIAGNOSTIC)
 	if (callout_pending(&xfer->timeout_handle)) {
 		callout_stop(&xfer->timeout_handle);
 		printf("usbd_free_xfer: timout_handle pending");
+	}
 #endif
 	cv_destroy(&xfer->cv);
 	cv_destroy(&xfer->hccv);
 	xfer->device->bus->methods->freex(xfer->device->bus, xfer);
 	return (USBD_NORMAL_COMPLETION);
+}
 void
 usbd_setup_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
 		usbd_private_handle priv, void *buffer, u_int32_t length,
 		u_int16_t flags, u_int32_t timeout,
 		usbd_callback callback)
+{
 	xfer->pipe = pipe;
 	xfer->priv = priv;
 	xfer->buffer = buffer;
 	xfer->length = length;
 	xfer->actlen = 0;
 	xfer->flags = flags;
 	xfer->timeout = timeout;
 	xfer->status = USBD_NOT_STARTED;
 	xfer->callback = callback;
 	xfer->rqflags &= ~URQ_REQUEST;
 	xfer->nframes = 0;
+}
 void
 usbd_setup_default_xfer(usbd_xfer_handle xfer, usbd_device_handle dev,
 			usbd_private_handle priv, u_int32_t timeout,
 			usb_device_request_t *req, void *buffer,
 			u_int32_t length, u_int16_t flags,
 			usbd_callback callback)
+{
 	xfer->pipe = dev->default_pipe;
 	xfer->priv = priv;
 	xfer->buffer = buffer;
 	xfer->length = length;
 	xfer->actlen = 0;
 	xfer->flags = flags;
 	xfer->timeout = timeout;
 	xfer->status = USBD_NOT_STARTED;
 	xfer->callback = callback;
 	xfer->request = *req;
 	xfer->rqflags |= URQ_REQUEST;
 	xfer->nframes = 0;
+}
 void
 usbd_setup_isoc_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
 		     usbd_private_handle priv, u_int16_t *frlengths,
 		     u_int32_t nframes, u_int16_t flags, usbd_callback callback)
+{
 	xfer->pipe = pipe;
 	xfer->priv = priv;
 	xfer->buffer = 0;
 	xfer->length = 0;
 	xfer->actlen = 0;
 	xfer->flags = flags;
 	xfer->timeout = USBD_NO_TIMEOUT;
 	xfer->status = USBD_NOT_STARTED;
 	xfer->callback = callback;
 	xfer->rqflags &= ~URQ_REQUEST;
 	xfer->frlengths = frlengths;
 	xfer->nframes = nframes;
+}
 void
 usbd_get_xfer_status(usbd_xfer_handle xfer, usbd_private_handle *priv,
 		     void **buffer, u_int32_t *count, usbd_status *status)
+{
 	if (priv != NULL)
 		*priv = xfer->priv;
 	if (buffer != NULL)
 		*buffer = xfer->buffer;
 	if (count != NULL)
 		*count = xfer->actlen;
 	if (status != NULL)
 		*status = xfer->status;
+}
 usb_config_descriptor_t *
 usbd_get_config_descriptor(usbd_device_handle dev)
+{
 #ifdef DIAGNOSTIC
 	if (dev == NULL) {
 		printf("usbd_get_config_descriptor: dev == NULL\n");
 		return (NULL);
+	}
 #endif
 	return (dev->cdesc);
+}
 usb_interface_descriptor_t *
 usbd_get_interface_descriptor(usbd_interface_handle iface)
+{
 #ifdef DIAGNOSTIC
 	if (iface == NULL) {
 		printf("usbd_get_interface_descriptor: dev == NULL\n");
 		return (NULL);
+	}
 #endif
 	return (iface->idesc);
+}
 usb_device_descriptor_t *
 usbd_get_device_descriptor(usbd_device_handle dev)
+{
 	return (&dev->ddesc);
+}
 usb_endpoint_descriptor_t *
 usbd_interface2endpoint_descriptor(usbd_interface_handle iface, u_int8_t index)
+{
 	if (index >= iface->idesc->bNumEndpoints)
 		return (0);
 	return (iface->endpoints[index].edesc);
+}
 /* Some drivers may wish to abort requests on the default pipe, *
  * but there is no mechanism for getting a handle on it.        */
 usbd_status
 usbd_abort_default_pipe(struct usbd_device *device)
+{
 	return usbd_abort_pipe(device->default_pipe);
+}
 usbd_status
 usbd_abort_pipe(usbd_pipe_handle pipe)
+{
 	usbd_status err;
 	int s;
 	usbd_xfer_handle intrxfer = pipe->intrxfer;
 #ifdef DIAGNOSTIC
 	if (pipe == NULL) {
 		printf("usbd_abort_pipe: pipe==NULL\n");
 		return (USBD_NORMAL_COMPLETION);
+	}
 #endif
 	usbd_lock_pipe(pipe);
 	err = usbd_ar_pipe(pipe);
 	usbd_unlock_pipe(pipe);
 	if (pipe->intrxfer != intrxfer)
 		usbd_free_xfer(intrxfer);
 	return (err);
+}
 usbd_status
 usbd_clear_endpoint_stall(usbd_pipe_handle pipe)
+{
 	usbd_device_handle dev = pipe->device;
 	usb_device_request_t req;
 	usbd_status err;
 	DPRINTFN(8, ("usbd_clear_endpoint_stall\n"));
 	/*
 	 * Clearing en endpoint stall resets the endpoint toggle, so
 	 * do the same to the HC toggle.
 	 */
 	pipe->methods->cleartoggle(pipe);
 	req.bmRequestType = UT_WRITE_ENDPOINT;
 	req.bRequest = UR_CLEAR_FEATURE;
 	USETW(req.wValue, UF_ENDPOINT_HALT);
 	USETW(req.wIndex, pipe->endpoint->edesc->bEndpointAddress);
 	USETW(req.wLength, 0);
 	err = usbd_do_request(dev, &req, 0);
 #if 0
 XXX should we do this?
 	if (!err) {
 		pipe->state = USBD_PIPE_ACTIVE;
 		/* XXX activate pipe */
+	}
 #endif
 	return (err);
+}
 usbd_status
 usbd_clear_endpoint_stall_async(usbd_pipe_handle pipe)
+{
 	usbd_device_handle dev = pipe->device;
 	usb_device_request_t req;
 	usbd_status err;
 	pipe->methods->cleartoggle(pipe);
 	req.bmRequestType = UT_WRITE_ENDPOINT;
 	req.bRequest = UR_CLEAR_FEATURE;
 	USETW(req.wValue, UF_ENDPOINT_HALT);
 	USETW(req.wIndex, pipe->endpoint->edesc->bEndpointAddress);
 	USETW(req.wLength, 0);
 	err = usbd_do_request_async(dev, &req, 0);
 	return (err);
+}
 void
 usbd_clear_endpoint_toggle(usbd_pipe_handle pipe)
+{
 	pipe->methods->cleartoggle(pipe);
+}
 usbd_status
 usbd_endpoint_count(usbd_interface_handle iface, u_int8_t *count)
+{
 #ifdef DIAGNOSTIC
 	if (iface == NULL || iface->idesc == NULL) {
 		printf("usbd_endpoint_count: NULL pointer\n");
 		return (USBD_INVAL);
+	}
 #endif
 	*count = iface->idesc->bNumEndpoints;
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_status
 usbd_interface_count(usbd_device_handle dev, u_int8_t *count)
+{
 	if (dev->cdesc == NULL)
 		return (USBD_NOT_CONFIGURED);
 	*count = dev->cdesc->bNumInterface;
 	return (USBD_NORMAL_COMPLETION);
+}
 void
 usbd_interface2device_handle(usbd_interface_handle iface,
 			     usbd_device_handle *dev)
+{
 	*dev = iface->device;
+}
 usbd_status
 usbd_device2interface_handle(usbd_device_handle dev,
 			     u_int8_t ifaceno, usbd_interface_handle *iface)
+{
 	if (dev->cdesc == NULL)
 		return (USBD_NOT_CONFIGURED);
 	if (ifaceno >= dev->cdesc->bNumInterface)
 		return (USBD_INVAL);
 	*iface = &dev->ifaces[ifaceno];
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_device_handle
 usbd_pipe2device_handle(usbd_pipe_handle pipe)
+{
 	return (pipe->device);
+}
 /* XXXX use altno */
 usbd_status
 usbd_set_interface(usbd_interface_handle iface, int altidx)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	void *endpoints;
 	if (LIST_FIRST(&iface->pipes) != 0)
 		return (USBD_IN_USE);
 	endpoints = iface->endpoints;
 	err = usbd_fill_iface_data(iface->device, iface->index, altidx);
 	if (err)
 		return (err);
 	/* new setting works, we can free old endpoints */
 	if (endpoints != NULL)
 		free(endpoints, M_USB);
 #ifdef DIAGNOSTIC
 	if (iface->idesc == NULL) {
 		printf("usbd_set_interface: NULL pointer\n");
 		return (USBD_INVAL);
+	}
 #endif
 	req.bmRequestType = UT_WRITE_INTERFACE;
 	req.bRequest = UR_SET_INTERFACE;
 	USETW(req.wValue, iface->idesc->bAlternateSetting);
 	USETW(req.wIndex, iface->idesc->bInterfaceNumber);
 	USETW(req.wLength, 0);
 	return (usbd_do_request(iface->device, &req, 0));
+}
 int
 usbd_get_no_alts(usb_config_descriptor_t *cdesc, int ifaceno)
+{
 	char *p = (char *)cdesc;
 	char *end = p + UGETW(cdesc->wTotalLength);
 	usb_interface_descriptor_t *d;
 	int n;
 	for (n = 0; p < end; p += d->bLength) {
 		d = (usb_interface_descriptor_t *)p;
 		if (p + d->bLength <= end &&
 		    d->bDescriptorType == UDESC_INTERFACE &&
 		    d->bInterfaceNumber == ifaceno)
 			n++;
+	}
 	return (n);
+}
 int
 usbd_get_interface_altindex(usbd_interface_handle iface)
+{
 	return (iface->altindex);
+}
 usbd_status
 usbd_get_interface(usbd_interface_handle iface, u_int8_t *aiface)
+{
 	usb_device_request_t req;
 	req.bmRequestType = UT_READ_INTERFACE;
 	req.bRequest = UR_GET_INTERFACE;
 	USETW(req.wValue, 0);
 	USETW(req.wIndex, iface->idesc->bInterfaceNumber);
 	USETW(req.wLength, 1);
 	return (usbd_do_request(iface->device, &req, aiface));
+}
 /*** Internal routines ***/
 /* Dequeue all pipe operations, called at splusb(). */
 Static usbd_status
 usbd_ar_pipe(usbd_pipe_handle pipe)
+{
 	usbd_xfer_handle xfer;
 	KASSERT(pipe->device->bus->lock == NULL || mutex_owned(pipe->device->bus->lock));
 	DPRINTFN(2,("usbd_ar_pipe: pipe=%p\n", pipe));
 #ifdef USB_DEBUG
 	if (usbdebug > 5)
 		usbd_dump_queue(pipe);
 #endif
 	pipe->repeat = 0;
 	pipe->aborting = 1;
 	while ((xfer = SIMPLEQ_FIRST(&pipe->queue)) != NULL) {
 		DPRINTFN(2,("usbd_ar_pipe: pipe=%p xfer=%p (methods=%p)\n",
 			    pipe, xfer, pipe->methods));
 		/* Make the HC abort it (and invoke the callback). */
 		if (pipe->device->bus->lock)
 			mutex_exit(pipe->device->bus->lock);
 		pipe->methods->abort(xfer);
 		if (pipe->device->bus->lock)
 			mutex_enter(pipe->device->bus->lock);
 		/* XXX only for non-0 usbd_clear_endpoint_stall(pipe); */
+	}
 	pipe->aborting = 0;
 	return (USBD_NORMAL_COMPLETION);
+}
 /* Called at splusb() */
 void
 usb_transfer_complete(usbd_xfer_handle xfer)
+{
 	usbd_pipe_handle pipe = xfer->pipe;
 	usb_dma_t *dmap = &xfer->dmabuf;
 	int sync = xfer->flags & USBD_SYNCHRONOUS;
 	int erred = xfer->status == USBD_CANCELLED ||
 	    xfer->status == USBD_TIMEOUT;
 	int repeat, polling;
 	DPRINTFN(5, ("usb_transfer_complete: pipe=%p xfer=%p status=%d "
 		     "actlen=%d\n", pipe, xfer, xfer->status, xfer->actlen));
 	KASSERT(pipe->device->bus->lock == NULL || mutex_owned(pipe->device->bus->lock));
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_ONQU) {
 		printf("usb_transfer_complete: xfer=%p not busy 0x%08x\n",
 		       xfer, xfer->busy_free);
+	}
 #endif
 #ifdef DIAGNOSTIC
 	if (pipe == NULL) {
 		printf("usbd_transfer_cb: pipe==0, xfer=%p\n", xfer);
 		return;
+	}
 #endif
 	repeat = pipe->repeat;
 	polling = pipe->device->bus->use_polling;
 	/* XXXX */
 	if (polling)
 		pipe->running = 0;
 	if (!(xfer->flags & USBD_NO_COPY) && xfer->actlen != 0 &&
 	    usbd_xfer_isread(xfer)) {
 #ifdef DIAGNOSTIC
 		if (xfer->actlen > xfer->length) {
 			printf("usb_transfer_complete: actlen > len %d > %d\n",
 			       xfer->actlen, xfer->length);
 			xfer->actlen = xfer->length;
+		}
 #endif
 		memcpy(xfer->buffer, KERNADDR(dmap, 0), xfer->actlen);
+	}
 	/* if we allocated the buffer in usbd_transfer() we free it here. */
 	if (xfer->rqflags & URQ_AUTO_DMABUF) {
 		if (!repeat) {
 			struct usbd_bus *bus = pipe->device->bus;
 			bus->methods->freem(bus, dmap);
 			xfer->rqflags &= ~URQ_AUTO_DMABUF;
+		}
+	}
 	if (!repeat) {
 		/* Remove request from queue. */
 #ifdef DIAGNOSTIC
 		if (xfer != SIMPLEQ_FIRST(&pipe->queue))
 			printf("usb_transfer_complete: bad dequeue %p != %p\n",
 			       xfer, SIMPLEQ_FIRST(&pipe->queue));
 		xfer->busy_free = XFER_BUSY;
 #endif
 		SIMPLEQ_REMOVE_HEAD(&pipe->queue, next);
+	}
 	DPRINTFN(5,("usb_transfer_complete: repeat=%d new head=%p\n",
 		    repeat, SIMPLEQ_FIRST(&pipe->queue)));
 	/* Count completed transfers. */
 	++pipe->device->bus->stats.uds_requests
 		[pipe->endpoint->edesc->bmAttributes & UE_XFERTYPE];
 	xfer->done = 1;
 	if (!xfer->status && xfer->actlen < xfer->length &&
 	    !(xfer->flags & USBD_SHORT_XFER_OK)) {
 		DPRINTFN(-1,("usbd_transfer_cb: short transfer %d<%d\n",
 			     xfer->actlen, xfer->length));
 		xfer->status = USBD_SHORT_XFER;
+	}
 	if (repeat) {
 		if (xfer->callback) {
-			if (pipe->lock) mutex_exit(pipe->lock);
+			if (pipe->device->bus->lock)
 				mutex_exit(pipe->device->bus->lock);
 			xfer->callback(xfer, xfer->priv, xfer->status);
-			if (pipe->lock) mutex_enter(pipe->lock);
+			if (pipe->device->bus->lock)
 				mutex_enter(pipe->device->bus->lock);
+		}
 		pipe->methods->done(xfer);
 	} else {
 		pipe->methods->done(xfer);
 		if (xfer->callback) {
 			if (pipe->device->bus->lock)
 				mutex_exit(pipe->device->bus->lock);
 			xfer->callback(xfer, xfer->priv, xfer->status);
 			if (pipe->device->bus->lock)
 				mutex_enter(pipe->device->bus->lock);
+		}
+	}
 	if (sync && !polling) {
 		if (pipe->device->bus->lock)
 			cv_broadcast(&xfer->cv);
 		else
 			wakeup(xfer);
+	}
 	if (!repeat) {
 		/* XXX should we stop the queue on all errors? */
 		if (erred && pipe->iface != NULL)	/* not control pipe */
 			pipe->running = 0;
 		else
 			usbd_start_next(pipe);
+	}
+}
 usbd_status
 usb_insert_transfer(usbd_xfer_handle xfer)
+{
 	usbd_pipe_handle pipe = xfer->pipe;
 	usbd_status err;
 	int s;
 	DPRINTFN(5,("usb_insert_transfer: pipe=%p running=%d timeout=%d\n",
 		    pipe, pipe->running, xfer->timeout));
 	//KASSERT(pipe->device->bus->lock == NULL || mutex_owned(pipe->device->bus->lock));
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_BUSY) {
 		printf("usb_insert_transfer: xfer=%p not busy 0x%08x\n",
 		       xfer, xfer->busy_free);
 		return (USBD_INVAL);
+	}
 	xfer->busy_free = XFER_ONQU;
 #endif
 	s = splusb();
 	SIMPLEQ_INSERT_TAIL(&pipe->queue, xfer, next);
 	if (pipe->running)
 		err = USBD_IN_PROGRESS;
 	else {
 		pipe->running = 1;
 		err = USBD_NORMAL_COMPLETION;
+	}
 	splx(s);
 	return (err);
+}
 /* Called at splusb() */
 void
 usbd_start_next(usbd_pipe_handle pipe)
+{
 	usbd_xfer_handle xfer;
 	usbd_status err;
 	KASSERT(pipe->device->bus->lock == NULL || mutex_owned(pipe->device->bus->lock));
 #ifdef DIAGNOSTIC
 	if (pipe == NULL) {
 		printf("usbd_start_next: pipe == NULL\n");
 		return;
+	}
 	if (pipe->methods == NULL || pipe->methods->start == NULL) {
 		printf("usbd_start_next: pipe=%p no start method\n", pipe);
 		return;
+	}
 #endif
 	KASSERT(pipe->device->bus->lock == NULL || mutex_owned(pipe->device->bus->lock));
 	/* Get next request in queue. */
 	xfer = SIMPLEQ_FIRST(&pipe->queue);
 	DPRINTFN(5, ("usbd_start_next: pipe=%p, xfer=%p\n", pipe, xfer));
 	if (xfer == NULL) {
 		pipe->running = 0;
 	} else {
 		if (pipe->device->bus->lock)
 			mutex_exit(pipe->device->bus->lock);
 		err = pipe->methods->start(xfer);
 		if (pipe->device->bus->lock)
 			mutex_enter(pipe->device->bus->lock);
 		if (err != USBD_IN_PROGRESS) {
 			printf("usbd_start_next: error=%d\n", err);
 			pipe->running = 0;
 			/* XXX do what? */
+		}
+	}
+}
 usbd_status
 usbd_do_request(usbd_device_handle dev, usb_device_request_t *req, void *data)
+{
 	return (usbd_do_request_flags(dev, req, data, 0, 0,
 				      USBD_DEFAULT_TIMEOUT));
+}
 usbd_status
 usbd_do_request_flags(usbd_device_handle dev, usb_device_request_t *req,
 		      void *data, u_int16_t flags, int *actlen, u_int32_t timo)
+{
 	return (usbd_do_request_flags_pipe(dev, dev->default_pipe, req,
 					   data, flags, actlen, timo));
+}
 usbd_status
 usbd_do_request_flags_pipe(usbd_device_handle dev, usbd_pipe_handle pipe,
 	usb_device_request_t *req, void *data, u_int16_t flags, int *actlen,
 	u_int32_t timeout)
+{
 	usbd_xfer_handle xfer;
 	usbd_status err;
 #ifdef DIAGNOSTIC
 	if (dev->bus->intr_context) {
 		printf("usbd_do_request: not in process context\n");
 		return (USBD_INVAL);
+	}
 #endif
 	xfer = usbd_alloc_xfer(dev);
 	if (xfer == NULL)
 		return (USBD_NOMEM);
 	usbd_setup_default_xfer(xfer, dev, 0, timeout, req,
 				data, UGETW(req->wLength), flags, 0);
 	xfer->pipe = pipe;
 	err = usbd_sync_transfer(xfer);
 #if defined(USB_DEBUG) || defined(DIAGNOSTIC)
 	if (xfer->actlen > xfer->length) {
 		DPRINTF(("%s: overrun addr=%d type=0x%02x req=0x"
 			 "%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
 			 __func__, dev->address, xfer->request.bmRequestType,
 			 xfer->request.bRequest, UGETW(xfer->request.wValue),
 			 UGETW(xfer->request.wIndex),
 			 UGETW(xfer->request.wLength),
 			 xfer->length, xfer->actlen));
+	}
 #endif
 	if (actlen != NULL)
 		*actlen = xfer->actlen;
 	if (err == USBD_STALLED) {
 		/*
 		 * The control endpoint has stalled.  Control endpoints
 		 * should not halt, but some may do so anyway so clear
 		 * any halt condition.
 		 */
 		usb_device_request_t treq;
 		usb_status_t status;
 		u_int16_t s;
 		usbd_status nerr;
 		treq.bmRequestType = UT_READ_ENDPOINT;
 		treq.bRequest = UR_GET_STATUS;
 		USETW(treq.wValue, 0);
 		USETW(treq.wIndex, 0);
 		USETW(treq.wLength, sizeof(usb_status_t));
 		usbd_setup_default_xfer(xfer, dev, 0, USBD_DEFAULT_TIMEOUT,
 					   &treq, &status,sizeof(usb_status_t),
 , 0);
 		nerr = usbd_sync_transfer(xfer);
 		if (nerr)
 			goto bad;
 		s = UGETW(status.wStatus);
 		DPRINTF(("usbd_do_request: status = 0x%04x\n", s));
 		if (!(s & UES_HALT))
 			goto bad;
 		treq.bmRequestType = UT_WRITE_ENDPOINT;
 		treq.bRequest = UR_CLEAR_FEATURE;
 		USETW(treq.wValue, UF_ENDPOINT_HALT);
 		USETW(treq.wIndex, 0);
 		USETW(treq.wLength, 0);
 		usbd_setup_default_xfer(xfer, dev, 0, USBD_DEFAULT_TIMEOUT,
 					   &treq, &status, 0, 0, 0);
 		nerr = usbd_sync_transfer(xfer);
 		if (nerr)
 			goto bad;
+	}
  bad:
 	if (err) {
 		DPRINTF(("%s: returning err=%s\n", __func__, usbd_errstr(err)));
+	}
 	usbd_free_xfer(xfer);
 	return (err);
+}
 void
 usbd_do_request_async_cb(usbd_xfer_handle xfer,
     usbd_private_handle priv, usbd_status status)
+{
 #if defined(USB_DEBUG) || defined(DIAGNOSTIC)
 	if (xfer->actlen > xfer->length) {
 		DPRINTF(("usbd_do_request: overrun addr=%d type=0x%02x req=0x"
 			 "%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
 			 xfer->pipe->device->address,
 			 xfer->request.bmRequestType,
 			 xfer->request.bRequest, UGETW(xfer->request.wValue),
 			 UGETW(xfer->request.wIndex),
 			 UGETW(xfer->request.wLength),
 			 xfer->length, xfer->actlen));
+	}
 #endif
 	usbd_free_xfer(xfer);
+}
 /*
  * Execute a request without waiting for completion.
  * Can be used from interrupt context.
  */
 usbd_status
 usbd_do_request_async(usbd_device_handle dev, usb_device_request_t *req,
 		      void *data)
+{
 	usbd_xfer_handle xfer;
 	usbd_status err;
 	xfer = usbd_alloc_xfer(dev);
 	if (xfer == NULL)
 		return (USBD_NOMEM);
 	usbd_setup_default_xfer(xfer, dev, 0, USBD_DEFAULT_TIMEOUT, req,
 	    data, UGETW(req->wLength), 0, usbd_do_request_async_cb);
 	err = usbd_transfer(xfer);
 	if (err != USBD_IN_PROGRESS) {
 		usbd_free_xfer(xfer);
 		return (err);
+	}
 	return (USBD_NORMAL_COMPLETION);
+}
 const struct usbd_quirks *
 usbd_get_quirks(usbd_device_handle dev)
+{
 #ifdef DIAGNOSTIC
 	if (dev == NULL) {
 		printf("usbd_get_quirks: dev == NULL\n");
 		return 0;
+	}
 #endif
 	return (dev->quirks);
+}
 /* XXX do periodic free() of free list */
 /*
  * Called from keyboard driver when in polling mode.
  */
 void
 usbd_dopoll(usbd_interface_handle iface)
+{
 	iface->device->bus->methods->do_poll(iface->device->bus);
+}
 void
 usbd_set_polling(usbd_device_handle dev, int on)
+{
 	if (on)
 		dev->bus->use_polling++;
 	else
 		dev->bus->use_polling--;
 	/* Kick the host controller when switching modes */
 	dev->bus->methods->soft_intr(dev->bus);
+}
 usb_endpoint_descriptor_t *
 usbd_get_endpoint_descriptor(usbd_interface_handle iface, u_int8_t address)
+{
 	struct usbd_endpoint *ep;
 	int i;
 	for (i = 0; i < iface->idesc->bNumEndpoints; i++) {
 		ep = &iface->endpoints[i];
 		if (ep->edesc->bEndpointAddress == address)
 			return (iface->endpoints[i].edesc);
+	}
 	return (0);
+}
 /*
  * usbd_ratecheck() can limit the number of error messages that occurs.
  * When a device is unplugged it may take up to 0.25s for the hub driver
  * to notice it.  If the driver continuosly tries to do I/O operations
  * this can generate a large number of messages.
  */
 int
 usbd_ratecheck(struct timeval *last)
+{
 	static struct timeval errinterval = { 0, 250000 }; /* 0.25 s*/
 	return (ratecheck(last, &errinterval));
+}
 /*
  * Search for a vendor/product pair in an array.  The item size is
  * given as an argument.
  */
 const struct usb_devno *
 usb_match_device(const struct usb_devno *tbl, u_int nentries, u_int sz,
 		 u_int16_t vendor, u_int16_t product)
+{
 	while (nentries-- > 0) {
 		u_int16_t tproduct = tbl->ud_product;
 		if (tbl->ud_vendor == vendor &&
 		    (tproduct == product || tproduct == USB_PRODUCT_ANY))
 			return (tbl);
 		tbl = (const struct usb_devno *)((const char *)tbl + sz);
+	}
 	return (NULL);
+}
 void
 usb_desc_iter_init(usbd_device_handle dev, usbd_desc_iter_t *iter)
+{
 	const usb_config_descriptor_t *cd = usbd_get_config_descriptor(dev);
         iter->cur = (const uByte *)cd;
         iter->end = (const uByte *)cd + UGETW(cd->wTotalLength);
+}
 const usb_descriptor_t *
 usb_desc_iter_next(usbd_desc_iter_t *iter)
+{
 	const usb_descriptor_t *desc;
 	if (iter->cur + sizeof(usb_descriptor_t) >= iter->end) {
 		if (iter->cur != iter->end)
 			printf("usb_desc_iter_next: bad descriptor\n");
 		return NULL;
+	}
 	desc = (const usb_descriptor_t *)iter->cur;
 	if (desc->bLength == 0) {
 		printf("usb_desc_iter_next: descriptor length = 0\n");
 		return NULL;
+	}
 	iter->cur += desc->bLength;
 	if (iter->cur > iter->end) {
 		printf("usb_desc_iter_next: descriptor length too large\n");
 		return NULL;
+	}
 	return desc;
+}
 usbd_status
 usbd_get_string(usbd_device_handle dev, int si, char *buf)
+{
 	return usbd_get_string0(dev, si, buf, 1);
+}
 usbd_status
 usbd_get_string0(usbd_device_handle dev, int si, char *buf, int unicode)
+{
 	int swap = dev->quirks->uq_flags & UQ_SWAP_UNICODE;
 	usb_string_descriptor_t us;
 	char *s;
 	int i, n;
 	u_int16_t c;
 	usbd_status err;
 	int size;
 	buf[0] = '\0';
 	if (si == 0)
 		return (USBD_INVAL);
 	if (dev->quirks->uq_flags & UQ_NO_STRINGS)
 		return (USBD_STALLED);
 	if (dev->langid == USBD_NOLANG) {
 		/* Set up default language */
 		err = usbd_get_string_desc(dev, USB_LANGUAGE_TABLE, 0, &us,
 		    &size);
 		if (err || size < 4) {
 			DPRINTFN(-1,("usbd_get_string: getting lang failed, using 0\n"));
 			dev->langid = 0; /* Well, just pick something then */
 		} else {
 			/* Pick the first language as the default. */
 			dev->langid = UGETW(us.bString[0]);
+		}
+	}
 	err = usbd_get_string_desc(dev, si, dev->langid, &us, &size);
 	if (err)
 		return (err);
 	s = buf;
 	n = size / 2 - 1;
 	if (unicode) {
 		for (i = 0; i < n; i++) {
 			c = UGETW(us.bString[i]);
 			if (swap)
 				c = (c >> 8) | (c << 8);
 			s += wput_utf8(s, 3, c);
+		}
 		*s++ = 0;
+	}
 #ifdef COMPAT_30
 	else {
 		for (i = 0; i < n; i++) {
 			c = UGETW(us.bString[i]);
 			if (swap)
 				c = (c >> 8) | (c << 8);
 			*s++ = (c < 0x80) ? c : '?';
+		}
 		*s++ = 0;
+	}
 #endif
 	return (USBD_NORMAL_COMPLETION);
+}

 @@ -1,323 +1,318 @@
-/*	$NetBSD: usbdivar.h,v 1.93.8.1.2.2 2011/12/08 10:41:28 mrg Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.93.8.1.2.3 2011/12/08 22:04:56 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma 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
  *    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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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/callout.h>
 #include <sys/mutex.h>
 /*
  * Discussion about locking in the USB code:
+ *
  * There are two locks presented by the host controller: the interrupt lock
  * and the thread lock.  The interrupt lock, either a spin or adaptive mutex,
  * manages hardware state and anything else touched in an interrupt context.
  * The thread lock has everything else.
+ *
  * List of hardware interface methods, and which locks are held when each
  * is called by this module:
+ *
  *	BUS METHOD		INTR	THREAD  NOTES
  *	----------------------- ------- -------	-------------------------
  *	open_pipe		-	-	might want to take thread lock?
  *	soft_intr		-	-	intr lock is taken sometimes, thread lock taken often, but nothing demanded?
  *	do_poll			-	-	might want to take thread lock?
  *	allocm			-	-
  *	freem			-	-
  *	allocx			-	-
  *	freex			-	-
  *	get_locks 		-	-	Called at attach time
+ *
  *	PIPE METHOD		INTR	THREAD  NOTES
  *	----------------------- ------- -------	-------------------------
  *	transfer		-	-
  *	start			-	-
  *	abort			-	-
  *	close			-	x
  *	cleartoggle		-	-
  *	done			-	x
+ *
  * The above semantics are likely to change.
+ *
  */
 /* From usb_mem.h */
 struct usb_dma_block;
 typedef struct {
 	struct usb_dma_block *block;
 	u_int offs;
 } usb_dma_t;
 struct usbd_xfer;
 struct usbd_pipe;
 struct usbd_endpoint {
 	usb_endpoint_descriptor_t *edesc;
 	int			refcnt;
 	int datatoggle;
 };
 struct usbd_bus_methods {
 	usbd_status	      (*open_pipe)(struct usbd_pipe *pipe);
 	void		      (*soft_intr)(void *);
 	void		      (*do_poll)(struct usbd_bus *);
 	usbd_status	      (*allocm)(struct usbd_bus *, usb_dma_t *,
 					u_int32_t bufsize);
 	void		      (*freem)(struct usbd_bus *, usb_dma_t *);
 	struct usbd_xfer *    (*allocx)(struct usbd_bus *);
 	void		      (*freex)(struct usbd_bus *, struct usbd_xfer *);
 	void		      (*get_locks)(struct usbd_bus *,
 					kmutex_t **, kmutex_t **);
 };
 struct usbd_pipe_methods {
 	usbd_status	      (*transfer)(usbd_xfer_handle xfer);
 	usbd_status	      (*start)(usbd_xfer_handle xfer);
 	void		      (*abort)(usbd_xfer_handle xfer);
 	void		      (*close)(usbd_pipe_handle pipe);
 	void		      (*cleartoggle)(usbd_pipe_handle pipe);
 	void		      (*done)(usbd_xfer_handle xfer);
 };
 #if 0 /* notyet */
 struct usbd_tt {
 	struct usbd_hub	       *hub;
 };
 #endif
 struct usbd_port {
 	usb_port_status_t	status;
 	u_int16_t		power;	/* mA of current on port */
 	u_int8_t		portno;
 	u_int8_t		restartcnt;
 #define USBD_RESTART_MAX 5
 	u_int8_t		reattach;
 	struct usbd_device     *device;	/* Connected device */
 	struct usbd_device     *parent;	/* The ports hub */
 #if 0
 	struct usbd_tt	       *tt; /* Transaction translator (if any) */
 #endif
 };
 struct usbd_hub {
 	usbd_status	      (*explore)(usbd_device_handle hub);
 	void		       *hubsoftc;
 	usb_hub_descriptor_t	hubdesc;
 	struct usbd_port        ports[1];
 };
 /*****/
 struct usbd_bus {
 	/* Filled by HC driver */
 	void			*hci_private;
 	const struct usbd_bus_methods *methods;
 	u_int32_t		pipe_size; /* size of a pipe struct */
 	/* Filled by usb driver */
 	kmutex_t		*intr_lock;
 	kmutex_t		*lock;
 	struct usbd_device      *root_hub;
 	usbd_device_handle	devices[USB_MAX_DEVICES];
 	char			needs_explore;/* a hub a signalled a change */
 	char			use_polling;
 	device_t		usbctl;
 	struct usb_device_stats	stats;
 	int 			intr_context;
 	u_int			no_intrs;
 	int			usbrev;	/* 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_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" }
 	void		       *soft; /* soft interrupt cookie */
 	bus_dma_tag_t		dmatag;	/* DMA tag */
 };
 struct usbd_device {
 	struct usbd_bus	       *bus;           /* our controller */
 	struct usbd_pipe       *default_pipe;  /* pipe 0 */
 	u_int8_t		address;       /* device addess */
 	u_int8_t		config;	       /* current configuration # */
 	u_int8_t		depth;         /* distance from root hub */
 	u_int8_t		speed;         /* low/full/high speed */
 	u_int8_t		self_powered;  /* flag for self powered */
 	u_int16_t		power;         /* mA the device uses */
 	int16_t			langid;	       /* language for strings */
 #define USBD_NOLANG (-1)
 	usb_event_cookie_t	cookie;	       /* unique connection id */
 	struct usbd_port       *powersrc;      /* upstream hub port, or 0 */
 	struct usbd_device     *myhub; 	       /* upstream hub */
 	struct usbd_port       *myhsport;      /* closest high speed port */
 	struct usbd_endpoint	def_ep;	       /* for pipe 0 */
 	usb_endpoint_descriptor_t def_ep_desc; /* for pipe 0 */
 	struct usbd_interface  *ifaces;        /* array of all interfaces */
 	usb_device_descriptor_t ddesc;         /* device descriptor */
 	usb_config_descriptor_t *cdesc;	       /* full config descr */
 	const struct usbd_quirks     *quirks;  /* device quirks, always set */
 	struct usbd_hub	       *hub;           /* only if this is a hub */
 	int			subdevlen;     /* array length of following */
 	device_t	       *subdevs;       /* sub-devices */
 	int			nifaces_claimed; /* number of ifaces in use */
 };
 struct usbd_interface {
 	struct usbd_device     *device;
 	usb_interface_descriptor_t *idesc;
 	int			index;
 	int			altindex;
 	struct usbd_endpoint   *endpoints;
 	void		       *priv;
 	LIST_HEAD(, usbd_pipe)	pipes;
 };
 struct usbd_pipe {
 	struct usbd_interface  *iface;
 	struct usbd_device     *device;
 	struct usbd_endpoint   *endpoint;
 	int			refcnt;
 	char			running;
 	char			aborting;
 	SIMPLEQ_HEAD(, usbd_xfer) queue;
 	LIST_ENTRY(usbd_pipe)	next;
 	usbd_xfer_handle	intrxfer; /* used for repeating requests */
 	char			repeat;
 	int			interval;
 	kmutex_t		*intr_lock;
 	kmutex_t		*lock;
 	/* Filled by HC driver. */
 	const struct usbd_pipe_methods *methods;
 };
 struct usbd_xfer {
 	struct usbd_pipe       *pipe;
 	void		       *priv;
 	void		       *buffer;
 	kcondvar_t		cv;
 	u_int32_t		length;
 	u_int32_t		actlen;
 	u_int16_t		flags;
 	u_int32_t		timeout;
 	usbd_status		status;
 	usbd_callback		callback;
 	volatile u_int8_t	done;
 	u_int8_t		busy_free;	/* used for DIAGNOSTIC */
 #define XFER_FREE 0x46
 #define XFER_BUSY 0x55
 #define XFER_ONQU 0x9e
 	/* For control pipe */
 	usb_device_request_t	request;
 	/* For isoc */
 	u_int16_t		*frlengths;
 	int			nframes;
 	/* For memory allocation */
 	struct usbd_device     *device;
 	usb_dma_t		dmabuf;
 	u_int8_t		rqflags;
 #define URQ_REQUEST	0x01
 #define URQ_AUTO_DMABUF	0x10
 #define URQ_DEV_DMABUF	0x20
 	SIMPLEQ_ENTRY(usbd_xfer) next;
 	void		       *hcpriv; /* private use by the HC driver */
 	u_int8_t		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		hccv; /* private use by the HC driver */
         struct callout timeout_handle;
 };
 void usbd_init(void);
 void usbd_finish(void);
 #if defined(USB_DEBUG) || defined(EHCI_DEBUG)
 void usbd_dump_iface(struct usbd_interface *iface);
 void usbd_dump_device(struct usbd_device *dev);
 void usbd_dump_endpoint(struct usbd_endpoint *endp);
 void usbd_dump_queue(usbd_pipe_handle pipe);
 void usbd_dump_pipe(usbd_pipe_handle pipe);
 #endif
 /* Routines from usb_subr.c */
 int		usbctlprint(void *, const char *);
 void		usb_delay_ms(usbd_bus_handle, u_int);
 usbd_status	usbd_reset_port(usbd_device_handle, int, usb_port_status_t *);
 usbd_status	usbd_setup_pipe(usbd_device_handle dev,
 				usbd_interface_handle iface,
 				struct usbd_endpoint *, int,
 				usbd_pipe_handle *pipe);
 usbd_status	usbd_new_device(device_t, usbd_bus_handle, int, int, int,
                                 struct usbd_port *);
 usbd_status	usbd_reattach_device(device_t, usbd_device_handle,
                                      int, const int *);
 void		usbd_remove_device(usbd_device_handle, struct usbd_port *);
 int		usbd_printBCD(char *, size_t, int);
 usbd_status	usbd_fill_iface_data(usbd_device_handle, int, int);
 void		usb_free_device(usbd_device_handle);
 usbd_status	usb_insert_transfer(usbd_xfer_handle);
 void		usb_transfer_complete(usbd_xfer_handle);
 int		usb_disconnect_port(struct usbd_port *, device_t, int);
 /* Routines from usb.c */
 void		usb_needs_explore(usbd_device_handle);
 void		usb_needs_reattach(usbd_device_handle);
 void		usb_schedsoftintr(struct usbd_bus *);
 #define usbd_lock(m)	if (m) { s = -1; mutex_enter(m); } else s = splusb()
 #define usbd_unlock(m)	if (m) { s = -1; mutex_exit(m); } else splx(s)
 #define usbd_lock_pipe(p)	do { \
 	if ((p)->device->bus->lock) { \
 		s = -1; \
 		mutex_enter((p)->device->bus->lock); \
 	} else \
 		s = splusb(); \
 } while (0)
 #define usbd_unlock_pipe(p)	do { \
 	if ((p)->device->bus->lock) { \
 		s = -1; \
 		mutex_exit((p)->device->bus->lock); \
 	} else \
 		splx(s); \
 } while (0)