 @@ -1,4242 +1,4245 @@
-/*	$NetBSD: ehci.c,v 1.181.6.3 2011/12/06 02:10:01 mrg Exp $ */
+/*	$NetBSD: ehci.c,v 1.181.6.4 2011/12/08 02:51:07 mrg Exp $ */
 /*
  * Copyright (c) 2004-2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum,
  * Jeremy Morse (jeremy.morse@gmail.com), and Jared D. McNeill
  * (jmcneill@invisible.ca).
+ *
  * 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.
  */
 /*
  * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
+ *
  * The EHCI 1.0 spec can be found at
  * http://www.intel.com/technology/usb/spec.htm
  * and the USB 2.0 spec at
  * http://www.usb.org/developers/docs/
+ *
  */
 /*
  * TODO:
  * 1) hold off explorations by companion controllers until ehci has started.
+ *
  * 2) The hub driver needs to handle and schedule the transaction translator,
  *    to assign place in frame where different devices get to go. See chapter
  *    on hubs in USB 2.0 for details.
+ *
  * 3) Command failures are not recovered correctly.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.3 2011/12/06 02:10:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.4 2011/12/08 02:51:07 mrg Exp $");
 #include "ohci.h"
 #include "uhci.h"
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <machine/endian.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/ehcireg.h>
 #include <dev/usb/ehcivar.h>
 #include <dev/usb/usbroothub_subr.h>
 #ifdef EHCI_DEBUG
 #include <sys/kprintf.h>
 static void
 ehciprintf(const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	kprintf(fmt, TOLOG|TOCONS, NULL, NULL, ap);
 	va_end(ap);
+}
 #define DPRINTF(x)	do { if (ehcidebug) ehciprintf x; } while(0)
 #define DPRINTFN(n,x)	do { if (ehcidebug>(n)) ehciprintf x; } while (0)
 int ehcidebug = 0;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 struct ehci_pipe {
 	struct usbd_pipe pipe;
 	int nexttoggle;
 	ehci_soft_qh_t *sqh;
 	union {
 		ehci_soft_qtd_t *qtd;
 		/* ehci_soft_itd_t *itd; */
 	} tail;
 	union {
 		/* Control pipe */
 		struct {
 			usb_dma_t reqdma;
 			u_int length;
 		} ctl;
 		/* Interrupt pipe */
 		struct {
 			u_int length;
 		} intr;
 		/* Bulk pipe */
 		struct {
 			u_int length;
 		} bulk;
 		/* Iso pipe */
 		struct {
 			u_int next_frame;
 			u_int cur_xfers;
 		} isoc;
 	} u;
 };
 Static usbd_status	ehci_open(usbd_pipe_handle);
 Static void		ehci_poll(struct usbd_bus *);
 Static void		ehci_softintr(void *);
 Static int		ehci_intr1(ehci_softc_t *);
 Static void		ehci_waitintr(ehci_softc_t *, usbd_xfer_handle);
 Static void		ehci_check_intr(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_check_qh_intr(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_check_itd_intr(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_idone(struct ehci_xfer *);
 Static void		ehci_timeout(void *);
 Static void		ehci_timeout_task(void *);
 Static void		ehci_intrlist_timeout(void *);
 Static void		ehci_doorbell(void *);
 Static void		ehci_pcd(void *);
 Static usbd_status	ehci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
 Static void		ehci_freem(struct usbd_bus *, usb_dma_t *);
 Static usbd_xfer_handle	ehci_allocx(struct usbd_bus *);
 Static void		ehci_freex(struct usbd_bus *, usbd_xfer_handle);
 Static void		ehci_get_locks(struct usbd_bus *, kmutex_t **,
 				       kmutex_t **);
 Static usbd_status	ehci_root_ctrl_transfer(usbd_xfer_handle);
 Static usbd_status	ehci_root_ctrl_start(usbd_xfer_handle);
 Static void		ehci_root_ctrl_abort(usbd_xfer_handle);
 Static void		ehci_root_ctrl_close(usbd_pipe_handle);
 Static void		ehci_root_ctrl_done(usbd_xfer_handle);
 Static usbd_status	ehci_root_intr_transfer(usbd_xfer_handle);
 Static usbd_status	ehci_root_intr_start(usbd_xfer_handle);
 Static void		ehci_root_intr_abort(usbd_xfer_handle);
 Static void		ehci_root_intr_close(usbd_pipe_handle);
 Static void		ehci_root_intr_done(usbd_xfer_handle);
 Static usbd_status	ehci_device_ctrl_transfer(usbd_xfer_handle);
 Static usbd_status	ehci_device_ctrl_start(usbd_xfer_handle);
 Static void		ehci_device_ctrl_abort(usbd_xfer_handle);
 Static void		ehci_device_ctrl_close(usbd_pipe_handle);
 Static void		ehci_device_ctrl_done(usbd_xfer_handle);
 Static usbd_status	ehci_device_bulk_transfer(usbd_xfer_handle);
 Static usbd_status	ehci_device_bulk_start(usbd_xfer_handle);
 Static void		ehci_device_bulk_abort(usbd_xfer_handle);
 Static void		ehci_device_bulk_close(usbd_pipe_handle);
 Static void		ehci_device_bulk_done(usbd_xfer_handle);
 Static usbd_status	ehci_device_intr_transfer(usbd_xfer_handle);
 Static usbd_status	ehci_device_intr_start(usbd_xfer_handle);
 Static void		ehci_device_intr_abort(usbd_xfer_handle);
 Static void		ehci_device_intr_close(usbd_pipe_handle);
 Static void		ehci_device_intr_done(usbd_xfer_handle);
 Static usbd_status	ehci_device_isoc_transfer(usbd_xfer_handle);
 Static usbd_status	ehci_device_isoc_start(usbd_xfer_handle);
 Static void		ehci_device_isoc_abort(usbd_xfer_handle);
 Static void		ehci_device_isoc_close(usbd_pipe_handle);
 Static void		ehci_device_isoc_done(usbd_xfer_handle);
 Static void		ehci_device_clear_toggle(usbd_pipe_handle pipe);
 Static void		ehci_noop(usbd_pipe_handle pipe);
 Static void		ehci_disown(ehci_softc_t *, int, int);
 Static ehci_soft_qh_t  *ehci_alloc_sqh(ehci_softc_t *);
 Static void		ehci_free_sqh(ehci_softc_t *, ehci_soft_qh_t *);
 Static ehci_soft_qtd_t  *ehci_alloc_sqtd(ehci_softc_t *);
 Static void		ehci_free_sqtd(ehci_softc_t *, ehci_soft_qtd_t *);
 Static usbd_status	ehci_alloc_sqtd_chain(struct ehci_pipe *,
 			    ehci_softc_t *, int, int, usbd_xfer_handle,
 			    ehci_soft_qtd_t **, ehci_soft_qtd_t **);
 Static void		ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qtd_t *,
 					    ehci_soft_qtd_t *);
 Static ehci_soft_itd_t	*ehci_alloc_itd(ehci_softc_t *sc);
 Static void		ehci_free_itd(ehci_softc_t *sc, ehci_soft_itd_t *itd);
 Static void 		ehci_rem_free_itd_chain(ehci_softc_t *sc,
 						struct ehci_xfer *exfer);
 Static void 		ehci_abort_isoc_xfer(usbd_xfer_handle xfer,
 						usbd_status status);
 Static usbd_status	ehci_device_request(usbd_xfer_handle xfer);
 Static usbd_status	ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *,
 			    int ival);
-Static void		ehci_add_qh(ehci_soft_qh_t *, ehci_soft_qh_t *);
+Static void		ehci_add_qh(ehci_softc_t *, ehci_soft_qh_t *,
 				    ehci_soft_qh_t *);
 Static void		ehci_rem_qh(ehci_softc_t *, ehci_soft_qh_t *,
 				    ehci_soft_qh_t *);
 Static void		ehci_set_qh_qtd(ehci_soft_qh_t *, ehci_soft_qtd_t *);
 Static void		ehci_sync_hc(ehci_softc_t *);
 Static void		ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *);
 Static void		ehci_abort_xfer(usbd_xfer_handle, usbd_status);
 #ifdef EHCI_DEBUG
 Static void		ehci_dump_regs(ehci_softc_t *);
 void			ehci_dump(void);
 Static ehci_softc_t 	*theehci;
 Static void		ehci_dump_link(ehci_link_t, int);
 Static void		ehci_dump_sqtds(ehci_soft_qtd_t *);
 Static void		ehci_dump_sqtd(ehci_soft_qtd_t *);
 Static void		ehci_dump_qtd(ehci_qtd_t *);
 Static void		ehci_dump_sqh(ehci_soft_qh_t *);
 #if notyet
 Static void		ehci_dump_sitd(struct ehci_soft_itd *itd);
 Static void		ehci_dump_itd(struct ehci_soft_itd *);
 #endif
 #ifdef DIAGNOSTIC
 Static void		ehci_dump_exfer(struct ehci_xfer *);
 #endif
 #endif
 #define EHCI_NULL htole32(EHCI_LINK_TERMINATE)
 #define EHCI_INTR_ENDPT 1
 #define ehci_add_intr_list(sc, ex) \
 	TAILQ_INSERT_TAIL(&(sc)->sc_intrhead, (ex), inext);
 #define ehci_del_intr_list(sc, ex) \
 	do { \
 		TAILQ_REMOVE(&sc->sc_intrhead, (ex), inext); \
 		(ex)->inext.tqe_prev = NULL; \
 	} while (0)
 #define ehci_active_intr_list(ex) ((ex)->inext.tqe_prev != NULL)
 Static const struct usbd_bus_methods ehci_bus_methods = {
-	ehci_open,
+	.open_pipe =	ehci_open,
-	ehci_softintr,
+	.soft_intr =	ehci_softintr,
-	ehci_poll,
+	.do_poll =	ehci_poll,
-	ehci_allocm,
+	.allocm =	ehci_allocm,
-	ehci_freem,
+	.freem =	ehci_freem,
-	ehci_allocx,
+	.allocx =	ehci_allocx,
-	ehci_freex,
+	.freex =	ehci_freex,
-	ehci_get_locks,
+	.get_locks =	ehci_get_locks,
 };
 Static const struct usbd_pipe_methods ehci_root_ctrl_methods = {
-	ehci_root_ctrl_transfer,
+	.transfer =	ehci_root_ctrl_transfer,
-	ehci_root_ctrl_start,
+	.start =	ehci_root_ctrl_start,
-	ehci_root_ctrl_abort,
+	.abort =	ehci_root_ctrl_abort,
-	ehci_root_ctrl_close,
+	.close =	ehci_root_ctrl_close,
-	ehci_noop,
+	.cleartoggle =	ehci_noop,
-	ehci_root_ctrl_done,
+	.done =		ehci_root_ctrl_done,
 };
 Static const struct usbd_pipe_methods ehci_root_intr_methods = {
-	ehci_root_intr_transfer,
+	.transfer =	ehci_root_intr_transfer,
-	ehci_root_intr_start,
+	.start =	ehci_root_intr_start,
-	ehci_root_intr_abort,
+	.abort =	ehci_root_intr_abort,
-	ehci_root_intr_close,
+	.close =	ehci_root_intr_close,
-	ehci_noop,
+	.cleartoggle =	ehci_noop,
-	ehci_root_intr_done,
+	.done =		ehci_root_intr_done,
 };
 Static const struct usbd_pipe_methods ehci_device_ctrl_methods = {
-	ehci_device_ctrl_transfer,
+	.transfer =	ehci_device_ctrl_transfer,
-	ehci_device_ctrl_start,
+	.start =	ehci_device_ctrl_start,
-	ehci_device_ctrl_abort,
+	.abort =	ehci_device_ctrl_abort,
-	ehci_device_ctrl_close,
+	.close =	ehci_device_ctrl_close,
-	ehci_noop,
+	.cleartoggle =	ehci_noop,
-	ehci_device_ctrl_done,
+	.done =		ehci_device_ctrl_done,
 };
 Static const struct usbd_pipe_methods ehci_device_intr_methods = {
-	ehci_device_intr_transfer,
+	.transfer =	ehci_device_intr_transfer,
-	ehci_device_intr_start,
+	.start =	ehci_device_intr_start,
-	ehci_device_intr_abort,
+	.abort =	ehci_device_intr_abort,
-	ehci_device_intr_close,
+	.close =	ehci_device_intr_close,
-	ehci_device_clear_toggle,
+	.cleartoggle =	ehci_device_clear_toggle,
-	ehci_device_intr_done,
+	.done =		ehci_device_intr_done,
 };
 Static const struct usbd_pipe_methods ehci_device_bulk_methods = {
-	ehci_device_bulk_transfer,
+	.transfer =	ehci_device_bulk_transfer,
-	ehci_device_bulk_start,
+	.start =	ehci_device_bulk_start,
-	ehci_device_bulk_abort,
+	.abort =	ehci_device_bulk_abort,
-	ehci_device_bulk_close,
+	.close =	ehci_device_bulk_close,
-	ehci_device_clear_toggle,
+	.cleartoggle =	ehci_device_clear_toggle,
-	ehci_device_bulk_done,
+	.done =		ehci_device_bulk_done,
 };
 Static const struct usbd_pipe_methods ehci_device_isoc_methods = {
-	ehci_device_isoc_transfer,
+	.transfer =	ehci_device_isoc_transfer,
-	ehci_device_isoc_start,
+	.start =	ehci_device_isoc_start,
-	ehci_device_isoc_abort,
+	.abort =	ehci_device_isoc_abort,
-	ehci_device_isoc_close,
+	.close =	ehci_device_isoc_close,
-	ehci_noop,
+	.cleartoggle =	ehci_noop,
-	ehci_device_isoc_done,
+	.done =		ehci_device_isoc_done,
 };
 static const uint8_t revbits[EHCI_MAX_POLLRATE] = {
 x00,0x40,0x20,0x60,0x10,0x50,0x30,0x70,0x08,0x48,0x28,0x68,0x18,0x58,0x38,0x78,
 x04,0x44,0x24,0x64,0x14,0x54,0x34,0x74,0x0c,0x4c,0x2c,0x6c,0x1c,0x5c,0x3c,0x7c,
 x02,0x42,0x22,0x62,0x12,0x52,0x32,0x72,0x0a,0x4a,0x2a,0x6a,0x1a,0x5a,0x3a,0x7a,
 x06,0x46,0x26,0x66,0x16,0x56,0x36,0x76,0x0e,0x4e,0x2e,0x6e,0x1e,0x5e,0x3e,0x7e,
 x01,0x41,0x21,0x61,0x11,0x51,0x31,0x71,0x09,0x49,0x29,0x69,0x19,0x59,0x39,0x79,
 x05,0x45,0x25,0x65,0x15,0x55,0x35,0x75,0x0d,0x4d,0x2d,0x6d,0x1d,0x5d,0x3d,0x7d,
 x03,0x43,0x23,0x63,0x13,0x53,0x33,0x73,0x0b,0x4b,0x2b,0x6b,0x1b,0x5b,0x3b,0x7b,
 x07,0x47,0x27,0x67,0x17,0x57,0x37,0x77,0x0f,0x4f,0x2f,0x6f,0x1f,0x5f,0x3f,0x7f,
 };
 usbd_status
 ehci_init(ehci_softc_t *sc)
+{
 	u_int32_t vers, sparams, cparams, hcr;
 	u_int i;
 	usbd_status err;
 	ehci_soft_qh_t *sqh;
 	u_int ncomp;
 	DPRINTF(("ehci_init: start\n"));
 #ifdef EHCI_DEBUG
 	theehci = sc;
 #endif
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "ehciab");
 	cv_init(&sc->sc_doorbell, "ehcidi");
 	sc->sc_doorbell_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
 	    ehci_doorbell, sc);
 	sc->sc_pcd_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
 	    ehci_pcd, sc);
 	sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
 	vers = EREAD2(sc, EHCI_HCIVERSION);
 	aprint_verbose("%s: EHCI version %x.%x\n", device_xname(sc->sc_dev),
 	       vers >> 8, vers & 0xff);
 	sparams = EREAD4(sc, EHCI_HCSPARAMS);
 	DPRINTF(("ehci_init: sparams=0x%x\n", sparams));
 	sc->sc_npcomp = EHCI_HCS_N_PCC(sparams);
 	ncomp = EHCI_HCS_N_CC(sparams);
 	if (ncomp != sc->sc_ncomp) {
 		aprint_verbose("%s: wrong number of companions (%d != %d)\n",
 			       device_xname(sc->sc_dev), ncomp, sc->sc_ncomp);
 #if NOHCI == 0 || NUHCI == 0
 		aprint_error("%s: ohci or uhci probably not configured\n",
 			     device_xname(sc->sc_dev));
 #endif
 		if (ncomp < sc->sc_ncomp)
 			sc->sc_ncomp = ncomp;
+	}
 	if (sc->sc_ncomp > 0) {
 		KASSERT(!(sc->sc_flags & EHCIF_ETTF));
 		aprint_normal("%s: companion controller%s, %d port%s each:",
 		    device_xname(sc->sc_dev), sc->sc_ncomp!=1 ? "s" : "",
 		    EHCI_HCS_N_PCC(sparams),
 		    EHCI_HCS_N_PCC(sparams)!=1 ? "s" : "");
 		for (i = 0; i < sc->sc_ncomp; i++)
 			aprint_normal(" %s", device_xname(sc->sc_comps[i]));
 		aprint_normal("\n");
+	}
 	sc->sc_noport = EHCI_HCS_N_PORTS(sparams);
 	cparams = EREAD4(sc, EHCI_HCCPARAMS);
 	DPRINTF(("ehci_init: cparams=0x%x\n", cparams));
 	sc->sc_hasppc = EHCI_HCS_PPC(sparams);
 	if (EHCI_HCC_64BIT(cparams)) {
 		/* MUST clear segment register if 64 bit capable. */
 		EWRITE4(sc, EHCI_CTRLDSSEGMENT, 0);
+	}
 	sc->sc_bus.usbrev = USBREV_2_0;
 	usb_setup_reserve(sc->sc_dev, &sc->sc_dma_reserve, sc->sc_bus.dmatag,
 	    USB_MEM_RESERVE);
 	/* Reset the controller */
 	DPRINTF(("%s: resetting\n", device_xname(sc->sc_dev)));
 	EOWRITE4(sc, EHCI_USBCMD, 0);	/* Halt controller */
 	usb_delay_ms(&sc->sc_bus, 1);
 	EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
 	for (i = 0; i < 100; i++) {
 		usb_delay_ms(&sc->sc_bus, 1);
 		hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET;
 		if (!hcr)
 			break;
+	}
 	if (hcr) {
 		aprint_error("%s: reset timeout\n", device_xname(sc->sc_dev));
 		return (USBD_IOERROR);
+	}
 	if (sc->sc_vendor_init)
 		sc->sc_vendor_init(sc);
 	/*
 	 * If we are doing embedded transaction translation function, force
 	 * the controller to host mode.
 	 */
 	if (sc->sc_flags & EHCIF_ETTF) {
 		uint32_t usbmode = EREAD4(sc, EHCI_USBMODE);
 		usbmode &= ~EHCI_USBMODE_CM;
 		usbmode |= EHCI_USBMODE_CM_HOST;
 		EWRITE4(sc, EHCI_USBMODE, usbmode);
+	}
 	/* XXX need proper intr scheduling */
 	sc->sc_rand = 96;
 	/* frame list size at default, read back what we got and use that */
 	switch (EHCI_CMD_FLS(EOREAD4(sc, EHCI_USBCMD))) {
 	case 0: sc->sc_flsize = 1024; break;
 	case 1: sc->sc_flsize = 512; break;
 	case 2: sc->sc_flsize = 256; break;
 	case 3: return (USBD_IOERROR);
+	}
 	err = usb_allocmem(&sc->sc_bus, sc->sc_flsize * sizeof(ehci_link_t),
 	    EHCI_FLALIGN_ALIGN, &sc->sc_fldma);
 	if (err)
 		return (err);
 	DPRINTF(("%s: flsize=%d\n", device_xname(sc->sc_dev),sc->sc_flsize));
 	sc->sc_flist = KERNADDR(&sc->sc_fldma, 0);
 	for (i = 0; i < sc->sc_flsize; i++) {
 		sc->sc_flist[i] = EHCI_NULL;
+	}
 	EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0));
 	sc->sc_softitds = kmem_zalloc(sc->sc_flsize * sizeof(ehci_soft_itd_t *),
 				     KM_SLEEP);
 	if (sc->sc_softitds == NULL)
 		return ENOMEM;
 	LIST_INIT(&sc->sc_freeitds);
 	TAILQ_INIT(&sc->sc_intrhead);
 	/* Set up the bus struct. */
 	sc->sc_bus.methods = &ehci_bus_methods;
 	sc->sc_bus.pipe_size = sizeof(struct ehci_pipe);
 	sc->sc_eintrs = EHCI_NORMAL_INTRS;
 	/*
 	 * Allocate the interrupt dummy QHs. These are arranged to give poll
 	 * intervals that are powers of 2 times 1ms.
 	 */
 	for (i = 0; i < EHCI_INTRQHS; i++) {
 		sqh = ehci_alloc_sqh(sc);
 		if (sqh == NULL) {
 			err = USBD_NOMEM;
 			goto bad1;
+		}
 		sc->sc_islots[i].sqh = sqh;
+	}
 	for (i = 0; i < EHCI_INTRQHS; i++) {
 		sqh = sc->sc_islots[i].sqh;
 		if (i == 0) {
 			/* The last (1ms) QH terminates. */
 			sqh->qh.qh_link = EHCI_NULL;
 			sqh->next = NULL;
 		} else {
 			/* Otherwise the next QH has half the poll interval */
 			sqh->next = sc->sc_islots[(i + 1) / 2 - 1].sqh;
 			sqh->qh.qh_link = htole32(sqh->next->physaddr |
 			    EHCI_LINK_QH);
+		}
 		sqh->qh.qh_endp = htole32(EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH));
 		sqh->qh.qh_curqtd = EHCI_NULL;
 		sqh->next = NULL;
 		sqh->qh.qh_qtd.qtd_next = EHCI_NULL;
 		sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL;
 		sqh->qh.qh_qtd.qtd_status = htole32(EHCI_QTD_HALTED);
 		sqh->sqtd = NULL;
 		usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	/* Point the frame list at the last level (128ms). */
 	for (i = 0; i < sc->sc_flsize; i++) {
 		int j;
 		j = (i & ~(EHCI_MAX_POLLRATE-1)) |
 		    revbits[i & (EHCI_MAX_POLLRATE-1)];
 		sc->sc_flist[j] = htole32(EHCI_LINK_QH |
 		    sc->sc_islots[EHCI_IQHIDX(EHCI_IPOLLRATES - 1,
 		    i)].sqh->physaddr);
+	}
 	usb_syncmem(&sc->sc_fldma, 0, sc->sc_flsize * sizeof(ehci_link_t),
 	    BUS_DMASYNC_PREWRITE);
 	/* Allocate dummy QH that starts the async list. */
 	sqh = ehci_alloc_sqh(sc);
 	if (sqh == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	/* Fill the QH */
 	sqh->qh.qh_endp =
 	    htole32(EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_HRECL);
 	sqh->qh.qh_link =
 	    htole32(sqh->physaddr | EHCI_LINK_QH);
 	sqh->qh.qh_curqtd = EHCI_NULL;
 	sqh->next = NULL;
 	/* Fill the overlay qTD */
 	sqh->qh.qh_qtd.qtd_next = EHCI_NULL;
 	sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL;
 	sqh->qh.qh_qtd.qtd_status = htole32(EHCI_QTD_HALTED);
 	sqh->sqtd = NULL;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef EHCI_DEBUG
 	if (ehcidebug) {
 		ehci_dump_sqh(sqh);
+	}
 #endif
 	/* Point to async list */
 	sc->sc_async_head = sqh;
 	EOWRITE4(sc, EHCI_ASYNCLISTADDR, sqh->physaddr | EHCI_LINK_QH);
 	callout_init(&(sc->sc_tmo_intrlist), CALLOUT_MPSAFE);
 	/* Turn on controller */
 	EOWRITE4(sc, EHCI_USBCMD,
 		 EHCI_CMD_ITC_2 | /* 2 microframes interrupt delay */
 		 (EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_FLS_M) |
 		 EHCI_CMD_ASE |
 		 EHCI_CMD_PSE |
 		 EHCI_CMD_RS);
 	/* Take over port ownership */
 	EOWRITE4(sc, EHCI_CONFIGFLAG, EHCI_CONF_CF);
 	for (i = 0; i < 100; i++) {
 		usb_delay_ms(&sc->sc_bus, 1);
 		hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH;
 		if (!hcr)
 			break;
+	}
 	if (hcr) {
 		aprint_error("%s: run timeout\n", device_xname(sc->sc_dev));
 		return (USBD_IOERROR);
+	}
 	/* Enable interrupts */
 	DPRINTFN(1,("ehci_init: enabling\n"));
 	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
 	return (USBD_NORMAL_COMPLETION);
 #if 0
  bad2:
 	ehci_free_sqh(sc, sc->sc_async_head);
 #endif
  bad1:
 	usb_freemem(&sc->sc_bus, &sc->sc_fldma);
 	return (err);
+}
 int
 ehci_intr(void *v)
+{
 	ehci_softc_t *sc = v;
 	int ret = 0;
 	if (sc == NULL)
 		return 0;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	if (sc->sc_dying || !device_has_power(sc->sc_dev))
 		goto done;
 	/* If we get an interrupt while polling, then just ignore it. */
 	if (sc->sc_bus.use_polling) {
 		u_int32_t intrs = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS));
 		if (intrs)
 			EOWRITE4(sc, EHCI_USBSTS, intrs); /* Acknowledge */
 #ifdef DIAGNOSTIC
 		DPRINTFN(16, ("ehci_intr: ignored interrupt while polling\n"));
 #endif
 		goto done;
+	}
 	ret = ehci_intr1(sc);
 done:
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return ret;
+}
 Static int
 ehci_intr1(ehci_softc_t *sc)
+{
 	u_int32_t intrs, eintrs;
 	DPRINTFN(20,("ehci_intr1: enter\n"));
 	/* In case the interrupt occurs before initialization has completed. */
 	if (sc == NULL) {
 #ifdef DIAGNOSTIC
 		printf("ehci_intr1: sc == NULL\n");
 #endif
 		return (0);
+	}
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	intrs = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS));
 	if (!intrs)
 		return (0);
 	eintrs = intrs & sc->sc_eintrs;
 	DPRINTFN(7, ("ehci_intr1: sc=%p intrs=0x%x(0x%x) eintrs=0x%x\n",
 		     sc, (u_int)intrs, EOREAD4(sc, EHCI_USBSTS),
 		     (u_int)eintrs));
 	if (!eintrs)
 		return (0);
 	EOWRITE4(sc, EHCI_USBSTS, intrs); /* Acknowledge */
 	sc->sc_bus.intr_context++;
 	sc->sc_bus.no_intrs++;
 	if (eintrs & EHCI_STS_IAA) {
 		DPRINTF(("ehci_intr1: door bell\n"));
 		kpreempt_disable();
 		softint_schedule(sc->sc_doorbell_si);
 		kpreempt_enable();
 		eintrs &= ~EHCI_STS_IAA;
+	}
 	if (eintrs & (EHCI_STS_INT | EHCI_STS_ERRINT)) {
 		DPRINTFN(5,("ehci_intr1: %s %s\n",
 			    eintrs & EHCI_STS_INT ? "INT" : "",
 			    eintrs & EHCI_STS_ERRINT ? "ERRINT" : ""));
 		usb_schedsoftintr(&sc->sc_bus);
 		eintrs &= ~(EHCI_STS_INT | EHCI_STS_ERRINT);
+	}
 	if (eintrs & EHCI_STS_HSE) {
 		printf("%s: unrecoverable error, controller halted\n",
 		       device_xname(sc->sc_dev));
 		/* XXX what else */
+	}
 	if (eintrs & EHCI_STS_PCD) {
 		kpreempt_disable();
 		softint_schedule(sc->sc_pcd_si);
 		kpreempt_enable();
 		eintrs &= ~EHCI_STS_PCD;
+	}
 	sc->sc_bus.intr_context--;
 	if (eintrs != 0) {
 		/* Block unprocessed interrupts. */
 		sc->sc_eintrs &= ~eintrs;
 		EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
 		printf("%s: blocking intrs 0x%x\n",
 		       device_xname(sc->sc_dev), eintrs);
+	}
 	return (1);
+}
 Static void
 ehci_doorbell(void *addr)
+{
 	ehci_softc_t *sc = addr;
 	mutex_enter(&sc->sc_lock);
 	cv_broadcast(&sc->sc_doorbell);
 	mutex_exit(&sc->sc_lock);
+}
 Static void
 ehci_pcd(void *addr)
+{
 	ehci_softc_t *sc = addr;
 	usbd_xfer_handle xfer;
 	usbd_pipe_handle pipe;
 	u_char *p;
 	int i, m;
 	mutex_enter(&sc->sc_lock);
 	xfer = sc->sc_intrxfer;
 	if (xfer == NULL) {
 		/* Just ignore the change. */
 		goto done;
+	}
 	pipe = xfer->pipe;
 	p = KERNADDR(&xfer->dmabuf, 0);
 	m = min(sc->sc_noport, xfer->length * 8 - 1);
 	memset(p, 0, xfer->length);
 	for (i = 1; i <= m; i++) {
 		/* Pick out CHANGE bits from the status reg. */
 		if (EOREAD4(sc, EHCI_PORTSC(i)) & EHCI_PS_CLEAR)
 			p[i/8] |= 1 << (i%8);
+	}
 	DPRINTF(("ehci_pcd: change=0x%02x\n", *p));
 	xfer->actlen = xfer->length;
 	xfer->status = USBD_NORMAL_COMPLETION;
 	usb_transfer_complete(xfer);
 done:
 	mutex_exit(&sc->sc_lock);
+}
 Static void
 ehci_softintr(void *v)
+{
 	struct usbd_bus *bus = v;
 	ehci_softc_t *sc = bus->hci_private;
 	struct ehci_xfer *ex, *nextex;
 	DPRINTFN(10,("%s: ehci_softintr (%d)\n", device_xname(sc->sc_dev),
 		     sc->sc_bus.intr_context));
 	mutex_enter(&sc->sc_lock);
 	sc->sc_bus.intr_context++;
 	/*
 	 * The only explanation I can think of for why EHCI is as brain dead
 	 * as UHCI interrupt-wise is that Intel was involved in both.
 	 * An interrupt just tells us that something is done, we have no
 	 * clue what, so we need to scan through all active transfers. :-(
 	 */
 	for (ex = TAILQ_FIRST(&sc->sc_intrhead); ex; ex = nextex) {
 		nextex = TAILQ_NEXT(ex, inext);
 		ehci_check_intr(sc, ex);
+	}
 	/* Schedule a callout to catch any dropped transactions. */
 	if ((sc->sc_flags & EHCIF_DROPPED_INTR_WORKAROUND) &&
 	    !TAILQ_EMPTY(&sc->sc_intrhead))
 		callout_reset(&(sc->sc_tmo_intrlist),
 		    (hz), (ehci_intrlist_timeout), (sc));
 	if (sc->sc_softwake) {
 		sc->sc_softwake = 0;
 		cv_broadcast(&sc->sc_softwake_cv);
+	}
 	sc->sc_bus.intr_context--;
 	mutex_exit(&sc->sc_lock);
+}
 /* Check for an interrupt. */
 Static void
 ehci_check_intr(ehci_softc_t *sc, struct ehci_xfer *ex)
+{
 	int attr;
 	DPRINTFN(/*15*/2, ("ehci_check_intr: ex=%p\n", ex));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	attr = ex->xfer.pipe->endpoint->edesc->bmAttributes;
 	if (UE_GET_XFERTYPE(attr) == UE_ISOCHRONOUS)
 		ehci_check_itd_intr(sc, ex);
 	else
 		ehci_check_qh_intr(sc, ex);
 	return;
+}
 Static void
 ehci_check_qh_intr(ehci_softc_t *sc, struct ehci_xfer *ex)
+{
 	ehci_soft_qtd_t *sqtd, *lsqtd;
 	__uint32_t status;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (ex->sqtdstart == NULL) {
 		printf("ehci_check_qh_intr: not valid sqtd\n");
 		return;
+	}
 	lsqtd = ex->sqtdend;
 #ifdef DIAGNOSTIC
 	if (lsqtd == NULL) {
 		printf("ehci_check_qh_intr: lsqtd==0\n");
 		return;
+	}
 #endif
 	/*
 	 * If the last TD is still active we need to check whether there
 	 * is a an error somewhere in the middle, or whether there was a
 	 * short packet (SPD and not ACTIVE).
 	 */
 	usb_syncmem(&lsqtd->dma,
 	    lsqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 	    sizeof(lsqtd->qtd.qtd_status),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (le32toh(lsqtd->qtd.qtd_status) & EHCI_QTD_ACTIVE) {
 		DPRINTFN(12, ("ehci_check_intr: active ex=%p\n", ex));
 		for (sqtd = ex->sqtdstart; sqtd != lsqtd; sqtd=sqtd->nextqtd) {
 			usb_syncmem(&sqtd->dma,
 			    sqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 			    sizeof(sqtd->qtd.qtd_status),
 			    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 			status = le32toh(sqtd->qtd.qtd_status);
 			usb_syncmem(&sqtd->dma,
 			    sqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 			    sizeof(sqtd->qtd.qtd_status), BUS_DMASYNC_PREREAD);
 			/* If there's an active QTD the xfer isn't done. */
 			if (status & EHCI_QTD_ACTIVE)
 				break;
 			/* Any kind of error makes the xfer done. */
 			if (status & EHCI_QTD_HALTED)
 				goto done;
 			/* We want short packets, and it is short: it's done */
 			if (EHCI_QTD_GET_BYTES(status) != 0)
 				goto done;
+		}
 		DPRINTFN(12, ("ehci_check_intr: ex=%p std=%p still active\n",
 			      ex, ex->sqtdstart));
 		usb_syncmem(&lsqtd->dma,
 		    lsqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 		    sizeof(lsqtd->qtd.qtd_status), BUS_DMASYNC_PREREAD);
 		return;
+	}
  done:
 	DPRINTFN(12, ("ehci_check_intr: ex=%p done\n", ex));
 	callout_stop(&ex->xfer.timeout_handle);
 	ehci_idone(ex);
+}
 Static void
 ehci_check_itd_intr(ehci_softc_t *sc, struct ehci_xfer *ex) {
 	ehci_soft_itd_t *itd;
 	int i;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (&ex->xfer != SIMPLEQ_FIRST(&ex->xfer.pipe->queue))
 		return;
 	if (ex->itdstart == NULL) {
 		printf("ehci_check_itd_intr: not valid itd\n");
 		return;
+	}
 	itd = ex->itdend;
 #ifdef DIAGNOSTIC
 	if (itd == NULL) {
 		printf("ehci_check_itd_intr: itdend == 0\n");
 		return;
+	}
 #endif
 	/*
 	 * check no active transfers in last itd, meaning we're finished
 	 */
 	usb_syncmem(&itd->dma, itd->offs + offsetof(ehci_itd_t, itd_ctl),
 		    sizeof(itd->itd.itd_ctl), BUS_DMASYNC_POSTWRITE |
 		    BUS_DMASYNC_POSTREAD);
 	for (i = 0; i < EHCI_ITD_NUFRAMES; i++) {
 		if (le32toh(itd->itd.itd_ctl[i]) & EHCI_ITD_ACTIVE)
 			break;
+	}
 	if (i == EHCI_ITD_NUFRAMES) {
 		goto done; /* All 8 descriptors inactive, it's done */
+	}
 	DPRINTFN(12, ("ehci_check_itd_intr: ex %p itd %p still active\n", ex,
 			ex->itdstart));
 	return;
 done:
 	DPRINTFN(12, ("ehci_check_itd_intr: ex=%p done\n", ex));
 	callout_stop(&ex->xfer.timeout_handle);
 	ehci_idone(ex);
+}
 Static void
 ehci_idone(struct ehci_xfer *ex)
+{
 	usbd_xfer_handle xfer = &ex->xfer;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	struct ehci_softc *sc = xfer->pipe->device->bus->hci_private;
 	ehci_soft_qtd_t *sqtd, *lsqtd;
 	u_int32_t status = 0, nstatus = 0;
 	int actlen;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(/*12*/2, ("ehci_idone: ex=%p\n", ex));
 #ifdef DIAGNOSTIC
+	{
 		if (ex->isdone) {
 #ifdef EHCI_DEBUG
 			printf("ehci_idone: ex is done!\n   ");
 			ehci_dump_exfer(ex);
 #else
 			printf("ehci_idone: ex=%p is done!\n", ex);
 #endif
 			return;
+		}
 		ex->isdone = 1;
+	}
 #endif
 	if (xfer->status == USBD_CANCELLED ||
 	    xfer->status == USBD_TIMEOUT) {
 		DPRINTF(("ehci_idone: aborted xfer=%p\n", xfer));
 		return;
+	}
 #ifdef EHCI_DEBUG
 	DPRINTFN(/*10*/2, ("ehci_idone: xfer=%p, pipe=%p ready\n", xfer, epipe));
 	if (ehcidebug > 10)
 		ehci_dump_sqtds(ex->sqtdstart);
 #endif
 	/* The transfer is done, compute actual length and status. */
 	if (UE_GET_XFERTYPE(xfer->pipe->endpoint->edesc->bmAttributes)
 				== UE_ISOCHRONOUS) {
 		/* Isoc transfer */
 		struct ehci_soft_itd *itd;
 		int i, nframes, len, uframes;
 		nframes = 0;
 		actlen = 0;
 		i = xfer->pipe->endpoint->edesc->bInterval;
 		uframes = min(1 << (i - 1), USB_UFRAMES_PER_FRAME);
 		for (itd = ex->itdstart; itd != NULL; itd = itd->xfer_next) {
 			usb_syncmem(&itd->dma,itd->offs + offsetof(ehci_itd_t,itd_ctl),
 			    sizeof(itd->itd.itd_ctl), BUS_DMASYNC_POSTWRITE |
 			    BUS_DMASYNC_POSTREAD);
 			for (i = 0; i < EHCI_ITD_NUFRAMES; i += uframes) {
 				/* XXX - driver didn't fill in the frame full
 				 *   of uframes. This leads to scheduling
 				 *   inefficiencies, but working around
 				 *   this doubles complexity of tracking
 				 *   an xfer.
 				 */
 				if (nframes >= xfer->nframes)
 					break;
 				status = le32toh(itd->itd.itd_ctl[i]);
 				len = EHCI_ITD_GET_LEN(status);
 				if (EHCI_ITD_GET_STATUS(status) != 0)
 					len = 0; /*No valid data on error*/
 				xfer->frlengths[nframes++] = len;
 				actlen += len;
+			}
 			if (nframes >= xfer->nframes)
 				break;
+	    	}
 		xfer->actlen = actlen;
 		xfer->status = USBD_NORMAL_COMPLETION;
 		goto end;
+	}
 	/* Continue processing xfers using queue heads */
 	lsqtd = ex->sqtdend;
 	actlen = 0;
 	for (sqtd = ex->sqtdstart; sqtd != lsqtd->nextqtd; sqtd = sqtd->nextqtd) {
 		usb_syncmem(&sqtd->dma, sqtd->offs, sizeof(sqtd->qtd),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		nstatus = le32toh(sqtd->qtd.qtd_status);
 		if (nstatus & EHCI_QTD_ACTIVE)
 			break;
 		status = nstatus;
 		if (EHCI_QTD_GET_PID(status) != EHCI_QTD_PID_SETUP)
 			actlen += sqtd->len - EHCI_QTD_GET_BYTES(status);
+	}
 	/*
 	 * If there are left over TDs we need to update the toggle.
 	 * The default pipe doesn't need it since control transfers
 	 * start the toggle at 0 every time.
 	 * For a short transfer we need to update the toggle for the missing
 	 * packets within the qTD.
 	 */
 	if ((sqtd != lsqtd->nextqtd || EHCI_QTD_GET_BYTES(status)) &&
 	    xfer->pipe->device->default_pipe != xfer->pipe) {
 		DPRINTFN(2, ("ehci_idone: need toggle update "
 			     "status=%08x nstatus=%08x\n", status, nstatus));
 #if 0
 		ehci_dump_sqh(epipe->sqh);
 		ehci_dump_sqtds(ex->sqtdstart);
 #endif
 		epipe->nexttoggle = EHCI_QTD_GET_TOGGLE(nstatus);
+	}
 	DPRINTFN(/*10*/2, ("ehci_idone: len=%d, actlen=%d, status=0x%x\n",
 			   xfer->length, actlen, status));
 	xfer->actlen = actlen;
 	if (status & EHCI_QTD_HALTED) {
 #ifdef EHCI_DEBUG
 		char sbuf[128];
 		snprintb(sbuf, sizeof(sbuf),
 		    "\20\7HALTED\6BUFERR\5BABBLE\4XACTERR\3MISSED\1PINGSTATE",
 		    (u_int32_t)status);
 		DPRINTFN(2, ("ehci_idone: error, addr=%d, endpt=0x%02x, "
 			  "status 0x%s\n",
 			  xfer->pipe->device->address,
 			  xfer->pipe->endpoint->edesc->bEndpointAddress,
 			  sbuf));
 		if (ehcidebug > 2) {
 			ehci_dump_sqh(epipe->sqh);
 			ehci_dump_sqtds(ex->sqtdstart);
+		}
 #endif
 		/* low&full speed has an extra error flag */
 		if (EHCI_QH_GET_EPS(epipe->sqh->qh.qh_endp) !=
 		    EHCI_QH_SPEED_HIGH)
 			status &= EHCI_QTD_STATERRS | EHCI_QTD_PINGSTATE;
 		else
 			status &= EHCI_QTD_STATERRS;
 		if (status == 0) /* no other errors means a stall */ {
 			xfer->status = USBD_STALLED;
 		} else {
 			xfer->status = USBD_IOERROR; /* more info XXX */
+		}
 		/* XXX need to reset TT on missed microframe */
 		if (status & EHCI_QTD_MISSEDMICRO) {
 			printf("%s: missed microframe, TT reset not "
 			    "implemented, hub might be inoperational\n",
 			    device_xname(sc->sc_dev));
+		}
 	} else {
 		xfer->status = USBD_NORMAL_COMPLETION;
+	}
     end:
 	/* XXX transfer_complete memcpys out transfer data (for in endpoints)
 	 * during this call, before methods->done is called: dma sync required
 	 * beforehand? */
 	usb_transfer_complete(xfer);
 	DPRINTFN(/*12*/2, ("ehci_idone: ex=%p done\n", ex));
+}
 /*
  * Wait here until controller claims to have an interrupt.
  * Then call ehci_intr and return.  Use timeout to avoid waiting
  * too long.
  */
 Static void
 ehci_waitintr(ehci_softc_t *sc, usbd_xfer_handle xfer)
+{
 	int timo;
 	u_int32_t intrs;
 	xfer->status = USBD_IN_PROGRESS;
 	for (timo = xfer->timeout; timo >= 0; timo--) {
 		usb_delay_ms(&sc->sc_bus, 1);
 		if (sc->sc_dying)
 			break;
 		intrs = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS)) &
 			sc->sc_eintrs;
 		DPRINTFN(15,("ehci_waitintr: 0x%04x\n", intrs));
 #ifdef EHCI_DEBUG
 		if (ehcidebug > 15)
 			ehci_dump_regs(sc);
 #endif
 		if (intrs) {
 			mutex_spin_enter(&sc->sc_intr_lock);
 			ehci_intr1(sc);
 			mutex_spin_exit(&sc->sc_intr_lock);
 			if (xfer->status != USBD_IN_PROGRESS)
 				return;
+		}
+	}
 	/* Timeout */
 	DPRINTF(("ehci_waitintr: timeout\n"));
 	xfer->status = USBD_TIMEOUT;
 	usb_transfer_complete(xfer);
 	/* XXX should free TD */
+}
 Static void
 ehci_poll(struct usbd_bus *bus)
+{
 	ehci_softc_t *sc = bus->hci_private;
 #ifdef EHCI_DEBUG
 	static int last;
 	int new;
 	new = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS));
 	if (new != last) {
 		DPRINTFN(10,("ehci_poll: intrs=0x%04x\n", new));
 		last = new;
+	}
 #endif
 	if (EOREAD4(sc, EHCI_USBSTS) & sc->sc_eintrs) {
 		mutex_spin_enter(&sc->sc_intr_lock);
 		ehci_intr1(sc);
 		mutex_spin_exit(&sc->sc_intr_lock);
+	}
+}
 void
 ehci_childdet(device_t self, device_t child)
+{
 	struct ehci_softc *sc = device_private(self);
 	KASSERT(sc->sc_child == child);
 	sc->sc_child = NULL;
+}
 int
 ehci_detach(struct ehci_softc *sc, int flags)
+{
 	usbd_xfer_handle xfer;
 	int rv = 0;
 	if (sc->sc_child != NULL)
 		rv = config_detach(sc->sc_child, flags);
 	if (rv != 0)
 		return (rv);
 	callout_halt(&sc->sc_tmo_intrlist, NULL);
 	callout_destroy(&sc->sc_tmo_intrlist);
 	/* XXX free other data structures XXX */
 	if (sc->sc_softitds)
 		kmem_free(sc->sc_softitds,
 		    sc->sc_flsize * sizeof(ehci_soft_itd_t *));
 	cv_destroy(&sc->sc_doorbell);
 	cv_destroy(&sc->sc_softwake_cv);
 	softint_disestablish(sc->sc_doorbell_si);
 	softint_disestablish(sc->sc_pcd_si);
 	while ((xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers)) != NULL) {
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 		kmem_free(xfer, sizeof(struct ehci_xfer));
+	}
 	EOWRITE4(sc, EHCI_CONFIGFLAG, 0);
 	return (rv);
+}
 int
 ehci_activate(device_t self, enum devact act)
+{
 	struct ehci_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
+}
 /*
  * Handle suspend/resume.
+ *
  * We need to switch to polling mode here, because this routine is
  * called from an interrupt context.  This is all right since we
  * are almost suspended anyway.
+ *
  * Note that this power handler isn't to be registered directly; the
  * bus glue needs to call out to it.
  */
 bool
 ehci_suspend(device_t dv, const pmf_qual_t *qual)
+{
 	ehci_softc_t *sc = device_private(dv);
 	int i;
 	uint32_t cmd, hcr;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_bus.use_polling++;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	for (i = 1; i <= sc->sc_noport; i++) {
 		cmd = EOREAD4(sc, EHCI_PORTSC(i)) & ~EHCI_PS_CLEAR;
 		if ((cmd & EHCI_PS_PO) == 0 && (cmd & EHCI_PS_PE) == EHCI_PS_PE)
 			EOWRITE4(sc, EHCI_PORTSC(i), cmd | EHCI_PS_SUSP);
+	}
 	sc->sc_cmd = EOREAD4(sc, EHCI_USBCMD);
 	cmd = sc->sc_cmd & ~(EHCI_CMD_ASE | EHCI_CMD_PSE);
 	EOWRITE4(sc, EHCI_USBCMD, cmd);
 	for (i = 0; i < 100; i++) {
 		hcr = EOREAD4(sc, EHCI_USBSTS) & (EHCI_STS_ASS | EHCI_STS_PSS);
 		if (hcr == 0)
 			break;
 		usb_delay_ms(&sc->sc_bus, 1);
+	}
 	if (hcr != 0)
 		printf("%s: reset timeout\n", device_xname(dv));
 	cmd &= ~EHCI_CMD_RS;
 	EOWRITE4(sc, EHCI_USBCMD, cmd);
 	for (i = 0; i < 100; i++) {
 		hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH;
 		if (hcr == EHCI_STS_HCH)
 			break;
 		usb_delay_ms(&sc->sc_bus, 1);
+	}
 	if (hcr != EHCI_STS_HCH)
 		printf("%s: config timeout\n", device_xname(dv));
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_bus.use_polling--;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return true;
+}
 bool
 ehci_resume(device_t dv, const pmf_qual_t *qual)
+{
 	ehci_softc_t *sc = device_private(dv);
 	int i;
 	uint32_t cmd, hcr;
 	/* restore things in case the bios sucks */
 	EOWRITE4(sc, EHCI_CTRLDSSEGMENT, 0);
 	EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0));
 	EOWRITE4(sc, EHCI_ASYNCLISTADDR,
 	    sc->sc_async_head->physaddr | EHCI_LINK_QH);
 	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs & ~EHCI_INTR_PCIE);
 	EOWRITE4(sc, EHCI_USBCMD, sc->sc_cmd);
 	hcr = 0;
 	for (i = 1; i <= sc->sc_noport; i++) {
 		cmd = EOREAD4(sc, EHCI_PORTSC(i)) & ~EHCI_PS_CLEAR;
 		if ((cmd & EHCI_PS_PO) == 0 &&
 		    (cmd & EHCI_PS_SUSP) == EHCI_PS_SUSP) {
 			EOWRITE4(sc, EHCI_PORTSC(i), cmd | EHCI_PS_FPR);
 			hcr = 1;
+		}
+	}
 	if (hcr) {
 		usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT);
 		for (i = 1; i <= sc->sc_noport; i++) {
 			cmd = EOREAD4(sc, EHCI_PORTSC(i)) & ~EHCI_PS_CLEAR;
 			if ((cmd & EHCI_PS_PO) == 0 &&
 			    (cmd & EHCI_PS_SUSP) == EHCI_PS_SUSP)
 				EOWRITE4(sc, EHCI_PORTSC(i),
 				    cmd & ~EHCI_PS_FPR);
+		}
+	}
 	EOWRITE4(sc, EHCI_USBCMD, sc->sc_cmd);
 	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
 	for (i = 0; i < 100; i++) {
 		hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH;
 		if (hcr != EHCI_STS_HCH)
 			break;
 		usb_delay_ms(&sc->sc_bus, 1);
+	}
 	if (hcr == EHCI_STS_HCH)
 		printf("%s: config timeout\n", device_xname(dv));
 	return true;
+}
 /*
  * Shut down the controller when the system is going down.
  */
 bool
 ehci_shutdown(device_t self, int flags)
+{
 	ehci_softc_t *sc = device_private(self);
 	DPRINTF(("ehci_shutdown: stopping the HC\n"));
 	EOWRITE4(sc, EHCI_USBCMD, 0);	/* Halt controller */
 	EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
 	return true;
+}
 Static usbd_status
 ehci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size)
+{
 	struct ehci_softc *sc = bus->hci_private;
 	usbd_status err;
 	err = usb_allocmem(&sc->sc_bus, size, 0, dma);
 	if (err == USBD_NOMEM)
 		err = usb_reserve_allocm(&sc->sc_dma_reserve, dma, size);
 #ifdef EHCI_DEBUG
 	if (err)
 		printf("ehci_allocm: usb_allocmem()=%d\n", err);
 #endif
 	return (err);
+}
 Static void
 ehci_freem(struct usbd_bus *bus, usb_dma_t *dma)
+{
 	struct ehci_softc *sc = bus->hci_private;
 	if (dma->block->flags & USB_DMA_RESERVE) {
 		usb_reserve_freem(&sc->sc_dma_reserve,
 		    dma);
 		return;
+	}
 	usb_freemem(&sc->sc_bus, dma);
+}
 Static usbd_xfer_handle
 ehci_allocx(struct usbd_bus *bus)
+{
 	struct ehci_softc *sc = bus->hci_private;
 	usbd_xfer_handle xfer;
 	xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 	if (xfer != NULL) {
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 #ifdef DIAGNOSTIC
 		if (xfer->busy_free != XFER_FREE) {
 			printf("ehci_allocx: xfer=%p not free, 0x%08x\n", xfer,
 			       xfer->busy_free);
+		}
 #endif
 	} else {
 		xfer = kmem_alloc(sizeof(struct ehci_xfer), KM_SLEEP);
+	}
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct ehci_xfer));
 #ifdef DIAGNOSTIC
 		EXFER(xfer)->isdone = 1;
 		xfer->busy_free = XFER_BUSY;
 #endif
+	}
 	return (xfer);
+}
 Static void
 ehci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
+{
 	struct ehci_softc *sc = bus->hci_private;
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_BUSY) {
 		printf("ehci_freex: xfer=%p not busy, 0x%08x\n", xfer,
 		       xfer->busy_free);
+	}
 	xfer->busy_free = XFER_FREE;
 	if (!EXFER(xfer)->isdone) {
 		printf("ehci_freex: !isdone\n");
+	}
 #endif
 	SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
+}
 Static void
 ehci_get_locks(struct usbd_bus *bus, kmutex_t **intr, kmutex_t **thread)
+{
 	struct ehci_softc *sc = bus->hci_private;
 	*intr = &sc->sc_intr_lock;
 	*thread = &sc->sc_lock;
+}
 Static void
 ehci_device_clear_toggle(usbd_pipe_handle pipe)
+{
 	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
 	DPRINTF(("ehci_device_clear_toggle: epipe=%p status=0x%x\n",
 		 epipe, epipe->sqh->qh.qh_qtd.qtd_status));
 #ifdef EHCI_DEBUG
 	if (ehcidebug)
 		usbd_dump_pipe(pipe);
 #endif
 	epipe->nexttoggle = 0;
+}
 Static void
 ehci_noop(usbd_pipe_handle pipe)
+{
+}
 #ifdef EHCI_DEBUG
 Static void
 ehci_dump_regs(ehci_softc_t *sc)
+{
 	int i;
 	printf("cmd=0x%08x, sts=0x%08x, ien=0x%08x\n",
 	       EOREAD4(sc, EHCI_USBCMD),
 	       EOREAD4(sc, EHCI_USBSTS),
 	       EOREAD4(sc, EHCI_USBINTR));
 	printf("frindex=0x%08x ctrdsegm=0x%08x periodic=0x%08x async=0x%08x\n",
 	       EOREAD4(sc, EHCI_FRINDEX),
 	       EOREAD4(sc, EHCI_CTRLDSSEGMENT),
 	       EOREAD4(sc, EHCI_PERIODICLISTBASE),
 	       EOREAD4(sc, EHCI_ASYNCLISTADDR));
 	for (i = 1; i <= sc->sc_noport; i++)
 		printf("port %d status=0x%08x\n", i,
 		       EOREAD4(sc, EHCI_PORTSC(i)));
+}
 /*
  * Unused function - this is meant to be called from a kernel
  * debugger.
  */
 void
 ehci_dump(void)
+{
 	ehci_dump_regs(theehci);
+}
 Static void
 ehci_dump_link(ehci_link_t link, int type)
+{
 	link = le32toh(link);
 	printf("0x%08x", link);
 	if (link & EHCI_LINK_TERMINATE)
 		printf("<T>");
 	else {
 		printf("<");
 		if (type) {
 			switch (EHCI_LINK_TYPE(link)) {
 			case EHCI_LINK_ITD: printf("ITD"); break;
 			case EHCI_LINK_QH: printf("QH"); break;
 			case EHCI_LINK_SITD: printf("SITD"); break;
 			case EHCI_LINK_FSTN: printf("FSTN"); break;
+			}
+		}
 		printf(">");
+	}
+}
 Static void
 ehci_dump_sqtds(ehci_soft_qtd_t *sqtd)
+{
 	int i;
 	u_int32_t stop;
 	stop = 0;
 	for (i = 0; sqtd && i < 20 && !stop; sqtd = sqtd->nextqtd, i++) {
 		ehci_dump_sqtd(sqtd);
 		usb_syncmem(&sqtd->dma,
 		    sqtd->offs + offsetof(ehci_qtd_t, qtd_next),
 		    sizeof(sqtd->qtd),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		stop = sqtd->qtd.qtd_next & htole32(EHCI_LINK_TERMINATE);
 		usb_syncmem(&sqtd->dma,
 		    sqtd->offs + offsetof(ehci_qtd_t, qtd_next),
 		    sizeof(sqtd->qtd), BUS_DMASYNC_PREREAD);
+	}
 	if (sqtd)
 		printf("dump aborted, too many TDs\n");
+}
 Static void
 ehci_dump_sqtd(ehci_soft_qtd_t *sqtd)
+{
 	usb_syncmem(&sqtd->dma, sqtd->offs,
 	    sizeof(sqtd->qtd), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	printf("QTD(%p) at 0x%08x:\n", sqtd, sqtd->physaddr);
 	ehci_dump_qtd(&sqtd->qtd);
 	usb_syncmem(&sqtd->dma, sqtd->offs,
 	    sizeof(sqtd->qtd), BUS_DMASYNC_PREREAD);
+}
 Static void
 ehci_dump_qtd(ehci_qtd_t *qtd)
+{
 	u_int32_t s;
 	char sbuf[128];
 	printf("  next="); ehci_dump_link(qtd->qtd_next, 0);
 	printf(" altnext="); ehci_dump_link(qtd->qtd_altnext, 0);
 	printf("\n");
 	s = le32toh(qtd->qtd_status);
 	snprintb(sbuf, sizeof(sbuf),
 	    "\20\10ACTIVE\7HALTED\6BUFERR\5BABBLE\4XACTERR"
 	    "\3MISSED\2SPLIT\1PING", EHCI_QTD_GET_STATUS(s));
 	printf("  status=0x%08x: toggle=%d bytes=0x%x ioc=%d c_page=0x%x\n",
 	       s, EHCI_QTD_GET_TOGGLE(s), EHCI_QTD_GET_BYTES(s),
 	       EHCI_QTD_GET_IOC(s), EHCI_QTD_GET_C_PAGE(s));
 	printf("    cerr=%d pid=%d stat=0x%s\n", EHCI_QTD_GET_CERR(s),
 	       EHCI_QTD_GET_PID(s), sbuf);
 	for (s = 0; s < 5; s++)
 		printf("  buffer[%d]=0x%08x\n", s, le32toh(qtd->qtd_buffer[s]));
+}
 Static void
 ehci_dump_sqh(ehci_soft_qh_t *sqh)
+{
 	ehci_qh_t *qh = &sqh->qh;
 	u_int32_t endp, endphub;
 	usb_syncmem(&sqh->dma, sqh->offs,
 	    sizeof(sqh->qh), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	printf("QH(%p) at 0x%08x:\n", sqh, sqh->physaddr);
 	printf("  link="); ehci_dump_link(qh->qh_link, 1); printf("\n");
 	endp = le32toh(qh->qh_endp);
 	printf("  endp=0x%08x\n", endp);
 	printf("    addr=0x%02x inact=%d endpt=%d eps=%d dtc=%d hrecl=%d\n",
 	       EHCI_QH_GET_ADDR(endp), EHCI_QH_GET_INACT(endp),
 	       EHCI_QH_GET_ENDPT(endp),  EHCI_QH_GET_EPS(endp),
 	       EHCI_QH_GET_DTC(endp), EHCI_QH_GET_HRECL(endp));
 	printf("    mpl=0x%x ctl=%d nrl=%d\n",
 	       EHCI_QH_GET_MPL(endp), EHCI_QH_GET_CTL(endp),
 	       EHCI_QH_GET_NRL(endp));
 	endphub = le32toh(qh->qh_endphub);
 	printf("  endphub=0x%08x\n", endphub);
 	printf("    smask=0x%02x cmask=0x%02x huba=0x%02x port=%d mult=%d\n",
 	       EHCI_QH_GET_SMASK(endphub), EHCI_QH_GET_CMASK(endphub),
 	       EHCI_QH_GET_HUBA(endphub), EHCI_QH_GET_PORT(endphub),
 	       EHCI_QH_GET_MULT(endphub));
 	printf("  curqtd="); ehci_dump_link(qh->qh_curqtd, 0); printf("\n");
 	printf("Overlay qTD:\n");
 	ehci_dump_qtd(&qh->qh_qtd);
 	usb_syncmem(&sqh->dma, sqh->offs,
 	    sizeof(sqh->qh), BUS_DMASYNC_PREREAD);
+}
 #if notyet
 Static void
 ehci_dump_itd(struct ehci_soft_itd *itd)
+{
 	ehci_isoc_trans_t t;
 	ehci_isoc_bufr_ptr_t b, b2, b3;
 	int i;
 	printf("ITD: next phys=%X\n", itd->itd.itd_next);
 	for (i = 0; i < EHCI_ITD_NUFRAMES; i++) {
 		t = le32toh(itd->itd.itd_ctl[i]);
 		printf("ITDctl %d: stat=%X len=%X ioc=%X pg=%X offs=%X\n", i,
 		    EHCI_ITD_GET_STATUS(t), EHCI_ITD_GET_LEN(t),
 		    EHCI_ITD_GET_IOC(t), EHCI_ITD_GET_PG(t),
 		    EHCI_ITD_GET_OFFS(t));
+	}
 	printf("ITDbufr: ");
 	for (i = 0; i < EHCI_ITD_NBUFFERS; i++)
 		printf("%X,", EHCI_ITD_GET_BPTR(le32toh(itd->itd.itd_bufr[i])));
 	b = le32toh(itd->itd.itd_bufr[0]);
 	b2 = le32toh(itd->itd.itd_bufr[1]);
 	b3 = le32toh(itd->itd.itd_bufr[2]);
 	printf("\nep=%X daddr=%X dir=%d maxpkt=%X multi=%X\n",
 	    EHCI_ITD_GET_EP(b), EHCI_ITD_GET_DADDR(b), EHCI_ITD_GET_DIR(b2),
 	    EHCI_ITD_GET_MAXPKT(b2), EHCI_ITD_GET_MULTI(b3));
+}
 Static void
 ehci_dump_sitd(struct ehci_soft_itd *itd)
+{
 	printf("SITD %p next=%p prev=%p xfernext=%p physaddr=%X slot=%d\n",
 			itd, itd->u.frame_list.next, itd->u.frame_list.prev,
 			itd->xfer_next, itd->physaddr, itd->slot);
+}
 #endif
 #ifdef DIAGNOSTIC
 Static void
 ehci_dump_exfer(struct ehci_xfer *ex)
+{
 	printf("ehci_dump_exfer: ex=%p sqtdstart=%p end=%p itdstart=%p end=%p isdone=%d\n", ex, ex->sqtdstart, ex->sqtdend, ex->itdstart, ex->itdend, ex->isdone);
+}
 #endif
 #endif
 Static usbd_status
 ehci_open(usbd_pipe_handle pipe)
+{
 	usbd_device_handle dev = pipe->device;
 	ehci_softc_t *sc = dev->bus->hci_private;
 	usb_endpoint_descriptor_t *ed = pipe->endpoint->edesc;
 	u_int8_t addr = dev->address;
 	u_int8_t xfertype = ed->bmAttributes & UE_XFERTYPE;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
 	ehci_soft_qh_t *sqh;
 	usbd_status err;
 	int ival, speed, naks;
 	int hshubaddr, hshubport;
 	DPRINTFN(1, ("ehci_open: pipe=%p, addr=%d, endpt=%d (%d)\n",
 		     pipe, addr, ed->bEndpointAddress, sc->sc_addr));
 	if (dev->myhsport) {
 		/*
 		 * When directly attached FS/LS device while doing embedded
 		 * transaction translations and we are the hub, set the hub
 		 * adddress to 0 (us).
 		 */
 		if (!(sc->sc_flags & EHCIF_ETTF)
 		    || (dev->myhsport->parent->address != sc->sc_addr)) {
 			hshubaddr = dev->myhsport->parent->address;
 		} else {
 			hshubaddr = 0;
+		}
 		hshubport = dev->myhsport->portno;
 	} else {
 		hshubaddr = 0;
 		hshubport = 0;
+	}
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 	/* toggle state needed for bulk endpoints */
 	epipe->nexttoggle = pipe->endpoint->datatoggle;
 	if (addr == sc->sc_addr) {
 		switch (ed->bEndpointAddress) {
 		case USB_CONTROL_ENDPOINT:
 			pipe->methods = &ehci_root_ctrl_methods;
 			break;
 		case UE_DIR_IN | EHCI_INTR_ENDPT:
 			pipe->methods = &ehci_root_intr_methods;
 			break;
 		default:
 			DPRINTF(("ehci_open: bad bEndpointAddress 0x%02x\n",
 			    ed->bEndpointAddress));
 			return (USBD_INVAL);
+		}
 		return (USBD_NORMAL_COMPLETION);
+	}
 	/* XXX All this stuff is only valid for async. */
 	switch (dev->speed) {
 	case USB_SPEED_LOW:  speed = EHCI_QH_SPEED_LOW;  break;
 	case USB_SPEED_FULL: speed = EHCI_QH_SPEED_FULL; break;
 	case USB_SPEED_HIGH: speed = EHCI_QH_SPEED_HIGH; break;
 	default: panic("ehci_open: bad device speed %d", dev->speed);
+	}
 	if (speed != EHCI_QH_SPEED_HIGH && xfertype == UE_ISOCHRONOUS) {
 		aprint_error_dev(sc->sc_dev, "error opening low/full speed "
 		    "isoc endpoint.\n");
 		aprint_normal_dev(sc->sc_dev, "a low/full speed device is "
 		    "attached to a USB2 hub, and transaction translations are "
 		    "not yet supported.\n");
 		aprint_normal_dev(sc->sc_dev, "reattach the device to the "
 		    "root hub instead.\n");
 		DPRINTFN(1,("ehci_open: hshubaddr=%d hshubport=%d\n",
 			    hshubaddr, hshubport));
 		return USBD_INVAL;
+	}
 	/*
 	 * For interrupt transfer, nak throttling must be disabled, but for
 	 * the other transfer type, nak throttling should be enabled from the
 	 * veiwpoint that avoids the memory thrashing.
 	 */
 	naks = (xfertype == UE_INTERRUPT) ? 0
 	    : ((speed == EHCI_QH_SPEED_HIGH) ? 4 : 0);
 	/* Allocate sqh for everything, save isoc xfers */
 	if (xfertype != UE_ISOCHRONOUS) {
 		sqh = ehci_alloc_sqh(sc);
 		if (sqh == NULL)
 			return (USBD_NOMEM);
 		/* qh_link filled when the QH is added */
 		sqh->qh.qh_endp = htole32(
 		    EHCI_QH_SET_ADDR(addr) |
 		    EHCI_QH_SET_ENDPT(UE_GET_ADDR(ed->bEndpointAddress)) |
 		    EHCI_QH_SET_EPS(speed) |
 		    EHCI_QH_DTC |
 		    EHCI_QH_SET_MPL(UGETW(ed->wMaxPacketSize)) |
 		    (speed != EHCI_QH_SPEED_HIGH && xfertype == UE_CONTROL ?
 		     EHCI_QH_CTL : 0) |
 		    EHCI_QH_SET_NRL(naks)
 		    );
 		sqh->qh.qh_endphub = htole32(
 		    EHCI_QH_SET_MULT(1) |
 		    EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x02 : 0)
 		    );
 		if (speed != EHCI_QH_SPEED_HIGH)
 			sqh->qh.qh_endphub |= htole32(
 			    EHCI_QH_SET_PORT(hshubport) |
 			    EHCI_QH_SET_HUBA(hshubaddr) |
 			    EHCI_QH_SET_CMASK(0x08) /* XXX */
 			);
 		sqh->qh.qh_curqtd = EHCI_NULL;
 		/* Fill the overlay qTD */
 		sqh->qh.qh_qtd.qtd_next = EHCI_NULL;
 		sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL;
 		sqh->qh.qh_qtd.qtd_status = htole32(0);
 		usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		epipe->sqh = sqh;
 	} else {
 		sqh = NULL;
 	} /*xfertype == UE_ISOC*/
 	switch (xfertype) {
 	case UE_CONTROL:
 		err = usb_allocmem(&sc->sc_bus, sizeof(usb_device_request_t),
 , &epipe->u.ctl.reqdma);
 #ifdef EHCI_DEBUG
 		if (err)
 			printf("ehci_open: usb_allocmem()=%d\n", err);
 #endif
 		if (err)
 			goto bad;
 		pipe->methods = &ehci_device_ctrl_methods;
 		mutex_enter(&sc->sc_lock);
-		ehci_add_qh(sqh, sc->sc_async_head);
+		ehci_add_qh(sc, sqh, sc->sc_async_head);
 		mutex_exit(&sc->sc_lock);
 		break;
 	case UE_BULK:
 		pipe->methods = &ehci_device_bulk_methods;
 		mutex_enter(&sc->sc_lock);
-		ehci_add_qh(sqh, sc->sc_async_head);
+		ehci_add_qh(sc, sqh, sc->sc_async_head);
 		mutex_exit(&sc->sc_lock);
 		break;
 	case UE_INTERRUPT:
 		pipe->methods = &ehci_device_intr_methods;
 		ival = pipe->interval;
 		if (ival == USBD_DEFAULT_INTERVAL) {
 			if (speed == EHCI_QH_SPEED_HIGH) {
 				if (ed->bInterval > 16) {
 					/*
 					 * illegal with high-speed, but there
 					 * were documentation bugs in the spec,
 					 * so be generous
 					 */
 					ival = 256;
 				} else
 					ival = (1 << (ed->bInterval - 1)) / 8;
 			} else
 				ival = ed->bInterval;
+		}
 		err = ehci_device_setintr(sc, sqh, ival);
 		if (err)
 			goto bad;
 		break;
 	case UE_ISOCHRONOUS:
 		pipe->methods = &ehci_device_isoc_methods;
 		if (ed->bInterval == 0 || ed->bInterval > 16) {
 			printf("ehci: opening pipe with invalid bInterval\n");
 			err = USBD_INVAL;
 			goto bad;
+		}
 		if (UGETW(ed->wMaxPacketSize) == 0) {
 			printf("ehci: zero length endpoint open request\n");
 			err = USBD_INVAL;
 			goto bad;
+		}
 		epipe->u.isoc.next_frame = 0;
 		epipe->u.isoc.cur_xfers = 0;
 		break;
 	default:
 		DPRINTF(("ehci: bad xfer type %d\n", xfertype));
 		err = USBD_INVAL;
 		goto bad;
+	}
 	return (USBD_NORMAL_COMPLETION);
  bad:
 	if (sqh != NULL)
 		ehci_free_sqh(sc, sqh);
 	return (err);
+}
 /*
  * Add an ED to the schedule.  Called at splusb().
  */
 Static void
-ehci_add_qh(ehci_soft_qh_t *sqh, ehci_soft_qh_t *head)
+ehci_add_qh(ehci_softc_t *sc, ehci_soft_qh_t *sqh, ehci_soft_qh_t *head)
+{
 	SPLUSBCHECK;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	usb_syncmem(&head->dma, head->offs + offsetof(ehci_qh_t, qh_link),
 	    sizeof(head->qh.qh_link), BUS_DMASYNC_POSTWRITE);
 	sqh->next = head->next;
 	sqh->qh.qh_link = head->qh.qh_link;
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(ehci_qh_t, qh_link),
 	    sizeof(sqh->qh.qh_link), BUS_DMASYNC_PREWRITE);
 	head->next = sqh;
 	head->qh.qh_link = htole32(sqh->physaddr | EHCI_LINK_QH);
 	usb_syncmem(&head->dma, head->offs + offsetof(ehci_qh_t, qh_link),
 	    sizeof(head->qh.qh_link), BUS_DMASYNC_PREWRITE);
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 5) {
 		printf("ehci_add_qh:\n");
 		ehci_dump_sqh(sqh);
+	}
 #endif
+}
 /*
  * Remove an ED from the schedule.  Called at splusb().
  */
 Static void
 ehci_rem_qh(ehci_softc_t *sc, ehci_soft_qh_t *sqh, ehci_soft_qh_t *head)
+{
 	ehci_soft_qh_t *p;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	/* XXX */
 	for (p = head; p != NULL && p->next != sqh; p = p->next)
+		;
 	if (p == NULL)
 		panic("ehci_rem_qh: ED not found");
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(ehci_qh_t, qh_link),
 	    sizeof(sqh->qh.qh_link), BUS_DMASYNC_POSTWRITE);
 	p->next = sqh->next;
 	p->qh.qh_link = sqh->qh.qh_link;
 	usb_syncmem(&p->dma, p->offs + offsetof(ehci_qh_t, qh_link),
 	    sizeof(p->qh.qh_link), BUS_DMASYNC_PREWRITE);
 	ehci_sync_hc(sc);
+}
 Static void
 ehci_set_qh_qtd(ehci_soft_qh_t *sqh, ehci_soft_qtd_t *sqtd)
+{
 	int i;
 	u_int32_t status;
 	/* Save toggle bit and ping status. */
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	status = sqh->qh.qh_qtd.qtd_status &
 	    htole32(EHCI_QTD_TOGGLE_MASK |
 		    EHCI_QTD_SET_STATUS(EHCI_QTD_PINGSTATE));
 	/* Set HALTED to make hw leave it alone. */
 	sqh->qh.qh_qtd.qtd_status =
 	    htole32(EHCI_QTD_SET_STATUS(EHCI_QTD_HALTED));
 	usb_syncmem(&sqh->dma,
 	    sqh->offs + offsetof(ehci_qh_t, qh_qtd.qtd_status),
 	    sizeof(sqh->qh.qh_qtd.qtd_status),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	sqh->qh.qh_curqtd = 0;
 	sqh->qh.qh_qtd.qtd_next = htole32(sqtd->physaddr);
 	sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL;
 	for (i = 0; i < EHCI_QTD_NBUFFERS; i++)
 		sqh->qh.qh_qtd.qtd_buffer[i] = 0;
 	sqh->sqtd = sqtd;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/* Set !HALTED && !ACTIVE to start execution, preserve some fields */
 	sqh->qh.qh_qtd.qtd_status = status;
 	usb_syncmem(&sqh->dma,
 	    sqh->offs + offsetof(ehci_qh_t, qh_qtd.qtd_status),
 	    sizeof(sqh->qh.qh_qtd.qtd_status),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+}
 /*
  * Ensure that the HC has released all references to the QH.  We do this
  * by asking for a Async Advance Doorbell interrupt and then we wait for
  * the interrupt.
  * To make this easier we first obtain exclusive use of the doorbell.
  */
 Static void
 ehci_sync_hc(ehci_softc_t *sc)
+{
 	int error;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (sc->sc_dying) {
 		DPRINTFN(2,("ehci_sync_hc: dying\n"));
 		return;
+	}
 	DPRINTFN(2,("ehci_sync_hc: enter\n"));
 	/* ask for doorbell */
 	EOWRITE4(sc, EHCI_USBCMD, EOREAD4(sc, EHCI_USBCMD) | EHCI_CMD_IAAD);
 	DPRINTFN(1,("ehci_sync_hc: cmd=0x%08x sts=0x%08x\n",
 		    EOREAD4(sc, EHCI_USBCMD), EOREAD4(sc, EHCI_USBSTS)));
 	error = cv_timedwait(&sc->sc_doorbell, &sc->sc_lock, hz); /* bell wait */
 	DPRINTFN(1,("ehci_sync_hc: cmd=0x%08x sts=0x%08x\n",
 		    EOREAD4(sc, EHCI_USBCMD), EOREAD4(sc, EHCI_USBSTS)));
 #ifdef DIAGNOSTIC
 	if (error)
 		printf("ehci_sync_hc: cv_timedwait() = %d\n", error);
 #endif
 	DPRINTFN(2,("ehci_sync_hc: exit\n"));
+}
 /*Call at splusb*/
 Static void
 ehci_rem_free_itd_chain(ehci_softc_t *sc, struct ehci_xfer *exfer)
+{
 	struct ehci_soft_itd *itd, *prev;
 	prev = NULL;
 	if (exfer->itdstart == NULL || exfer->itdend == NULL)
 		panic("ehci isoc xfer being freed, but with no itd chain\n");
 	for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) {
 		prev = itd->u.frame_list.prev;
 		/* Unlink itd from hardware chain, or frame array */
 		if (prev == NULL) { /* We're at the table head */
 			sc->sc_softitds[itd->slot] = itd->u.frame_list.next;
 			sc->sc_flist[itd->slot] = itd->itd.itd_next;
 			usb_syncmem(&sc->sc_fldma,
 			    sizeof(ehci_link_t) * itd->slot,
                 	    sizeof(ehci_link_t),
 			    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 			if (itd->u.frame_list.next != NULL)
 				itd->u.frame_list.next->u.frame_list.prev = NULL;
 		} else {
 			/* XXX this part is untested... */
 			prev->itd.itd_next = itd->itd.itd_next;
 			usb_syncmem(&itd->dma,
 			    itd->offs + offsetof(ehci_itd_t, itd_next),
                 	    sizeof(itd->itd.itd_next), BUS_DMASYNC_PREWRITE);
 			prev->u.frame_list.next = itd->u.frame_list.next;
 			if (itd->u.frame_list.next != NULL)
 				itd->u.frame_list.next->u.frame_list.prev = prev;
+		}
+	}
 	prev = NULL;
 	for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) {
 		if (prev != NULL)
 			ehci_free_itd(sc, prev);
 		prev = itd;
+	}
 	if (prev)
 		ehci_free_itd(sc, prev);
 	exfer->itdstart = NULL;
 	exfer->itdend = NULL;
+}
 /***********/
 /*
  * Data structures and routines to emulate the root hub.
  */
 Static usb_device_descriptor_t ehci_devd = {
 	USB_DEVICE_DESCRIPTOR_SIZE,
 	UDESC_DEVICE,		/* type */
 	{0x00, 0x02},		/* USB version */
 	UDCLASS_HUB,		/* class */
 	UDSUBCLASS_HUB,		/* subclass */
 	UDPROTO_HSHUBSTT,	/* protocol */
 ,			/* max packet */
 	{0},{0},{0x00,0x01},	/* device id */
 ,2,0,			/* string indicies */
 			/* # of configurations */
 };
 Static const usb_device_qualifier_t ehci_odevd = {
 	USB_DEVICE_DESCRIPTOR_SIZE,
 	UDESC_DEVICE_QUALIFIER,	/* type */
 	{0x00, 0x02},		/* USB version */
 	UDCLASS_HUB,		/* class */
 	UDSUBCLASS_HUB,		/* subclass */
 	UDPROTO_FSHUB,		/* protocol */
 ,			/* max packet */
 ,			/* # of configurations */
 };
 Static const usb_config_descriptor_t ehci_confd = {
 	USB_CONFIG_DESCRIPTOR_SIZE,
 	UDESC_CONFIG,
 	{USB_CONFIG_DESCRIPTOR_SIZE +
 	 USB_INTERFACE_DESCRIPTOR_SIZE +
 	 USB_ENDPOINT_DESCRIPTOR_SIZE},
 ,
 ,
 ,
 	UC_ATTR_MBO | UC_SELF_POWERED,
 			/* max power */
 };
 Static const usb_interface_descriptor_t ehci_ifcd = {
 	USB_INTERFACE_DESCRIPTOR_SIZE,
 	UDESC_INTERFACE,
 ,
 ,
 ,
 	UICLASS_HUB,
 	UISUBCLASS_HUB,
 	UIPROTO_HSHUBSTT,
 };
 Static const usb_endpoint_descriptor_t ehci_endpd = {
 	USB_ENDPOINT_DESCRIPTOR_SIZE,
 	UDESC_ENDPOINT,
 	UE_DIR_IN | EHCI_INTR_ENDPT,
 	UE_INTERRUPT,
 	{8, 0},			/* max packet */
 };
 Static const usb_hub_descriptor_t ehci_hubd = {
 	USB_HUB_DESCRIPTOR_SIZE,
 	UDESC_HUB,
 ,
 	{0,0},
 ,
 ,
 	{""},
 	{""},
 };
 /*
  * Simulate a hardware hub by handling all the necessary requests.
  */
 Static usbd_status
 ehci_root_ctrl_transfer(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ehci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ehci_root_ctrl_start(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usb_device_request_t *req;
 	void *buf = NULL;
 	int port, i;
 	int len, value, index, l, totlen = 0;
 	usb_port_status_t ps;
 	usb_hub_descriptor_t hubd;
 	usbd_status err;
 	u_int32_t v;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST))
 		/* XXX panic */
 		return (USBD_INVAL);
 #endif
 	req = &xfer->request;
 	DPRINTFN(4,("ehci_root_ctrl_start: type=0x%02x request=%02x\n",
 		    req->bmRequestType, req->bRequest));
 	len = UGETW(req->wLength);
 	value = UGETW(req->wValue);
 	index = UGETW(req->wIndex);
 	if (len != 0)
 		buf = KERNADDR(&xfer->dmabuf, 0);
 #define C(x,y) ((x) | ((y) << 8))
 	switch(C(req->bRequest, req->bmRequestType)) {
 	case C(UR_CLEAR_FEATURE, UT_WRITE_DEVICE):
 	case C(UR_CLEAR_FEATURE, UT_WRITE_INTERFACE):
 	case C(UR_CLEAR_FEATURE, UT_WRITE_ENDPOINT):
 		/*
 		 * DEVICE_REMOTE_WAKEUP and ENDPOINT_HALT are no-ops
 		 * for the integrated root hub.
 		 */
 		break;
 	case C(UR_GET_CONFIG, UT_READ_DEVICE):
 		if (len > 0) {
 			*(u_int8_t *)buf = sc->sc_conf;
 			totlen = 1;
+		}
 		break;
 	case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
 		DPRINTFN(8,("ehci_root_ctrl_start: wValue=0x%04x\n", value));
 		if (len == 0)
 			break;
 		switch(value >> 8) {
 		case UDESC_DEVICE:
 			if ((value & 0xff) != 0) {
 				err = USBD_IOERROR;
 				goto ret;
+			}
 			totlen = l = min(len, USB_DEVICE_DESCRIPTOR_SIZE);
 			USETW(ehci_devd.idVendor, sc->sc_id_vendor);
 			memcpy(buf, &ehci_devd, l);
 			break;
 		/*
 		 * We can't really operate at another speed, but the spec says
 		 * we need this descriptor.
 		 */
 		case UDESC_DEVICE_QUALIFIER:
 			if ((value & 0xff) != 0) {
 				err = USBD_IOERROR;
 				goto ret;
+			}
 			totlen = l = min(len, USB_DEVICE_DESCRIPTOR_SIZE);
 			memcpy(buf, &ehci_odevd, l);
 			break;
 		/*
 		 * We can't really operate at another speed, but the spec says
 		 * we need this descriptor.
 		 */
 		case UDESC_OTHER_SPEED_CONFIGURATION:
 		case UDESC_CONFIG:
 			if ((value & 0xff) != 0) {
 				err = USBD_IOERROR;
 				goto ret;
+			}
 			totlen = l = min(len, USB_CONFIG_DESCRIPTOR_SIZE);
 			memcpy(buf, &ehci_confd, l);
 			((usb_config_descriptor_t *)buf)->bDescriptorType =
 				value >> 8;
 			buf = (char *)buf + l;
 			len -= l;
 			l = min(len, USB_INTERFACE_DESCRIPTOR_SIZE);
 			totlen += l;
 			memcpy(buf, &ehci_ifcd, l);
 			buf = (char *)buf + l;
 			len -= l;
 			l = min(len, USB_ENDPOINT_DESCRIPTOR_SIZE);
 			totlen += l;
 			memcpy(buf, &ehci_endpd, l);
 			break;
 		case UDESC_STRING:
 #define sd ((usb_string_descriptor_t *)buf)
 			switch (value & 0xff) {
 			case 0: /* Language table */
 				totlen = usb_makelangtbl(sd, len);
 				break;
 			case 1: /* Vendor */
 				totlen = usb_makestrdesc(sd, len,
 							 sc->sc_vendor);
 				break;
 			case 2: /* Product */
 				totlen = usb_makestrdesc(sd, len,
 							 "EHCI root hub");
 				break;
+			}
 #undef sd
 			break;
 		default:
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		break;
 	case C(UR_GET_INTERFACE, UT_READ_INTERFACE):
 		if (len > 0) {
 			*(u_int8_t *)buf = 0;
 			totlen = 1;
+		}
 		break;
 	case C(UR_GET_STATUS, UT_READ_DEVICE):
 		if (len > 1) {
 			USETW(((usb_status_t *)buf)->wStatus,UDS_SELF_POWERED);
 			totlen = 2;
+		}
 		break;
 	case C(UR_GET_STATUS, UT_READ_INTERFACE):
 	case C(UR_GET_STATUS, UT_READ_ENDPOINT):
 		if (len > 1) {
 			USETW(((usb_status_t *)buf)->wStatus, 0);
 			totlen = 2;
+		}
 		break;
 	case C(UR_SET_ADDRESS, UT_WRITE_DEVICE):
 		if (value >= USB_MAX_DEVICES) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		sc->sc_addr = value;
 		break;
 	case C(UR_SET_CONFIG, UT_WRITE_DEVICE):
 		if (value != 0 && value != 1) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		sc->sc_conf = value;
 		break;
 	case C(UR_SET_DESCRIPTOR, UT_WRITE_DEVICE):
 		break;
 	case C(UR_SET_FEATURE, UT_WRITE_DEVICE):
 	case C(UR_SET_FEATURE, UT_WRITE_INTERFACE):
 	case C(UR_SET_FEATURE, UT_WRITE_ENDPOINT):
 		err = USBD_IOERROR;
 		goto ret;
 	case C(UR_SET_INTERFACE, UT_WRITE_INTERFACE):
 		break;
 	case C(UR_SYNCH_FRAME, UT_WRITE_ENDPOINT):
 		break;
 	/* Hub requests */
 	case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_DEVICE):
 		break;
 	case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_OTHER):
 		DPRINTFN(4, ("ehci_root_ctrl_start: UR_CLEAR_PORT_FEATURE "
 			     "port=%d feature=%d\n",
 			     index, value));
 		if (index < 1 || index > sc->sc_noport) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		port = EHCI_PORTSC(index);
 		v = EOREAD4(sc, port);
 		DPRINTFN(4, ("ehci_root_ctrl_start: portsc=0x%08x\n", v));
 		v &= ~EHCI_PS_CLEAR;
 		switch(value) {
 		case UHF_PORT_ENABLE:
 			EOWRITE4(sc, port, v &~ EHCI_PS_PE);
 			break;
 		case UHF_PORT_SUSPEND:
 			if (!(v & EHCI_PS_SUSP)) /* not suspended */
 				break;
 			v &= ~EHCI_PS_SUSP;
 			EOWRITE4(sc, port, v | EHCI_PS_FPR);
 			/* see USB2 spec ch. 7.1.7.7 */
 			usb_delay_ms(&sc->sc_bus, 20);
 			EOWRITE4(sc, port, v);
 			usb_delay_ms(&sc->sc_bus, 2);
 #ifdef DEBUG
 			v = EOREAD4(sc, port);
 			if (v & (EHCI_PS_FPR | EHCI_PS_SUSP))
 				printf("ehci: resume failed: %x\n", v);
 #endif
 			break;
 		case UHF_PORT_POWER:
 			if (sc->sc_hasppc)
 				EOWRITE4(sc, port, v &~ EHCI_PS_PP);
 			break;
 		case UHF_PORT_TEST:
 			DPRINTFN(2,("ehci_root_ctrl_start: clear port test "
 				    "%d\n", index));
 			break;
 		case UHF_PORT_INDICATOR:
 			DPRINTFN(2,("ehci_root_ctrl_start: clear port ind "
 				    "%d\n", index));
 			EOWRITE4(sc, port, v &~ EHCI_PS_PIC);
 			break;
 		case UHF_C_PORT_CONNECTION:
 			EOWRITE4(sc, port, v | EHCI_PS_CSC);
 			break;
 		case UHF_C_PORT_ENABLE:
 			EOWRITE4(sc, port, v | EHCI_PS_PEC);
 			break;
 		case UHF_C_PORT_SUSPEND:
 			/* how? */
 			break;
 		case UHF_C_PORT_OVER_CURRENT:
 			EOWRITE4(sc, port, v | EHCI_PS_OCC);
 			break;
 		case UHF_C_PORT_RESET:
 			sc->sc_isreset[index] = 0;
 			break;
 		default:
 			err = USBD_IOERROR;
 			goto ret;
+		}
 #if 0
 		switch(value) {
 		case UHF_C_PORT_CONNECTION:
 		case UHF_C_PORT_ENABLE:
 		case UHF_C_PORT_SUSPEND:
 		case UHF_C_PORT_OVER_CURRENT:
 		case UHF_C_PORT_RESET:
 		default:
 			break;
+		}
 #endif
 		break;
 	case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE):
 		if (len == 0)
 			break;
 		if ((value & 0xff) != 0) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		hubd = ehci_hubd;
 		hubd.bNbrPorts = sc->sc_noport;
 		v = EOREAD4(sc, EHCI_HCSPARAMS);
 		USETW(hubd.wHubCharacteristics,
 		    EHCI_HCS_PPC(v) ? UHD_PWR_INDIVIDUAL : UHD_PWR_NO_SWITCH |
 		    EHCI_HCS_P_INDICATOR(EREAD4(sc, EHCI_HCSPARAMS))
 			? UHD_PORT_IND : 0);
 		hubd.bPwrOn2PwrGood = 200; /* XXX can't find out? */
 		for (i = 0, l = sc->sc_noport; l > 0; i++, l -= 8, v >>= 8)
 			hubd.DeviceRemovable[i++] = 0; /* XXX can't find out? */
 		hubd.bDescLength = USB_HUB_DESCRIPTOR_SIZE + i;
 		l = min(len, hubd.bDescLength);
 		totlen = l;
 		memcpy(buf, &hubd, l);
 		break;
 	case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE):
 		if (len != 4) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		memset(buf, 0, len); /* ? XXX */
 		totlen = len;
 		break;
 	case C(UR_GET_STATUS, UT_READ_CLASS_OTHER):
 		DPRINTFN(8,("ehci_root_ctrl_start: get port status i=%d\n",
 			    index));
 		if (index < 1 || index > sc->sc_noport) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		if (len != 4) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		v = EOREAD4(sc, EHCI_PORTSC(index));
 		DPRINTFN(8,("ehci_root_ctrl_start: port status=0x%04x\n", v));
 		i = UPS_HIGH_SPEED;
 #if 0
 		if (sc->sc_flags & EHCIF_ETTF) {
 			/*
 			 * If we are doing embedded transaction translation,
 			 * then directly attached LS/FS devices are reset by
 			 * the EHCI controller itself.  PSPD is encoded
 			 * the same way as in USBSTATUS.
 			 */
 			i = __SHIFTOUT(v, EHCI_PS_PSPD) * UPS_LOW_SPEED;
+		}
 #endif
 		if (v & EHCI_PS_CS)	i |= UPS_CURRENT_CONNECT_STATUS;
 		if (v & EHCI_PS_PE)	i |= UPS_PORT_ENABLED;
 		if (v & EHCI_PS_SUSP)	i |= UPS_SUSPEND;
 		if (v & EHCI_PS_OCA)	i |= UPS_OVERCURRENT_INDICATOR;
 		if (v & EHCI_PS_PR)	i |= UPS_RESET;
 		if (v & EHCI_PS_PP)	i |= UPS_PORT_POWER;
 		if (sc->sc_vendor_port_status)
 			i = sc->sc_vendor_port_status(sc, v, i);
 		USETW(ps.wPortStatus, i);
 		i = 0;
 		if (v & EHCI_PS_CSC)	i |= UPS_C_CONNECT_STATUS;
 		if (v & EHCI_PS_PEC)	i |= UPS_C_PORT_ENABLED;
 		if (v & EHCI_PS_OCC)	i |= UPS_C_OVERCURRENT_INDICATOR;
 		if (sc->sc_isreset[index]) i |= UPS_C_PORT_RESET;
 		USETW(ps.wPortChange, i);
 		l = min(len, sizeof ps);
 		memcpy(buf, &ps, l);
 		totlen = l;
 		break;
 	case C(UR_SET_DESCRIPTOR, UT_WRITE_CLASS_DEVICE):
 		err = USBD_IOERROR;
 		goto ret;
 	case C(UR_SET_FEATURE, UT_WRITE_CLASS_DEVICE):
 		break;
 	case C(UR_SET_FEATURE, UT_WRITE_CLASS_OTHER):
 		if (index < 1 || index > sc->sc_noport) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		port = EHCI_PORTSC(index);
 		v = EOREAD4(sc, port);
 		DPRINTFN(4, ("ehci_root_ctrl_start: portsc=0x%08x\n", v));
 		v &= ~EHCI_PS_CLEAR;
 		switch(value) {
 		case UHF_PORT_ENABLE:
 			EOWRITE4(sc, port, v | EHCI_PS_PE);
 			break;
 		case UHF_PORT_SUSPEND:
 			EOWRITE4(sc, port, v | EHCI_PS_SUSP);
 			break;
 		case UHF_PORT_RESET:
 			DPRINTFN(5,("ehci_root_ctrl_start: reset port %d\n",
 				    index));
 			if (EHCI_PS_IS_LOWSPEED(v)
 			    && sc->sc_ncomp > 0
 			    && !(sc->sc_flags & EHCIF_ETTF)) {
 				/*
 				 * Low speed device on non-ETTF controller or
 				 * unaccompanied controller, give up ownership.
 				 */
 				ehci_disown(sc, index, 1);
 				break;
+			}
 			/* Start reset sequence. */
 			v &= ~ (EHCI_PS_PE | EHCI_PS_PR);
 			EOWRITE4(sc, port, v | EHCI_PS_PR);
 			/* Wait for reset to complete. */
 			usb_delay_ms(&sc->sc_bus, USB_PORT_ROOT_RESET_DELAY);
 			if (sc->sc_dying) {
 				err = USBD_IOERROR;
 				goto ret;
+			}
 			/*
 			 * An embedded transaction translater will automatically
 			 * terminate the reset sequence so there's no need to
 			 * it.
 			 */
 			v = EOREAD4(sc, port);
 			if (v & EHCI_PS_PR) {
 				/* Terminate reset sequence. */
 				EOWRITE4(sc, port, v & ~EHCI_PS_PR);
 				/* Wait for HC to complete reset. */
 				usb_delay_ms(&sc->sc_bus,
 				    EHCI_PORT_RESET_COMPLETE);
 				if (sc->sc_dying) {
 					err = USBD_IOERROR;
 					goto ret;
+				}
+			}
 			v = EOREAD4(sc, port);
 			DPRINTF(("ehci after reset, status=0x%08x\n", v));
 			if (v & EHCI_PS_PR) {
 				printf("%s: port reset timeout\n",
 				       device_xname(sc->sc_dev));
 				return (USBD_TIMEOUT);
+			}
 			if (!(v & EHCI_PS_PE)) {
 				/* Not a high speed device, give up ownership.*/
 				ehci_disown(sc, index, 0);
 				break;
+			}
 			sc->sc_isreset[index] = 1;
 			DPRINTF(("ehci port %d reset, status = 0x%08x\n",
 				 index, v));
 			break;
 		case UHF_PORT_POWER:
 			DPRINTFN(2,("ehci_root_ctrl_start: set port power "
 				    "%d (has PPC = %d)\n", index,
 				    sc->sc_hasppc));
 			if (sc->sc_hasppc)
 				EOWRITE4(sc, port, v | EHCI_PS_PP);
 			break;
 		case UHF_PORT_TEST:
 			DPRINTFN(2,("ehci_root_ctrl_start: set port test "
 				    "%d\n", index));
 			break;
 		case UHF_PORT_INDICATOR:
 			DPRINTFN(2,("ehci_root_ctrl_start: set port ind "
 				    "%d\n", index));
 			EOWRITE4(sc, port, v | EHCI_PS_PIC);
 			break;
 		default:
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		break;
 	case C(UR_CLEAR_TT_BUFFER, UT_WRITE_CLASS_OTHER):
 	case C(UR_RESET_TT, UT_WRITE_CLASS_OTHER):
 	case C(UR_GET_TT_STATE, UT_READ_CLASS_OTHER):
 	case C(UR_STOP_TT, UT_WRITE_CLASS_OTHER):
 		break;
 	default:
 		err = USBD_IOERROR;
 		goto ret;
+	}
 	xfer->actlen = totlen;
 	err = USBD_NORMAL_COMPLETION;
  ret:
 	mutex_enter(&sc->sc_lock);
 	xfer->status = err;
 	usb_transfer_complete(xfer);
 	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 Static void
 ehci_disown(ehci_softc_t *sc, int index, int lowspeed)
+{
 	int port;
 	u_int32_t v;
 	DPRINTF(("ehci_disown: index=%d lowspeed=%d\n", index, lowspeed));
 #ifdef DIAGNOSTIC
 	if (sc->sc_npcomp != 0) {
 		int i = (index-1) / sc->sc_npcomp;
 		if (i >= sc->sc_ncomp)
 			printf("%s: strange port\n",
 			       device_xname(sc->sc_dev));
 		else
 			printf("%s: handing over %s speed device on "
 			       "port %d to %s\n",
 			       device_xname(sc->sc_dev),
 			       lowspeed ? "low" : "full",
 			       index, device_xname(sc->sc_comps[i]));
 	} else {
 		printf("%s: npcomp == 0\n", device_xname(sc->sc_dev));
+	}
 #endif
 	port = EHCI_PORTSC(index);
 	v = EOREAD4(sc, port) &~ EHCI_PS_CLEAR;
 	EOWRITE4(sc, port, v | EHCI_PS_PO);
+}
 /* Abort a root control request. */
 Static void
 ehci_root_ctrl_abort(usbd_xfer_handle xfer)
+{
 	/* Nothing to do, all transfers are synchronous. */
+}
 /* Close the root pipe. */
 Static void
 ehci_root_ctrl_close(usbd_pipe_handle pipe)
+{
 	DPRINTF(("ehci_root_ctrl_close\n"));
 	/* Nothing to do. */
+}
 Static void
 ehci_root_intr_done(usbd_xfer_handle xfer)
+{
 	xfer->hcpriv = NULL;
+}
 Static usbd_status
 ehci_root_intr_transfer(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ehci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ehci_root_intr_start(usbd_xfer_handle xfer)
+{
 	usbd_pipe_handle pipe = xfer->pipe;
 	ehci_softc_t *sc = pipe->device->bus->hci_private;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 	mutex_enter(&sc->sc_lock);
 	sc->sc_intrxfer = xfer;
 	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a root interrupt request. */
 Static void
 ehci_root_intr_abort(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	mutex_enter(&sc->sc_lock);
 	if (xfer->pipe->intrxfer == xfer) {
 		DPRINTF(("ehci_root_intr_abort: remove\n"));
 		xfer->pipe->intrxfer = NULL;
+	}
 	xfer->status = USBD_CANCELLED;
 	usb_transfer_complete(xfer);
 	mutex_exit(&sc->sc_lock);
+}
 /* Close the root pipe. */
 Static void
 ehci_root_intr_close(usbd_pipe_handle pipe)
+{
 	ehci_softc_t *sc = pipe->device->bus->hci_private;
 	DPRINTF(("ehci_root_intr_close\n"));
 	mutex_enter(&sc->sc_lock);
 	sc->sc_intrxfer = NULL;
 	mutex_exit(&sc->sc_lock);
+}
 Static void
 ehci_root_ctrl_done(usbd_xfer_handle xfer)
+{
 	xfer->hcpriv = NULL;
+}
 /************************/
 Static ehci_soft_qh_t *
 ehci_alloc_sqh(ehci_softc_t *sc)
+{
 	ehci_soft_qh_t *sqh;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freeqhs == NULL) {
 		DPRINTFN(2, ("ehci_alloc_sqh: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, EHCI_SQH_SIZE * EHCI_SQH_CHUNK,
 			  EHCI_PAGE_SIZE, &dma);
 #ifdef EHCI_DEBUG
 		if (err)
 			printf("ehci_alloc_sqh: usb_allocmem()=%d\n", err);
 #endif
 		if (err)
 			return (NULL);
 		for(i = 0; i < EHCI_SQH_CHUNK; i++) {
 			offs = i * EHCI_SQH_SIZE;
 			sqh = KERNADDR(&dma, offs);
 			sqh->physaddr = DMAADDR(&dma, offs);
 			sqh->dma = dma;
 			sqh->offs = offs;
 			sqh->next = sc->sc_freeqhs;
 			sc->sc_freeqhs = sqh;
+		}
+	}
 	sqh = sc->sc_freeqhs;
 	sc->sc_freeqhs = sqh->next;
 	memset(&sqh->qh, 0, sizeof(ehci_qh_t));
 	sqh->next = NULL;
 	return (sqh);
+}
 Static void
 ehci_free_sqh(ehci_softc_t *sc, ehci_soft_qh_t *sqh)
+{
 	sqh->next = sc->sc_freeqhs;
 	sc->sc_freeqhs = sqh;
+}
 Static ehci_soft_qtd_t *
 ehci_alloc_sqtd(ehci_softc_t *sc)
+{
 	ehci_soft_qtd_t *sqtd = NULL;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freeqtds == NULL) {
 		DPRINTFN(2, ("ehci_alloc_sqtd: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, EHCI_SQTD_SIZE*EHCI_SQTD_CHUNK,
 			  EHCI_PAGE_SIZE, &dma);
 #ifdef EHCI_DEBUG
 		if (err)
 			printf("ehci_alloc_sqtd: usb_allocmem()=%d\n", err);
 #endif
 		if (err)
 			goto done;
 		for(i = 0; i < EHCI_SQTD_CHUNK; i++) {
 			offs = i * EHCI_SQTD_SIZE;
 			sqtd = KERNADDR(&dma, offs);
 			sqtd->physaddr = DMAADDR(&dma, offs);
 			sqtd->dma = dma;
 			sqtd->offs = offs;
 			sqtd->nextqtd = sc->sc_freeqtds;
 			sc->sc_freeqtds = sqtd;
+		}
+	}
 	sqtd = sc->sc_freeqtds;
 	sc->sc_freeqtds = sqtd->nextqtd;
 	memset(&sqtd->qtd, 0, sizeof(ehci_qtd_t));
 	sqtd->nextqtd = NULL;
 	sqtd->xfer = NULL;
 done:
 	return (sqtd);
+}
 Static void
 ehci_free_sqtd(ehci_softc_t *sc, ehci_soft_qtd_t *sqtd)
+{
 	KASSERT(mutex_owned(&sc->sc_lock));
 	sqtd->nextqtd = sc->sc_freeqtds;
 	sc->sc_freeqtds = sqtd;
+}
 Static usbd_status
 ehci_alloc_sqtd_chain(struct ehci_pipe *epipe, ehci_softc_t *sc,
 		     int alen, int rd, usbd_xfer_handle xfer,
 		     ehci_soft_qtd_t **sp, ehci_soft_qtd_t **ep)
+{
 	ehci_soft_qtd_t *next, *cur;
 	ehci_physaddr_t dataphys, dataphyspage, dataphyslastpage, nextphys;
 	u_int32_t qtdstatus;
 	int len, curlen, mps;
 	int i, tog;
 	usb_dma_t *dma = &xfer->dmabuf;
 	u_int16_t flags = xfer->flags;
 	DPRINTFN(alen<4*4096,("ehci_alloc_sqtd_chain: start len=%d\n", alen));
 	len = alen;
 	dataphys = DMAADDR(dma, 0);
 	dataphyslastpage = EHCI_PAGE(dataphys + len - 1);
 	qtdstatus = EHCI_QTD_ACTIVE |
 	    EHCI_QTD_SET_PID(rd ? EHCI_QTD_PID_IN : EHCI_QTD_PID_OUT) |
 	    EHCI_QTD_SET_CERR(3)
 	    /* IOC set below */
 	    /* BYTES set below */
+	    ;
 	mps = UGETW(epipe->pipe.endpoint->edesc->wMaxPacketSize);
 	tog = epipe->nexttoggle;
 	qtdstatus |= EHCI_QTD_SET_TOGGLE(tog);
 	cur = ehci_alloc_sqtd(sc);
 	*sp = cur;
 	if (cur == NULL)
 		goto nomem;
 	usb_syncmem(dma, 0, alen,
 	    rd ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE);
 	for (;;) {
 		dataphyspage = EHCI_PAGE(dataphys);
 		/* The EHCI hardware can handle at most 5 pages. */
 		if (dataphyslastpage - dataphyspage <
 		    EHCI_QTD_NBUFFERS * EHCI_PAGE_SIZE) {
 			/* we can handle it in this QTD */
 			curlen = len;
 		} else {
 			/* must use multiple TDs, fill as much as possible. */
 			curlen = EHCI_QTD_NBUFFERS * EHCI_PAGE_SIZE -
 				 EHCI_PAGE_OFFSET(dataphys);
 #ifdef DIAGNOSTIC
 			if (curlen > len) {
 				printf("ehci_alloc_sqtd_chain: curlen=0x%x "
 				       "len=0x%x offs=0x%x\n", curlen, len,
 				       EHCI_PAGE_OFFSET(dataphys));
 				printf("lastpage=0x%x page=0x%x phys=0x%x\n",
 				       dataphyslastpage, dataphyspage,
 				       dataphys);
 				curlen = len;
+			}
 #endif
 			/* the length must be a multiple of the max size */
 			curlen -= curlen % mps;
 			DPRINTFN(1,("ehci_alloc_sqtd_chain: multiple QTDs, "
 				    "curlen=%d\n", curlen));
 #ifdef DIAGNOSTIC
 			if (curlen == 0)
 				panic("ehci_alloc_sqtd_chain: curlen == 0");
 #endif
+		}
 		DPRINTFN(4,("ehci_alloc_sqtd_chain: dataphys=0x%08x "
 			    "dataphyslastpage=0x%08x len=%d curlen=%d\n",
 			    dataphys, dataphyslastpage,
 			    len, curlen));
 		len -= curlen;
 		/*
 		 * Allocate another transfer if there's more data left,
 		 * or if force last short transfer flag is set and we're
 		 * allocating a multiple of the max packet size.
 		 */
 		if (len != 0 ||
 		    ((curlen % mps) == 0 && !rd && curlen != 0 &&
 		     (flags & USBD_FORCE_SHORT_XFER))) {
 			next = ehci_alloc_sqtd(sc);
 			if (next == NULL)
 				goto nomem;
 			nextphys = htole32(next->physaddr);
 		} else {
 			next = NULL;
 			nextphys = EHCI_NULL;
+		}
 		for (i = 0; i * EHCI_PAGE_SIZE <
 		            curlen + EHCI_PAGE_OFFSET(dataphys); i++) {
 			ehci_physaddr_t a = dataphys + i * EHCI_PAGE_SIZE;
 			if (i != 0) /* use offset only in first buffer */
 				a = EHCI_PAGE(a);
 			cur->qtd.qtd_buffer[i] = htole32(a);
 			cur->qtd.qtd_buffer_hi[i] = 0;
 #ifdef DIAGNOSTIC
 			if (i >= EHCI_QTD_NBUFFERS) {
 				printf("ehci_alloc_sqtd_chain: i=%d\n", i);
 				goto nomem;
+			}
 #endif
+		}
 		cur->nextqtd = next;
 		cur->qtd.qtd_next = cur->qtd.qtd_altnext = nextphys;
 		cur->qtd.qtd_status =
 		    htole32(qtdstatus | EHCI_QTD_SET_BYTES(curlen));
 		cur->xfer = xfer;
 		cur->len = curlen;
 		DPRINTFN(10,("ehci_alloc_sqtd_chain: cbp=0x%08x end=0x%08x\n",
 			    dataphys, dataphys + curlen));
 		/* adjust the toggle based on the number of packets in this
 		   qtd */
 		if (((curlen + mps - 1) / mps) & 1) {
 			tog ^= 1;
 			qtdstatus ^= EHCI_QTD_TOGGLE_MASK;
+		}
 		if (next == NULL)
 			break;
 		usb_syncmem(&cur->dma, cur->offs, sizeof(cur->qtd),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		DPRINTFN(10,("ehci_alloc_sqtd_chain: extend chain\n"));
 		if (len)
 			dataphys += curlen;
 		cur = next;
+	}
 	cur->qtd.qtd_status |= htole32(EHCI_QTD_IOC);
 	usb_syncmem(&cur->dma, cur->offs, sizeof(cur->qtd),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	*ep = cur;
 	epipe->nexttoggle = tog;
 	DPRINTFN(10,("ehci_alloc_sqtd_chain: return sqtd=%p sqtdend=%p\n",
 		     *sp, *ep));
 	return (USBD_NORMAL_COMPLETION);
  nomem:
 	/* XXX free chain */
 	DPRINTFN(-1,("ehci_alloc_sqtd_chain: no memory\n"));
 	return (USBD_NOMEM);
+}
 Static void
 ehci_free_sqtd_chain(ehci_softc_t *sc, ehci_soft_qtd_t *sqtd,
 		    ehci_soft_qtd_t *sqtdend)
+{
 	ehci_soft_qtd_t *p;
 	int i;
 	DPRINTFN(10,("ehci_free_sqtd_chain: sqtd=%p sqtdend=%p\n",
 		     sqtd, sqtdend));
 	for (i = 0; sqtd != sqtdend; sqtd = p, i++) {
 		p = sqtd->nextqtd;
 		ehci_free_sqtd(sc, sqtd);
+	}
+}
 Static ehci_soft_itd_t *
 ehci_alloc_itd(ehci_softc_t *sc)
+{
 	struct ehci_soft_itd *itd, *freeitd;
 	usbd_status err;
 	int i, s, offs, frindex, previndex;
 	usb_dma_t dma;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	/* Find an itd that wasn't freed this frame or last frame. This can
 	 * discard itds that were freed before frindex wrapped around
 	 * XXX - can this lead to thrashing? Could fix by enabling wrap-around
 	 *       interrupt and fiddling with list when that happens */
 	frindex = (EOREAD4(sc, EHCI_FRINDEX) + 1) >> 3;
 	previndex = (frindex != 0) ? frindex - 1 : sc->sc_flsize;
 	freeitd = NULL;
 	LIST_FOREACH(itd, &sc->sc_freeitds, u.free_list) {
 		if (itd == NULL)
 			break;
 		if (itd->slot != frindex && itd->slot != previndex) {
 			freeitd = itd;
 			break;
+		}
+	}
 	if (freeitd == NULL) {
 		DPRINTFN(2, ("ehci_alloc_itd allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, EHCI_ITD_SIZE * EHCI_ITD_CHUNK,
 				EHCI_PAGE_SIZE, &dma);
 		if (err) {
 			DPRINTF(("ehci_alloc_itd, alloc returned %d\n", err));
 			return NULL;
+		}
 		for (i = 0; i < EHCI_ITD_CHUNK; i++) {
 			offs = i * EHCI_ITD_SIZE;
 			itd = KERNADDR(&dma, offs);
 			itd->physaddr = DMAADDR(&dma, offs);
 	 		itd->dma = dma;
 			itd->offs = offs;
 			LIST_INSERT_HEAD(&sc->sc_freeitds, itd, u.free_list);
+		}
 		freeitd = LIST_FIRST(&sc->sc_freeitds);
+	}
 	itd = freeitd;
 	LIST_REMOVE(itd, u.free_list);
 	memset(&itd->itd, 0, sizeof(ehci_itd_t));
 	usb_syncmem(&itd->dma, itd->offs + offsetof(ehci_itd_t, itd_next),
                     sizeof(itd->itd.itd_next), BUS_DMASYNC_PREWRITE |
                     BUS_DMASYNC_PREREAD);
 	itd->u.frame_list.next = NULL;
 	itd->u.frame_list.prev = NULL;
 	itd->xfer_next = NULL;
 	itd->slot = 0;
 	splx(s);
 	return itd;
+}
 Static void
 ehci_free_itd(ehci_softc_t *sc, ehci_soft_itd_t *itd)
+{
 	KASSERT(mutex_owned(&sc->sc_lock));
 	LIST_INSERT_HEAD(&sc->sc_freeitds, itd, u.free_list);
+}
 /****************/
 /*
  * Close a reqular pipe.
  * Assumes that there are no pending transactions.
  */
 Static void
 ehci_close_pipe(usbd_pipe_handle pipe, ehci_soft_qh_t *head)
+{
 	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
 	ehci_softc_t *sc = pipe->device->bus->hci_private;
 	ehci_soft_qh_t *sqh = epipe->sqh;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	ehci_rem_qh(sc, sqh, head);
 	ehci_free_sqh(sc, epipe->sqh);
+}
 /*
  * Abort a device request.
  * If this routine is called at splusb() it guarantees that the request
  * will be removed from the hardware scheduling and that the callback
  * for it will be called with USBD_CANCELLED status.
  * It's impossible to guarantee that the requested transfer will not
  * have happened since the hardware runs concurrently.
  * If the transaction has already happened we rely on the ordinary
  * interrupt processing to process it.
  * XXX This is most probably wrong.
  */
 Static void
 ehci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
+{
 #define exfer EXFER(xfer)
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	ehci_softc_t *sc = epipe->pipe.device->bus->hci_private;
 	ehci_soft_qh_t *sqh = epipe->sqh;
 	ehci_soft_qtd_t *sqtd;
 	ehci_physaddr_t cur;
 	u_int32_t qhstatus;
 	int hit;
 	int wake;
 	DPRINTF(("ehci_abort_xfer: xfer=%p pipe=%p\n", xfer, epipe));
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
 		mutex_enter(&sc->sc_lock);
 		xfer->status = status;	/* make software ignore it */
 		callout_stop(&xfer->timeout_handle);
 		usb_transfer_complete(xfer);
 		mutex_exit(&sc->sc_lock);
 		return;
+	}
 	if (xfer->device->bus->intr_context)
 		panic("ehci_abort_xfer: not in process context");
 	mutex_enter(&sc->sc_lock);
 	/*
 	 * If an abort is already in progress then just wait for it to
 	 * complete and return.
 	 */
 	if (xfer->hcflags & UXFER_ABORTING) {
 		DPRINTFN(2, ("ehci_abort_xfer: already aborting\n"));
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("ehci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		/* Override the status which might be USBD_TIMEOUT. */
 		xfer->status = status;
 		DPRINTFN(2, ("ehci_abort_xfer: waiting for abort to finish\n"));
 		xfer->hcflags |= UXFER_ABORTWAIT;
 		while (xfer->hcflags & UXFER_ABORTING)
 			cv_wait(&xfer->hccv, &sc->sc_lock);
 		mutex_exit(&sc->sc_lock);
 		return;
+	}
 	xfer->hcflags |= UXFER_ABORTING;
 	/*
 	 * Step 1: Make interrupt routine and hardware ignore xfer.
 	 */
 	xfer->status = status;	/* make software ignore it */
 	callout_stop(&xfer->timeout_handle);
 	usb_syncmem(&sqh->dma,
 	    sqh->offs + offsetof(ehci_qh_t, qh_qtd.qtd_status),
 	    sizeof(sqh->qh.qh_qtd.qtd_status),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	qhstatus = sqh->qh.qh_qtd.qtd_status;
 	sqh->qh.qh_qtd.qtd_status = qhstatus | htole32(EHCI_QTD_HALTED);
 	usb_syncmem(&sqh->dma,
 	    sqh->offs + offsetof(ehci_qh_t, qh_qtd.qtd_status),
 	    sizeof(sqh->qh.qh_qtd.qtd_status),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	for (sqtd = exfer->sqtdstart; ; sqtd = sqtd->nextqtd) {
 		usb_syncmem(&sqtd->dma,
 		    sqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 		    sizeof(sqtd->qtd.qtd_status),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		sqtd->qtd.qtd_status |= htole32(EHCI_QTD_HALTED);
 		usb_syncmem(&sqtd->dma,
 		    sqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 		    sizeof(sqtd->qtd.qtd_status),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		if (sqtd == exfer->sqtdend)
 			break;
+	}
 	/*
 	 * Step 2: Wait until we know hardware has finished any possible
 	 * use of the xfer.  Also make sure the soft interrupt routine
 	 * has run.
 	 */
 	ehci_sync_hc(sc);
 	sc->sc_softwake = 1;
 	usb_schedsoftintr(&sc->sc_bus);
 	cv_wait(&sc->sc_softwake_cv, &sc->sc_lock);
 	/*
 	 * Step 3: Remove any vestiges of the xfer from the hardware.
 	 * The complication here is that the hardware may have executed
 	 * beyond the xfer we're trying to abort.  So as we're scanning
 	 * the TDs of this xfer we check if the hardware points to
 	 * any of them.
 	 */
 	usb_syncmem(&sqh->dma,
 	    sqh->offs + offsetof(ehci_qh_t, qh_curqtd),
 	    sizeof(sqh->qh.qh_curqtd),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	cur = EHCI_LINK_ADDR(le32toh(sqh->qh.qh_curqtd));
 	hit = 0;
 	for (sqtd = exfer->sqtdstart; ; sqtd = sqtd->nextqtd) {
 		hit |= cur == sqtd->physaddr;
 		if (sqtd == exfer->sqtdend)
 			break;
+	}
 	sqtd = sqtd->nextqtd;
 	/* Zap curqtd register if hardware pointed inside the xfer. */
 	if (hit && sqtd != NULL) {
 		DPRINTFN(1,("ehci_abort_xfer: cur=0x%08x\n", sqtd->physaddr));
 		sqh->qh.qh_curqtd = htole32(sqtd->physaddr); /* unlink qTDs */
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(ehci_qh_t, qh_curqtd),
 		    sizeof(sqh->qh.qh_curqtd),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		sqh->qh.qh_qtd.qtd_status = qhstatus;
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(ehci_qh_t, qh_qtd.qtd_status),
 		    sizeof(sqh->qh.qh_qtd.qtd_status),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	} else {
 		DPRINTFN(1,("ehci_abort_xfer: no hit\n"));
+	}
 	/*
 	 * Step 4: Execute callback.
 	 */
 #ifdef DIAGNOSTIC
 	exfer->isdone = 1;
 #endif
 	wake = xfer->hcflags & UXFER_ABORTWAIT;
 	xfer->hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake) {
 		cv_broadcast(&xfer->hccv);
+	}
 	mutex_exit(&sc->sc_lock);
 #undef exfer
+}
 Static void
 ehci_abort_isoc_xfer(usbd_xfer_handle xfer, usbd_status status)
+{
 	ehci_isoc_trans_t trans_status;
 	struct ehci_pipe *epipe;
 	struct ehci_xfer *exfer;
 	ehci_softc_t *sc;
 	struct ehci_soft_itd *itd;
 	int i, wake;
 	epipe = (struct ehci_pipe *) xfer->pipe;
 	exfer = EXFER(xfer);
 	sc = epipe->pipe.device->bus->hci_private;
 	DPRINTF(("ehci_abort_isoc_xfer: xfer %p pipe %p\n", xfer, epipe));
 	if (sc->sc_dying) {
 		mutex_enter(&sc->sc_lock);
 		xfer->status = status;
 		callout_stop(&xfer->timeout_handle);
 		usb_transfer_complete(xfer);
 		mutex_exit(&sc->sc_lock);
 		return;
+	}
 	mutex_enter(&sc->sc_lock);
 	if (xfer->hcflags & UXFER_ABORTING) {
 		DPRINTFN(2, ("ehci_abort_isoc_xfer: already aborting\n"));
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("ehci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		xfer->status = status;
 		DPRINTFN(2, ("ehci_abort_xfer: waiting for abort to finish\n"));
 		xfer->hcflags |= UXFER_ABORTWAIT;
 		while (xfer->hcflags & UXFER_ABORTING)
 			cv_wait(&xfer->hccv, &sc->sc_intr_lock);
 		goto done;
+	}
 	xfer->hcflags |= UXFER_ABORTING;
 	xfer->status = status;
 	callout_stop(&xfer->timeout_handle);
 	for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) {
 		usb_syncmem(&itd->dma,
 		    itd->offs + offsetof(ehci_itd_t, itd_ctl),
 		    sizeof(itd->itd.itd_ctl),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		for (i = 0; i < 8; i++) {
 			trans_status = le32toh(itd->itd.itd_ctl[i]);
 			trans_status &= ~EHCI_ITD_ACTIVE;
 			itd->itd.itd_ctl[i] = htole32(trans_status);
+		}
 		usb_syncmem(&itd->dma,
 		    itd->offs + offsetof(ehci_itd_t, itd_ctl),
 		    sizeof(itd->itd.itd_ctl),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
         sc->sc_softwake = 1;
         usb_schedsoftintr(&sc->sc_bus);
 	cv_wait(&sc->sc_softwake_cv, &sc->sc_intr_lock);
 #ifdef DIAGNOSTIC
 	exfer->isdone = 1;
 #endif
 	wake = xfer->hcflags & UXFER_ABORTWAIT;
 	xfer->hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake) {
 		cv_broadcast(&xfer->hccv);
+	}
 done:
 	mutex_exit(&sc->sc_lock);
 	return;
+}
 Static void
 ehci_timeout(void *addr)
+{
 	struct ehci_xfer *exfer = addr;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)exfer->xfer.pipe;
 	ehci_softc_t *sc = epipe->pipe.device->bus->hci_private;
 	DPRINTF(("ehci_timeout: exfer=%p\n", exfer));
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 1)
 		usbd_dump_pipe(exfer->xfer.pipe);
 #endif
 	if (sc->sc_dying) {
 		ehci_abort_xfer(&exfer->xfer, USBD_TIMEOUT);
 		return;
+	}
 	/* Execute the abort in a process context. */
 	usb_init_task(&exfer->abort_task, ehci_timeout_task, addr);
 	usb_add_task(exfer->xfer.pipe->device, &exfer->abort_task,
 	    USB_TASKQ_HC);
+}
 Static void
 ehci_timeout_task(void *addr)
+{
 	usbd_xfer_handle xfer = addr;
 	DPRINTF(("ehci_timeout_task: xfer=%p\n", xfer));
 	ehci_abort_xfer(xfer, USBD_TIMEOUT);
+}
 /************************/
 Static usbd_status
 ehci_device_ctrl_transfer(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ehci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ehci_device_ctrl_start(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST)) {
 		/* XXX panic */
 		printf("ehci_device_ctrl_transfer: not a request\n");
 		return (USBD_INVAL);
+	}
 #endif
 	err = ehci_device_request(xfer);
 	if (err) {
 		return (err);
+	}
 	if (sc->sc_bus.use_polling)
 		ehci_waitintr(sc, xfer);
 	return (USBD_IN_PROGRESS);
+}
 Static void
 ehci_device_ctrl_done(usbd_xfer_handle xfer)
+{
 	struct ehci_xfer *ex = EXFER(xfer);
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	usb_device_request_t *req = &xfer->request;
 	int len = UGETW(req->wLength);
 	int rd = req->bmRequestType & UT_READ;
 	DPRINTFN(10,("ehci_ctrl_done: xfer=%p\n", xfer));
 	KASSERT(mutex_owned(&sc->sc_lock));
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST)) {
 		panic("ehci_ctrl_done: not a request");
+	}
 #endif
 	if (xfer->status != USBD_NOMEM && ehci_active_intr_list(ex)) {
 		ehci_del_intr_list(sc, ex);	/* remove from active list */
 		ehci_free_sqtd_chain(sc, ex->sqtdstart, NULL);
 		usb_syncmem(&epipe->u.ctl.reqdma, 0, sizeof *req,
 		    BUS_DMASYNC_POSTWRITE);
 		if (len)
 			usb_syncmem(&xfer->dmabuf, 0, len,
 			    rd ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
+	}
 	DPRINTFN(5, ("ehci_ctrl_done: length=%d\n", xfer->actlen));
+}
 /* Abort a device control request. */
 Static void
 ehci_device_ctrl_abort(usbd_xfer_handle xfer)
+{
 	DPRINTF(("ehci_device_ctrl_abort: xfer=%p\n", xfer));
 	ehci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /* Close a device control pipe. */
 Static void
 ehci_device_ctrl_close(usbd_pipe_handle pipe)
+{
 	ehci_softc_t *sc = pipe->device->bus->hci_private;
 	/*struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;*/
 	DPRINTF(("ehci_device_ctrl_close: pipe=%p\n", pipe));
 	mutex_enter(&sc->sc_lock);
 	ehci_close_pipe(pipe, sc->sc_async_head);
 	mutex_exit(&sc->sc_lock);
+}
 Static usbd_status
 ehci_device_request(usbd_xfer_handle xfer)
+{
 #define exfer EXFER(xfer)
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	usb_device_request_t *req = &xfer->request;
 	usbd_device_handle dev = epipe->pipe.device;
 	ehci_softc_t *sc = dev->bus->hci_private;
 	int addr = dev->address;
 	ehci_soft_qtd_t *setup, *stat, *next;
 	ehci_soft_qh_t *sqh;
 	int isread;
 	int len;
 	usbd_status err;
 	isread = req->bmRequestType & UT_READ;
 	len = UGETW(req->wLength);
 	DPRINTFN(3,("ehci_device_request: type=0x%02x, request=0x%02x, "
 		    "wValue=0x%04x, wIndex=0x%04x len=%d, addr=%d, endpt=%d\n",
 		    req->bmRequestType, req->bRequest, UGETW(req->wValue),
 		    UGETW(req->wIndex), len, addr,
 		    epipe->pipe.endpoint->edesc->bEndpointAddress));
 	setup = ehci_alloc_sqtd(sc);
 	if (setup == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	stat = ehci_alloc_sqtd(sc);
 	if (stat == NULL) {
 		err = USBD_NOMEM;
 		goto bad2;
+	}
 	mutex_enter(&sc->sc_lock);
 	sqh = epipe->sqh;
 	epipe->u.ctl.length = len;
 	/* Update device address and length since they may have changed
 	   during the setup of the control pipe in usbd_new_device(). */
 	/* XXX This only needs to be done once, but it's too early in open. */
 	/* XXXX Should not touch ED here! */
 	sqh->qh.qh_endp =
 	    (sqh->qh.qh_endp & htole32(~(EHCI_QH_ADDRMASK | EHCI_QH_MPLMASK))) |
 	    htole32(
 	     EHCI_QH_SET_ADDR(addr) |
 	     EHCI_QH_SET_MPL(UGETW(epipe->pipe.endpoint->edesc->wMaxPacketSize))
 	    );
 	/* Set up data transaction */
 	if (len != 0) {
 		ehci_soft_qtd_t *end;
 		/* Start toggle at 1. */
 		epipe->nexttoggle = 1;
 		err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer,
 			  &next, &end);
 		if (err)
 			goto bad3;
 		end->qtd.qtd_status &= htole32(~EHCI_QTD_IOC);
 		end->nextqtd = stat;
 		end->qtd.qtd_next =
 		end->qtd.qtd_altnext = htole32(stat->physaddr);
 		usb_syncmem(&end->dma, end->offs, sizeof(end->qtd),
 		   BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	} else {
 		next = stat;
+	}
 	memcpy(KERNADDR(&epipe->u.ctl.reqdma, 0), req, sizeof *req);
 	usb_syncmem(&epipe->u.ctl.reqdma, 0, sizeof *req, BUS_DMASYNC_PREWRITE);
 	/* Clear toggle */
 	setup->qtd.qtd_status = htole32(
 	    EHCI_QTD_ACTIVE |
 	    EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) |
 	    EHCI_QTD_SET_CERR(3) |
 	    EHCI_QTD_SET_TOGGLE(0) |
 	    EHCI_QTD_SET_BYTES(sizeof *req)
 	    );
 	setup->qtd.qtd_buffer[0] = htole32(DMAADDR(&epipe->u.ctl.reqdma, 0));
 	setup->qtd.qtd_buffer_hi[0] = 0;
 	setup->nextqtd = next;
 	setup->qtd.qtd_next = setup->qtd.qtd_altnext = htole32(next->physaddr);
 	setup->xfer = xfer;
 	setup->len = sizeof *req;
 	usb_syncmem(&setup->dma, setup->offs, sizeof(setup->qtd),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	stat->qtd.qtd_status = htole32(
 	    EHCI_QTD_ACTIVE |
 	    EHCI_QTD_SET_PID(isread ? EHCI_QTD_PID_OUT : EHCI_QTD_PID_IN) |
 	    EHCI_QTD_SET_CERR(3) |
 	    EHCI_QTD_SET_TOGGLE(1) |
 	    EHCI_QTD_IOC
 	    );
 	stat->qtd.qtd_buffer[0] = 0; /* XXX not needed? */
 	stat->qtd.qtd_buffer_hi[0] = 0; /* XXX not needed? */
 	stat->nextqtd = NULL;
 	stat->qtd.qtd_next = stat->qtd.qtd_altnext = EHCI_NULL;
 	stat->xfer = xfer;
 	stat->len = 0;
 	usb_syncmem(&stat->dma, stat->offs, sizeof(stat->qtd),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 5) {
 		DPRINTF(("ehci_device_request:\n"));
 		ehci_dump_sqh(sqh);
 		ehci_dump_sqtds(setup);
+	}
 #endif
 	exfer->sqtdstart = setup;
 	exfer->sqtdend = stat;
 #ifdef DIAGNOSTIC
 	if (!exfer->isdone) {
 		printf("ehci_device_request: not done, exfer=%p\n", exfer);
+	}
 	exfer->isdone = 0;
 #endif
 	/* Insert qTD in QH list. */
 	ehci_set_qh_qtd(sqh, setup); /* also does usb_syncmem(sqh) */
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&(xfer->timeout_handle), (mstohz(xfer->timeout)),
 		    (ehci_timeout), (xfer));
+	}
 	ehci_add_intr_list(sc, exfer);
 	xfer->status = USBD_IN_PROGRESS;
 	mutex_exit(&sc->sc_lock);
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 10) {
 		DPRINTF(("ehci_device_request: status=%x\n",
 			 EOREAD4(sc, EHCI_USBSTS)));
 		delay(10000);
 		ehci_dump_regs(sc);
 		ehci_dump_sqh(sc->sc_async_head);
 		ehci_dump_sqh(sqh);
 		ehci_dump_sqtds(setup);
+	}
 #endif
 	return (USBD_NORMAL_COMPLETION);
  bad3:
 	mutex_exit(&sc->sc_lock);
 	ehci_free_sqtd(sc, stat);
  bad2:
 	ehci_free_sqtd(sc, setup);
  bad1:
 	DPRINTFN(-1,("ehci_device_request: no memory\n"));
 	mutex_enter(&sc->sc_lock);
 	xfer->status = err;
 	usb_transfer_complete(xfer);
 	mutex_exit(&sc->sc_lock);
 	return (err);
 #undef exfer
+}
 /*
  * Some EHCI chips from VIA seem to trigger interrupts before writing back the
  * qTD status, or miss signalling occasionally under heavy load.  If the host
  * machine is too fast, we we can miss transaction completion - when we scan
  * the active list the transaction still seems to be active.  This generally
  * exhibits itself as a umass stall that never recovers.
+ *
  * We work around this behaviour by setting up this callback after any softintr
  * that completes with transactions still pending, giving us another chance to
  * check for completion after the writeback has taken place.
  */
 Static void
 ehci_intrlist_timeout(void *arg)
+{
 	ehci_softc_t *sc = arg;
 	DPRINTF(("ehci_intrlist_timeout\n"));
 	mutex_spin_enter(&sc->sc_intr_lock);
 	usb_schedsoftintr(&sc->sc_bus);
 	mutex_spin_exit(&sc->sc_intr_lock);
+}
 /************************/
 Static usbd_status
 ehci_device_bulk_transfer(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ehci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ehci_device_bulk_start(usbd_xfer_handle xfer)
+{
 #define exfer EXFER(xfer)
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	usbd_device_handle dev = epipe->pipe.device;
 	ehci_softc_t *sc = dev->bus->hci_private;
 	ehci_soft_qtd_t *data, *dataend;
 	ehci_soft_qh_t *sqh;
 	usbd_status err;
 	int len, isread, endpt;
 	DPRINTFN(2, ("ehci_device_bulk_start: xfer=%p len=%d flags=%d\n",
 		     xfer, xfer->length, xfer->flags));
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST)
 		panic("ehci_device_bulk_start: a request");
 #endif
 	len = xfer->length;
 	endpt = epipe->pipe.endpoint->edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	sqh = epipe->sqh;
 	epipe->u.bulk.length = len;
 	err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer, &data,
 				   &dataend);
 	if (err) {
 		DPRINTFN(-1,("ehci_device_bulk_transfer: no memory\n"));
 		xfer->status = err;
 		usb_transfer_complete(xfer);
 		return (err);
+	}
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 5) {
 		DPRINTF(("ehci_device_bulk_start: data(1)\n"));
 		ehci_dump_sqh(sqh);
 		ehci_dump_sqtds(data);
+	}
 #endif
 	/* Set up interrupt info. */
 	exfer->sqtdstart = data;
 	exfer->sqtdend = dataend;
 #ifdef DIAGNOSTIC
 	if (!exfer->isdone) {
 		printf("ehci_device_bulk_start: not done, ex=%p\n", exfer);
+	}
 	exfer->isdone = 0;
 #endif
 	mutex_enter(&sc->sc_lock);
 	ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&(xfer->timeout_handle), (mstohz(xfer->timeout)),
 		    (ehci_timeout), (xfer));
+	}
 	ehci_add_intr_list(sc, exfer);
 	xfer->status = USBD_IN_PROGRESS;
 	mutex_exit(&sc->sc_lock);
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 10) {
 		DPRINTF(("ehci_device_bulk_start: data(2)\n"));
 		delay(10000);
 		DPRINTF(("ehci_device_bulk_start: data(3)\n"));
 		ehci_dump_regs(sc);
 #if 0
 		printf("async_head:\n");
 		ehci_dump_sqh(sc->sc_async_head);
 #endif
 		printf("sqh:\n");
 		ehci_dump_sqh(sqh);
 		ehci_dump_sqtds(data);
+	}
 #endif
 	if (sc->sc_bus.use_polling)
 		ehci_waitintr(sc, xfer);
 	return (USBD_IN_PROGRESS);
 #undef exfer
+}
 Static void
 ehci_device_bulk_abort(usbd_xfer_handle xfer)
+{
 	DPRINTF(("ehci_device_bulk_abort: xfer=%p\n", xfer));
 	ehci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /*
  * Close a device bulk pipe.
  */
 Static void
 ehci_device_bulk_close(usbd_pipe_handle pipe)
+{
 	ehci_softc_t *sc = pipe->device->bus->hci_private;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
 	DPRINTF(("ehci_device_bulk_close: pipe=%p\n", pipe));
 	mutex_enter(&sc->sc_lock);
 	pipe->endpoint->datatoggle = epipe->nexttoggle;
 	ehci_close_pipe(pipe, sc->sc_async_head);
 	mutex_exit(&sc->sc_lock);
+}
 Static void
 ehci_device_bulk_done(usbd_xfer_handle xfer)
+{
 	struct ehci_xfer *ex = EXFER(xfer);
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	int endpt = epipe->pipe.endpoint->edesc->bEndpointAddress;
 	int rd = UE_GET_DIR(endpt) == UE_DIR_IN;
 	DPRINTFN(10,("ehci_bulk_done: xfer=%p, actlen=%d\n",
 		     xfer, xfer->actlen));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (xfer->status != USBD_NOMEM && ehci_active_intr_list(ex)) {
 		ehci_del_intr_list(sc, ex);	/* remove from active list */
 		ehci_free_sqtd_chain(sc, ex->sqtdstart, NULL);
 		usb_syncmem(&xfer->dmabuf, 0, xfer->length,
 		    rd ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
+	}
 	DPRINTFN(5, ("ehci_bulk_done: length=%d\n", xfer->actlen));
+}
 /************************/
 Static usbd_status
 ehci_device_setintr(ehci_softc_t *sc, ehci_soft_qh_t *sqh, int ival)
+{
 	struct ehci_soft_islot *isp;
 	int islot, lev;
 	/* Find a poll rate that is large enough. */
 	for (lev = EHCI_IPOLLRATES - 1; lev > 0; lev--)
 		if (EHCI_ILEV_IVAL(lev) <= ival)
 			break;
 	/* Pick an interrupt slot at the right level. */
 	/* XXX could do better than picking at random */
 	sc->sc_rand = (sc->sc_rand + 191) % sc->sc_flsize;
 	islot = EHCI_IQHIDX(lev, sc->sc_rand);
 	sqh->islot = islot;
 	isp = &sc->sc_islots[islot];
-	ehci_add_qh(sqh, isp->sqh);
+	ehci_add_qh(sc, sqh, isp->sqh);
 	return (USBD_NORMAL_COMPLETION);
+}
 Static usbd_status
 ehci_device_intr_transfer(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * so start it first.
 	 */
 	return (ehci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ehci_device_intr_start(usbd_xfer_handle xfer)
+{
 #define exfer EXFER(xfer)
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	usbd_device_handle dev = xfer->pipe->device;
 	ehci_softc_t *sc = dev->bus->hci_private;
 	ehci_soft_qtd_t *data, *dataend;
 	ehci_soft_qh_t *sqh;
 	usbd_status err;
 	int len, isread, endpt;
 	DPRINTFN(2, ("ehci_device_intr_start: xfer=%p len=%d flags=%d\n",
 	    xfer, xfer->length, xfer->flags));
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST)
 		panic("ehci_device_intr_start: a request");
 #endif
 	len = xfer->length;
 	endpt = epipe->pipe.endpoint->edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	sqh = epipe->sqh;
 	epipe->u.intr.length = len;
 	err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer, &data,
 	    &dataend);
 	if (err) {
 		DPRINTFN(-1, ("ehci_device_intr_start: no memory\n"));
 		xfer->status = err;
 		usb_transfer_complete(xfer);
 		return (err);
+	}
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 5) {
 		DPRINTF(("ehci_device_intr_start: data(1)\n"));
 		ehci_dump_sqh(sqh);
 		ehci_dump_sqtds(data);
+	}
 #endif
 	/* Set up interrupt info. */
 	exfer->sqtdstart = data;
 	exfer->sqtdend = dataend;
 #ifdef DIAGNOSTIC
 	if (!exfer->isdone) {
 		printf("ehci_device_intr_start: not done, ex=%p\n", exfer);
+	}
 	exfer->isdone = 0;
 #endif
 	mutex_enter(&sc->sc_lock);
 	ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&(xfer->timeout_handle), (mstohz(xfer->timeout)),
 		    (ehci_timeout), (xfer));
+	}
 	ehci_add_intr_list(sc, exfer);
 	xfer->status = USBD_IN_PROGRESS;
 	mutex_exit(&sc->sc_lock);
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 10) {
 		DPRINTF(("ehci_device_intr_start: data(2)\n"));
 		delay(10000);
 		DPRINTF(("ehci_device_intr_start: data(3)\n"));
 		ehci_dump_regs(sc);
 		printf("sqh:\n");
 		ehci_dump_sqh(sqh);
 		ehci_dump_sqtds(data);
+	}
 #endif
 	if (sc->sc_bus.use_polling)
 		ehci_waitintr(sc, xfer);
 	return (USBD_IN_PROGRESS);
 #undef exfer
+}
 Static void
 ehci_device_intr_abort(usbd_xfer_handle xfer)
+{
 	DPRINTFN(1, ("ehci_device_intr_abort: xfer=%p\n", xfer));
 	if (xfer->pipe->intrxfer == xfer) {
 		DPRINTFN(1, ("echi_device_intr_abort: remove\n"));
 		xfer->pipe->intrxfer = NULL;
+	}
 	/*
 	 * XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance
 	 *       async doorbell. That's dependent on the async list, wheras
 	 *       intr xfers are periodic, should not use this?
 	 */
 	ehci_abort_xfer(xfer, USBD_CANCELLED);
+}
 Static void
 ehci_device_intr_close(usbd_pipe_handle pipe)
+{
 	ehci_softc_t *sc = pipe->device->bus->hci_private;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
 	struct ehci_soft_islot *isp;
 	isp = &sc->sc_islots[epipe->sqh->islot];
 	ehci_close_pipe(pipe, isp->sqh);
+}
 Static void
 ehci_device_intr_done(usbd_xfer_handle xfer)
+{
 #define exfer EXFER(xfer)
 	struct ehci_xfer *ex = EXFER(xfer);
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
 	ehci_soft_qtd_t *data, *dataend;
 	ehci_soft_qh_t *sqh;
 	usbd_status err;
 	int len, isread, endpt;
 	DPRINTFN(10, ("ehci_device_intr_done: xfer=%p, actlen=%d\n",
 	    xfer, xfer->actlen));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (xfer->pipe->repeat) {
 		ehci_free_sqtd_chain(sc, ex->sqtdstart, NULL);
 		len = epipe->u.intr.length;
 		xfer->length = len;
 		endpt = epipe->pipe.endpoint->edesc->bEndpointAddress;
 		isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 		usb_syncmem(&xfer->dmabuf, 0, len,
 		    isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
 		sqh = epipe->sqh;
 		err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer,
 		    &data, &dataend);
 		if (err) {
 			DPRINTFN(-1, ("ehci_device_intr_done: no memory\n"));
 			xfer->status = err;
 			return;
+		}
 		/* Set up interrupt info. */
 		exfer->sqtdstart = data;
 		exfer->sqtdend = dataend;
 #ifdef DIAGNOSTIC
 		if (!exfer->isdone) {
 			printf("ehci_device_intr_done: not done, ex=%p\n",
 			    exfer);
+		}
 		exfer->isdone = 0;
 #endif
 		ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */
 		if (xfer->timeout && !sc->sc_bus.use_polling) {
 			callout_reset(&(xfer->timeout_handle),
 			    (mstohz(xfer->timeout)), (ehci_timeout), (xfer));
+		}
 		xfer->status = USBD_IN_PROGRESS;
 	} else if (xfer->status != USBD_NOMEM && ehci_active_intr_list(ex)) {
 		ehci_del_intr_list(sc, ex); /* remove from active list */
 		ehci_free_sqtd_chain(sc, ex->sqtdstart, NULL);
 		endpt = epipe->pipe.endpoint->edesc->bEndpointAddress;
 		isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 		usb_syncmem(&xfer->dmabuf, 0, xfer->length,
 		    isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
+	}
 #undef exfer
+}
 /************************/
 Static usbd_status
 ehci_device_isoc_transfer(usbd_xfer_handle xfer)
+{
 	ehci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err && err != USBD_IN_PROGRESS)
 		return err;
 	return ehci_device_isoc_start(xfer);
+}
 Static usbd_status
 ehci_device_isoc_start(usbd_xfer_handle xfer)
+{
 	struct ehci_pipe *epipe;
 	usbd_device_handle dev;
 	ehci_softc_t *sc;
 	struct ehci_xfer *exfer;
 	ehci_soft_itd_t *itd, *prev, *start, *stop;
 	usb_dma_t *dma_buf;
 	int i, j, k, frames, uframes, ufrperframe;
 	int trans_count, offs, total_length;
 	int frindex;
 	start = NULL;
 	prev = NULL;
 	itd = NULL;
 	trans_count = 0;
 	total_length = 0;
 	exfer = (struct ehci_xfer *) xfer;
 	sc = xfer->pipe->device->bus->hci_private;
 	dev = xfer->pipe->device;
 	epipe = (struct ehci_pipe *)xfer->pipe;
 	/*
 	 * To allow continuous transfers, above we start all transfers
 	 * immediately. However, we're still going to get usbd_start_next call
 	 * this when another xfer completes. So, check if this is already
 	 * in progress or not
 	 */
 	if (exfer->itdstart != NULL)
 		return USBD_IN_PROGRESS;
 	DPRINTFN(2, ("ehci_device_isoc_start: xfer %p len %d flags %d\n",
 			xfer, xfer->length, xfer->flags));
 	if (sc->sc_dying)
 		return USBD_IOERROR;
 	/*
 	 * To avoid complication, don't allow a request right now that'll span
 	 * the entire frame table. To within 4 frames, to allow some leeway
 	 * on either side of where the hc currently is.
 	 */
 	if ((1 << (epipe->pipe.endpoint->edesc->bInterval)) *
 			xfer->nframes >= (sc->sc_flsize - 4) * 8) {
 		printf("ehci: isoc descriptor requested that spans the entire frametable, too many frames\n");
 		return USBD_INVAL;
+	}
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST)
 		panic("ehci_device_isoc_start: request\n");
 	if (!exfer->isdone)
 		printf("ehci_device_isoc_start: not done, ex = %p\n", exfer);
 	exfer->isdone = 0;
 #endif
 	/*
 	 * Step 1: Allocate and initialize itds, how many do we need?
 	 * One per transfer if interval >= 8 microframes, fewer if we use
 	 * multiple microframes per frame.
 	 */
 	i = epipe->pipe.endpoint->edesc->bInterval;
 	if (i > 16 || i == 0) {
 		/* Spec page 271 says intervals > 16 are invalid */
 		DPRINTF(("ehci_device_isoc_start: bInvertal %d invalid\n", i));
 		return USBD_INVAL;
+	}
 	ufrperframe = max(1, USB_UFRAMES_PER_FRAME / (1 << (i - 1)));
 	frames = (xfer->nframes + (ufrperframe - 1)) / ufrperframe;
 	uframes = USB_UFRAMES_PER_FRAME / ufrperframe;
 	if (frames == 0) {
 		DPRINTF(("ehci_device_isoc_start: frames == 0\n"));
 		return USBD_INVAL;
+	}
 	dma_buf = &xfer->dmabuf;
 	offs = 0;
 	for (i = 0; i < frames; i++) {
 		int froffs = offs;
 		itd = ehci_alloc_itd(sc);
 		if (prev != NULL) {
 			prev->itd.itd_next =
 			    htole32(itd->physaddr | EHCI_LINK_ITD);
 			usb_syncmem(&itd->dma,
 			    itd->offs + offsetof(ehci_itd_t, itd_next),
                 	    sizeof(itd->itd.itd_next), BUS_DMASYNC_POSTWRITE);
 			prev->xfer_next = itd;
 	    	} else {
 			start = itd;
+		}
 		/*
 		 * Step 1.5, initialize uframes
 		 */
 		for (j = 0; j < EHCI_ITD_NUFRAMES; j += uframes) {
 			/* Calculate which page in the list this starts in */
 			int addr = DMAADDR(dma_buf, froffs);
 			addr = EHCI_PAGE_OFFSET(addr);
 			addr += (offs - froffs);
 			addr = EHCI_PAGE(addr);
 			addr /= EHCI_PAGE_SIZE;
 			/* This gets the initial offset into the first page,
 			 * looks how far further along the current uframe
 			 * offset is. Works out how many pages that is.
 			 */
 			itd->itd.itd_ctl[j] = htole32 ( EHCI_ITD_ACTIVE |
 			    EHCI_ITD_SET_LEN(xfer->frlengths[trans_count]) |
 			    EHCI_ITD_SET_PG(addr) |
 			    EHCI_ITD_SET_OFFS(EHCI_PAGE_OFFSET(DMAADDR(dma_buf,offs))));
 			total_length += xfer->frlengths[trans_count];
 			offs += xfer->frlengths[trans_count];
 			trans_count++;
 			if (trans_count >= xfer->nframes) { /*Set IOC*/
 				itd->itd.itd_ctl[j] |= htole32(EHCI_ITD_IOC);
 				break;
+			}
+		}
 		/* Step 1.75, set buffer pointers. To simplify matters, all
 		 * pointers are filled out for the next 7 hardware pages in
 		 * the dma block, so no need to worry what pages to cover
 		 * and what to not.
 		 */
 		for (j = 0; j < EHCI_ITD_NBUFFERS; j++) {
 			/*
 			 * Don't try to lookup a page that's past the end
 			 * of buffer
 			 */
 			int page_offs = EHCI_PAGE(froffs + (EHCI_PAGE_SIZE * j));
 			if (page_offs >= dma_buf->block->size)
 				break;
 			unsigned long long page = DMAADDR(dma_buf, page_offs);
 			page = EHCI_PAGE(page);
 			itd->itd.itd_bufr[j] =
 			    htole32(EHCI_ITD_SET_BPTR(page));
 			itd->itd.itd_bufr_hi[j] =
 			    htole32(page >> 32);
+		}
 		/*
 		 * Other special values
 		 */
 		k = epipe->pipe.endpoint->edesc->bEndpointAddress;
 		itd->itd.itd_bufr[0] |= htole32(EHCI_ITD_SET_EP(UE_GET_ADDR(k)) |
 		    EHCI_ITD_SET_DADDR(epipe->pipe.device->address));
 		k = (UE_GET_DIR(epipe->pipe.endpoint->edesc->bEndpointAddress))
 		    ? 1 : 0;
 		j = UGETW(epipe->pipe.endpoint->edesc->wMaxPacketSize);
 		itd->itd.itd_bufr[1] |= htole32(EHCI_ITD_SET_DIR(k) |
 		    EHCI_ITD_SET_MAXPKT(UE_GET_SIZE(j)));
 		/* FIXME: handle invalid trans */
 		itd->itd.itd_bufr[2] |=
 		    htole32(EHCI_ITD_SET_MULTI(UE_GET_TRANS(j)+1));
 		usb_syncmem(&itd->dma,
 		    itd->offs + offsetof(ehci_itd_t, itd_next),
                     sizeof(ehci_itd_t),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		prev = itd;
 	} /* End of frame */
 	stop = itd;
 	stop->xfer_next = NULL;
 	exfer->isoc_len = total_length;
 	usb_syncmem(&exfer->xfer.dmabuf, 0, total_length,
 		BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 	/*
 	 * Part 2: Transfer descriptors have now been set up, now they must
 	 * be scheduled into the period frame list. Erk. Not wanting to
 	 * complicate matters, transfer is denied if the transfer spans
 	 * more than the period frame list.
 	 */
 	mutex_enter(&sc->sc_lock);
 	/* Start inserting frames */
 	if (epipe->u.isoc.cur_xfers > 0) {
 		frindex = epipe->u.isoc.next_frame;
 	} else {
 		frindex = EOREAD4(sc, EHCI_FRINDEX);
 		frindex = frindex >> 3; /* Erase microframe index */
 		frindex += 2;
+	}
 	if (frindex >= sc->sc_flsize)
 		frindex &= (sc->sc_flsize - 1);
 	/* What's the frame interval? */
 	i = (1 << (epipe->pipe.endpoint->edesc->bInterval - 1));
 	if (i / USB_UFRAMES_PER_FRAME == 0)
 		i = 1;
 	else
 		i /= USB_UFRAMES_PER_FRAME;
 	itd = start;
 	for (j = 0; j < frames; j++) {
 		if (itd == NULL)
 			panic("ehci: unexpectedly ran out of isoc itds, isoc_start\n");
 		itd->itd.itd_next = sc->sc_flist[frindex];
 		if (itd->itd.itd_next == 0)
 			/* FIXME: frindex table gets initialized to NULL
 			 * or EHCI_NULL? */
 			itd->itd.itd_next = EHCI_NULL;
 		usb_syncmem(&itd->dma,
 		    itd->offs + offsetof(ehci_itd_t, itd_next),
                     sizeof(itd->itd.itd_next),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		sc->sc_flist[frindex] = htole32(EHCI_LINK_ITD | itd->physaddr);
 		usb_syncmem(&sc->sc_fldma,
 		    sizeof(ehci_link_t) * frindex,
                     sizeof(ehci_link_t),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		itd->u.frame_list.next = sc->sc_softitds[frindex];
 		sc->sc_softitds[frindex] = itd;
 		if (itd->u.frame_list.next != NULL)
 			itd->u.frame_list.next->u.frame_list.prev = itd;
 		itd->slot = frindex;
 		itd->u.frame_list.prev = NULL;
 		frindex += i;
 		if (frindex >= sc->sc_flsize)
 			frindex -= sc->sc_flsize;
 		itd = itd->xfer_next;
+	}
 	epipe->u.isoc.cur_xfers++;
 	epipe->u.isoc.next_frame = frindex;
 	exfer->itdstart = start;
 	exfer->itdend = stop;
 	exfer->sqtdstart = NULL;
 	exfer->sqtdstart = NULL;
 	ehci_add_intr_list(sc, exfer);
 	xfer->status = USBD_IN_PROGRESS;
 	xfer->done = 0;
 	mutex_exit(&sc->sc_lock);
 	if (sc->sc_bus.use_polling) {
 		printf("Starting ehci isoc xfer with polling. Bad idea?\n");
 		ehci_waitintr(sc, xfer);
+	}
 	return USBD_IN_PROGRESS;
+}
 Static void
 ehci_device_isoc_abort(usbd_xfer_handle xfer)
+{
 	DPRINTFN(1, ("ehci_device_isoc_abort: xfer = %p\n", xfer));
 	ehci_abort_isoc_xfer(xfer, USBD_CANCELLED);
+}
 Static void
 ehci_device_isoc_close(usbd_pipe_handle pipe)
+{
 	DPRINTFN(1, ("ehci_device_isoc_close: nothing in the pipe to free?\n"));
+}
 Static void
 ehci_device_isoc_done(usbd_xfer_handle xfer)
+{
 	struct ehci_xfer *exfer;
 	ehci_softc_t *sc;
 	struct ehci_pipe *epipe;
 	exfer = EXFER(xfer);
 	sc = xfer->pipe->device->bus->hci_private;
 	epipe = (struct ehci_pipe *) xfer->pipe;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	epipe->u.isoc.cur_xfers--;
 	if (xfer->status != USBD_NOMEM && ehci_active_intr_list(exfer)) {
 		ehci_del_intr_list(sc, exfer);
 		ehci_rem_free_itd_chain(sc, exfer);
+	}
 	usb_syncmem(&xfer->dmabuf, 0, xfer->length, BUS_DMASYNC_POSTWRITE |
                     BUS_DMASYNC_POSTREAD);
+}

 @@ -1,3273 +1,3276 @@
-/*	$NetBSD: ohci.c,v 1.218.6.5 2011/12/07 05:41:53 macallan Exp $	*/
+/*	$NetBSD: ohci.c,v 1.218.6.6 2011/12/08 02:51:07 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2005, 2011 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, Jared D. McNeill (jmcneill@invisible.ca)
  * and Matthew R. Green.
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
  */
 /*
  * USB Open Host Controller driver.
+ *
  * OHCI spec: http://www.compaq.com/productinfo/development/openhci.html
  * USB spec: http://www.usb.org/developers/docs/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.5 2011/12/07 05:41:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.6 2011/12/08 02:51:07 mrg Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <machine/endian.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/ohcireg.h>
 #include <dev/usb/ohcivar.h>
 #include <dev/usb/usbroothub_subr.h>
 #ifdef OHCI_DEBUG
 #define DPRINTF(x)	if (ohcidebug) printf x
 #define DPRINTFN(n,x)	if (ohcidebug>(n)) printf x
 int ohcidebug = 0;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 #if BYTE_ORDER == BIG_ENDIAN
 #define	SWAP_ENDIAN	OHCI_LITTLE_ENDIAN
 #else
 #define	SWAP_ENDIAN	OHCI_BIG_ENDIAN
 #endif
 #define	O16TOH(val)	(sc->sc_endian == SWAP_ENDIAN ? bswap16(val) : val)
 #define	O32TOH(val)	(sc->sc_endian == SWAP_ENDIAN ? bswap32(val) : val)
 #define	HTOO16(val)	O16TOH(val)
 #define	HTOO32(val)	O32TOH(val)
 struct ohci_pipe;
 Static ohci_soft_ed_t  *ohci_alloc_sed(ohci_softc_t *);
 Static void		ohci_free_sed(ohci_softc_t *, ohci_soft_ed_t *);
 Static ohci_soft_td_t  *ohci_alloc_std(ohci_softc_t *);
 Static void		ohci_free_std(ohci_softc_t *, ohci_soft_td_t *);
 Static ohci_soft_itd_t *ohci_alloc_sitd(ohci_softc_t *);
 Static void		ohci_free_sitd(ohci_softc_t *,ohci_soft_itd_t *);
 #if 0
 Static void		ohci_free_std_chain(ohci_softc_t *, ohci_soft_td_t *,
 					    ohci_soft_td_t *);
 #endif
 Static usbd_status	ohci_alloc_std_chain(struct ohci_pipe *,
 			    ohci_softc_t *, int, int, usbd_xfer_handle,
 			    ohci_soft_td_t *, ohci_soft_td_t **);
 Static usbd_status	ohci_open(usbd_pipe_handle);
 Static void		ohci_poll(struct usbd_bus *);
 Static void		ohci_softintr(void *);
 Static void		ohci_waitintr(ohci_softc_t *, usbd_xfer_handle);
 Static void		ohci_rhsc(ohci_softc_t *, usbd_xfer_handle);
 Static void		ohci_rhsc_softint(void *arg);
 Static usbd_status	ohci_device_request(usbd_xfer_handle xfer);
 Static void		ohci_add_ed(ohci_softc_t *, ohci_soft_ed_t *,
 			    ohci_soft_ed_t *);
-Static void		ohci_rem_ed(ohci_soft_ed_t *, ohci_soft_ed_t *);
+Static void		ohci_rem_ed(ohci_softc_t *, ohci_soft_ed_t *,
 				    ohci_soft_ed_t *);
 Static void		ohci_hash_add_td(ohci_softc_t *, ohci_soft_td_t *);
 Static void		ohci_hash_rem_td(ohci_softc_t *, ohci_soft_td_t *);
 Static ohci_soft_td_t  *ohci_hash_find_td(ohci_softc_t *, ohci_physaddr_t);
 Static void		ohci_hash_add_itd(ohci_softc_t *, ohci_soft_itd_t *);
 Static void		ohci_hash_rem_itd(ohci_softc_t *, ohci_soft_itd_t *);
 Static ohci_soft_itd_t  *ohci_hash_find_itd(ohci_softc_t *, ohci_physaddr_t);
 Static usbd_status	ohci_setup_isoc(usbd_pipe_handle pipe);
 Static void		ohci_device_isoc_enter(usbd_xfer_handle);
 Static usbd_status	ohci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
 Static void		ohci_freem(struct usbd_bus *, usb_dma_t *);
 Static usbd_xfer_handle	ohci_allocx(struct usbd_bus *);
 Static void		ohci_freex(struct usbd_bus *, usbd_xfer_handle);
 Static void		ohci_get_locks(struct usbd_bus *, kmutex_t **,
 				       kmutex_t **);
 Static usbd_status	ohci_root_ctrl_transfer(usbd_xfer_handle);
 Static usbd_status	ohci_root_ctrl_start(usbd_xfer_handle);
 Static void		ohci_root_ctrl_abort(usbd_xfer_handle);
 Static void		ohci_root_ctrl_close(usbd_pipe_handle);
 Static void		ohci_root_ctrl_done(usbd_xfer_handle);
 Static usbd_status	ohci_root_intr_transfer(usbd_xfer_handle);
 Static usbd_status	ohci_root_intr_start(usbd_xfer_handle);
 Static void		ohci_root_intr_abort(usbd_xfer_handle);
 Static void		ohci_root_intr_close(usbd_pipe_handle);
 Static void		ohci_root_intr_done(usbd_xfer_handle);
 Static usbd_status	ohci_device_ctrl_transfer(usbd_xfer_handle);
 Static usbd_status	ohci_device_ctrl_start(usbd_xfer_handle);
 Static void		ohci_device_ctrl_abort(usbd_xfer_handle);
 Static void		ohci_device_ctrl_close(usbd_pipe_handle);
 Static void		ohci_device_ctrl_done(usbd_xfer_handle);
 Static usbd_status	ohci_device_bulk_transfer(usbd_xfer_handle);
 Static usbd_status	ohci_device_bulk_start(usbd_xfer_handle);
 Static void		ohci_device_bulk_abort(usbd_xfer_handle);
 Static void		ohci_device_bulk_close(usbd_pipe_handle);
 Static void		ohci_device_bulk_done(usbd_xfer_handle);
 Static usbd_status	ohci_device_intr_transfer(usbd_xfer_handle);
 Static usbd_status	ohci_device_intr_start(usbd_xfer_handle);
 Static void		ohci_device_intr_abort(usbd_xfer_handle);
 Static void		ohci_device_intr_close(usbd_pipe_handle);
 Static void		ohci_device_intr_done(usbd_xfer_handle);
 Static usbd_status	ohci_device_isoc_transfer(usbd_xfer_handle);
 Static usbd_status	ohci_device_isoc_start(usbd_xfer_handle);
 Static void		ohci_device_isoc_abort(usbd_xfer_handle);
 Static void		ohci_device_isoc_close(usbd_pipe_handle);
 Static void		ohci_device_isoc_done(usbd_xfer_handle);
 Static usbd_status	ohci_device_setintr(ohci_softc_t *sc,
 			    struct ohci_pipe *pipe, int ival);
 Static void		ohci_timeout(void *);
 Static void		ohci_timeout_task(void *);
 Static void		ohci_rhsc_enable(void *);
 Static void		ohci_close_pipe(usbd_pipe_handle, ohci_soft_ed_t *);
 Static void		ohci_abort_xfer(usbd_xfer_handle, usbd_status);
 Static void		ohci_device_clear_toggle(usbd_pipe_handle pipe);
 Static void		ohci_noop(usbd_pipe_handle pipe);
 #ifdef OHCI_DEBUG
 Static void		ohci_dumpregs(ohci_softc_t *);
 Static void		ohci_dump_tds(ohci_softc_t *, ohci_soft_td_t *);
 Static void		ohci_dump_td(ohci_softc_t *, ohci_soft_td_t *);
 Static void		ohci_dump_ed(ohci_softc_t *, ohci_soft_ed_t *);
 Static void		ohci_dump_itd(ohci_softc_t *, ohci_soft_itd_t *);
 Static void		ohci_dump_itds(ohci_softc_t *, ohci_soft_itd_t *);
 #endif
 #define OBARR(sc) bus_space_barrier((sc)->iot, (sc)->ioh, 0, (sc)->sc_size, \
 			BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE)
 #define OWRITE1(sc, r, x) \
  do { OBARR(sc); bus_space_write_1((sc)->iot, (sc)->ioh, (r), (x)); } while (0)
 #define OWRITE2(sc, r, x) \
  do { OBARR(sc); bus_space_write_2((sc)->iot, (sc)->ioh, (r), (x)); } while (0)
 #define OWRITE4(sc, r, x) \
  do { OBARR(sc); bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x)); } while (0)
 static __inline uint8_t
 OREAD1(ohci_softc_t *sc, bus_size_t r)
+{
 	OBARR(sc);
 	return bus_space_read_1(sc->iot, sc->ioh, r);
+}
 static __inline uint16_t
 OREAD2(ohci_softc_t *sc, bus_size_t r)
+{
 	OBARR(sc);
 	return bus_space_read_2(sc->iot, sc->ioh, r);
+}
 static __inline uint32_t
 OREAD4(ohci_softc_t *sc, bus_size_t r)
+{
 	OBARR(sc);
 	return bus_space_read_4(sc->iot, sc->ioh, r);
+}
 /* Reverse the bits in a value 0 .. 31 */
 Static u_int8_t revbits[OHCI_NO_INTRS] =
   { 0x00, 0x10, 0x08, 0x18, 0x04, 0x14, 0x0c, 0x1c,
 x02, 0x12, 0x0a, 0x1a, 0x06, 0x16, 0x0e, 0x1e,
 x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0d, 0x1d,
 x03, 0x13, 0x0b, 0x1b, 0x07, 0x17, 0x0f, 0x1f };
 struct ohci_pipe {
 	struct usbd_pipe pipe;
 	ohci_soft_ed_t *sed;
 	union {
 		ohci_soft_td_t *td;
 		ohci_soft_itd_t *itd;
 	} tail;
 	/* Info needed for different pipe kinds. */
 	union {
 		/* Control pipe */
 		struct {
 			usb_dma_t reqdma;
 			u_int length;
 			ohci_soft_td_t *setup, *data, *stat;
 		} ctl;
 		/* Interrupt pipe */
 		struct {
 			int nslots;
 			int pos;
 		} intr;
 		/* Bulk pipe */
 		struct {
 			u_int length;
 			int isread;
 		} bulk;
 		/* Iso pipe */
 		struct iso {
 			int next, inuse;
 		} iso;
 	} u;
 };
 #define OHCI_INTR_ENDPT 1
 Static const struct usbd_bus_methods ohci_bus_methods = {
-	ohci_open,
+	.open_pipe =	ohci_open,
-	ohci_softintr,
+	.soft_intr =	ohci_softintr,
-	ohci_poll,
+	.do_poll =	ohci_poll,
-	ohci_allocm,
+	.allocm =	ohci_allocm,
-	ohci_freem,
+	.freem =	ohci_freem,
-	ohci_allocx,
+	.allocx =	ohci_allocx,
-	ohci_freex,
+	.freex =	ohci_freex,
-	ohci_get_locks,
+	.get_locks =	ohci_get_locks,
 };
 Static const struct usbd_pipe_methods ohci_root_ctrl_methods = {
-	ohci_root_ctrl_transfer,
+	.transfer =	ohci_root_ctrl_transfer,
-	ohci_root_ctrl_start,
+	.start =	ohci_root_ctrl_start,
-	ohci_root_ctrl_abort,
+	.abort =	ohci_root_ctrl_abort,
-	ohci_root_ctrl_close,
+	.close =	ohci_root_ctrl_close,
-	ohci_noop,
+	.cleartoggle =	ohci_noop,
-	ohci_root_ctrl_done,
+	.done =		ohci_root_ctrl_done,
 };
 Static const struct usbd_pipe_methods ohci_root_intr_methods = {
-	ohci_root_intr_transfer,
+	.transfer =	ohci_root_intr_transfer,
-	ohci_root_intr_start,
+	.start =	ohci_root_intr_start,
-	ohci_root_intr_abort,
+	.abort =	ohci_root_intr_abort,
-	ohci_root_intr_close,
+	.close =	ohci_root_intr_close,
-	ohci_noop,
+	.cleartoggle =	ohci_noop,
-	ohci_root_intr_done,
+	.done =		ohci_root_intr_done,
 };
 Static const struct usbd_pipe_methods ohci_device_ctrl_methods = {
-	ohci_device_ctrl_transfer,
+	.transfer =	ohci_device_ctrl_transfer,
-	ohci_device_ctrl_start,
+	.start =	ohci_device_ctrl_start,
-	ohci_device_ctrl_abort,
+	.abort =	ohci_device_ctrl_abort,
-	ohci_device_ctrl_close,
+	.close =	ohci_device_ctrl_close,
-	ohci_noop,
+	.cleartoggle =	ohci_noop,
-	ohci_device_ctrl_done,
+	.done =		ohci_device_ctrl_done,
 };
 Static const struct usbd_pipe_methods ohci_device_intr_methods = {
-	ohci_device_intr_transfer,
+	.transfer =	ohci_device_intr_transfer,
-	ohci_device_intr_start,
+	.start =	ohci_device_intr_start,
-	ohci_device_intr_abort,
+	.abort =	ohci_device_intr_abort,
-	ohci_device_intr_close,
+	.close =	ohci_device_intr_close,
-	ohci_device_clear_toggle,
+	.cleartoggle =	ohci_device_clear_toggle,
-	ohci_device_intr_done,
+	.done =		ohci_device_intr_done,
 };
 Static const struct usbd_pipe_methods ohci_device_bulk_methods = {
-	ohci_device_bulk_transfer,
+	.transfer =	ohci_device_bulk_transfer,
-	ohci_device_bulk_start,
+	.start =	ohci_device_bulk_start,
-	ohci_device_bulk_abort,
+	.abort =	ohci_device_bulk_abort,
-	ohci_device_bulk_close,
+	.close =	ohci_device_bulk_close,
-	ohci_device_clear_toggle,
+	.cleartoggle =	ohci_device_clear_toggle,
-	ohci_device_bulk_done,
+	.done =		ohci_device_bulk_done,
 };
 Static const struct usbd_pipe_methods ohci_device_isoc_methods = {
-	ohci_device_isoc_transfer,
+	.transfer =	ohci_device_isoc_transfer,
-	ohci_device_isoc_start,
+	.start =	ohci_device_isoc_start,
-	ohci_device_isoc_abort,
+	.abort =	ohci_device_isoc_abort,
-	ohci_device_isoc_close,
+	.close =	ohci_device_isoc_close,
-	ohci_noop,
+	.cleartoggle =	ohci_noop,
-	ohci_device_isoc_done,
+	.done =		ohci_device_isoc_done,
 };
 int
 ohci_activate(device_t self, enum devact act)
+{
 	struct ohci_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
+}
 void
 ohci_childdet(device_t self, device_t child)
+{
 	struct ohci_softc *sc = device_private(self);
 	KASSERT(sc->sc_child == child);
 	sc->sc_child = NULL;
+}
 int
 ohci_detach(struct ohci_softc *sc, int flags)
+{
 	int rv = 0;
 	usbd_xfer_handle xfer;
 	if (sc->sc_child != NULL)
 		rv = config_detach(sc->sc_child, flags);
 	if (rv != 0)
 		return (rv);
 	callout_stop(&sc->sc_tmo_rhsc);
 	usb_delay_ms(&sc->sc_bus, 300); /* XXX let stray task complete */
 	callout_destroy(&sc->sc_tmo_rhsc);
 	softint_disestablish(sc->sc_rhsc_si);
 	cv_destroy(&sc->sc_softwake_cv);
 	mutex_destroy(&sc->sc_lock);
 	mutex_destroy(&sc->sc_intr_lock);
 	if (sc->sc_hcca != NULL)
 		usb_freemem(&sc->sc_bus, &sc->sc_hccadma);
 	while((xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers)) != NULL) {
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 		kmem_free(xfer, sizeof(struct ohci_xfer));
+	}
 	return (rv);
+}
 ohci_soft_ed_t *
 ohci_alloc_sed(ohci_softc_t *sc)
+{
 	ohci_soft_ed_t *sed;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freeeds == NULL) {
 		DPRINTFN(2, ("ohci_alloc_sed: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, OHCI_SED_SIZE * OHCI_SED_CHUNK,
 			  OHCI_ED_ALIGN, &dma);
 		if (err)
 			return (0);
 		for(i = 0; i < OHCI_SED_CHUNK; i++) {
 			offs = i * OHCI_SED_SIZE;
 			sed = KERNADDR(&dma, offs);
 			sed->physaddr = DMAADDR(&dma, offs);
 			sed->dma = dma;
 			sed->offs = offs;
 			sed->next = sc->sc_freeeds;
 			sc->sc_freeeds = sed;
+		}
+	}
 	sed = sc->sc_freeeds;
 	sc->sc_freeeds = sed->next;
 	memset(&sed->ed, 0, sizeof(ohci_ed_t));
 	sed->next = 0;
 	return (sed);
+}
 void
 ohci_free_sed(ohci_softc_t *sc, ohci_soft_ed_t *sed)
+{
 	sed->next = sc->sc_freeeds;
 	sc->sc_freeeds = sed;
+}
 ohci_soft_td_t *
 ohci_alloc_std(ohci_softc_t *sc)
+{
 	ohci_soft_td_t *std;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freetds == NULL) {
 		DPRINTFN(2, ("ohci_alloc_std: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, OHCI_STD_SIZE * OHCI_STD_CHUNK,
 			  OHCI_TD_ALIGN, &dma);
 		if (err)
 			return (NULL);
 		for(i = 0; i < OHCI_STD_CHUNK; i++) {
 			offs = i * OHCI_STD_SIZE;
 			std = KERNADDR(&dma, offs);
 			std->physaddr = DMAADDR(&dma, offs);
 			std->dma = dma;
 			std->offs = offs;
 			std->nexttd = sc->sc_freetds;
 			sc->sc_freetds = std;
+		}
+	}
 	std = sc->sc_freetds;
 	sc->sc_freetds = std->nexttd;
 	memset(&std->td, 0, sizeof(ohci_td_t));
 	std->nexttd = NULL;
 	std->xfer = NULL;
 	ohci_hash_add_td(sc, std);
 	return (std);
+}
 void
 ohci_free_std(ohci_softc_t *sc, ohci_soft_td_t *std)
+{
 	ohci_hash_rem_td(sc, std);
 	std->nexttd = sc->sc_freetds;
 	sc->sc_freetds = std;
+}
 usbd_status
 ohci_alloc_std_chain(struct ohci_pipe *opipe, ohci_softc_t *sc,
 		     int alen, int rd, usbd_xfer_handle xfer,
 		     ohci_soft_td_t *sp, ohci_soft_td_t **ep)
+{
 	ohci_soft_td_t *next, *cur;
 	ohci_physaddr_t dataphys, dataphysend;
 	u_int32_t tdflags;
 	int len, curlen;
 	usb_dma_t *dma = &xfer->dmabuf;
 	u_int16_t flags = xfer->flags;
 	DPRINTFN(alen < 4096,("ohci_alloc_std_chain: start len=%d\n", alen));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	len = alen;
 	cur = sp;
 	dataphys = DMAADDR(dma, 0);
 	dataphysend = OHCI_PAGE(dataphys + len - 1);
 	usb_syncmem(dma, 0, len,
 	    rd ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE);
 	tdflags = HTOO32(
 	    (rd ? OHCI_TD_IN : OHCI_TD_OUT) |
 	    (flags & USBD_SHORT_XFER_OK ? OHCI_TD_R : 0) |
 	    OHCI_TD_NOCC | OHCI_TD_TOGGLE_CARRY | OHCI_TD_NOINTR);
 	for (;;) {
 		next = ohci_alloc_std(sc);
 		if (next == NULL)
 			goto nomem;
 		/* The OHCI hardware can handle at most one page crossing. */
 		if (OHCI_PAGE(dataphys) == dataphysend ||
 		    OHCI_PAGE(dataphys) + OHCI_PAGE_SIZE == dataphysend) {
 			/* we can handle it in this TD */
 			curlen = len;
 		} else {
 			/* must use multiple TDs, fill as much as possible. */
 			curlen = 2 * OHCI_PAGE_SIZE -
 				 (dataphys & (OHCI_PAGE_SIZE-1));
 			/* the length must be a multiple of the max size */
 			curlen -= curlen % UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize);
 #ifdef DIAGNOSTIC
 			if (curlen == 0)
 				panic("ohci_alloc_std: curlen == 0");
 #endif
+		}
 		DPRINTFN(4,("ohci_alloc_std_chain: dataphys=0x%08x "
 			    "dataphysend=0x%08x len=%d curlen=%d\n",
 			    dataphys, dataphysend,
 			    len, curlen));
 		len -= curlen;
 		cur->td.td_flags = tdflags;
 		cur->td.td_cbp = HTOO32(dataphys);
 		cur->nexttd = next;
 		cur->td.td_nexttd = HTOO32(next->physaddr);
 		cur->td.td_be = HTOO32(dataphys + curlen - 1);
 		cur->len = curlen;
 		cur->flags = OHCI_ADD_LEN;
 		cur->xfer = xfer;
 		usb_syncmem(&cur->dma, cur->offs, sizeof(cur->td),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		DPRINTFN(10,("ohci_alloc_std_chain: cbp=0x%08x be=0x%08x\n",
 			    dataphys, dataphys + curlen - 1));
 		if (len == 0)
 			break;
 		DPRINTFN(10,("ohci_alloc_std_chain: extend chain\n"));
 		dataphys += curlen;
 		cur = next;
+	}
 	if (!rd && (flags & USBD_FORCE_SHORT_XFER) &&
 	    alen % UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize) == 0) {
 		/* Force a 0 length transfer at the end. */
 		cur = next;
 		next = ohci_alloc_std(sc);
 		if (next == NULL)
 			goto nomem;
 		cur->td.td_flags = tdflags;
 		cur->td.td_cbp = 0; /* indicate 0 length packet */
 		cur->nexttd = next;
 		cur->td.td_nexttd = HTOO32(next->physaddr);
 		cur->td.td_be = ~0;
 		cur->len = 0;
 		cur->flags = 0;
 		cur->xfer = xfer;
 		usb_syncmem(&cur->dma, cur->offs, sizeof(cur->td),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		DPRINTFN(2,("ohci_alloc_std_chain: add 0 xfer\n"));
+	}
 	*ep = cur;
 	return (USBD_NORMAL_COMPLETION);
  nomem:
 	/* XXX free chain */
 	return (USBD_NOMEM);
+}
 #if 0
 Static void
 ohci_free_std_chain(ohci_softc_t *sc, ohci_soft_td_t *std,
 		    ohci_soft_td_t *stdend)
+{
 	ohci_soft_td_t *p;
 	for (; std != stdend; std = p) {
 		p = std->nexttd;
 		ohci_free_std(sc, std);
+	}
+}
 #endif
 ohci_soft_itd_t *
 ohci_alloc_sitd(ohci_softc_t *sc)
+{
 	ohci_soft_itd_t *sitd;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freeitds == NULL) {
 		DPRINTFN(2, ("ohci_alloc_sitd: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, OHCI_SITD_SIZE * OHCI_SITD_CHUNK,
 			  OHCI_ITD_ALIGN, &dma);
 		if (err)
 			return (NULL);
 		for(i = 0; i < OHCI_SITD_CHUNK; i++) {
 			offs = i * OHCI_SITD_SIZE;
 			sitd = KERNADDR(&dma, offs);
 			sitd->physaddr = DMAADDR(&dma, offs);
 			sitd->dma = dma;
 			sitd->offs = offs;
 			sitd->nextitd = sc->sc_freeitds;
 			sc->sc_freeitds = sitd;
+		}
+	}
 	sitd = sc->sc_freeitds;
 	sc->sc_freeitds = sitd->nextitd;
 	memset(&sitd->itd, 0, sizeof(ohci_itd_t));
 	sitd->nextitd = NULL;
 	sitd->xfer = NULL;
 	ohci_hash_add_itd(sc, sitd);
 #ifdef DIAGNOSTIC
 	sitd->isdone = 0;
 #endif
 	return (sitd);
+}
 void
 ohci_free_sitd(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
+{
 	DPRINTFN(10,("ohci_free_sitd: sitd=%p\n", sitd));
 #ifdef DIAGNOSTIC
 	if (!sitd->isdone) {
 		panic("ohci_free_sitd: sitd=%p not done", sitd);
 		return;
+	}
 	/* Warn double free */
 	sitd->isdone = 0;
 #endif
 	ohci_hash_rem_itd(sc, sitd);
 	sitd->nextitd = sc->sc_freeitds;
 	sc->sc_freeitds = sitd;
+}
 usbd_status
 ohci_init(ohci_softc_t *sc)
+{
 	ohci_soft_ed_t *sed, *psed;
 	usbd_status err;
 	int i;
 	u_int32_t s, ctl, rwc, ival, hcr, fm, per, rev, desca, descb;
 	DPRINTF(("ohci_init: start\n"));
 	aprint_normal_dev(sc->sc_dev, "");
 	sc->sc_hcca = NULL;
 	callout_init(&sc->sc_tmo_rhsc, CALLOUT_MPSAFE);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "ohciab");
 	sc->sc_rhsc_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
 	    ohci_rhsc_softint, sc);
 	for (i = 0; i < OHCI_HASH_SIZE; i++)
 		LIST_INIT(&sc->sc_hash_tds[i]);
 	for (i = 0; i < OHCI_HASH_SIZE; i++)
 		LIST_INIT(&sc->sc_hash_itds[i]);
 	SIMPLEQ_INIT(&sc->sc_free_xfers);
 	rev = OREAD4(sc, OHCI_REVISION);
 	aprint_normal("OHCI version %d.%d%s\n",
 	    OHCI_REV_HI(rev), OHCI_REV_LO(rev),
 	    OHCI_REV_LEGACY(rev) ? ", legacy support" : "");
 	if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) {
 		aprint_error_dev(sc->sc_dev, "unsupported OHCI revision\n");
 		sc->sc_bus.usbrev = USBREV_UNKNOWN;
 		return (USBD_INVAL);
+	}
 	sc->sc_bus.usbrev = USBREV_1_0;
 	usb_setup_reserve(sc->sc_dev, &sc->sc_dma_reserve, sc->sc_bus.dmatag,
 	    USB_MEM_RESERVE);
 	/* XXX determine alignment by R/W */
 	/* Allocate the HCCA area. */
 	err = usb_allocmem(&sc->sc_bus, OHCI_HCCA_SIZE,
 			 OHCI_HCCA_ALIGN, &sc->sc_hccadma);
 	if (err) {
 		sc->sc_hcca = NULL;
 		return err;
+	}
 	sc->sc_hcca = KERNADDR(&sc->sc_hccadma, 0);
 	memset(sc->sc_hcca, 0, OHCI_HCCA_SIZE);
 	sc->sc_eintrs = OHCI_NORMAL_INTRS;
 	/* Allocate dummy ED that starts the control list. */
 	sc->sc_ctrl_head = ohci_alloc_sed(sc);
 	if (sc->sc_ctrl_head == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	sc->sc_ctrl_head->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
 	/* Allocate dummy ED that starts the bulk list. */
 	sc->sc_bulk_head = ohci_alloc_sed(sc);
 	if (sc->sc_bulk_head == NULL) {
 		err = USBD_NOMEM;
 		goto bad2;
+	}
 	sc->sc_bulk_head->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
 	usb_syncmem(&sc->sc_bulk_head->dma, sc->sc_bulk_head->offs,
 	    sizeof(sc->sc_bulk_head->ed),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/* Allocate dummy ED that starts the isochronous list. */
 	sc->sc_isoc_head = ohci_alloc_sed(sc);
 	if (sc->sc_isoc_head == NULL) {
 		err = USBD_NOMEM;
 		goto bad3;
+	}
 	sc->sc_isoc_head->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
 	usb_syncmem(&sc->sc_isoc_head->dma, sc->sc_isoc_head->offs,
 	    sizeof(sc->sc_isoc_head->ed),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/* Allocate all the dummy EDs that make up the interrupt tree. */
 	for (i = 0; i < OHCI_NO_EDS; i++) {
 		sed = ohci_alloc_sed(sc);
 		if (sed == NULL) {
 			while (--i >= 0)
 				ohci_free_sed(sc, sc->sc_eds[i]);
 			err = USBD_NOMEM;
 			goto bad4;
+		}
 		/* All ED fields are set to 0. */
 		sc->sc_eds[i] = sed;
 		sed->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
 		if (i != 0)
 			psed = sc->sc_eds[(i-1) / 2];
 		else
 			psed= sc->sc_isoc_head;
 		sed->next = psed;
 		sed->ed.ed_nexted = HTOO32(psed->physaddr);
 		usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	/*
 	 * Fill HCCA interrupt table.  The bit reversal is to get
 	 * the tree set up properly to spread the interrupts.
 	 */
 	for (i = 0; i < OHCI_NO_INTRS; i++)
 		sc->sc_hcca->hcca_interrupt_table[revbits[i]] =
 		    HTOO32(sc->sc_eds[OHCI_NO_EDS-OHCI_NO_INTRS+i]->physaddr);
 	usb_syncmem(&sc->sc_hccadma, 0, OHCI_HCCA_SIZE,
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 15) {
 		for (i = 0; i < OHCI_NO_EDS; i++) {
 			printf("ed#%d ", i);
 			ohci_dump_ed(sc, sc->sc_eds[i]);
+		}
 		printf("iso ");
 		ohci_dump_ed(sc, sc->sc_isoc_head);
+	}
 #endif
 	/* Preserve values programmed by SMM/BIOS but lost over reset. */
 	ctl = OREAD4(sc, OHCI_CONTROL);
 	rwc = ctl & OHCI_RWC;
 	fm = OREAD4(sc, OHCI_FM_INTERVAL);
 	desca = OREAD4(sc, OHCI_RH_DESCRIPTOR_A);
 	descb = OREAD4(sc, OHCI_RH_DESCRIPTOR_B);
 	/* Determine in what context we are running. */
 	if (ctl & OHCI_IR) {
 		/* SMM active, request change */
 		DPRINTF(("ohci_init: SMM active, request owner change\n"));
 		if ((sc->sc_intre & (OHCI_OC | OHCI_MIE)) ==
 		    (OHCI_OC | OHCI_MIE))
 			OWRITE4(sc, OHCI_INTERRUPT_ENABLE, OHCI_MIE);
 		s = OREAD4(sc, OHCI_COMMAND_STATUS);
 		OWRITE4(sc, OHCI_COMMAND_STATUS, s | OHCI_OCR);
 		for (i = 0; i < 100 && (ctl & OHCI_IR); i++) {
 			usb_delay_ms(&sc->sc_bus, 1);
 			ctl = OREAD4(sc, OHCI_CONTROL);
+		}
 		OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_MIE);
 		if ((ctl & OHCI_IR) == 0) {
 			aprint_error_dev(sc->sc_dev,
 			    "SMM does not respond, resetting\n");
 			OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET | rwc);
 			goto reset;
+		}
 #if 0
 /* Don't bother trying to reuse the BIOS init, we'll reset it anyway. */
 	} else if ((ctl & OHCI_HCFS_MASK) != OHCI_HCFS_RESET) {
 		/* BIOS started controller. */
 		DPRINTF(("ohci_init: BIOS active\n"));
 		if ((ctl & OHCI_HCFS_MASK) != OHCI_HCFS_OPERATIONAL) {
 			OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_OPERATIONAL | rwc);
 			usb_delay_ms(&sc->sc_bus, USB_RESUME_DELAY);
+		}
 #endif
 	} else {
 		DPRINTF(("ohci_init: cold started\n"));
 	reset:
 		/* Controller was cold started. */
 		usb_delay_ms(&sc->sc_bus, USB_BUS_RESET_DELAY);
+	}
 	/*
 	 * This reset should not be necessary according to the OHCI spec, but
 	 * without it some controllers do not start.
 	 */
 	DPRINTF(("%s: resetting\n", device_xname(sc->sc_dev)));
 	OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET | rwc);
 	usb_delay_ms(&sc->sc_bus, USB_BUS_RESET_DELAY);
 	/* We now own the host controller and the bus has been reset. */
 	OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_HCR); /* Reset HC */
 	/* Nominal time for a reset is 10 us. */
 	for (i = 0; i < 10; i++) {
 		delay(10);
 		hcr = OREAD4(sc, OHCI_COMMAND_STATUS) & OHCI_HCR;
 		if (!hcr)
 			break;
+	}
 	if (hcr) {
 		aprint_error_dev(sc->sc_dev, "reset timeout\n");
 		err = USBD_IOERROR;
 		goto bad5;
+	}
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 15)
 		ohci_dumpregs(sc);
 #endif
 	/* The controller is now in SUSPEND state, we have 2ms to finish. */
 	/* Set up HC registers. */
 	OWRITE4(sc, OHCI_HCCA, DMAADDR(&sc->sc_hccadma, 0));
 	OWRITE4(sc, OHCI_CONTROL_HEAD_ED, sc->sc_ctrl_head->physaddr);
 	OWRITE4(sc, OHCI_BULK_HEAD_ED, sc->sc_bulk_head->physaddr);
 	/* disable all interrupts and then switch on all desired interrupts */
 	OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS);
 	/* switch on desired functional features */
 	ctl = OREAD4(sc, OHCI_CONTROL);
 	ctl &= ~(OHCI_CBSR_MASK | OHCI_LES | OHCI_HCFS_MASK | OHCI_IR);
 	ctl |= OHCI_PLE | OHCI_IE | OHCI_CLE | OHCI_BLE |
 		OHCI_RATIO_1_4 | OHCI_HCFS_OPERATIONAL | rwc;
 	/* And finally start it! */
 	OWRITE4(sc, OHCI_CONTROL, ctl);
 	/*
 	 * The controller is now OPERATIONAL.  Set a some final
 	 * registers that should be set earlier, but that the
 	 * controller ignores when in the SUSPEND state.
 	 */
 	ival = OHCI_GET_IVAL(fm);
 	fm = (OREAD4(sc, OHCI_FM_INTERVAL) & OHCI_FIT) ^ OHCI_FIT;
 	fm |= OHCI_FSMPS(ival) | ival;
 	OWRITE4(sc, OHCI_FM_INTERVAL, fm);
 	per = OHCI_PERIODIC(ival); /* 90% periodic */
 	OWRITE4(sc, OHCI_PERIODIC_START, per);
 	/* Fiddle the No OverCurrent Protection bit to avoid chip bug. */
 	OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca | OHCI_NOCP);
 	OWRITE4(sc, OHCI_RH_STATUS, OHCI_LPSC); /* Enable port power */
 	usb_delay_ms(&sc->sc_bus, OHCI_ENABLE_POWER_DELAY);
 	OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca);
 	/*
 	 * The AMD756 requires a delay before re-reading the register,
 	 * otherwise it will occasionally report 0 ports.
 	 */
 	sc->sc_noport = 0;
 	for (i = 0; i < 10 && sc->sc_noport == 0; i++) {
 		usb_delay_ms(&sc->sc_bus, OHCI_READ_DESC_DELAY);
 		sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A));
+	}
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 5)
 		ohci_dumpregs(sc);
 #endif
 	/* Set up the bus struct. */
 	sc->sc_bus.methods = &ohci_bus_methods;
 	sc->sc_bus.pipe_size = sizeof(struct ohci_pipe);
 	sc->sc_control = sc->sc_intre = 0;
 	/* Finally, turn on interrupts. */
 	DPRINTFN(1,("ohci_init: enabling %#x\n", sc->sc_eintrs | OHCI_MIE));
 	OWRITE4(sc, OHCI_INTERRUPT_ENABLE, sc->sc_eintrs | OHCI_MIE);
 	return (USBD_NORMAL_COMPLETION);
  bad5:
 	for (i = 0; i < OHCI_NO_EDS; i++)
 		ohci_free_sed(sc, sc->sc_eds[i]);
  bad4:
 	ohci_free_sed(sc, sc->sc_isoc_head);
  bad3:
 	ohci_free_sed(sc, sc->sc_bulk_head);
  bad2:
 	ohci_free_sed(sc, sc->sc_ctrl_head);
  bad1:
 	usb_freemem(&sc->sc_bus, &sc->sc_hccadma);
 	sc->sc_hcca = NULL;
 	return (err);
+}
 usbd_status
 ohci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size)
+{
 	struct ohci_softc *sc = bus->hci_private;
 	usbd_status status;
 	status = usb_allocmem(&sc->sc_bus, size, 0, dma);
 	if (status == USBD_NOMEM)
 		status = usb_reserve_allocm(&sc->sc_dma_reserve, dma, size);
 	return status;
+}
 void
 ohci_freem(struct usbd_bus *bus, usb_dma_t *dma)
+{
 	struct ohci_softc *sc = bus->hci_private;
 	if (dma->block->flags & USB_DMA_RESERVE) {
 		usb_reserve_freem(&sc->sc_dma_reserve, dma);
 		return;
+	}
 	usb_freemem(&sc->sc_bus, dma);
+}
 usbd_xfer_handle
 ohci_allocx(struct usbd_bus *bus)
+{
 	struct ohci_softc *sc = bus->hci_private;
 	usbd_xfer_handle xfer;
 	xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 	if (xfer != NULL) {
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 #ifdef DIAGNOSTIC
 		if (xfer->busy_free != XFER_FREE) {
 			printf("ohci_allocx: xfer=%p not free, 0x%08x\n", xfer,
 			       xfer->busy_free);
+		}
 #endif
 	} else {
 		xfer = kmem_alloc(sizeof(struct ohci_xfer), KM_SLEEP);
+	}
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof (struct ohci_xfer));
 #ifdef DIAGNOSTIC
 		xfer->busy_free = XFER_BUSY;
 #endif
+	}
 	return (xfer);
+}
 void
 ohci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
+{
 	struct ohci_softc *sc = bus->hci_private;
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_BUSY) {
 		printf("ohci_freex: xfer=%p not busy, 0x%08x\n", xfer,
 		       xfer->busy_free);
+	}
 	xfer->busy_free = XFER_FREE;
 #endif
 	SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
+}
 Static void
 ohci_get_locks(struct usbd_bus *bus, kmutex_t **intr, kmutex_t **thread)
+{
 	struct ohci_softc *sc = bus->hci_private;
 	*intr = &sc->sc_intr_lock;
 	*thread = &sc->sc_lock;
+}
 /*
  * Shut down the controller when the system is going down.
  */
 bool
 ohci_shutdown(device_t self, int flags)
+{
 	ohci_softc_t *sc = device_private(self);
 	DPRINTF(("ohci_shutdown: stopping the HC\n"));
 	OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
 	return true;
+}
 bool
 ohci_resume(device_t dv, const pmf_qual_t *qual)
+{
 	ohci_softc_t *sc = device_private(dv);
 	uint32_t ctl;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_bus.use_polling++;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	/* Some broken BIOSes do not recover these values */
 	OWRITE4(sc, OHCI_HCCA, DMAADDR(&sc->sc_hccadma, 0));
 	OWRITE4(sc, OHCI_CONTROL_HEAD_ED,
 	    sc->sc_ctrl_head->physaddr);
 	OWRITE4(sc, OHCI_BULK_HEAD_ED,
 	    sc->sc_bulk_head->physaddr);
 	if (sc->sc_intre)
 		OWRITE4(sc, OHCI_INTERRUPT_ENABLE, sc->sc_intre &
 		    (OHCI_ALL_INTRS | OHCI_MIE));
 	if (sc->sc_control)
 		ctl = sc->sc_control;
 	else
 		ctl = OREAD4(sc, OHCI_CONTROL);
 	ctl |= OHCI_HCFS_RESUME;
 	OWRITE4(sc, OHCI_CONTROL, ctl);
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_DELAY);
 	ctl = (ctl & ~OHCI_HCFS_MASK) | OHCI_HCFS_OPERATIONAL;
 	OWRITE4(sc, OHCI_CONTROL, ctl);
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_RECOVERY);
 	sc->sc_control = sc->sc_intre = 0;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_bus.use_polling--;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return true;
+}
 bool
 ohci_suspend(device_t dv, const pmf_qual_t *qual)
+{
 	ohci_softc_t *sc = device_private(dv);
 	uint32_t ctl;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_bus.use_polling++;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	ctl = OREAD4(sc, OHCI_CONTROL) & ~OHCI_HCFS_MASK;
 	if (sc->sc_control == 0) {
 		/*
 		 * Preserve register values, in case that BIOS
 		 * does not recover them.
 		 */
 		sc->sc_control = ctl;
 		sc->sc_intre = OREAD4(sc,
 		    OHCI_INTERRUPT_ENABLE);
+	}
 	ctl |= OHCI_HCFS_SUSPEND;
 	OWRITE4(sc, OHCI_CONTROL, ctl);
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT);
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_bus.use_polling--;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return true;
+}
 #ifdef OHCI_DEBUG
 void
 ohci_dumpregs(ohci_softc_t *sc)
+{
 	DPRINTF(("ohci_dumpregs: rev=0x%08x control=0x%08x command=0x%08x\n",
 		 OREAD4(sc, OHCI_REVISION),
 		 OREAD4(sc, OHCI_CONTROL),
 		 OREAD4(sc, OHCI_COMMAND_STATUS)));
 	DPRINTF(("               intrstat=0x%08x intre=0x%08x intrd=0x%08x\n",
 		 OREAD4(sc, OHCI_INTERRUPT_STATUS),
 		 OREAD4(sc, OHCI_INTERRUPT_ENABLE),
 		 OREAD4(sc, OHCI_INTERRUPT_DISABLE)));
 	DPRINTF(("               hcca=0x%08x percur=0x%08x ctrlhd=0x%08x\n",
 		 OREAD4(sc, OHCI_HCCA),
 		 OREAD4(sc, OHCI_PERIOD_CURRENT_ED),
 		 OREAD4(sc, OHCI_CONTROL_HEAD_ED)));
 	DPRINTF(("               ctrlcur=0x%08x bulkhd=0x%08x bulkcur=0x%08x\n",
 		 OREAD4(sc, OHCI_CONTROL_CURRENT_ED),
 		 OREAD4(sc, OHCI_BULK_HEAD_ED),
 		 OREAD4(sc, OHCI_BULK_CURRENT_ED)));
 	DPRINTF(("               done=0x%08x fmival=0x%08x fmrem=0x%08x\n",
 		 OREAD4(sc, OHCI_DONE_HEAD),
 		 OREAD4(sc, OHCI_FM_INTERVAL),
 		 OREAD4(sc, OHCI_FM_REMAINING)));
 	DPRINTF(("               fmnum=0x%08x perst=0x%08x lsthrs=0x%08x\n",
 		 OREAD4(sc, OHCI_FM_NUMBER),
 		 OREAD4(sc, OHCI_PERIODIC_START),
 		 OREAD4(sc, OHCI_LS_THRESHOLD)));
 	DPRINTF(("               desca=0x%08x descb=0x%08x stat=0x%08x\n",
 		 OREAD4(sc, OHCI_RH_DESCRIPTOR_A),
 		 OREAD4(sc, OHCI_RH_DESCRIPTOR_B),
 		 OREAD4(sc, OHCI_RH_STATUS)));
 	DPRINTF(("               port1=0x%08x port2=0x%08x\n",
 		 OREAD4(sc, OHCI_RH_PORT_STATUS(1)),
 		 OREAD4(sc, OHCI_RH_PORT_STATUS(2))));
 	DPRINTF(("         HCCA: frame_number=0x%04x done_head=0x%08x\n",
 		 O32TOH(sc->sc_hcca->hcca_frame_number),
 		 O32TOH(sc->sc_hcca->hcca_done_head)));
+}
 #endif
 Static int ohci_intr1(ohci_softc_t *);
 int
 ohci_intr(void *p)
+{
 	ohci_softc_t *sc = p;
 	int ret = 0;
 	if (sc == NULL)
 		return (0);
 	mutex_spin_enter(&sc->sc_intr_lock);
 	if (sc->sc_dying || !device_has_power(sc->sc_dev))
 		goto done;
 	/* If we get an interrupt while polling, then just ignore it. */
 	if (sc->sc_bus.use_polling) {
 #ifdef DIAGNOSTIC
 		DPRINTFN(16, ("ohci_intr: ignored interrupt while polling\n"));
 #endif
 		/* for level triggered intrs, should do something to ack */
 		OWRITE4(sc, OHCI_INTERRUPT_STATUS,
 			OREAD4(sc, OHCI_INTERRUPT_STATUS));
 		goto done;
+	}
 	ret = ohci_intr1(sc);
 done:
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return ret;
+}
 Static int
 ohci_intr1(ohci_softc_t *sc)
+{
 	u_int32_t intrs, eintrs;
 	DPRINTFN(14,("ohci_intr1: enter\n"));
 	/* In case the interrupt occurs before initialization has completed. */
 	if (sc == NULL || sc->sc_hcca == NULL) {
 #ifdef DIAGNOSTIC
 		printf("ohci_intr: sc->sc_hcca == NULL\n");
 #endif
 		return (0);
+	}
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	intrs = OREAD4(sc, OHCI_INTERRUPT_STATUS);
 	if (!intrs)
 		return (0);
 	OWRITE4(sc, OHCI_INTERRUPT_STATUS, intrs & ~(OHCI_MIE|OHCI_WDH)); /* Acknowledge */
 	eintrs = intrs & sc->sc_eintrs;
 	DPRINTFN(7, ("ohci_intr: sc=%p intrs=%#x(%#x) eintrs=%#x(%#x)\n",
 		     sc, (u_int)intrs, OREAD4(sc, OHCI_INTERRUPT_STATUS),
 		     (u_int)eintrs, sc->sc_eintrs));
 	if (!eintrs) {
 		return (0);
+	}
 	sc->sc_bus.intr_context++;
 	sc->sc_bus.no_intrs++;
 	if (eintrs & OHCI_SO) {
 		sc->sc_overrun_cnt++;
 		if (usbd_ratecheck(&sc->sc_overrun_ntc)) {
 			printf("%s: %u scheduling overruns\n",
 			    device_xname(sc->sc_dev), sc->sc_overrun_cnt);
 			sc->sc_overrun_cnt = 0;
+		}
 		/* XXX do what */
 		eintrs &= ~OHCI_SO;
+	}
 	if (eintrs & OHCI_WDH) {
 		/*
 		 * We block the interrupt below, and reenable it later from
 		 * ohci_softintr().
 		 */
 		usb_schedsoftintr(&sc->sc_bus);
+	}
 	if (eintrs & OHCI_RD) {
 		printf("%s: resume detect\n", device_xname(sc->sc_dev));
 		/* XXX process resume detect */
+	}
 	if (eintrs & OHCI_UE) {
 		printf("%s: unrecoverable error, controller halted\n",
 		       device_xname(sc->sc_dev));
 		OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
 		/* XXX what else */
+	}
 	if (eintrs & OHCI_RHSC) {
 		/*
 		 * We block the interrupt below, and reenable it later from
 		 * a timeout.
 		 */
 		softint_schedule(sc->sc_rhsc_si);
+	}
 	sc->sc_bus.intr_context--;
 	if (eintrs != 0) {
 		/* Block unprocessed interrupts. */
 		OWRITE4(sc, OHCI_INTERRUPT_DISABLE, eintrs);
 		sc->sc_eintrs &= ~eintrs;
 		DPRINTFN(1, ("%s: blocking intrs 0x%x\n",
 		    device_xname(sc->sc_dev), eintrs));
+	}
 	return (1);
+}
 void
 ohci_rhsc_enable(void *v_sc)
+{
 	ohci_softc_t *sc = v_sc;
 	DPRINTFN(1, ("%s: %s\n", __func__, device_xname(sc->sc_dev)));
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_eintrs |= OHCI_RHSC;
 	OWRITE4(sc, OHCI_INTERRUPT_ENABLE, OHCI_RHSC);
 	mutex_spin_exit(&sc->sc_intr_lock);
+}
 #ifdef OHCI_DEBUG
 const char *ohci_cc_strs[] = {
 	"NO_ERROR",
 	"CRC",
 	"BIT_STUFFING",
 	"DATA_TOGGLE_MISMATCH",
 	"STALL",
 	"DEVICE_NOT_RESPONDING",
 	"PID_CHECK_FAILURE",
 	"UNEXPECTED_PID",
 	"DATA_OVERRUN",
 	"DATA_UNDERRUN",
 	"BUFFER_OVERRUN",
 	"BUFFER_UNDERRUN",
 	"reserved",
 	"reserved",
 	"NOT_ACCESSED",
 	"NOT_ACCESSED",
 };
 #endif
 void
 ohci_softintr(void *v)
+{
 	struct usbd_bus *bus = v;
 	ohci_softc_t *sc = bus->hci_private;
 	ohci_soft_itd_t *sitd, *sidone, *sitdnext;
 	ohci_soft_td_t  *std,  *sdone,  *stdnext;
 	usbd_xfer_handle xfer;
 	struct ohci_pipe *opipe;
 	int len, cc;
 	int i, j, actlen, iframes, uedir;
 	ohci_physaddr_t done;
 	DPRINTFN(10,("ohci_softintr: enter\n"));
 	mutex_enter(&sc->sc_lock);
 	sc->sc_bus.intr_context++;
 	usb_syncmem(&sc->sc_hccadma, offsetof(struct ohci_hcca, hcca_done_head),
 	    sizeof(sc->sc_hcca->hcca_done_head),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	done = O32TOH(sc->sc_hcca->hcca_done_head) & ~OHCI_DONE_INTRS;
 	sc->sc_hcca->hcca_done_head = 0;
 	usb_syncmem(&sc->sc_hccadma, offsetof(struct ohci_hcca, hcca_done_head),
 	    sizeof(sc->sc_hcca->hcca_done_head),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	OWRITE4(sc, OHCI_INTERRUPT_STATUS, OHCI_WDH);
 	sc->sc_eintrs |= OHCI_WDH;
 	OWRITE4(sc, OHCI_INTERRUPT_ENABLE, OHCI_WDH);
 	/* Reverse the done list. */
 	for (sdone = NULL, sidone = NULL; done != 0; ) {
 		std = ohci_hash_find_td(sc, done);
 		if (std != NULL) {
 			usb_syncmem(&std->dma, std->offs, sizeof(std->td),
 			    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 			std->dnext = sdone;
 			done = O32TOH(std->td.td_nexttd);
 			sdone = std;
 			DPRINTFN(10,("add TD %p\n", std));
 			continue;
+		}
 		sitd = ohci_hash_find_itd(sc, done);
 		if (sitd != NULL) {
 			usb_syncmem(&sitd->dma, sitd->offs, sizeof(sitd->itd),
 			    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 			sitd->dnext = sidone;
 			done = O32TOH(sitd->itd.itd_nextitd);
 			sidone = sitd;
 			DPRINTFN(5,("add ITD %p\n", sitd));
 			continue;
+		}
 		device_printf(sc->sc_dev, "WARNING: addr 0x%08lx not found\n",
 		    (u_long)done);
 		break;
+	}
 	DPRINTFN(10,("ohci_softintr: sdone=%p sidone=%p\n", sdone, sidone));
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 10) {
 		DPRINTF(("ohci_process_done: TD done:\n"));
 		ohci_dump_tds(sc, sdone);
+	}
 #endif
 	for (std = sdone; std; std = stdnext) {
 		xfer = std->xfer;
 		stdnext = std->dnext;
 		DPRINTFN(10, ("ohci_process_done: std=%p xfer=%p hcpriv=%p\n",
 				std, xfer, xfer ? xfer->hcpriv : 0));
 		if (xfer == NULL) {
 			/*
 			 * xfer == NULL: There seems to be no xfer associated
 			 * with this TD. It is tailp that happened to end up on
 			 * the done queue.
 			 * Shouldn't happen, but some chips are broken(?).
 			 */
 			continue;
+		}
 		if (xfer->status == USBD_CANCELLED ||
 		    xfer->status == USBD_TIMEOUT) {
 			DPRINTF(("ohci_process_done: cancel/timeout %p\n",
 				 xfer));
 			/* Handled by abort routine. */
 			continue;
+		}
 		callout_stop(&xfer->timeout_handle);
 		len = std->len;
 		if (std->td.td_cbp != 0)
 			len -= O32TOH(std->td.td_be) -
 			       O32TOH(std->td.td_cbp) + 1;
 		DPRINTFN(10, ("ohci_process_done: len=%d, flags=0x%x\n", len,
 		    std->flags));
 		if (std->flags & OHCI_ADD_LEN)
 			xfer->actlen += len;
 		cc = OHCI_TD_GET_CC(O32TOH(std->td.td_flags));
 		if (cc == OHCI_CC_NO_ERROR) {
 			if (std->flags & OHCI_CALL_DONE) {
 				xfer->status = USBD_NORMAL_COMPLETION;
 				usb_transfer_complete(xfer);
+			}
 			ohci_free_std(sc, std);
 		} else {
 			/*
 			 * Endpoint is halted.  First unlink all the TDs
 			 * belonging to the failed transfer, and then restart
 			 * the endpoint.
 			 */
 			ohci_soft_td_t *p, *n;
 			opipe = (struct ohci_pipe *)xfer->pipe;
 			DPRINTFN(15,("ohci_process_done: error cc=%d (%s)\n",
 			  OHCI_TD_GET_CC(O32TOH(std->td.td_flags)),
 			  ohci_cc_strs[OHCI_TD_GET_CC(O32TOH(std->td.td_flags))]));
 			/* remove TDs */
 			for (p = std; p->xfer == xfer; p = n) {
 				n = p->nexttd;
 				ohci_free_std(sc, p);
+			}
 			/* clear halt */
 			opipe->sed->ed.ed_headp = HTOO32(p->physaddr);
 			OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF);
 			if (cc == OHCI_CC_STALL)
 				xfer->status = USBD_STALLED;
 			else
 				xfer->status = USBD_IOERROR;
 			usb_transfer_complete(xfer);
+		}
+	}
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 10) {
 		DPRINTF(("ohci_softintr: ITD done:\n"));
 		ohci_dump_itds(sc, sidone);
+	}
 #endif
 	for (sitd = sidone; sitd != NULL; sitd = sitdnext) {
 		xfer = sitd->xfer;
 		sitdnext = sitd->dnext;
 		DPRINTFN(1, ("ohci_process_done: sitd=%p xfer=%p hcpriv=%p\n",
 			     sitd, xfer, xfer ? xfer->hcpriv : 0));
 		if (xfer == NULL)
 			continue;
 		if (xfer->status == USBD_CANCELLED ||
 		    xfer->status == USBD_TIMEOUT) {
 			DPRINTF(("ohci_process_done: cancel/timeout %p\n",
 				 xfer));
 			/* Handled by abort routine. */
 			continue;
+		}
 #ifdef DIAGNOSTIC
 		if (sitd->isdone)
 			printf("ohci_softintr: sitd=%p is done\n", sitd);
 		sitd->isdone = 1;
 #endif
 		if (sitd->flags & OHCI_CALL_DONE) {
 			ohci_soft_itd_t *next;
 			opipe = (struct ohci_pipe *)xfer->pipe;
 			opipe->u.iso.inuse -= xfer->nframes;
 			uedir = UE_GET_DIR(xfer->pipe->endpoint->edesc->
 			    bEndpointAddress);
 			xfer->status = USBD_NORMAL_COMPLETION;
 			actlen = 0;
 			for (i = 0, sitd = xfer->hcpriv;;
 			    sitd = next) {
 				next = sitd->nextitd;
 				if (OHCI_ITD_GET_CC(O32TOH(sitd->
 				    itd.itd_flags)) != OHCI_CC_NO_ERROR)
 					xfer->status = USBD_IOERROR;
 				/* For input, update frlengths with actual */
 				/* XXX anything necessary for output? */
 				if (uedir == UE_DIR_IN &&
 				    xfer->status == USBD_NORMAL_COMPLETION) {
 					iframes = OHCI_ITD_GET_FC(O32TOH(
 					    sitd->itd.itd_flags));
 					for (j = 0; j < iframes; i++, j++) {
 						len = O16TOH(sitd->
 						    itd.itd_offset[j]);
 						if ((OHCI_ITD_PSW_GET_CC(len) &
 						    OHCI_CC_NOT_ACCESSED_MASK)
 						    == OHCI_CC_NOT_ACCESSED)
 							len = 0;
 						else
 							len = OHCI_ITD_PSW_LENGTH(len);
 						xfer->frlengths[i] = len;
 						actlen += len;
+					}
+				}
 				if (sitd->flags & OHCI_CALL_DONE)
 					break;
 				ohci_free_sitd(sc, sitd);
+			}
 			ohci_free_sitd(sc, sitd);
 			if (uedir == UE_DIR_IN &&
 			    xfer->status == USBD_NORMAL_COMPLETION)
 				xfer->actlen = actlen;
 			xfer->hcpriv = NULL;
 			usb_transfer_complete(xfer);
+		}
+	}
 	if (sc->sc_softwake) {
 		sc->sc_softwake = 0;
 		cv_broadcast(&sc->sc_softwake_cv);
+	}
 	sc->sc_bus.intr_context--;
 	mutex_exit(&sc->sc_lock);
 	DPRINTFN(10,("ohci_softintr: done:\n"));
+}
 void
 ohci_device_ctrl_done(usbd_xfer_handle xfer)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
 #ifdef DIAGNOSTIC
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 #endif
 	int len = UGETW(xfer->request.wLength);
 	int isread = (xfer->request.bmRequestType & UT_READ);
 	DPRINTFN(10,("ohci_device_ctrl_done: xfer=%p\n", xfer));
 	KASSERT(mutex_owned(&sc->sc_lock));
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST)) {
 		panic("ohci_device_ctrl_done: not a request");
+	}
 #endif
 	if (len)
 		usb_syncmem(&xfer->dmabuf, 0, len,
 		    isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
 	 usb_syncmem(&opipe->u.ctl.reqdma, 0,
 	     sizeof(usb_device_request_t),  BUS_DMASYNC_POSTWRITE);
+}
 void
 ohci_device_intr_done(usbd_xfer_handle xfer)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
 	ohci_softc_t *sc = opipe->pipe.device->bus->hci_private;
 	ohci_soft_ed_t *sed = opipe->sed;
 	ohci_soft_td_t *data, *tail;
 	int isread =
 	    (UE_GET_DIR(xfer->pipe->endpoint->edesc->bEndpointAddress) == UE_DIR_IN);
 	DPRINTFN(10,("ohci_device_intr_done: xfer=%p, actlen=%d\n",
 		     xfer, xfer->actlen));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	usb_syncmem(&xfer->dmabuf, 0, xfer->length,
 	    isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
 	if (xfer->pipe->repeat) {
 		data = opipe->tail.td;
 		tail = ohci_alloc_std(sc); /* XXX should reuse TD */
 		if (tail == NULL) {
 			xfer->status = USBD_NOMEM;
 			return;
+		}
 		tail->xfer = NULL;
 		data->td.td_flags = HTOO32(
 			OHCI_TD_IN | OHCI_TD_NOCC |
 			OHCI_TD_SET_DI(1) | OHCI_TD_TOGGLE_CARRY);
 		if (xfer->flags & USBD_SHORT_XFER_OK)
 			data->td.td_flags |= HTOO32(OHCI_TD_R);
 		data->td.td_cbp = HTOO32(DMAADDR(&xfer->dmabuf, 0));
 		data->nexttd = tail;
 		data->td.td_nexttd = HTOO32(tail->physaddr);
 		data->td.td_be = HTOO32(O32TOH(data->td.td_cbp) +
 			xfer->length - 1);
 		data->len = xfer->length;
 		data->xfer = xfer;
 		data->flags = OHCI_CALL_DONE | OHCI_ADD_LEN;
 		usb_syncmem(&data->dma, data->offs, sizeof(data->td),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		xfer->hcpriv = data;
 		xfer->actlen = 0;
 		sed->ed.ed_tailp = HTOO32(tail->physaddr);
 		usb_syncmem(&sed->dma,
 		    sed->offs + offsetof(ohci_ed_t, ed_tailp),
 		    sizeof(sed->ed.ed_tailp),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		opipe->tail.td = tail;
+	}
+}
 void
 ohci_device_bulk_done(usbd_xfer_handle xfer)
+{
 #ifdef DIAGNOSTIC
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 #endif
 	int isread =
 	    (UE_GET_DIR(xfer->pipe->endpoint->edesc->bEndpointAddress) == UE_DIR_IN);
 	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10,("ohci_device_bulk_done: xfer=%p, actlen=%d\n",
 		     xfer, xfer->actlen));
 	usb_syncmem(&xfer->dmabuf, 0, xfer->length,
 	    isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
+}
 Static void
 ohci_rhsc_softint(void *arg)
+{
 	ohci_softc_t *sc = arg;
 	mutex_enter(&sc->sc_lock);
 	ohci_rhsc(sc, sc->sc_intrxfer);
 	/* Do not allow RHSC interrupts > 1 per second */
 	callout_reset(&sc->sc_tmo_rhsc, hz, ohci_rhsc_enable, sc);
 	mutex_exit(&sc->sc_lock);
+}
 void
 ohci_rhsc(ohci_softc_t *sc, usbd_xfer_handle xfer)
+{
 	usbd_pipe_handle pipe;
 	u_char *p;
 	int i, m;
 	int hstatus;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	hstatus = OREAD4(sc, OHCI_RH_STATUS);
 	DPRINTF(("ohci_rhsc: sc=%p xfer=%p hstatus=0x%08x\n",
 		 sc, xfer, hstatus));
 	if (xfer == NULL) {
 		/* Just ignore the change. */
 		return;
+	}
 	pipe = xfer->pipe;
 	p = KERNADDR(&xfer->dmabuf, 0);
 	m = min(sc->sc_noport, xfer->length * 8 - 1);
 	memset(p, 0, xfer->length);
 	for (i = 1; i <= m; i++) {
 		/* Pick out CHANGE bits from the status reg. */
 		if (OREAD4(sc, OHCI_RH_PORT_STATUS(i)) >> 16)
 			p[i/8] |= 1 << (i%8);
+	}
 	DPRINTF(("ohci_rhsc: change=0x%02x\n", *p));
 	xfer->actlen = xfer->length;
 	xfer->status = USBD_NORMAL_COMPLETION;
 	usb_transfer_complete(xfer);
+}
 void
 ohci_root_intr_done(usbd_xfer_handle xfer)
+{
+}
 void
 ohci_root_ctrl_done(usbd_xfer_handle xfer)
+{
+}
 /*
  * Wait here until controller claims to have an interrupt.
  * Then call ohci_intr and return.  Use timeout to avoid waiting
  * too long.
  */
 void
 ohci_waitintr(ohci_softc_t *sc, usbd_xfer_handle xfer)
+{
 	int timo;
 	u_int32_t intrs;
 	mutex_enter(&sc->sc_lock);
 	xfer->status = USBD_IN_PROGRESS;
 	for (timo = xfer->timeout; timo >= 0; timo--) {
 		usb_delay_ms(&sc->sc_bus, 1);
 		if (sc->sc_dying)
 			break;
 		intrs = OREAD4(sc, OHCI_INTERRUPT_STATUS) & sc->sc_eintrs;
 		DPRINTFN(15,("ohci_waitintr: 0x%04x\n", intrs));
 #ifdef OHCI_DEBUG
 		if (ohcidebug > 15)
 			ohci_dumpregs(sc);
 #endif
 		if (intrs) {
 			mutex_spin_enter(&sc->sc_intr_lock);
 			ohci_intr1(sc);
 			mutex_spin_exit(&sc->sc_intr_lock);
 			if (xfer->status != USBD_IN_PROGRESS)
 				return;
+		}
+	}
 	/* Timeout */
 	DPRINTF(("ohci_waitintr: timeout\n"));
 	xfer->status = USBD_TIMEOUT;
 	usb_transfer_complete(xfer);
 	/* XXX should free TD */
 	mutex_exit(&sc->sc_lock);
+}
 void
 ohci_poll(struct usbd_bus *bus)
+{
 	ohci_softc_t *sc = bus->hci_private;
 #ifdef OHCI_DEBUG
 	static int last;
 	int new;
 	new = OREAD4(sc, OHCI_INTERRUPT_STATUS);
 	if (new != last) {
 		DPRINTFN(10,("ohci_poll: intrs=0x%04x\n", new));
 		last = new;
+	}
 #endif
 	sc->sc_eintrs |= OHCI_WDH;
 	if (OREAD4(sc, OHCI_INTERRUPT_STATUS) & sc->sc_eintrs) {
 		mutex_spin_enter(&sc->sc_intr_lock);
 		ohci_intr1(sc);
 		mutex_spin_exit(&sc->sc_intr_lock);
+	}
+}
 usbd_status
 ohci_device_request(usbd_xfer_handle xfer)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
 	usb_device_request_t *req = &xfer->request;
 	usbd_device_handle dev = opipe->pipe.device;
 	ohci_softc_t *sc = dev->bus->hci_private;
 	int addr = dev->address;
 	ohci_soft_td_t *setup, *stat, *next, *tail;
 	ohci_soft_ed_t *sed;
 	int isread;
 	int len;
 	usbd_status err;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	isread = req->bmRequestType & UT_READ;
 	len = UGETW(req->wLength);
 	DPRINTFN(3,("ohci_device_control type=0x%02x, request=0x%02x, "
 		    "wValue=0x%04x, wIndex=0x%04x len=%d, addr=%d, endpt=%d\n",
 		    req->bmRequestType, req->bRequest, UGETW(req->wValue),
 		    UGETW(req->wIndex), len, addr,
 		    opipe->pipe.endpoint->edesc->bEndpointAddress));
 	setup = opipe->tail.td;
 	stat = ohci_alloc_std(sc);
 	if (stat == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	tail = ohci_alloc_std(sc);
 	if (tail == NULL) {
 		err = USBD_NOMEM;
 		goto bad2;
+	}
 	tail->xfer = NULL;
 	sed = opipe->sed;
 	opipe->u.ctl.length = len;
 	/* Update device address and length since they may have changed
 	   during the setup of the control pipe in usbd_new_device(). */
 	/* XXX This only needs to be done once, but it's too early in open. */
 	/* XXXX Should not touch ED here! */
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_flags = HTOO32(
 	 (O32TOH(sed->ed.ed_flags) & ~(OHCI_ED_ADDRMASK | OHCI_ED_MAXPMASK)) |
 	 OHCI_ED_SET_FA(addr) |
 	 OHCI_ED_SET_MAXP(UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize)));
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	next = stat;
 	/* Set up data transaction */
 	if (len != 0) {
 		ohci_soft_td_t *std = stat;
 		err = ohci_alloc_std_chain(opipe, sc, len, isread, xfer,
 			  std, &stat);
 		stat = stat->nexttd; /* point at free TD */
 		if (err)
 			goto bad3;
 		/* Start toggle at 1 and then use the carried toggle. */
 		std->td.td_flags &= HTOO32(~OHCI_TD_TOGGLE_MASK);
 		std->td.td_flags |= HTOO32(OHCI_TD_TOGGLE_1);
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(ohci_td_t, td_flags),
 		    sizeof(std->td.td_flags),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	memcpy(KERNADDR(&opipe->u.ctl.reqdma, 0), req, sizeof *req);
 	usb_syncmem(&opipe->u.ctl.reqdma, 0, sizeof *req, BUS_DMASYNC_PREWRITE);
 	setup->td.td_flags = HTOO32(OHCI_TD_SETUP | OHCI_TD_NOCC |
 				     OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR);
 	setup->td.td_cbp = HTOO32(DMAADDR(&opipe->u.ctl.reqdma, 0));
 	setup->nexttd = next;
 	setup->td.td_nexttd = HTOO32(next->physaddr);
 	setup->td.td_be = HTOO32(O32TOH(setup->td.td_cbp) + sizeof *req - 1);
 	setup->len = 0;
 	setup->xfer = xfer;
 	setup->flags = 0;
 	xfer->hcpriv = setup;
 	usb_syncmem(&setup->dma, setup->offs, sizeof(setup->td),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	stat->td.td_flags = HTOO32(
 		(isread ? OHCI_TD_OUT : OHCI_TD_IN) |
 		OHCI_TD_NOCC | OHCI_TD_TOGGLE_1 | OHCI_TD_SET_DI(1));
 	stat->td.td_cbp = 0;
 	stat->nexttd = tail;
 	stat->td.td_nexttd = HTOO32(tail->physaddr);
 	stat->td.td_be = 0;
 	stat->flags = OHCI_CALL_DONE;
 	stat->len = 0;
 	stat->xfer = xfer;
 	usb_syncmem(&stat->dma, stat->offs, sizeof(stat->td),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 5) {
 		DPRINTF(("ohci_device_request:\n"));
 		ohci_dump_ed(sc, sed);
 		ohci_dump_tds(sc, setup);
+	}
 #endif
 	/* Insert ED in schedule */
 	sed->ed.ed_tailp = HTOO32(tail->physaddr);
 	usb_syncmem(&sed->dma,
 	    sed->offs + offsetof(ohci_ed_t, ed_tailp),
 	    sizeof(sed->ed.ed_tailp),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	opipe->tail.td = tail;
 	OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF);
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&xfer->timeout_handle, mstohz(xfer->timeout),
 			    ohci_timeout, xfer);
+	}
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 20) {
 		delay(10000);
 		DPRINTF(("ohci_device_request: status=%x\n",
 			 OREAD4(sc, OHCI_COMMAND_STATUS)));
 		ohci_dumpregs(sc);
 		printf("ctrl head:\n");
 		ohci_dump_ed(sc, sc->sc_ctrl_head);
 		printf("sed:\n");
 		ohci_dump_ed(sc, sed);
 		ohci_dump_tds(sc, setup);
+	}
 #endif
 	return (USBD_NORMAL_COMPLETION);
  bad3:
 	ohci_free_std(sc, tail);
  bad2:
 	ohci_free_std(sc, stat);
  bad1:
 	return (err);
+}
 /*
  * Add an ED to the schedule.  Called at splusb().
  */
-void
+Static void
 ohci_add_ed(ohci_softc_t *sc, ohci_soft_ed_t *sed, ohci_soft_ed_t *head)
+{
 	DPRINTFN(8,("ohci_add_ed: sed=%p head=%p\n", sed, head));
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	usb_syncmem(&head->dma, head->offs + offsetof(ohci_ed_t, ed_nexted),
 	    sizeof(head->ed.ed_nexted),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->next = head->next;
 	sed->ed.ed_nexted = head->ed.ed_nexted;
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_nexted),
 	    sizeof(sed->ed.ed_nexted),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	head->next = sed;
 	head->ed.ed_nexted = HTOO32(sed->physaddr);
 	usb_syncmem(&head->dma, head->offs + offsetof(ohci_ed_t, ed_nexted),
 	    sizeof(head->ed.ed_nexted),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+}
 /*
  * Remove an ED from the schedule.  Called at splusb().
  */
-void
+Static void
-ohci_rem_ed(ohci_soft_ed_t *sed, ohci_soft_ed_t *head)
+ohci_rem_ed(ohci_softc_t *sc, ohci_soft_ed_t *sed, ohci_soft_ed_t *head)
+{
 	ohci_soft_ed_t *p;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	/* XXX */
 	for (p = head; p != NULL && p->next != sed; p = p->next)
+		;
 	if (p == NULL)
 		panic("ohci_rem_ed: ED not found");
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_nexted),
 	    sizeof(sed->ed.ed_nexted),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	p->next = sed->next;
 	p->ed.ed_nexted = sed->ed.ed_nexted;
 	usb_syncmem(&p->dma, p->offs + offsetof(ohci_ed_t, ed_nexted),
 	    sizeof(p->ed.ed_nexted),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+}
 /*
  * When a transfer is completed the TD is added to the done queue by
  * the host controller.  This queue is the processed by software.
  * Unfortunately the queue contains the physical address of the TD
  * and we have no simple way to translate this back to a kernel address.
  * To make the translation possible (and fast) we use a hash table of
  * TDs currently in the schedule.  The physical address is used as the
  * hash value.
  */
 #define HASH(a) (((a) >> 4) % OHCI_HASH_SIZE)
 /* Called at splusb() */
 void
 ohci_hash_add_td(ohci_softc_t *sc, ohci_soft_td_t *std)
+{
 	int h = HASH(std->physaddr);
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	LIST_INSERT_HEAD(&sc->sc_hash_tds[h], std, hnext);
+}
 /* Called at splusb() */
 void
 ohci_hash_rem_td(ohci_softc_t *sc, ohci_soft_td_t *std)
+{
 	SPLUSBCHECK;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	LIST_REMOVE(std, hnext);
+}
 ohci_soft_td_t *
 ohci_hash_find_td(ohci_softc_t *sc, ohci_physaddr_t a)
+{
 	int h = HASH(a);
 	ohci_soft_td_t *std;
 	for (std = LIST_FIRST(&sc->sc_hash_tds[h]);
 	     std != NULL;
 	     std = LIST_NEXT(std, hnext))
 		if (std->physaddr == a)
 			return (std);
 	return (NULL);
+}
 /* Called at splusb() */
 void
 ohci_hash_add_itd(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
+{
 	int h = HASH(sitd->physaddr);
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10,("ohci_hash_add_itd: sitd=%p physaddr=0x%08lx\n",
 		    sitd, (u_long)sitd->physaddr));
 	LIST_INSERT_HEAD(&sc->sc_hash_itds[h], sitd, hnext);
+}
 /* Called at splusb() */
 void
 ohci_hash_rem_itd(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
+{
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10,("ohci_hash_rem_itd: sitd=%p physaddr=0x%08lx\n",
 		    sitd, (u_long)sitd->physaddr));
 	LIST_REMOVE(sitd, hnext);
+}
 ohci_soft_itd_t *
 ohci_hash_find_itd(ohci_softc_t *sc, ohci_physaddr_t a)
+{
 	int h = HASH(a);
 	ohci_soft_itd_t *sitd;
 	for (sitd = LIST_FIRST(&sc->sc_hash_itds[h]);
 	     sitd != NULL;
 	     sitd = LIST_NEXT(sitd, hnext))
 		if (sitd->physaddr == a)
 			return (sitd);
 	return (NULL);
+}
 void
 ohci_timeout(void *addr)
+{
 	struct ohci_xfer *oxfer = addr;
 	struct ohci_pipe *opipe = (struct ohci_pipe *)oxfer->xfer.pipe;
 	ohci_softc_t *sc = opipe->pipe.device->bus->hci_private;
 	DPRINTF(("ohci_timeout: oxfer=%p\n", oxfer));
 	if (sc->sc_dying) {
 		ohci_abort_xfer(&oxfer->xfer, USBD_TIMEOUT);
 		return;
+	}
 	/* Execute the abort in a process context. */
 	usb_init_task(&oxfer->abort_task, ohci_timeout_task, addr);
 	usb_add_task(oxfer->xfer.pipe->device, &oxfer->abort_task,
 	    USB_TASKQ_HC);
+}
 void
 ohci_timeout_task(void *addr)
+{
 	usbd_xfer_handle xfer = addr;
 	DPRINTF(("ohci_timeout_task: xfer=%p\n", xfer));
 	ohci_abort_xfer(xfer, USBD_TIMEOUT);
+}
 #ifdef OHCI_DEBUG
 void
 ohci_dump_tds(ohci_softc_t *sc, ohci_soft_td_t *std)
+{
 	for (; std; std = std->nexttd)
 		ohci_dump_td(sc, std);
+}
 void
 ohci_dump_td(ohci_softc_t *sc, ohci_soft_td_t *std)
+{
 	char sbuf[128];
 	usb_syncmem(&std->dma, std->offs, sizeof(std->td),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	snprintb(sbuf, sizeof(sbuf),
 	    "\20\23R\24OUT\25IN\31TOG1\32SETTOGGLE",
 	    (u_int32_t)O32TOH(std->td.td_flags));
 	printf("TD(%p) at %08lx: %s delay=%d ec=%d cc=%d\ncbp=0x%08lx "
 	       "nexttd=0x%08lx be=0x%08lx\n",
 	       std, (u_long)std->physaddr, sbuf,
 	       OHCI_TD_GET_DI(O32TOH(std->td.td_flags)),
 	       OHCI_TD_GET_EC(O32TOH(std->td.td_flags)),
 	       OHCI_TD_GET_CC(O32TOH(std->td.td_flags)),
 	       (u_long)O32TOH(std->td.td_cbp),
 	       (u_long)O32TOH(std->td.td_nexttd),
 	       (u_long)O32TOH(std->td.td_be));
+}
 void
 ohci_dump_itd(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
+{
 	int i;
 	usb_syncmem(&sitd->dma, sitd->offs, sizeof(sitd->itd),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	printf("ITD(%p) at %08lx: sf=%d di=%d fc=%d cc=%d\n"
 	       "bp0=0x%08lx next=0x%08lx be=0x%08lx\n",
 	       sitd, (u_long)sitd->physaddr,
 	       OHCI_ITD_GET_SF(O32TOH(sitd->itd.itd_flags)),
 	       OHCI_ITD_GET_DI(O32TOH(sitd->itd.itd_flags)),
 	       OHCI_ITD_GET_FC(O32TOH(sitd->itd.itd_flags)),
 	       OHCI_ITD_GET_CC(O32TOH(sitd->itd.itd_flags)),
 	       (u_long)O32TOH(sitd->itd.itd_bp0),
 	       (u_long)O32TOH(sitd->itd.itd_nextitd),
 	       (u_long)O32TOH(sitd->itd.itd_be));
 	for (i = 0; i < OHCI_ITD_NOFFSET; i++)
 		printf("offs[%d]=0x%04x ", i,
 		       (u_int)O16TOH(sitd->itd.itd_offset[i]));
 	printf("\n");
+}
 void
 ohci_dump_itds(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
+{
 	for (; sitd; sitd = sitd->nextitd)
 		ohci_dump_itd(sc, sitd);
+}
 void
 ohci_dump_ed(ohci_softc_t *sc, ohci_soft_ed_t *sed)
+{
 	char sbuf[128], sbuf2[128];
 	usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	snprintb(sbuf, sizeof(sbuf),
 	    "\20\14OUT\15IN\16LOWSPEED\17SKIP\20ISO",
 	    (u_int32_t)O32TOH(sed->ed.ed_flags));
 	snprintb(sbuf2, sizeof(sbuf2), "\20\1HALT\2CARRY",
 	    (u_int32_t)O32TOH(sed->ed.ed_headp));
 	printf("ED(%p) at 0x%08lx: addr=%d endpt=%d maxp=%d flags=%s\ntailp=0x%08lx "
 		 "headflags=%s headp=0x%08lx nexted=0x%08lx\n",
 		 sed, (u_long)sed->physaddr,
 		 OHCI_ED_GET_FA(O32TOH(sed->ed.ed_flags)),
 		 OHCI_ED_GET_EN(O32TOH(sed->ed.ed_flags)),
 		 OHCI_ED_GET_MAXP(O32TOH(sed->ed.ed_flags)), sbuf,
 		 (u_long)O32TOH(sed->ed.ed_tailp), sbuf2,
 		 (u_long)O32TOH(sed->ed.ed_headp),
 		 (u_long)O32TOH(sed->ed.ed_nexted));
+}
 #endif
 usbd_status
 ohci_open(usbd_pipe_handle pipe)
+{
 	usbd_device_handle dev = pipe->device;
 	ohci_softc_t *sc = dev->bus->hci_private;
 	usb_endpoint_descriptor_t *ed = pipe->endpoint->edesc;
 	struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
 	u_int8_t addr = dev->address;
 	u_int8_t xfertype = ed->bmAttributes & UE_XFERTYPE;
 	ohci_soft_ed_t *sed;
 	ohci_soft_td_t *std;
 	ohci_soft_itd_t *sitd;
 	ohci_physaddr_t tdphys;
 	u_int32_t fmt;
 	usbd_status err = USBD_NOMEM;
 	int ival;
 	DPRINTFN(1, ("ohci_open: pipe=%p, addr=%d, endpt=%d (%d)\n",
 		     pipe, addr, ed->bEndpointAddress, sc->sc_addr));
 	if (sc->sc_dying) {
 		err = USBD_IOERROR;
 		goto bad0;
+	}
 	std = NULL;
 	sed = NULL;
 	if (addr == sc->sc_addr) {
 		switch (ed->bEndpointAddress) {
 		case USB_CONTROL_ENDPOINT:
 			pipe->methods = &ohci_root_ctrl_methods;
 			break;
 		case UE_DIR_IN | OHCI_INTR_ENDPT:
 			pipe->methods = &ohci_root_intr_methods;
 			break;
 		default:
 			err = USBD_INVAL;
 			goto bad0;
+		}
 	} else {
 		sed = ohci_alloc_sed(sc);
 		if (sed == NULL)
 			goto bad0;
 		opipe->sed = sed;
 		if (xfertype == UE_ISOCHRONOUS) {
 			sitd = ohci_alloc_sitd(sc);
 			if (sitd == NULL)
 				goto bad1;
 			opipe->tail.itd = sitd;
 			tdphys = sitd->physaddr;
 			fmt = OHCI_ED_FORMAT_ISO;
 			if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN)
 				fmt |= OHCI_ED_DIR_IN;
 			else
 				fmt |= OHCI_ED_DIR_OUT;
 		} else {
 			std = ohci_alloc_std(sc);
 			if (std == NULL)
 				goto bad1;
 			opipe->tail.td = std;
 			tdphys = std->physaddr;
 			fmt = OHCI_ED_FORMAT_GEN | OHCI_ED_DIR_TD;
+		}
 		sed->ed.ed_flags = HTOO32(
 			OHCI_ED_SET_FA(addr) |
 			OHCI_ED_SET_EN(UE_GET_ADDR(ed->bEndpointAddress)) |
 			(dev->speed == USB_SPEED_LOW ? OHCI_ED_SPEED : 0) |
 			fmt |
 			OHCI_ED_SET_MAXP(UGETW(ed->wMaxPacketSize)));
 		sed->ed.ed_headp = HTOO32(tdphys |
 		    (pipe->endpoint->datatoggle ? OHCI_TOGGLECARRY : 0));
 		sed->ed.ed_tailp = HTOO32(tdphys);
 		usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		switch (xfertype) {
 		case UE_CONTROL:
 			pipe->methods = &ohci_device_ctrl_methods;
 			err = usb_allocmem(&sc->sc_bus,
 				  sizeof(usb_device_request_t),
 , &opipe->u.ctl.reqdma);
 			if (err)
 				goto bad;
 			mutex_enter(&sc->sc_lock);
 			ohci_add_ed(sc, sed, sc->sc_ctrl_head);
 			mutex_exit(&sc->sc_lock);
 			break;
 		case UE_INTERRUPT:
 			pipe->methods = &ohci_device_intr_methods;
 			ival = pipe->interval;
 			if (ival == USBD_DEFAULT_INTERVAL)
 				ival = ed->bInterval;
 			return (ohci_device_setintr(sc, opipe, ival));
 		case UE_ISOCHRONOUS:
 			pipe->methods = &ohci_device_isoc_methods;
 			return (ohci_setup_isoc(pipe));
 		case UE_BULK:
 			pipe->methods = &ohci_device_bulk_methods;
 			mutex_enter(&sc->sc_lock);
 			ohci_add_ed(sc, sed, sc->sc_bulk_head);
 			mutex_exit(&sc->sc_lock);
 			break;
+		}
+	}
 	return USBD_NORMAL_COMPLETION;
  bad:
 	if (std != NULL)
 		ohci_free_std(sc, std);
  bad1:
 	if (sed != NULL)
 		ohci_free_sed(sc, sed);
  bad0:
 	return err;
+}
 /*
  * Close a reqular pipe.
  * Assumes that there are no pending transactions.
  */
 void
 ohci_close_pipe(usbd_pipe_handle pipe, ohci_soft_ed_t *head)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
 	ohci_softc_t *sc = pipe->device->bus->hci_private;
 	ohci_soft_ed_t *sed = opipe->sed;
 	KASSERT(mutex_owned(&sc->sc_lock));
 #ifdef DIAGNOSTIC
 	sed->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
 	if ((O32TOH(sed->ed.ed_tailp) & OHCI_HEADMASK) !=
 	    (O32TOH(sed->ed.ed_headp) & OHCI_HEADMASK)) {
 		ohci_soft_td_t *std;
 		std = ohci_hash_find_td(sc, O32TOH(sed->ed.ed_headp));
 		printf("ohci_close_pipe: pipe not empty sed=%p hd=0x%x "
 		       "tl=0x%x pipe=%p, std=%p\n", sed,
 		       (int)O32TOH(sed->ed.ed_headp),
 		       (int)O32TOH(sed->ed.ed_tailp),
 		       pipe, std);
 #ifdef USB_DEBUG
 		usbd_dump_pipe(&opipe->pipe);
 #endif
 #ifdef OHCI_DEBUG
 		ohci_dump_ed(sc, sed);
 		if (std)
 			ohci_dump_td(sc, std);
 #endif
 		usb_delay_ms(&sc->sc_bus, 2);
 		if ((O32TOH(sed->ed.ed_tailp) & OHCI_HEADMASK) !=
 		    (O32TOH(sed->ed.ed_headp) & OHCI_HEADMASK))
 			printf("ohci_close_pipe: pipe still not empty\n");
+	}
 #endif
-	ohci_rem_ed(sed, head);
+	ohci_rem_ed(sc, sed, head);
 	/* Make sure the host controller is not touching this ED */
 	usb_delay_ms(&sc->sc_bus, 1);
 	pipe->endpoint->datatoggle =
 	    (O32TOH(sed->ed.ed_headp) & OHCI_TOGGLECARRY) ? 1 : 0;
 	ohci_free_sed(sc, opipe->sed);
+}
 /*
  * Abort a device request.
  * If this routine is called at splusb() it guarantees that the request
  * will be removed from the hardware scheduling and that the callback
  * for it will be called with USBD_CANCELLED status.
  * It's impossible to guarantee that the requested transfer will not
  * have happened since the hardware runs concurrently.
  * If the transaction has already happened we rely on the ordinary
  * interrupt processing to process it.
  */
 void
 ohci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
 	ohci_softc_t *sc = opipe->pipe.device->bus->hci_private;
 	ohci_soft_ed_t *sed = opipe->sed;
 	ohci_soft_td_t *p, *n;
 	ohci_physaddr_t headp;
 	int hit;
 	int wake;
 	DPRINTF(("ohci_abort_xfer: xfer=%p pipe=%p sed=%p\n", xfer, opipe,sed));
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
 		mutex_enter(&sc->sc_lock);
 		xfer->status = status;	/* make software ignore it */
 		callout_halt(&xfer->timeout_handle, &sc->sc_lock);
 		usb_transfer_complete(xfer);
 		mutex_exit(&sc->sc_lock);
 		return;
+	}
 	if (xfer->device->bus->intr_context || !curproc)
 		panic("ohci_abort_xfer: not in process context");
 	mutex_enter(&sc->sc_lock);
 	/*
 	 * If an abort is already in progress then just wait for it to
 	 * complete and return.
 	 */
 	if (xfer->hcflags & UXFER_ABORTING) {
 		DPRINTFN(2, ("ohci_abort_xfer: already aborting\n"));
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("0hci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		/* Override the status which might be USBD_TIMEOUT. */
 		xfer->status = status;
 		DPRINTFN(2, ("ohci_abort_xfer: waiting for abort to finish\n"));
 		xfer->hcflags |= UXFER_ABORTWAIT;
 		while (xfer->hcflags & UXFER_ABORTING)
 			cv_wait(&xfer->hccv, &sc->sc_lock);
 		goto done;
 		return;
+	}
 	xfer->hcflags |= UXFER_ABORTING;
 	/*
 	 * Step 1: Make interrupt routine and hardware ignore xfer.
 	 */
 	xfer->status = status;	/* make software ignore it */
 	callout_stop(&xfer->timeout_handle);
 	DPRINTFN(1,("ohci_abort_xfer: stop ed=%p\n", sed));
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_flags |= HTOO32(OHCI_ED_SKIP); /* force hardware skip */
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/*
 	 * Step 2: Wait until we know hardware has finished any possible
 	 * use of the xfer.  Also make sure the soft interrupt routine
 	 * has run.
 	 */
 	usb_delay_ms(opipe->pipe.device->bus, 20); /* Hardware finishes in 1ms */
 	sc->sc_softwake = 1;
 	usb_schedsoftintr(&sc->sc_bus);
 	cv_wait(&sc->sc_softwake_cv, &sc->sc_lock);
 	/*
 	 * Step 3: Remove any vestiges of the xfer from the hardware.
 	 * The complication here is that the hardware may have executed
 	 * beyond the xfer we're trying to abort.  So as we're scanning
 	 * the TDs of this xfer we check if the hardware points to
 	 * any of them.
 	 */
 	p = xfer->hcpriv;
 #ifdef DIAGNOSTIC
 	if (p == NULL) {
 		xfer->hcflags &= ~UXFER_ABORTING; /* XXX */
 		printf("ohci_abort_xfer: hcpriv is NULL\n");
 		goto done;
+	}
 #endif
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 1) {
 		DPRINTF(("ohci_abort_xfer: sed=\n"));
 		ohci_dump_ed(sc, sed);
 		ohci_dump_tds(sc, p);
+	}
 #endif
 	headp = O32TOH(sed->ed.ed_headp) & OHCI_HEADMASK;
 	hit = 0;
 	for (; p->xfer == xfer; p = n) {
 		hit |= headp == p->physaddr;
 		n = p->nexttd;
 		ohci_free_std(sc, p);
+	}
 	/* Zap headp register if hardware pointed inside the xfer. */
 	if (hit) {
 		DPRINTFN(1,("ohci_abort_xfer: set hd=0x%08x, tl=0x%08x\n",
 			    (int)p->physaddr, (int)O32TOH(sed->ed.ed_tailp)));
 		sed->ed.ed_headp = HTOO32(p->physaddr); /* unlink TDs */
 		usb_syncmem(&sed->dma,
 		    sed->offs + offsetof(ohci_ed_t, ed_headp),
 		    sizeof(sed->ed.ed_headp),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	} else {
 		DPRINTFN(1,("ohci_abort_xfer: no hit\n"));
+	}
 	/*
 	 * Step 4: Turn on hardware again.
 	 */
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_flags &= HTOO32(~OHCI_ED_SKIP); /* remove hardware skip */
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/*
 	 * Step 5: Execute callback.
 	 */
 	wake = xfer->hcflags & UXFER_ABORTWAIT;
 	xfer->hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake)
 		cv_broadcast(&xfer->hccv);
 done:
 	mutex_exit(&sc->sc_lock);
+}
 /*
  * Data structures and routines to emulate the root hub.
  */
 Static usb_device_descriptor_t ohci_devd = {
 	USB_DEVICE_DESCRIPTOR_SIZE,
 	UDESC_DEVICE,		/* type */
 	{0x00, 0x01},		/* USB version */
 	UDCLASS_HUB,		/* class */
 	UDSUBCLASS_HUB,		/* subclass */
 	UDPROTO_FSHUB,		/* protocol */
 ,			/* max packet */
 	{0},{0},{0x00,0x01},	/* device id */
 ,2,0,			/* string indicies */
 			/* # of configurations */
 };
 Static const usb_config_descriptor_t ohci_confd = {
 	USB_CONFIG_DESCRIPTOR_SIZE,
 	UDESC_CONFIG,
 	{USB_CONFIG_DESCRIPTOR_SIZE +
 	 USB_INTERFACE_DESCRIPTOR_SIZE +
 	 USB_ENDPOINT_DESCRIPTOR_SIZE},
 ,
 ,
 ,
 	UC_ATTR_MBO | UC_SELF_POWERED,
 			/* max power */
 };
 Static const usb_interface_descriptor_t ohci_ifcd = {
 	USB_INTERFACE_DESCRIPTOR_SIZE,
 	UDESC_INTERFACE,
 ,
 ,
 ,
 	UICLASS_HUB,
 	UISUBCLASS_HUB,
 	UIPROTO_FSHUB,
 };
 Static const usb_endpoint_descriptor_t ohci_endpd = {
 	.bLength = USB_ENDPOINT_DESCRIPTOR_SIZE,
 	.bDescriptorType = UDESC_ENDPOINT,
 	.bEndpointAddress = UE_DIR_IN | OHCI_INTR_ENDPT,
 	.bmAttributes = UE_INTERRUPT,
 	.wMaxPacketSize = {8, 0},			/* max packet */
 	.bInterval = 255,
 };
 Static const usb_hub_descriptor_t ohci_hubd = {
 	.bDescLength = USB_HUB_DESCRIPTOR_SIZE,
 	.bDescriptorType = UDESC_HUB,
 };
 /*
  * Simulate a hardware hub by handling all the necessary requests.
  */
 Static usbd_status
 ohci_root_ctrl_transfer(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ohci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ohci_root_ctrl_start(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usb_device_request_t *req;
 	void *buf = NULL;
 	int port, i;
 	int len, value, index, l, totlen = 0;
 	usb_port_status_t ps;
 	usb_hub_descriptor_t hubd;
 	usbd_status err;
 	u_int32_t v;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST))
 		/* XXX panic */
 		return (USBD_INVAL);
 #endif
 	req = &xfer->request;
 	DPRINTFN(4,("ohci_root_ctrl_control type=0x%02x request=%02x\n",
 		    req->bmRequestType, req->bRequest));
 	len = UGETW(req->wLength);
 	value = UGETW(req->wValue);
 	index = UGETW(req->wIndex);
 	if (len != 0)
 		buf = KERNADDR(&xfer->dmabuf, 0);
 #define C(x,y) ((x) | ((y) << 8))
 	switch(C(req->bRequest, req->bmRequestType)) {
 	case C(UR_CLEAR_FEATURE, UT_WRITE_DEVICE):
 	case C(UR_CLEAR_FEATURE, UT_WRITE_INTERFACE):
 	case C(UR_CLEAR_FEATURE, UT_WRITE_ENDPOINT):
 		/*
 		 * DEVICE_REMOTE_WAKEUP and ENDPOINT_HALT are no-ops
 		 * for the integrated root hub.
 		 */
 		break;
 	case C(UR_GET_CONFIG, UT_READ_DEVICE):
 		if (len > 0) {
 			*(u_int8_t *)buf = sc->sc_conf;
 			totlen = 1;
+		}
 		break;
 	case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
 		DPRINTFN(8,("ohci_root_ctrl_control wValue=0x%04x\n", value));
 		if (len == 0)
 			break;
 		switch(value >> 8) {
 		case UDESC_DEVICE:
 			if ((value & 0xff) != 0) {
 				err = USBD_IOERROR;
 				goto ret;
+			}
 			totlen = l = min(len, USB_DEVICE_DESCRIPTOR_SIZE);
 			USETW(ohci_devd.idVendor, sc->sc_id_vendor);
 			memcpy(buf, &ohci_devd, l);
 			break;
 		case UDESC_CONFIG:
 			if ((value & 0xff) != 0) {
 				err = USBD_IOERROR;
 				goto ret;
+			}
 			totlen = l = min(len, USB_CONFIG_DESCRIPTOR_SIZE);
 			memcpy(buf, &ohci_confd, l);
 			buf = (char *)buf + l;
 			len -= l;
 			l = min(len, USB_INTERFACE_DESCRIPTOR_SIZE);
 			totlen += l;
 			memcpy(buf, &ohci_ifcd, l);
 			buf = (char *)buf + l;
 			len -= l;
 			l = min(len, USB_ENDPOINT_DESCRIPTOR_SIZE);
 			totlen += l;
 			memcpy(buf, &ohci_endpd, l);
 			break;
 		case UDESC_STRING:
 #define sd ((usb_string_descriptor_t *)buf)
 			switch (value & 0xff) {
 			case 0: /* Language table */
 				totlen = usb_makelangtbl(sd, len);
 				break;
 			case 1: /* Vendor */
 				totlen = usb_makestrdesc(sd, len,
 							 sc->sc_vendor);
 				break;
 			case 2: /* Product */
 				totlen = usb_makestrdesc(sd, len,
 							 "OHCI root hub");
 				break;
+			}
 #undef sd
 			break;
 		default:
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		break;
 	case C(UR_GET_INTERFACE, UT_READ_INTERFACE):
 		if (len > 0) {
 			*(u_int8_t *)buf = 0;
 			totlen = 1;
+		}
 		break;
 	case C(UR_GET_STATUS, UT_READ_DEVICE):
 		if (len > 1) {
 			USETW(((usb_status_t *)buf)->wStatus,UDS_SELF_POWERED);
 			totlen = 2;
+		}
 		break;
 	case C(UR_GET_STATUS, UT_READ_INTERFACE):
 	case C(UR_GET_STATUS, UT_READ_ENDPOINT):
 		if (len > 1) {
 			USETW(((usb_status_t *)buf)->wStatus, 0);
 			totlen = 2;
+		}
 		break;
 	case C(UR_SET_ADDRESS, UT_WRITE_DEVICE):
 		if (value >= USB_MAX_DEVICES) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		sc->sc_addr = value;
 		break;
 	case C(UR_SET_CONFIG, UT_WRITE_DEVICE):
 		if (value != 0 && value != 1) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		sc->sc_conf = value;
 		break;
 	case C(UR_SET_DESCRIPTOR, UT_WRITE_DEVICE):
 		break;
 	case C(UR_SET_FEATURE, UT_WRITE_DEVICE):
 	case C(UR_SET_FEATURE, UT_WRITE_INTERFACE):
 	case C(UR_SET_FEATURE, UT_WRITE_ENDPOINT):
 		err = USBD_IOERROR;
 		goto ret;
 	case C(UR_SET_INTERFACE, UT_WRITE_INTERFACE):
 		break;
 	case C(UR_SYNCH_FRAME, UT_WRITE_ENDPOINT):
 		break;
 	/* Hub requests */
 	case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_DEVICE):
 		break;
 	case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_OTHER):
 		DPRINTFN(8, ("ohci_root_ctrl_control: UR_CLEAR_PORT_FEATURE "
 			     "port=%d feature=%d\n",
 			     index, value));
 		if (index < 1 || index > sc->sc_noport) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		port = OHCI_RH_PORT_STATUS(index);
 		switch(value) {
 		case UHF_PORT_ENABLE:
 			OWRITE4(sc, port, UPS_CURRENT_CONNECT_STATUS);
 			break;
 		case UHF_PORT_SUSPEND:
 			OWRITE4(sc, port, UPS_OVERCURRENT_INDICATOR);
 			break;
 		case UHF_PORT_POWER:
 			/* Yes, writing to the LOW_SPEED bit clears power. */
 			OWRITE4(sc, port, UPS_LOW_SPEED);
 			break;
 		case UHF_C_PORT_CONNECTION:
 			OWRITE4(sc, port, UPS_C_CONNECT_STATUS << 16);
 			break;
 		case UHF_C_PORT_ENABLE:
 			OWRITE4(sc, port, UPS_C_PORT_ENABLED << 16);
 			break;
 		case UHF_C_PORT_SUSPEND:
 			OWRITE4(sc, port, UPS_C_SUSPEND << 16);
 			break;
 		case UHF_C_PORT_OVER_CURRENT:
 			OWRITE4(sc, port, UPS_C_OVERCURRENT_INDICATOR << 16);
 			break;
 		case UHF_C_PORT_RESET:
 			OWRITE4(sc, port, UPS_C_PORT_RESET << 16);
 			break;
 		default:
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		switch(value) {
 		case UHF_C_PORT_CONNECTION:
 		case UHF_C_PORT_ENABLE:
 		case UHF_C_PORT_SUSPEND:
 		case UHF_C_PORT_OVER_CURRENT:
 		case UHF_C_PORT_RESET:
 			/* Enable RHSC interrupt if condition is cleared. */
 			if ((OREAD4(sc, port) >> 16) == 0)
 				ohci_rhsc_enable(sc);
 			break;
 		default:
 			break;
+		}
 		break;
 	case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE):
 		if (len == 0)
 			break;
 		if ((value & 0xff) != 0) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		v = OREAD4(sc, OHCI_RH_DESCRIPTOR_A);
 		hubd = ohci_hubd;
 		hubd.bNbrPorts = sc->sc_noport;
 		USETW(hubd.wHubCharacteristics,
 		      (v & OHCI_NPS ? UHD_PWR_NO_SWITCH :
 		       v & OHCI_PSM ? UHD_PWR_GANGED : UHD_PWR_INDIVIDUAL)
 		      /* XXX overcurrent */
 		      );
 		hubd.bPwrOn2PwrGood = OHCI_GET_POTPGT(v);
 		v = OREAD4(sc, OHCI_RH_DESCRIPTOR_B);
 		for (i = 0, l = sc->sc_noport; l > 0; i++, l -= 8, v >>= 8)
 			hubd.DeviceRemovable[i++] = (u_int8_t)v;
 		hubd.bDescLength = USB_HUB_DESCRIPTOR_SIZE + i;
 		l = min(len, hubd.bDescLength);
 		totlen = l;
 		memcpy(buf, &hubd, l);
 		break;
 	case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE):
 		if (len != 4) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		memset(buf, 0, len); /* ? XXX */
 		totlen = len;
 		break;
 	case C(UR_GET_STATUS, UT_READ_CLASS_OTHER):
 		DPRINTFN(8,("ohci_root_ctrl_transfer: get port status i=%d\n",
 			    index));
 		if (index < 1 || index > sc->sc_noport) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		if (len != 4) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		v = OREAD4(sc, OHCI_RH_PORT_STATUS(index));
 		DPRINTFN(8,("ohci_root_ctrl_transfer: port status=0x%04x\n",
 			    v));
 		USETW(ps.wPortStatus, v);
 		USETW(ps.wPortChange, v >> 16);
 		l = min(len, sizeof ps);
 		memcpy(buf, &ps, l);
 		totlen = l;
 		break;
 	case C(UR_SET_DESCRIPTOR, UT_WRITE_CLASS_DEVICE):
 		err = USBD_IOERROR;
 		goto ret;
 	case C(UR_SET_FEATURE, UT_WRITE_CLASS_DEVICE):
 		break;
 	case C(UR_SET_FEATURE, UT_WRITE_CLASS_OTHER):
 		if (index < 1 || index > sc->sc_noport) {
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		port = OHCI_RH_PORT_STATUS(index);
 		switch(value) {
 		case UHF_PORT_ENABLE:
 			OWRITE4(sc, port, UPS_PORT_ENABLED);
 			break;
 		case UHF_PORT_SUSPEND:
 			OWRITE4(sc, port, UPS_SUSPEND);
 			break;
 		case UHF_PORT_RESET:
 			DPRINTFN(5,("ohci_root_ctrl_transfer: reset port %d\n",
 				    index));
 			OWRITE4(sc, port, UPS_RESET);
 			for (i = 0; i < 5; i++) {
 				usb_delay_ms(&sc->sc_bus,
 					     USB_PORT_ROOT_RESET_DELAY);
 				if (sc->sc_dying) {
 					err = USBD_IOERROR;
 					goto ret;
+				}
 				if ((OREAD4(sc, port) & UPS_RESET) == 0)
 					break;
+			}
 			DPRINTFN(8,("ohci port %d reset, status = 0x%04x\n",
 				    index, OREAD4(sc, port)));
 			break;
 		case UHF_PORT_POWER:
 			DPRINTFN(2,("ohci_root_ctrl_transfer: set port power "
 				    "%d\n", index));
 			OWRITE4(sc, port, UPS_PORT_POWER);
 			break;
 		default:
 			err = USBD_IOERROR;
 			goto ret;
+		}
 		break;
 	default:
 		err = USBD_IOERROR;
 		goto ret;
+	}
 	xfer->actlen = totlen;
 	err = USBD_NORMAL_COMPLETION;
  ret:
 	xfer->status = err;
 	mutex_enter(&sc->sc_lock);
 	usb_transfer_complete(xfer);
 	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a root control request. */
 Static void
 ohci_root_ctrl_abort(usbd_xfer_handle xfer)
+{
 	/* Nothing to do, all transfers are synchronous. */
+}
 /* Close the root pipe. */
 Static void
 ohci_root_ctrl_close(usbd_pipe_handle pipe)
+{
 	DPRINTF(("ohci_root_ctrl_close\n"));
 	/* Nothing to do. */
+}
 Static usbd_status
 ohci_root_intr_transfer(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ohci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ohci_root_intr_start(usbd_xfer_handle xfer)
+{
 	usbd_pipe_handle pipe = xfer->pipe;
 	ohci_softc_t *sc = pipe->device->bus->hci_private;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 	mutex_enter(&sc->sc_lock);
 	KASSERT(sc->sc_intrxfer == NULL);
 	sc->sc_intrxfer = xfer;
 	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a root interrupt request. */
 Static void
 ohci_root_intr_abort(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	if (xfer->pipe->intrxfer == xfer) {
 		DPRINTF(("ohci_root_intr_abort: remove\n"));
 		xfer->pipe->intrxfer = NULL;
+	}
 	xfer->status = USBD_CANCELLED;
 	mutex_enter(&sc->sc_lock);
 	usb_transfer_complete(xfer);
 	mutex_exit(&sc->sc_lock);
+}
 /* Close the root pipe. */
 Static void
 ohci_root_intr_close(usbd_pipe_handle pipe)
+{
 	ohci_softc_t *sc = pipe->device->bus->hci_private;
 	DPRINTF(("ohci_root_intr_close\n"));
 	sc->sc_intrxfer = NULL;
+}
 /************************/
 Static usbd_status
 ohci_device_ctrl_transfer(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ohci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ohci_device_ctrl_start(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST)) {
 		/* XXX panic */
 		printf("ohci_device_ctrl_transfer: not a request\n");
 		return (USBD_INVAL);
+	}
 #endif
 	mutex_enter(&sc->sc_lock);
 	err = ohci_device_request(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	if (sc->sc_bus.use_polling)
 		ohci_waitintr(sc, xfer);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a device control request. */
 Static void
 ohci_device_ctrl_abort(usbd_xfer_handle xfer)
+{
 	DPRINTF(("ohci_device_ctrl_abort: xfer=%p\n", xfer));
 	ohci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /* Close a device control pipe. */
 Static void
 ohci_device_ctrl_close(usbd_pipe_handle pipe)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
 	ohci_softc_t *sc = pipe->device->bus->hci_private;
 	DPRINTF(("ohci_device_ctrl_close: pipe=%p\n", pipe));
 	mutex_enter(&sc->sc_lock);
 	ohci_close_pipe(pipe, sc->sc_ctrl_head);
 	mutex_exit(&sc->sc_lock);
 	ohci_free_std(sc, opipe->tail.td);
+}
 /************************/
 Static void
 ohci_device_clear_toggle(usbd_pipe_handle pipe)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
 	ohci_softc_t *sc = pipe->device->bus->hci_private;
 	opipe->sed->ed.ed_headp &= HTOO32(~OHCI_TOGGLECARRY);
+}
 Static void
 ohci_noop(usbd_pipe_handle pipe)
+{
+}
 Static usbd_status
 ohci_device_bulk_transfer(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ohci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ohci_device_bulk_start(usbd_xfer_handle xfer)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
 	usbd_device_handle dev = opipe->pipe.device;
 	ohci_softc_t *sc = dev->bus->hci_private;
 	int addr = dev->address;
 	ohci_soft_td_t *data, *tail, *tdp;
 	ohci_soft_ed_t *sed;
 	int len, isread, endpt;
 	usbd_status err;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST) {
 		/* XXX panic */
 		printf("ohci_device_bulk_start: a request\n");
 		return (USBD_INVAL);
+	}
 #endif
 	mutex_enter(&sc->sc_lock);
 	len = xfer->length;
 	endpt = xfer->pipe->endpoint->edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	sed = opipe->sed;
 	DPRINTFN(4,("ohci_device_bulk_start: xfer=%p len=%d isread=%d "
 		    "flags=%d endpt=%d\n", xfer, len, isread, xfer->flags,
 		    endpt));
 	opipe->u.bulk.isread = isread;
 	opipe->u.bulk.length = len;
 	usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	/* Update device address */
 	sed->ed.ed_flags = HTOO32(
 		(O32TOH(sed->ed.ed_flags) & ~OHCI_ED_ADDRMASK) |
 		OHCI_ED_SET_FA(addr));
 	/* Allocate a chain of new TDs (including a new tail). */
 	data = opipe->tail.td;
 	err = ohci_alloc_std_chain(opipe, sc, len, isread, xfer,
 		  data, &tail);
 	/* We want interrupt at the end of the transfer. */
 	tail->td.td_flags &= HTOO32(~OHCI_TD_INTR_MASK);
 	tail->td.td_flags |= HTOO32(OHCI_TD_SET_DI(1));
 	tail->flags |= OHCI_CALL_DONE;
 	tail = tail->nexttd;	/* point at sentinel */
 	usb_syncmem(&tail->dma, tail->offs + offsetof(ohci_td_t, td_flags),
 	    sizeof(tail->td.td_flags),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	if (err) {
 		mutex_exit(&sc->sc_lock);
 		return (err);
+	}
 	tail->xfer = NULL;
 	xfer->hcpriv = data;
 	DPRINTFN(4,("ohci_device_bulk_start: ed_flags=0x%08x td_flags=0x%08x "
 		    "td_cbp=0x%08x td_be=0x%08x\n",
 		    (int)O32TOH(sed->ed.ed_flags),
 		    (int)O32TOH(data->td.td_flags),
 		    (int)O32TOH(data->td.td_cbp),
 		    (int)O32TOH(data->td.td_be)));
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 5) {
 		ohci_dump_ed(sc, sed);
 		ohci_dump_tds(sc, data);
+	}
 #endif
 	/* Insert ED in schedule */
 	for (tdp = data; tdp != tail; tdp = tdp->nexttd) {
 		tdp->xfer = xfer;
+	}
 	sed->ed.ed_tailp = HTOO32(tail->physaddr);
 	opipe->tail.td = tail;
 	sed->ed.ed_flags &= HTOO32(~OHCI_ED_SKIP);
 	usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_BLF);
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&xfer->timeout_handle, mstohz(xfer->timeout),
 			    ohci_timeout, xfer);
+	}
 	mutex_exit(&sc->sc_lock);
 #if 0
 /* This goes wrong if we are too slow. */
 	if (ohcidebug > 10) {
 		delay(10000);
 		DPRINTF(("ohci_device_intr_transfer: status=%x\n",
 			 OREAD4(sc, OHCI_COMMAND_STATUS)));
 		ohci_dump_ed(sc, sed);
 		ohci_dump_tds(sc, data);
+	}
 #endif
 	return (USBD_IN_PROGRESS);
+}
 Static void
 ohci_device_bulk_abort(usbd_xfer_handle xfer)
+{
 	DPRINTF(("ohci_device_bulk_abort: xfer=%p\n", xfer));
 	ohci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /*
  * Close a device bulk pipe.
  */
 Static void
 ohci_device_bulk_close(usbd_pipe_handle pipe)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
 	ohci_softc_t *sc = pipe->device->bus->hci_private;
 	DPRINTF(("ohci_device_bulk_close: pipe=%p\n", pipe));
 	mutex_enter(&sc->sc_lock);
 	ohci_close_pipe(pipe, sc->sc_bulk_head);
 	mutex_exit(&sc->sc_lock);
 	ohci_free_std(sc, opipe->tail.td);
+}
 /************************/
 Static usbd_status
 ohci_device_intr_transfer(usbd_xfer_handle xfer)
+{
 	ohci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/* Pipe isn't running, start first */
 	return (ohci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 Static usbd_status
 ohci_device_intr_start(usbd_xfer_handle xfer)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
 	usbd_device_handle dev = opipe->pipe.device;
 	ohci_softc_t *sc = dev->bus->hci_private;
 	ohci_soft_ed_t *sed = opipe->sed;
 	ohci_soft_td_t *data, *tail;
 	int len, isread, endpt;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 	DPRINTFN(3, ("ohci_device_intr_transfer: xfer=%p len=%d "
 		     "flags=%d priv=%p\n",
 		     xfer, xfer->length, xfer->flags, xfer->priv));
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST)
 		panic("ohci_device_intr_transfer: a request");
 #endif
 	len = xfer->length;
 	endpt = xfer->pipe->endpoint->edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	data = opipe->tail.td;
 	tail = ohci_alloc_std(sc);
 	if (tail == NULL)
 		return (USBD_NOMEM);
 	tail->xfer = NULL;
 	data->td.td_flags = HTOO32(
 		isread ? OHCI_TD_IN : OHCI_TD_OUT |
 		OHCI_TD_NOCC |
 		OHCI_TD_SET_DI(1) | OHCI_TD_TOGGLE_CARRY);
 	if (xfer->flags & USBD_SHORT_XFER_OK)
 		data->td.td_flags |= HTOO32(OHCI_TD_R);
 	data->td.td_cbp = HTOO32(DMAADDR(&xfer->dmabuf, 0));
 	data->nexttd = tail;
 	data->td.td_nexttd = HTOO32(tail->physaddr);
 	data->td.td_be = HTOO32(O32TOH(data->td.td_cbp) + len - 1);
 	data->len = len;
 	data->xfer = xfer;
 	data->flags = OHCI_CALL_DONE | OHCI_ADD_LEN;
 	usb_syncmem(&data->dma, data->offs, sizeof(data->td),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	xfer->hcpriv = data;
 #ifdef OHCI_DEBUG
 	if (ohcidebug > 5) {
 		DPRINTF(("ohci_device_intr_transfer:\n"));
 		ohci_dump_ed(sc, sed);
 		ohci_dump_tds(sc, data);
+	}
 #endif
 	/* Insert ED in schedule */
 	mutex_enter(&sc->sc_lock);
 	usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_tailp = HTOO32(tail->physaddr);
 	opipe->tail.td = tail;
 	sed->ed.ed_flags &= HTOO32(~OHCI_ED_SKIP);
 	usb_syncmem(&sed->dma, sed->offs, sizeof(sed->ed),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #if 0
 /*
  * This goes horribly wrong, printing thousands of descriptors,
  * because false references are followed due to the fact that the
  * TD is gone.
  */
 	if (ohcidebug > 5) {
 		usb_delay_ms(&sc->sc_bus, 5);
 		DPRINTF(("ohci_device_intr_transfer: status=%x\n",
 			 OREAD4(sc, OHCI_COMMAND_STATUS)));
 		ohci_dump_ed(sc, sed);
 		ohci_dump_tds(sc, data);
+	}
 #endif
 	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a device control request. */
 Static void
 ohci_device_intr_abort(usbd_xfer_handle xfer)
+{
 	if (xfer->pipe->intrxfer == xfer) {
 		DPRINTF(("ohci_device_intr_abort: remove\n"));
 		xfer->pipe->intrxfer = NULL;
+	}
 	ohci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /* Close a device interrupt pipe. */
 Static void
 ohci_device_intr_close(usbd_pipe_handle pipe)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
 	ohci_softc_t *sc = pipe->device->bus->hci_private;
 	int nslots = opipe->u.intr.nslots;
 	int pos = opipe->u.intr.pos;
 	int j;
 	ohci_soft_ed_t *p, *sed = opipe->sed;
 	DPRINTFN(1,("ohci_device_intr_close: pipe=%p nslots=%d pos=%d\n",
 		    pipe, nslots, pos));
 	mutex_enter(&sc->sc_lock);
 	usb_syncmem(&sed->dma, sed->offs,
 	    sizeof(sed->ed), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	if ((O32TOH(sed->ed.ed_tailp) & OHCI_HEADMASK) !=
 	    (O32TOH(sed->ed.ed_headp) & OHCI_HEADMASK))
 		usb_delay_ms(&sc->sc_bus, 2);
 	for (p = sc->sc_eds[pos]; p && p->next != sed; p = p->next)
 		continue;
 #ifdef DIAGNOSTIC
 	if (p == NULL)
 		panic("ohci_device_intr_close: ED not found");

 @@ -1,2257 +1,2257 @@
-/*	$NetBSD: uhci.c,v 1.240.6.4 2011/12/06 05:40:02 mrg Exp $	*/
+/*	$NetBSD: uhci.c,v 1.240.6.5 2011/12/08 02:51:08 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2011 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, Jared D. McNeill (jmcneill@invisible.ca)
  * and Matthew R. Green.
+ *
  * 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.
  */
 /*
  * USB Universal Host Controller driver.
  * Handles e.g. PIIX3 and PIIX4.
+ *
  * UHCI spec: http://www.intel.com/technology/usb/spec.htm
  * USB spec: http://www.usb.org/developers/docs/
  * PIIXn spec: ftp://download.intel.com/design/intarch/datashts/29055002.pdf
  *             ftp://download.intel.com/design/intarch/datashts/29056201.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.4 2011/12/06 05:40:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.5 2011/12/08 02:51:08 mrg Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/extent.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <machine/endian.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/uhcireg.h>
 #include <dev/usb/uhcivar.h>
 #include <dev/usb/usbroothub_subr.h>
 /* Use bandwidth reclamation for control transfers. Some devices choke on it. */
 /*#define UHCI_CTL_LOOP */
 #ifdef UHCI_DEBUG
 uhci_softc_t *thesc;
 #define DPRINTF(x)	if (uhcidebug) printf x
 #define DPRINTFN(n,x)	if (uhcidebug>(n)) printf x
 int uhcidebug = 0;
 int uhcinoloop = 0;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 /*
  * The UHCI controller is little endian, so on big endian machines
  * the data stored in memory needs to be swapped.
  */
 struct uhci_pipe {
 	struct usbd_pipe pipe;
 	int nexttoggle;
 	u_char aborting;
 	usbd_xfer_handle abortstart, abortend;
 	/* Info needed for different pipe kinds. */
 	union {
 		/* Control pipe */
 		struct {
 			uhci_soft_qh_t *sqh;
 			usb_dma_t reqdma;
 			uhci_soft_td_t *setup, *stat;
 			u_int length;
 		} ctl;
 		/* Interrupt pipe */
 		struct {
 			int npoll;
 			int isread;
 			uhci_soft_qh_t **qhs;
 		} intr;
 		/* Bulk pipe */
 		struct {
 			uhci_soft_qh_t *sqh;
 			u_int length;
 			int isread;
 		} bulk;
 		/* Iso pipe */
 		struct iso {
 			uhci_soft_td_t **stds;
 			int next, inuse;
 		} iso;
 	} u;
 };
 Static void		uhci_globalreset(uhci_softc_t *);
 Static usbd_status	uhci_portreset(uhci_softc_t*, int);
 Static void		uhci_reset(uhci_softc_t *);
 Static usbd_status	uhci_run(uhci_softc_t *, int run);
 Static uhci_soft_td_t  *uhci_alloc_std(uhci_softc_t *);
 Static void		uhci_free_std(uhci_softc_t *, uhci_soft_td_t *);
 Static uhci_soft_qh_t  *uhci_alloc_sqh(uhci_softc_t *);
 Static void		uhci_free_sqh(uhci_softc_t *, uhci_soft_qh_t *);
 #if 0
 Static void		uhci_enter_ctl_q(uhci_softc_t *, uhci_soft_qh_t *,
 					 uhci_intr_info_t *);
 Static void		uhci_exit_ctl_q(uhci_softc_t *, uhci_soft_qh_t *);
 #endif
 Static void		uhci_free_std_chain(uhci_softc_t *,
 					    uhci_soft_td_t *, uhci_soft_td_t *);
 Static usbd_status	uhci_alloc_std_chain(struct uhci_pipe *,
 			    uhci_softc_t *, int, int, u_int16_t, usb_dma_t *,
 			    uhci_soft_td_t **, uhci_soft_td_t **);
 Static void		uhci_poll_hub(void *);
 Static void		uhci_waitintr(uhci_softc_t *, usbd_xfer_handle);
 Static void		uhci_check_intr(uhci_softc_t *, uhci_intr_info_t *);
 Static void		uhci_idone(uhci_intr_info_t *);
 Static void		uhci_abort_xfer(usbd_xfer_handle, usbd_status status);
 Static void		uhci_timeout(void *);
 Static void		uhci_timeout_task(void *);
 Static void		uhci_add_ls_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
 Static void		uhci_add_hs_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
 Static void		uhci_add_bulk(uhci_softc_t *, uhci_soft_qh_t *);
 Static void		uhci_remove_ls_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_remove_hs_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_remove_bulk(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_add_loop(uhci_softc_t *sc);
 Static void		uhci_rem_loop(uhci_softc_t *sc);
 Static usbd_status	uhci_setup_isoc(usbd_pipe_handle pipe);
 Static void		uhci_device_isoc_enter(usbd_xfer_handle);
 Static usbd_status	uhci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
 Static void		uhci_freem(struct usbd_bus *, usb_dma_t *);
 Static usbd_xfer_handle	uhci_allocx(struct usbd_bus *);
 Static void		uhci_freex(struct usbd_bus *, usbd_xfer_handle);
 Static void		uhci_get_locks(struct usbd_bus *, kmutex_t **,
 				       kmutex_t **);
 Static usbd_status	uhci_device_ctrl_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_device_ctrl_start(usbd_xfer_handle);
 Static void		uhci_device_ctrl_abort(usbd_xfer_handle);
 Static void		uhci_device_ctrl_close(usbd_pipe_handle);
 Static void		uhci_device_ctrl_done(usbd_xfer_handle);
 Static usbd_status	uhci_device_intr_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_device_intr_start(usbd_xfer_handle);
 Static void		uhci_device_intr_abort(usbd_xfer_handle);
 Static void		uhci_device_intr_close(usbd_pipe_handle);
 Static void		uhci_device_intr_done(usbd_xfer_handle);
 Static usbd_status	uhci_device_bulk_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_device_bulk_start(usbd_xfer_handle);
 Static void		uhci_device_bulk_abort(usbd_xfer_handle);
 Static void		uhci_device_bulk_close(usbd_pipe_handle);
 Static void		uhci_device_bulk_done(usbd_xfer_handle);
 Static usbd_status	uhci_device_isoc_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_device_isoc_start(usbd_xfer_handle);
 Static void		uhci_device_isoc_abort(usbd_xfer_handle);
 Static void		uhci_device_isoc_close(usbd_pipe_handle);
 Static void		uhci_device_isoc_done(usbd_xfer_handle);
 Static usbd_status	uhci_root_ctrl_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_root_ctrl_start(usbd_xfer_handle);
 Static void		uhci_root_ctrl_abort(usbd_xfer_handle);
 Static void		uhci_root_ctrl_close(usbd_pipe_handle);
 Static void		uhci_root_ctrl_done(usbd_xfer_handle);
 Static usbd_status	uhci_root_intr_transfer(usbd_xfer_handle);
 Static usbd_status	uhci_root_intr_start(usbd_xfer_handle);
 Static void		uhci_root_intr_abort(usbd_xfer_handle);
 Static void		uhci_root_intr_close(usbd_pipe_handle);
 Static void		uhci_root_intr_done(usbd_xfer_handle);
 Static usbd_status	uhci_open(usbd_pipe_handle);
 Static void		uhci_poll(struct usbd_bus *);
 Static void		uhci_softintr(void *);
 Static usbd_status	uhci_device_request(usbd_xfer_handle xfer);
 Static void		uhci_add_intr(uhci_softc_t *, uhci_soft_qh_t *);
 Static void		uhci_remove_intr(uhci_softc_t *, uhci_soft_qh_t *);
 Static usbd_status	uhci_device_setintr(uhci_softc_t *sc,
 			    struct uhci_pipe *pipe, int ival);
 Static void		uhci_device_clear_toggle(usbd_pipe_handle pipe);
 Static void		uhci_noop(usbd_pipe_handle pipe);
 static inline uhci_soft_qh_t *uhci_find_prev_qh(uhci_soft_qh_t *,
 						    uhci_soft_qh_t *);
 #ifdef UHCI_DEBUG
 Static void		uhci_dump_all(uhci_softc_t *);
 Static void		uhci_dumpregs(uhci_softc_t *);
 Static void		uhci_dump_qhs(uhci_soft_qh_t *);
 Static void		uhci_dump_qh(uhci_soft_qh_t *);
 Static void		uhci_dump_tds(uhci_soft_td_t *);
 Static void		uhci_dump_td(uhci_soft_td_t *);
 Static void		uhci_dump_ii(uhci_intr_info_t *ii);
 void			uhci_dump(void);
 #endif
 #define UBARR(sc) bus_space_barrier((sc)->iot, (sc)->ioh, 0, (sc)->sc_size, \
 			BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE)
 #define UWRITE1(sc, r, x) \
  do { UBARR(sc); bus_space_write_1((sc)->iot, (sc)->ioh, (r), (x)); \
  } while (/*CONSTCOND*/0)
 #define UWRITE2(sc, r, x) \
  do { UBARR(sc); bus_space_write_2((sc)->iot, (sc)->ioh, (r), (x)); \
  } while (/*CONSTCOND*/0)
 #define UWRITE4(sc, r, x) \
  do { UBARR(sc); bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x)); \
  } while (/*CONSTCOND*/0)
 static __inline uint8_t
 UREAD1(uhci_softc_t *sc, bus_size_t r)
+{
 	UBARR(sc);
 	return bus_space_read_1(sc->iot, sc->ioh, r);
+}
 static __inline uint16_t
 UREAD2(uhci_softc_t *sc, bus_size_t r)
+{
 	UBARR(sc);
 	return bus_space_read_2(sc->iot, sc->ioh, r);
+}
 static __inline uint32_t
 UREAD4(uhci_softc_t *sc, bus_size_t r)
+{
 	UBARR(sc);
 	return bus_space_read_4(sc->iot, sc->ioh, r);
+}
 #define UHCICMD(sc, cmd) UWRITE2(sc, UHCI_CMD, cmd)
 #define UHCISTS(sc) UREAD2(sc, UHCI_STS)
 #define UHCI_RESET_TIMEOUT 100	/* ms, reset timeout */
 #define UHCI_CURFRAME(sc) (UREAD2(sc, UHCI_FRNUM) & UHCI_FRNUM_MASK)
 #define UHCI_INTR_ENDPT 1
 const struct usbd_bus_methods uhci_bus_methods = {
-	uhci_open,
+	.open_pipe =	uhci_open,
-	uhci_softintr,
+	.soft_intr =	uhci_softintr,
-	uhci_poll,
+	.do_poll =	uhci_poll,
-	uhci_allocm,
+	.allocm =	uhci_allocm,
-	uhci_freem,
+	.freem =	uhci_freem,
-	uhci_allocx,
+	.allocx =	uhci_allocx,
-	uhci_freex,
+	.freex =	uhci_freex,
-	uhci_get_locks,
+	.get_locks =	uhci_get_locks,
 };
 const struct usbd_pipe_methods uhci_root_ctrl_methods = {
-	uhci_root_ctrl_transfer,
+	.transfer =	uhci_root_ctrl_transfer,
-	uhci_root_ctrl_start,
+	.start =	uhci_root_ctrl_start,
-	uhci_root_ctrl_abort,
+	.abort =	uhci_root_ctrl_abort,
-	uhci_root_ctrl_close,
+	.close =	uhci_root_ctrl_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_root_ctrl_done,
+	.done =		uhci_root_ctrl_done,
 };
 const struct usbd_pipe_methods uhci_root_intr_methods = {
-	uhci_root_intr_transfer,
+	.transfer =	uhci_root_intr_transfer,
-	uhci_root_intr_start,
+	.start =	uhci_root_intr_start,
-	uhci_root_intr_abort,
+	.abort =	uhci_root_intr_abort,
-	uhci_root_intr_close,
+	.close =	uhci_root_intr_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_root_intr_done,
+	.done =		uhci_root_intr_done,
 };
 const struct usbd_pipe_methods uhci_device_ctrl_methods = {
-	uhci_device_ctrl_transfer,
+	.transfer =	uhci_device_ctrl_transfer,
-	uhci_device_ctrl_start,
+	.start =	uhci_device_ctrl_start,
-	uhci_device_ctrl_abort,
+	.abort =	uhci_device_ctrl_abort,
-	uhci_device_ctrl_close,
+	.close =	uhci_device_ctrl_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_device_ctrl_done,
+	.done =		uhci_device_ctrl_done,
 };
 const struct usbd_pipe_methods uhci_device_intr_methods = {
-	uhci_device_intr_transfer,
+	.transfer =	uhci_device_intr_transfer,
-	uhci_device_intr_start,
+	.start =	uhci_device_intr_start,
-	uhci_device_intr_abort,
+	.abort =	uhci_device_intr_abort,
-	uhci_device_intr_close,
+	.close =	uhci_device_intr_close,
-	uhci_device_clear_toggle,
+	.cleartoggle =	uhci_device_clear_toggle,
-	uhci_device_intr_done,
+	.done =		uhci_device_intr_done,
 };
 const struct usbd_pipe_methods uhci_device_bulk_methods = {
-	uhci_device_bulk_transfer,
+	.transfer =	uhci_device_bulk_transfer,
-	uhci_device_bulk_start,
+	.start =	uhci_device_bulk_start,
-	uhci_device_bulk_abort,
+	.abort =	uhci_device_bulk_abort,
-	uhci_device_bulk_close,
+	.close =	uhci_device_bulk_close,
-	uhci_device_clear_toggle,
+	.cleartoggle =	uhci_device_clear_toggle,
-	uhci_device_bulk_done,
+	.done =		uhci_device_bulk_done,
 };
 const struct usbd_pipe_methods uhci_device_isoc_methods = {
-	uhci_device_isoc_transfer,
+	.transfer =	uhci_device_isoc_transfer,
-	uhci_device_isoc_start,
+	.start =	uhci_device_isoc_start,
-	uhci_device_isoc_abort,
+	.abort =	uhci_device_isoc_abort,
-	uhci_device_isoc_close,
+	.close =	uhci_device_isoc_close,
-	uhci_noop,
+	.cleartoggle =	uhci_noop,
-	uhci_device_isoc_done,
+	.done =		uhci_device_isoc_done,
 };
 #define uhci_add_intr_info(sc, ii) \
 	LIST_INSERT_HEAD(&(sc)->sc_intrhead, (ii), list)
 #define uhci_del_intr_info(ii) \
 	do { \
 		LIST_REMOVE((ii), list); \
 		(ii)->list.le_prev = NULL; \
 	} while (0)
 #define uhci_active_intr_info(ii) ((ii)->list.le_prev != NULL)
 static inline uhci_soft_qh_t *
 uhci_find_prev_qh(uhci_soft_qh_t *pqh, uhci_soft_qh_t *sqh)
+{
 	DPRINTFN(15,("uhci_find_prev_qh: pqh=%p sqh=%p\n", pqh, sqh));
 	for (; pqh->hlink != sqh; pqh = pqh->hlink) {
 #if defined(DIAGNOSTIC) || defined(UHCI_DEBUG)
 		usb_syncmem(&pqh->dma,
 		    pqh->offs + offsetof(uhci_qh_t, qh_hlink),
 		    sizeof(pqh->qh.qh_hlink),
 		    BUS_DMASYNC_POSTWRITE);
 		if (le32toh(pqh->qh.qh_hlink) & UHCI_PTR_T) {
 			printf("uhci_find_prev_qh: QH not found\n");
 			return (NULL);
+		}
 #endif
+	}
 	return (pqh);
+}
 void
 uhci_globalreset(uhci_softc_t *sc)
+{
 	UHCICMD(sc, UHCI_CMD_GRESET);	/* global reset */
 	usb_delay_ms(&sc->sc_bus, USB_BUS_RESET_DELAY); /* wait a little */
 	UHCICMD(sc, 0);			/* do nothing */
+}
 usbd_status
 uhci_init(uhci_softc_t *sc)
+{
 	usbd_status err;
 	int i, j;
 	uhci_soft_qh_t *clsqh, *chsqh, *bsqh, *sqh, *lsqh;
 	uhci_soft_td_t *std;
 	DPRINTFN(1,("uhci_init: start\n"));
 #ifdef UHCI_DEBUG
 	thesc = sc;
 	if (uhcidebug > 2)
 		uhci_dumpregs(sc);
 #endif
 	sc->sc_suspend = PWR_RESUME;
 	UWRITE2(sc, UHCI_INTR, 0);		/* disable interrupts */
 	uhci_globalreset(sc);			/* reset the controller */
 	uhci_reset(sc);
 	usb_setup_reserve(sc->sc_dev, &sc->sc_dma_reserve, sc->sc_bus.dmatag,
 	    USB_MEM_RESERVE);
 	/* Allocate and initialize real frame array. */
 	err = usb_allocmem(&sc->sc_bus,
 		  UHCI_FRAMELIST_COUNT * sizeof(uhci_physaddr_t),
 		  UHCI_FRAMELIST_ALIGN, &sc->sc_dma);
 	if (err)
 		return (err);
 	sc->sc_pframes = KERNADDR(&sc->sc_dma, 0);
 	UWRITE2(sc, UHCI_FRNUM, 0);		/* set frame number to 0 */
 	UWRITE4(sc, UHCI_FLBASEADDR, DMAADDR(&sc->sc_dma, 0)); /* set frame list*/
 	/*
 	 * Allocate a TD, inactive, that hangs from the last QH.
 	 * This is to avoid a bug in the PIIX that makes it run berserk
 	 * otherwise.
 	 */
 	std = uhci_alloc_std(sc);
 	if (std == NULL)
 		return (USBD_NOMEM);
 	std->link.std = NULL;
 	std->td.td_link = htole32(UHCI_PTR_T);
 	std->td.td_status = htole32(0); /* inactive */
 	std->td.td_token = htole32(0);
 	std->td.td_buffer = htole32(0);
 	usb_syncmem(&std->dma, std->offs, sizeof(std->td),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/* Allocate the dummy QH marking the end and used for looping the QHs.*/
 	lsqh = uhci_alloc_sqh(sc);
 	if (lsqh == NULL)
 		return (USBD_NOMEM);
 	lsqh->hlink = NULL;
 	lsqh->qh.qh_hlink = htole32(UHCI_PTR_T);	/* end of QH chain */
 	lsqh->elink = std;
 	lsqh->qh.qh_elink = htole32(std->physaddr | UHCI_PTR_TD);
 	sc->sc_last_qh = lsqh;
 	usb_syncmem(&lsqh->dma, lsqh->offs, sizeof(lsqh->qh),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/* Allocate the dummy QH where bulk traffic will be queued. */
 	bsqh = uhci_alloc_sqh(sc);
 	if (bsqh == NULL)
 		return (USBD_NOMEM);
 	bsqh->hlink = lsqh;
 	bsqh->qh.qh_hlink = htole32(lsqh->physaddr | UHCI_PTR_QH);
 	bsqh->elink = NULL;
 	bsqh->qh.qh_elink = htole32(UHCI_PTR_T);
 	sc->sc_bulk_start = sc->sc_bulk_end = bsqh;
 	usb_syncmem(&bsqh->dma, bsqh->offs, sizeof(bsqh->qh),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/* Allocate dummy QH where high speed control traffic will be queued. */
 	chsqh = uhci_alloc_sqh(sc);
 	if (chsqh == NULL)
 		return (USBD_NOMEM);
 	chsqh->hlink = bsqh;
 	chsqh->qh.qh_hlink = htole32(bsqh->physaddr | UHCI_PTR_QH);
 	chsqh->elink = NULL;
 	chsqh->qh.qh_elink = htole32(UHCI_PTR_T);
 	sc->sc_hctl_start = sc->sc_hctl_end = chsqh;
 	usb_syncmem(&chsqh->dma, chsqh->offs, sizeof(chsqh->qh),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/* Allocate dummy QH where control traffic will be queued. */
 	clsqh = uhci_alloc_sqh(sc);
 	if (clsqh == NULL)
 		return (USBD_NOMEM);
 	clsqh->hlink = chsqh;
 	clsqh->qh.qh_hlink = htole32(chsqh->physaddr | UHCI_PTR_QH);
 	clsqh->elink = NULL;
 	clsqh->qh.qh_elink = htole32(UHCI_PTR_T);
 	sc->sc_lctl_start = sc->sc_lctl_end = clsqh;
 	usb_syncmem(&clsqh->dma, clsqh->offs, sizeof(clsqh->qh),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/*
 	 * Make all (virtual) frame list pointers point to the interrupt
 	 * queue heads and the interrupt queue heads at the control
 	 * queue head and point the physical frame list to the virtual.
 	 */
 	for(i = 0; i < UHCI_VFRAMELIST_COUNT; i++) {
 		std = uhci_alloc_std(sc);
 		sqh = uhci_alloc_sqh(sc);
 		if (std == NULL || sqh == NULL)
 			return (USBD_NOMEM);
 		std->link.sqh = sqh;
 		std->td.td_link = htole32(sqh->physaddr | UHCI_PTR_QH);
 		std->td.td_status = htole32(UHCI_TD_IOS); /* iso, inactive */
 		std->td.td_token = htole32(0);
 		std->td.td_buffer = htole32(0);
 		usb_syncmem(&std->dma, std->offs, sizeof(std->td),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		sqh->hlink = clsqh;
 		sqh->qh.qh_hlink = htole32(clsqh->physaddr | UHCI_PTR_QH);
 		sqh->elink = NULL;
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		sc->sc_vframes[i].htd = std;
 		sc->sc_vframes[i].etd = std;
 		sc->sc_vframes[i].hqh = sqh;
 		sc->sc_vframes[i].eqh = sqh;
 		for (j = i;
 		     j < UHCI_FRAMELIST_COUNT;
 		     j += UHCI_VFRAMELIST_COUNT)
 			sc->sc_pframes[j] = htole32(std->physaddr);
+	}
 	usb_syncmem(&sc->sc_dma, 0,
 	    UHCI_FRAMELIST_COUNT * sizeof(uhci_physaddr_t),
 	    BUS_DMASYNC_PREWRITE);
 	LIST_INIT(&sc->sc_intrhead);
 	SIMPLEQ_INIT(&sc->sc_free_xfers);
 	callout_init(&sc->sc_poll_handle, CALLOUT_MPSAFE);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "uhciab");
 	/* Set up the bus struct. */
 	sc->sc_bus.methods = &uhci_bus_methods;
 	sc->sc_bus.pipe_size = sizeof(struct uhci_pipe);
 	UHCICMD(sc, UHCI_CMD_MAXP); /* Assume 64 byte packets at frame end */
 	DPRINTFN(1,("uhci_init: enabling\n"));
 	err =  uhci_run(sc, 1);		/* and here we go... */
 	UWRITE2(sc, UHCI_INTR, UHCI_INTR_TOCRCIE | UHCI_INTR_RIE |
 		UHCI_INTR_IOCE | UHCI_INTR_SPIE);	/* enable interrupts */
 	return err;
+}
 int
 uhci_activate(device_t self, enum devact act)
+{
 	struct uhci_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
+}
 void
 uhci_childdet(device_t self, device_t child)
+{
 	struct uhci_softc *sc = device_private(self);
 	KASSERT(sc->sc_child == child);
 	sc->sc_child = NULL;
+}
 int
 uhci_detach(struct uhci_softc *sc, int flags)
+{
 	usbd_xfer_handle xfer;
 	int rv = 0;
 	if (sc->sc_child != NULL)
 		rv = config_detach(sc->sc_child, flags);
 	if (rv != 0)
 		return (rv);
 	/* Free all xfers associated with this HC. */
 	for (;;) {
 		xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 		if (xfer == NULL)
 			break;
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 		kmem_free(xfer, sizeof(struct uhci_xfer));
+	}
 	callout_halt(&sc->sc_poll_handle, NULL);
 	callout_destroy(&sc->sc_poll_handle);
 	cv_destroy(&sc->sc_softwake_cv);
 	mutex_destroy(&sc->sc_lock);
 	mutex_destroy(&sc->sc_intr_lock);
 	/* XXX free other data structures XXX */
 	return (rv);
+}
 usbd_status
 uhci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size)
+{
 	struct uhci_softc *sc = bus->hci_private;
 	usbd_status status;
 	u_int32_t n;
 	/*
 	 * XXX
 	 * Since we are allocating a buffer we can assume that we will
 	 * need TDs for it.  Since we don't want to allocate those from
 	 * an interrupt context, we allocate them here and free them again.
 	 * This is no guarantee that we'll get the TDs next time...
 	 */
 	n = size / 8;
 	if (n > 16) {
 		u_int32_t i;
 		uhci_soft_td_t **stds;
 		DPRINTF(("uhci_allocm: get %d TDs\n", n));
 		stds = kmem_alloc(sizeof(uhci_soft_td_t *) * n, KM_SLEEP);
 		if (!stds)
 			return USBD_NOMEM;
 		for(i = 0; i < n; i++)
 			stds[i] = uhci_alloc_std(sc);
 		for(i = 0; i < n; i++)
 			if (stds[i] != NULL)
 				uhci_free_std(sc, stds[i]);
 		kmem_free(stds, sizeof(uhci_soft_td_t *) * n);
+	}
 	status = usb_allocmem(&sc->sc_bus, size, 0, dma);
 	if (status == USBD_NOMEM)
 		status = usb_reserve_allocm(&sc->sc_dma_reserve, dma, size);
 	return status;
+}
 void
 uhci_freem(struct usbd_bus *bus, usb_dma_t *dma)
+{
 	if (dma->block->flags & USB_DMA_RESERVE) {
 		usb_reserve_freem(&((struct uhci_softc *)bus)->sc_dma_reserve,
 		    dma);
 		return;
+	}
 	usb_freemem(&((struct uhci_softc *)bus)->sc_bus, dma);
+}
 usbd_xfer_handle
 uhci_allocx(struct usbd_bus *bus)
+{
 	struct uhci_softc *sc = bus->hci_private;
 	usbd_xfer_handle xfer;
 	xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 	if (xfer != NULL) {
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 #ifdef DIAGNOSTIC
 		if (xfer->busy_free != XFER_FREE) {
 			printf("uhci_allocx: xfer=%p not free, 0x%08x\n", xfer,
 			       xfer->busy_free);
+		}
 #endif
 	} else {
 		xfer = kmem_alloc(sizeof(struct uhci_xfer), KM_SLEEP);
+	}
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof (struct uhci_xfer));
 		UXFER(xfer)->iinfo.sc = sc;
 #ifdef DIAGNOSTIC
 		UXFER(xfer)->iinfo.isdone = 1;
 		xfer->busy_free = XFER_BUSY;
 #endif
+	}
 	return (xfer);
+}
 void
 uhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
+{
 	struct uhci_softc *sc = bus->hci_private;
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_BUSY) {
 		printf("uhci_freex: xfer=%p not busy, 0x%08x\n", xfer,
 		       xfer->busy_free);
+	}
 	xfer->busy_free = XFER_FREE;
 	if (!UXFER(xfer)->iinfo.isdone) {
 		printf("uhci_freex: !isdone\n");
+	}
 #endif
 	SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
+}
 Static void
 uhci_get_locks(struct usbd_bus *bus, kmutex_t **intr, kmutex_t **thread)
+{
 	struct uhci_softc *sc = bus->hci_private;
 	*intr = &sc->sc_intr_lock;
 	*thread = &sc->sc_lock;
+}
 /*
  * Handle suspend/resume.
+ *
  * We need to switch to polling mode here, because this routine is
  * called from an interrupt context.  This is all right since we
  * are almost suspended anyway.
  */
 bool
 uhci_resume(device_t dv, const pmf_qual_t *qual)
+{
 	uhci_softc_t *sc = device_private(dv);
 	int cmd;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	cmd = UREAD2(sc, UHCI_CMD);
 	sc->sc_bus.use_polling++;
 	UWRITE2(sc, UHCI_INTR, 0);
 	uhci_globalreset(sc);
 	uhci_reset(sc);
 	if (cmd & UHCI_CMD_RS)
 		uhci_run(sc, 0);
 	/* restore saved state */
 	UWRITE4(sc, UHCI_FLBASEADDR, DMAADDR(&sc->sc_dma, 0));
 	UWRITE2(sc, UHCI_FRNUM, sc->sc_saved_frnum);
 	UWRITE1(sc, UHCI_SOF, sc->sc_saved_sof);
 	UHCICMD(sc, cmd | UHCI_CMD_FGR); /* force resume */
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_DELAY);
 	UHCICMD(sc, cmd & ~UHCI_CMD_EGSM); /* back to normal */
 	UWRITE2(sc, UHCI_INTR, UHCI_INTR_TOCRCIE |
 	    UHCI_INTR_RIE | UHCI_INTR_IOCE | UHCI_INTR_SPIE);
 	UHCICMD(sc, UHCI_CMD_MAXP);
 	uhci_run(sc, 1); /* and start traffic again */
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_RECOVERY);
 	sc->sc_bus.use_polling--;
 	if (sc->sc_intr_xfer != NULL)
 		callout_reset(&sc->sc_poll_handle, sc->sc_ival, uhci_poll_hub,
 		    sc->sc_intr_xfer);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 2)
 		uhci_dumpregs(sc);
 #endif
 	sc->sc_suspend = PWR_RESUME;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return true;
+}
 bool
 uhci_suspend(device_t dv, const pmf_qual_t *qual)
+{
 	uhci_softc_t *sc = device_private(dv);
 	int cmd;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	cmd = UREAD2(sc, UHCI_CMD);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 2)
 		uhci_dumpregs(sc);
 #endif
 	if (sc->sc_intr_xfer != NULL)
 		callout_stop(&sc->sc_poll_handle);
 	sc->sc_suspend = PWR_SUSPEND;
 	sc->sc_bus.use_polling++;
 	uhci_run(sc, 0); /* stop the controller */
 	cmd &= ~UHCI_CMD_RS;
 	/* save some state if BIOS doesn't */
 	sc->sc_saved_frnum = UREAD2(sc, UHCI_FRNUM);
 	sc->sc_saved_sof = UREAD1(sc, UHCI_SOF);
 	UWRITE2(sc, UHCI_INTR, 0); /* disable intrs */
 	UHCICMD(sc, cmd | UHCI_CMD_EGSM); /* enter suspend */
 	usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT);
 	sc->sc_bus.use_polling--;
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return true;
+}
 #ifdef UHCI_DEBUG
 Static void
 uhci_dumpregs(uhci_softc_t *sc)
+{
 	DPRINTFN(-1,("%s regs: cmd=%04x, sts=%04x, intr=%04x, frnum=%04x, "
 		     "flbase=%08x, sof=%04x, portsc1=%04x, portsc2=%04x\n",
 		     device_xname(sc->sc_dev),
 		     UREAD2(sc, UHCI_CMD),
 		     UREAD2(sc, UHCI_STS),
 		     UREAD2(sc, UHCI_INTR),
 		     UREAD2(sc, UHCI_FRNUM),
 		     UREAD4(sc, UHCI_FLBASEADDR),
 		     UREAD1(sc, UHCI_SOF),
 		     UREAD2(sc, UHCI_PORTSC1),
 		     UREAD2(sc, UHCI_PORTSC2)));
+}
 void
 uhci_dump_td(uhci_soft_td_t *p)
+{
 	char sbuf[128], sbuf2[128];
 	usb_syncmem(&p->dma, p->offs, sizeof(p->td),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	DPRINTFN(-1,("TD(%p) at %08lx = link=0x%08lx status=0x%08lx "
 		     "token=0x%08lx buffer=0x%08lx\n",
 		     p, (long)p->physaddr,
 		     (long)le32toh(p->td.td_link),
 		     (long)le32toh(p->td.td_status),
 		     (long)le32toh(p->td.td_token),
 		     (long)le32toh(p->td.td_buffer)));
 	snprintb(sbuf, sizeof(sbuf), "\20\1T\2Q\3VF",
 	    (u_int32_t)le32toh(p->td.td_link));
 	snprintb(sbuf2, sizeof(sbuf2),
 	    "\20\22BITSTUFF\23CRCTO\24NAK\25BABBLE\26DBUFFER\27"
 	    "STALLED\30ACTIVE\31IOC\32ISO\33LS\36SPD",
 	    (u_int32_t)le32toh(p->td.td_status));
 	DPRINTFN(-1,("  %s %s,errcnt=%d,actlen=%d pid=%02x,addr=%d,endpt=%d,"
 		     "D=%d,maxlen=%d\n", sbuf, sbuf2,
 		     UHCI_TD_GET_ERRCNT(le32toh(p->td.td_status)),
 		     UHCI_TD_GET_ACTLEN(le32toh(p->td.td_status)),
 		     UHCI_TD_GET_PID(le32toh(p->td.td_token)),
 		     UHCI_TD_GET_DEVADDR(le32toh(p->td.td_token)),
 		     UHCI_TD_GET_ENDPT(le32toh(p->td.td_token)),
 		     UHCI_TD_GET_DT(le32toh(p->td.td_token)),
 		     UHCI_TD_GET_MAXLEN(le32toh(p->td.td_token))));
 	usb_syncmem(&p->dma, p->offs, sizeof(p->td),
 	    BUS_DMASYNC_PREREAD);
+}
 void
 uhci_dump_qh(uhci_soft_qh_t *sqh)
+{
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	DPRINTFN(-1,("QH(%p) at %08x: hlink=%08x elink=%08x\n", sqh,
 	    (int)sqh->physaddr, le32toh(sqh->qh.qh_hlink),
 	    le32toh(sqh->qh.qh_elink)));
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh), BUS_DMASYNC_PREREAD);
+}
 #if 1
 void
 uhci_dump(void)
+{
 	uhci_dump_all(thesc);
+}
 #endif
 void
 uhci_dump_all(uhci_softc_t *sc)
+{
 	uhci_dumpregs(sc);
 	printf("intrs=%d\n", sc->sc_bus.no_intrs);
 	/*printf("framelist[i].link = %08x\n", sc->sc_framelist[0].link);*/
 	uhci_dump_qh(sc->sc_lctl_start);
+}
 void
 uhci_dump_qhs(uhci_soft_qh_t *sqh)
+{
 	uhci_dump_qh(sqh);
 	/* uhci_dump_qhs displays all the QHs and TDs from the given QH onwards
 	 * Traverses sideways first, then down.
+	 *
 	 * QH1
 	 * QH2
 	 * No QH
 	 * TD2.1
 	 * TD2.2
 	 * TD1.1
 	 * etc.
+	 *
 	 * TD2.x being the TDs queued at QH2 and QH1 being referenced from QH1.
 	 */
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (sqh->hlink != NULL && !(le32toh(sqh->qh.qh_hlink) & UHCI_PTR_T))
 		uhci_dump_qhs(sqh->hlink);
 	else
 		DPRINTF(("No QH\n"));
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh), BUS_DMASYNC_PREREAD);
 	if (sqh->elink != NULL && !(le32toh(sqh->qh.qh_elink) & UHCI_PTR_T))
 		uhci_dump_tds(sqh->elink);
 	else
 		DPRINTF(("No TD\n"));
+}
 void
 uhci_dump_tds(uhci_soft_td_t *std)
+{
 	uhci_soft_td_t *td;
 	int stop;
 	for(td = std; td != NULL; td = td->link.std) {
 		uhci_dump_td(td);
 		/* Check whether the link pointer in this TD marks
 		 * the link pointer as end of queue. This avoids
 		 * printing the free list in case the queue/TD has
 		 * already been moved there (seatbelt).
 		 */
 		usb_syncmem(&td->dma, td->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(td->td.td_link),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		stop = (le32toh(td->td.td_link) & UHCI_PTR_T ||
 			le32toh(td->td.td_link) == 0);
 		usb_syncmem(&td->dma, td->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(td->td.td_link), BUS_DMASYNC_PREREAD);
 		if (stop)
 			break;
+	}
+}
 Static void
 uhci_dump_ii(uhci_intr_info_t *ii)
+{
 	usbd_pipe_handle pipe;
 	usb_endpoint_descriptor_t *ed;
 	usbd_device_handle dev;
 #ifdef DIAGNOSTIC
 #define DONE ii->isdone
 #else
 #define DONE 0
 #endif
         if (ii == NULL) {
                 printf("ii NULL\n");
                 return;
+        }
         if (ii->xfer == NULL) {
 		printf("ii %p: done=%d xfer=NULL\n",
 		       ii, DONE);
                 return;
+        }
         pipe = ii->xfer->pipe;
         if (pipe == NULL) {
 		printf("ii %p: done=%d xfer=%p pipe=NULL\n",
 		       ii, DONE, ii->xfer);
                 return;
+	}
         if (pipe->endpoint == NULL) {
 		printf("ii %p: done=%d xfer=%p pipe=%p pipe->endpoint=NULL\n",
 		       ii, DONE, ii->xfer, pipe);
                 return;
+	}
         if (pipe->device == NULL) {
 		printf("ii %p: done=%d xfer=%p pipe=%p pipe->device=NULL\n",
 		       ii, DONE, ii->xfer, pipe);
                 return;
+	}
         ed = pipe->endpoint->edesc;
         dev = pipe->device;
 	printf("ii %p: done=%d xfer=%p dev=%p vid=0x%04x pid=0x%04x addr=%d pipe=%p ep=0x%02x attr=0x%02x\n",
 	       ii, DONE, ii->xfer, dev,
 	       UGETW(dev->ddesc.idVendor),
 	       UGETW(dev->ddesc.idProduct),
 	       dev->address, pipe,
 	       ed->bEndpointAddress, ed->bmAttributes);
 #undef DONE
+}
 void uhci_dump_iis(struct uhci_softc *sc);
 void
 uhci_dump_iis(struct uhci_softc *sc)
+{
 	uhci_intr_info_t *ii;
 	printf("intr_info list:\n");
 	for (ii = LIST_FIRST(&sc->sc_intrhead); ii; ii = LIST_NEXT(ii, list))
 		uhci_dump_ii(ii);
+}
 void iidump(void);
 void iidump(void) { uhci_dump_iis(thesc); }
 #endif
 /*
  * This routine is executed periodically and simulates interrupts
  * from the root controller interrupt pipe for port status change.
  */
 void
 uhci_poll_hub(void *addr)
+{
 	usbd_xfer_handle xfer = addr;
 	usbd_pipe_handle pipe = xfer->pipe;
 	uhci_softc_t *sc;
 	u_char *p;
 	DPRINTFN(20, ("uhci_poll_hub\n"));
 	if (__predict_false(pipe->device == NULL || pipe->device->bus == NULL))
 		return;	/* device has detached */
 	sc = pipe->device->bus->hci_private;
 	callout_reset(&sc->sc_poll_handle, sc->sc_ival, uhci_poll_hub, xfer);
 	p = KERNADDR(&xfer->dmabuf, 0);
 	p[0] = 0;
 	if (UREAD2(sc, UHCI_PORTSC1) & (UHCI_PORTSC_CSC|UHCI_PORTSC_OCIC))
 		p[0] |= 1<<1;
 	if (UREAD2(sc, UHCI_PORTSC2) & (UHCI_PORTSC_CSC|UHCI_PORTSC_OCIC))
 		p[0] |= 1<<2;
 	if (p[0] == 0)
 		/* No change, try again in a while */
 		return;
 	xfer->actlen = 1;
 	xfer->status = USBD_NORMAL_COMPLETION;
 	mutex_enter(&sc->sc_lock);
 	xfer->device->bus->intr_context++;
 	usb_transfer_complete(xfer);
 	xfer->device->bus->intr_context--;
 	mutex_exit(&sc->sc_lock);
+}
 void
 uhci_root_intr_done(usbd_xfer_handle xfer)
+{
+}
 void
 uhci_root_ctrl_done(usbd_xfer_handle xfer)
+{
+}
 /*
  * Let the last QH loop back to the high speed control transfer QH.
  * This is what intel calls "bandwidth reclamation" and improves
  * USB performance a lot for some devices.
  * If we are already looping, just count it.
  */
 void
 uhci_add_loop(uhci_softc_t *sc) {
 #ifdef UHCI_DEBUG
 	if (uhcinoloop)
 		return;
 #endif
 	if (++sc->sc_loops == 1) {
 		DPRINTFN(5,("uhci_start_loop: add\n"));
 		/* Note, we don't loop back the soft pointer. */
 		sc->sc_last_qh->qh.qh_hlink =
 		    htole32(sc->sc_hctl_start->physaddr | UHCI_PTR_QH);
 		usb_syncmem(&sc->sc_last_qh->dma,
 		    sc->sc_last_qh->offs + offsetof(uhci_qh_t, qh_hlink),
 		    sizeof(sc->sc_last_qh->qh.qh_hlink),
 		    BUS_DMASYNC_PREWRITE);
+	}
+}
 void
 uhci_rem_loop(uhci_softc_t *sc) {
 #ifdef UHCI_DEBUG
 	if (uhcinoloop)
 		return;
 #endif
 	if (--sc->sc_loops == 0) {
 		DPRINTFN(5,("uhci_end_loop: remove\n"));
 		sc->sc_last_qh->qh.qh_hlink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sc->sc_last_qh->dma,
 		    sc->sc_last_qh->offs + offsetof(uhci_qh_t, qh_hlink),
 		    sizeof(sc->sc_last_qh->qh.qh_hlink),
 		    BUS_DMASYNC_PREWRITE);
+	}
+}
 /* Add high speed control QH, called at splusb(). */
 void
 uhci_add_hs_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *eqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_add_ctrl: sqh=%p\n", sqh));
 	eqh = sc->sc_hctl_end;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink),
 	    BUS_DMASYNC_POSTWRITE);
 	sqh->hlink       = eqh->hlink;
 	sqh->qh.qh_hlink = eqh->qh.qh_hlink;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE);
 	eqh->hlink       = sqh;
 	eqh->qh.qh_hlink = htole32(sqh->physaddr | UHCI_PTR_QH);
 	sc->sc_hctl_end = sqh;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 #ifdef UHCI_CTL_LOOP
 	uhci_add_loop(sc);
 #endif
+}
 /* Remove high speed control QH, called at splusb(). */
 void
 uhci_remove_hs_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *pqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_remove_hs_ctrl: sqh=%p\n", sqh));
 #ifdef UHCI_CTL_LOOP
 	uhci_rem_loop(sc);
 #endif
 	/*
 	 * The T bit should be set in the elink of the QH so that the HC
 	 * doesn't follow the pointer.  This condition may fail if the
 	 * the transferred packet was short so that the QH still points
 	 * at the last used TD.
 	 * In this case we set the T bit and wait a little for the HC
 	 * to stop looking at the TD.
 	 * Note that if the TD chain is large enough, the controller
 	 * may still be looking at the chain at the end of this function.
 	 * uhci_free_std_chain() will make sure the controller stops
 	 * looking at it quickly, but until then we should not change
 	 * sqh->hlink.
 	 */
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_elink),
 	    sizeof(sqh->qh.qh_elink),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (!(sqh->qh.qh_elink & htole32(UHCI_PTR_T))) {
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		delay(UHCI_QH_REMOVE_DELAY);
+	}
 	pqh = uhci_find_prev_qh(sc->sc_hctl_start, sqh);
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(sqh->qh.qh_hlink), BUS_DMASYNC_POSTWRITE);
 	pqh->hlink = sqh->hlink;
 	pqh->qh.qh_hlink = sqh->qh.qh_hlink;
 	usb_syncmem(&pqh->dma, pqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(pqh->qh.qh_hlink),
 	    BUS_DMASYNC_PREWRITE);
 	delay(UHCI_QH_REMOVE_DELAY);
 	if (sc->sc_hctl_end == sqh)
 		sc->sc_hctl_end = pqh;
+}
 /* Add low speed control QH, called at splusb(). */
 void
 uhci_add_ls_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *eqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_add_ls_ctrl: sqh=%p\n", sqh));
 	eqh = sc->sc_lctl_end;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_POSTWRITE);
 	sqh->hlink = eqh->hlink;
 	sqh->qh.qh_hlink = eqh->qh.qh_hlink;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE);
 	eqh->hlink = sqh;
 	eqh->qh.qh_hlink = htole32(sqh->physaddr | UHCI_PTR_QH);
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 	sc->sc_lctl_end = sqh;
+}
 /* Remove low speed control QH, called at splusb(). */
 void
 uhci_remove_ls_ctrl(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *pqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_remove_ls_ctrl: sqh=%p\n", sqh));
 	/* See comment in uhci_remove_hs_ctrl() */
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_elink),
 	    sizeof(sqh->qh.qh_elink),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (!(sqh->qh.qh_elink & htole32(UHCI_PTR_T))) {
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		delay(UHCI_QH_REMOVE_DELAY);
+	}
 	pqh = uhci_find_prev_qh(sc->sc_lctl_start, sqh);
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(sqh->qh.qh_hlink), BUS_DMASYNC_POSTWRITE);
 	pqh->hlink = sqh->hlink;
 	pqh->qh.qh_hlink = sqh->qh.qh_hlink;
 	usb_syncmem(&pqh->dma, pqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(pqh->qh.qh_hlink),
 	    BUS_DMASYNC_PREWRITE);
 	delay(UHCI_QH_REMOVE_DELAY);
 	if (sc->sc_lctl_end == sqh)
 		sc->sc_lctl_end = pqh;
+}
 /* Add bulk QH, called at splusb(). */
 void
 uhci_add_bulk(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *eqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_add_bulk: sqh=%p\n", sqh));
 	eqh = sc->sc_bulk_end;
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_POSTWRITE);
 	sqh->hlink = eqh->hlink;
 	sqh->qh.qh_hlink = eqh->qh.qh_hlink;
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREWRITE);
 	eqh->hlink = sqh;
 	eqh->qh.qh_hlink = htole32(sqh->physaddr | UHCI_PTR_QH);
 	usb_syncmem(&eqh->dma, eqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(eqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 	sc->sc_bulk_end = sqh;
 	uhci_add_loop(sc);
+}
 /* Remove bulk QH, called at splusb(). */
 void
 uhci_remove_bulk(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	uhci_soft_qh_t *pqh;
-	SPLUSBCHECK;
+	KASSERT(mutex_owned(&sc->sc_lock));
 	DPRINTFN(10, ("uhci_remove_bulk: sqh=%p\n", sqh));
 	uhci_rem_loop(sc);
 	/* See comment in uhci_remove_hs_ctrl() */
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_elink),
 	    sizeof(sqh->qh.qh_elink),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (!(sqh->qh.qh_elink & htole32(UHCI_PTR_T))) {
 		sqh->qh.qh_elink = htole32(UHCI_PTR_T);
 		usb_syncmem(&sqh->dma,
 		    sqh->offs + offsetof(uhci_qh_t, qh_elink),
 		    sizeof(sqh->qh.qh_elink),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		delay(UHCI_QH_REMOVE_DELAY);
+	}
 	pqh = uhci_find_prev_qh(sc->sc_bulk_start, sqh);
 	usb_syncmem(&sqh->dma, sqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(sqh->qh.qh_hlink), BUS_DMASYNC_POSTWRITE);
 	pqh->hlink       = sqh->hlink;
 	pqh->qh.qh_hlink = sqh->qh.qh_hlink;
 	usb_syncmem(&pqh->dma, pqh->offs + offsetof(uhci_qh_t, qh_hlink),
 	    sizeof(pqh->qh.qh_hlink), BUS_DMASYNC_PREWRITE);
 	delay(UHCI_QH_REMOVE_DELAY);
 	if (sc->sc_bulk_end == sqh)
 		sc->sc_bulk_end = pqh;
+}
 Static int uhci_intr1(uhci_softc_t *);
 int
 uhci_intr(void *arg)
+{
 	uhci_softc_t *sc = arg;
 	int ret = 0;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	if (sc->sc_dying || !device_has_power(sc->sc_dev))
 		goto done;
 	if (sc->sc_bus.use_polling || UREAD2(sc, UHCI_INTR) == 0) {
 #ifdef DIAGNOSTIC
 		DPRINTFN(16, ("uhci_intr: ignored interrupt while polling\n"));
 #endif
 		goto done;
+	}
 	ret = uhci_intr1(sc);
  done:
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return ret;
+}
 int
 uhci_intr1(uhci_softc_t *sc)
+{
 	int status;
 	int ack;
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 15) {
 		DPRINTF(("%s: uhci_intr1\n", device_xname(sc->sc_dev)));
 		uhci_dumpregs(sc);
+	}
 #endif
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	status = UREAD2(sc, UHCI_STS) & UHCI_STS_ALLINTRS;
 	if (status == 0)	/* The interrupt was not for us. */
 		return (0);
 	if (sc->sc_suspend != PWR_RESUME) {
 #ifdef DIAGNOSTIC
 		printf("%s: interrupt while not operating ignored\n",
 		       device_xname(sc->sc_dev));
 #endif
 		UWRITE2(sc, UHCI_STS, status); /* acknowledge the ints */
 		return (0);
+	}
 	ack = 0;
 	if (status & UHCI_STS_USBINT)
 		ack |= UHCI_STS_USBINT;
 	if (status & UHCI_STS_USBEI)
 		ack |= UHCI_STS_USBEI;
 	if (status & UHCI_STS_RD) {
 		ack |= UHCI_STS_RD;
 #ifdef UHCI_DEBUG
 		printf("%s: resume detect\n", device_xname(sc->sc_dev));
 #endif
+	}
 	if (status & UHCI_STS_HSE) {
 		ack |= UHCI_STS_HSE;
 		printf("%s: host system error\n", device_xname(sc->sc_dev));
+	}
 	if (status & UHCI_STS_HCPE) {
 		ack |= UHCI_STS_HCPE;
 		printf("%s: host controller process error\n",
 		       device_xname(sc->sc_dev));
+	}
 	/* When HCHalted=1 and Run/Stop=0 , it is normal */
 	if ((status & UHCI_STS_HCH) && (UREAD2(sc, UHCI_CMD) & UHCI_CMD_RS)) {
 		/* no acknowledge needed */
 		if (!sc->sc_dying) {
 			printf("%s: host controller halted\n",
 			    device_xname(sc->sc_dev));
 #ifdef UHCI_DEBUG
 			uhci_dump_all(sc);
 #endif
+		}
 		sc->sc_dying = 1;
+	}
 	if (!ack)
 		return (0);	/* nothing to acknowledge */
 	UWRITE2(sc, UHCI_STS, ack); /* acknowledge the ints */
 	sc->sc_bus.no_intrs++;
 	usb_schedsoftintr(&sc->sc_bus);
 	DPRINTFN(15, ("%s: uhci_intr: exit\n", device_xname(sc->sc_dev)));
 	return (1);
+}
 void
 uhci_softintr(void *v)
+{
 	struct usbd_bus *bus = v;
 	uhci_softc_t *sc = bus->hci_private;
 	uhci_intr_info_t *ii, *nextii;
 	DPRINTFN(10,("%s: uhci_softintr (%d)\n", device_xname(sc->sc_dev),
 		     sc->sc_bus.intr_context));
 	mutex_enter(&sc->sc_lock);
 	sc->sc_bus.intr_context++;
 	/*
 	 * Interrupts on UHCI really suck.  When the host controller
 	 * interrupts because a transfer is completed there is no
 	 * way of knowing which transfer it was.  You can scan down
 	 * the TDs and QHs of the previous frame to limit the search,
 	 * but that assumes that the interrupt was not delayed by more
 	 * than 1 ms, which may not always be true (e.g. after debug
 	 * output on a slow console).
 	 * We scan all interrupt descriptors to see if any have
 	 * completed.
 	 */
 	for (ii = LIST_FIRST(&sc->sc_intrhead); ii; ii = nextii) {
 		nextii = LIST_NEXT(ii, list);
 		uhci_check_intr(sc, ii);
+	}
 	if (sc->sc_softwake) {
 		sc->sc_softwake = 0;
 		cv_broadcast(&sc->sc_softwake_cv);
+	}
 	sc->sc_bus.intr_context--;
 	mutex_exit(&sc->sc_lock);
+}
 /* Check for an interrupt. */
 void
 uhci_check_intr(uhci_softc_t *sc, uhci_intr_info_t *ii)
+{
 	uhci_soft_td_t *std, *lstd;
 	u_int32_t status;
 	DPRINTFN(15, ("uhci_check_intr: ii=%p\n", ii));
 #ifdef DIAGNOSTIC
 	if (ii == NULL) {
 		printf("uhci_check_intr: no ii? %p\n", ii);
 		return;
+	}
 #endif
 	if (ii->xfer->status == USBD_CANCELLED ||
 	    ii->xfer->status == USBD_TIMEOUT) {
 		DPRINTF(("uhci_check_intr: aborted xfer=%p\n", ii->xfer));
 		return;
+	}
 	if (ii->stdstart == NULL)
 		return;
 	lstd = ii->stdend;
 #ifdef DIAGNOSTIC
 	if (lstd == NULL) {
 		printf("uhci_check_intr: std==0\n");
 		return;
+	}
 #endif
 	/*
 	 * If the last TD is still active we need to check whether there
 	 * is an error somewhere in the middle, or whether there was a
 	 * short packet (SPD and not ACTIVE).
 	 */
 	usb_syncmem(&lstd->dma,
 	    lstd->offs + offsetof(uhci_td_t, td_status),
 	    sizeof(lstd->td.td_status),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	if (le32toh(lstd->td.td_status) & UHCI_TD_ACTIVE) {
 		DPRINTFN(12, ("uhci_check_intr: active ii=%p\n", ii));
 		for (std = ii->stdstart; std != lstd; std = std->link.std) {
 			usb_syncmem(&std->dma,
 			    std->offs + offsetof(uhci_td_t, td_status),
 			    sizeof(std->td.td_status),
 			    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 			status = le32toh(std->td.td_status);
 			usb_syncmem(&std->dma,
 			    std->offs + offsetof(uhci_td_t, td_status),
 			    sizeof(std->td.td_status), BUS_DMASYNC_PREREAD);
 			/* If there's an active TD the xfer isn't done. */
 			if (status & UHCI_TD_ACTIVE)
 				break;
 			/* Any kind of error makes the xfer done. */
 			if (status & UHCI_TD_STALLED)
 				goto done;
 			/* We want short packets, and it is short: it's done */
 			usb_syncmem(&std->dma,
 			    std->offs + offsetof(uhci_td_t, td_token),
 			    sizeof(std->td.td_token),
 			    BUS_DMASYNC_POSTWRITE);
 			if ((status & UHCI_TD_SPD) &&
 			      UHCI_TD_GET_ACTLEN(status) <
 			      UHCI_TD_GET_MAXLEN(le32toh(std->td.td_token)))
 				goto done;
+		}
 		DPRINTFN(12, ("uhci_check_intr: ii=%p std=%p still active\n",
 			      ii, ii->stdstart));
 		usb_syncmem(&lstd->dma,
 		    lstd->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(lstd->td.td_status),
 		    BUS_DMASYNC_PREREAD);
 		return;
+	}
  done:
 	DPRINTFN(12, ("uhci_check_intr: ii=%p done\n", ii));
 	callout_stop(&ii->xfer->timeout_handle);
 	uhci_idone(ii);
+}
 /* Called at splusb() */
 void
 uhci_idone(uhci_intr_info_t *ii)
+{
 	usbd_xfer_handle xfer = ii->xfer;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	uhci_soft_td_t *std;
 	u_int32_t status = 0, nstatus;
 	int actlen;
 	DPRINTFN(12, ("uhci_idone: ii=%p\n", ii));
 #ifdef DIAGNOSTIC
+	{
 		/* XXX SMP? */
 		int s = splhigh();
 		if (ii->isdone) {
 			splx(s);
 #ifdef UHCI_DEBUG
 			printf("uhci_idone: ii is done!\n   ");
 			uhci_dump_ii(ii);
 #else
 			printf("uhci_idone: ii=%p is done!\n", ii);
 #endif
 			return;
+		}
 		ii->isdone = 1;
 		splx(s);
+	}
 #endif
 	if (xfer->nframes != 0) {
 		/* Isoc transfer, do things differently. */
 		uhci_soft_td_t **stds = upipe->u.iso.stds;
 		int i, n, nframes, len;
 		DPRINTFN(5,("uhci_idone: ii=%p isoc ready\n", ii));
 		nframes = xfer->nframes;
 		actlen = 0;
 		n = UXFER(xfer)->curframe;
 		for (i = 0; i < nframes; i++) {
 			std = stds[n];
 #ifdef UHCI_DEBUG
 			if (uhcidebug > 5) {
 				DPRINTFN(-1,("uhci_idone: isoc TD %d\n", i));
 				uhci_dump_td(std);
+			}
 #endif
 			if (++n >= UHCI_VFRAMELIST_COUNT)
 				n = 0;
 			usb_syncmem(&std->dma,
 			    std->offs + offsetof(uhci_td_t, td_status),
 			    sizeof(std->td.td_status),
 			    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 			status = le32toh(std->td.td_status);
 			len = UHCI_TD_GET_ACTLEN(status);
 			xfer->frlengths[i] = len;
 			actlen += len;
+		}
 		upipe->u.iso.inuse -= nframes;
 		xfer->actlen = actlen;
 		xfer->status = USBD_NORMAL_COMPLETION;
 		goto end;
+	}
 #ifdef UHCI_DEBUG
 	DPRINTFN(10, ("uhci_idone: ii=%p, xfer=%p, pipe=%p ready\n",
 		      ii, xfer, upipe));
 	if (uhcidebug > 10)
 		uhci_dump_tds(ii->stdstart);
 #endif
 	/* The transfer is done, compute actual length and status. */
 	actlen = 0;
 	for (std = ii->stdstart; std != NULL; std = std->link.std) {
 		usb_syncmem(&std->dma, std->offs, sizeof(std->td),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		nstatus = le32toh(std->td.td_status);
 		if (nstatus & UHCI_TD_ACTIVE)
 			break;
 		status = nstatus;
 		if (UHCI_TD_GET_PID(le32toh(std->td.td_token)) !=
 			UHCI_TD_PID_SETUP)
 			actlen += UHCI_TD_GET_ACTLEN(status);
 		else {
 			/*
 			 * UHCI will report CRCTO in addition to a STALL or NAK
 			 * for a SETUP transaction.  See section 3.2.2, "TD
 			 * CONTROL AND STATUS".
 			 */
 			if (status & (UHCI_TD_STALLED | UHCI_TD_NAK))
 				status &= ~UHCI_TD_CRCTO;
+		}
+	}
 	/* If there are left over TDs we need to update the toggle. */
 	if (std != NULL)
 		upipe->nexttoggle = UHCI_TD_GET_DT(le32toh(std->td.td_token));
 	status &= UHCI_TD_ERROR;
 	DPRINTFN(10, ("uhci_idone: actlen=%d, status=0x%x\n",
 		      actlen, status));
 	xfer->actlen = actlen;
 	if (status != 0) {
 #ifdef UHCI_DEBUG
 		char sbuf[128];
 		snprintb(sbuf, sizeof(sbuf),
 		    "\20\22BITSTUFF\23CRCTO\24NAK\25"
 		    "BABBLE\26DBUFFER\27STALLED\30ACTIVE",(u_int32_t)status);
 		DPRINTFN((status == UHCI_TD_STALLED)*10,
 			 ("uhci_idone: error, addr=%d, endpt=0x%02x, "
 			  "status 0x%s\n",
 			  xfer->pipe->device->address,
 			  xfer->pipe->endpoint->edesc->bEndpointAddress,
 			  sbuf));
 #endif
 		if (status == UHCI_TD_STALLED)
 			xfer->status = USBD_STALLED;
 		else
 			xfer->status = USBD_IOERROR; /* more info XXX */
 	} else {
 		xfer->status = USBD_NORMAL_COMPLETION;
+	}
  end:
 	usb_transfer_complete(xfer);
 	DPRINTFN(12, ("uhci_idone: ii=%p done\n", ii));
+}
 /*
  * Called when a request does not complete.
  */
 void
 uhci_timeout(void *addr)
+{
 	uhci_intr_info_t *ii = addr;
 	struct uhci_xfer *uxfer = UXFER(ii->xfer);
 	struct uhci_pipe *upipe = (struct uhci_pipe *)uxfer->xfer.pipe;
 	uhci_softc_t *sc = upipe->pipe.device->bus->hci_private;
 	DPRINTF(("uhci_timeout: uxfer=%p\n", uxfer));
 	if (sc->sc_dying) {
 		uhci_abort_xfer(&uxfer->xfer, USBD_TIMEOUT);
 		return;
+	}
 	/* Execute the abort in a process context. */
 	usb_init_task(&uxfer->abort_task, uhci_timeout_task, ii->xfer);
 	usb_add_task(uxfer->xfer.pipe->device, &uxfer->abort_task,
 	    USB_TASKQ_HC);
+}
 void
 uhci_timeout_task(void *addr)
+{
 	usbd_xfer_handle xfer = addr;
 	DPRINTF(("uhci_timeout_task: xfer=%p\n", xfer));
 	uhci_abort_xfer(xfer, USBD_TIMEOUT);
+}
 /*
  * Wait here until controller claims to have an interrupt.
  * Then call uhci_intr and return.  Use timeout to avoid waiting
  * too long.
  * Only used during boot when interrupts are not enabled yet.
  */
 void
 uhci_waitintr(uhci_softc_t *sc, usbd_xfer_handle xfer)
+{
 	int timo = xfer->timeout;
 	uhci_intr_info_t *ii;
 	mutex_enter(&sc->sc_lock);
 	DPRINTFN(10,("uhci_waitintr: timeout = %dms\n", timo));
 	xfer->status = USBD_IN_PROGRESS;
 	for (; timo >= 0; timo--) {
 		usb_delay_ms(&sc->sc_bus, 1);
 		DPRINTFN(20,("uhci_waitintr: 0x%04x\n", UREAD2(sc, UHCI_STS)));
 		if (UREAD2(sc, UHCI_STS) & UHCI_STS_USBINT) {
 			mutex_spin_enter(&sc->sc_intr_lock);
 			uhci_intr1(sc);
 			mutex_spin_exit(&sc->sc_intr_lock);
 			if (xfer->status != USBD_IN_PROGRESS)
 				goto done;
+		}
+	}
 	/* Timeout */
 	DPRINTF(("uhci_waitintr: timeout\n"));
 	for (ii = LIST_FIRST(&sc->sc_intrhead);
 	     ii != NULL && ii->xfer != xfer;
 	     ii = LIST_NEXT(ii, list))
+		;
 #ifdef DIAGNOSTIC
 	if (ii == NULL)
 		panic("uhci_waitintr: lost intr_info");
 #endif
 	uhci_idone(ii);
 done:
 	mutex_exit(&sc->sc_lock);
+}
 void
 uhci_poll(struct usbd_bus *bus)
+{
 	uhci_softc_t *sc = bus->hci_private;
 	if (UREAD2(sc, UHCI_STS) & UHCI_STS_USBINT) {
 		mutex_spin_enter(&sc->sc_intr_lock);
 		uhci_intr1(sc);
 		mutex_spin_exit(&sc->sc_intr_lock);
+	}
+}
 void
 uhci_reset(uhci_softc_t *sc)
+{
 	int n;
 	UHCICMD(sc, UHCI_CMD_HCRESET);
 	/* The reset bit goes low when the controller is done. */
 	for (n = 0; n < UHCI_RESET_TIMEOUT &&
 		    (UREAD2(sc, UHCI_CMD) & UHCI_CMD_HCRESET); n++)
 		usb_delay_ms(&sc->sc_bus, 1);
 	if (n >= UHCI_RESET_TIMEOUT)
 		printf("%s: controller did not reset\n",
 		       device_xname(sc->sc_dev));
+}
 usbd_status
 uhci_run(uhci_softc_t *sc, int run)
+{
 	int n, running;
 	u_int16_t cmd;
 	run = run != 0;
 	mutex_spin_enter(&sc->sc_intr_lock);
 	DPRINTF(("uhci_run: setting run=%d\n", run));
 	cmd = UREAD2(sc, UHCI_CMD);
 	if (run)
 		cmd |= UHCI_CMD_RS;
 	else
 		cmd &= ~UHCI_CMD_RS;
 	UHCICMD(sc, cmd);
 	for(n = 0; n < 10; n++) {
 		running = !(UREAD2(sc, UHCI_STS) & UHCI_STS_HCH);
 		/* return when we've entered the state we want */
 		if (run == running) {
 			mutex_spin_exit(&sc->sc_intr_lock);
 			DPRINTF(("uhci_run: done cmd=0x%x sts=0x%x\n",
 				 UREAD2(sc, UHCI_CMD), UREAD2(sc, UHCI_STS)));
 			return (USBD_NORMAL_COMPLETION);
+		}
 		usb_delay_ms(&sc->sc_bus, 1);
+	}
 	mutex_spin_exit(&sc->sc_intr_lock);
 	printf("%s: cannot %s\n", device_xname(sc->sc_dev),
 	       run ? "start" : "stop");
 	return (USBD_IOERROR);
+}
 /*
  * Memory management routines.
  *  uhci_alloc_std allocates TDs
  *  uhci_alloc_sqh allocates QHs
  * These two routines do their own free list management,
  * partly for speed, partly because allocating DMAable memory
  * has page size granularaity so much memory would be wasted if
  * only one TD/QH (32 bytes) was placed in each allocated chunk.
  */
 uhci_soft_td_t *
 uhci_alloc_std(uhci_softc_t *sc)
+{
 	uhci_soft_td_t *std;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freetds == NULL) {
 		DPRINTFN(2,("uhci_alloc_std: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, UHCI_STD_SIZE * UHCI_STD_CHUNK,
 			  UHCI_TD_ALIGN, &dma);
 		if (err)
 			return (0);
 		for (i = 0; i < UHCI_STD_CHUNK; i++) {
 			offs = i * UHCI_STD_SIZE;
 			std = KERNADDR(&dma, offs);
 			std->physaddr = DMAADDR(&dma, offs);
 			std->dma = dma;
 			std->offs = offs;
 			std->link.std = sc->sc_freetds;
 			sc->sc_freetds = std;
+		}
+	}
 	std = sc->sc_freetds;
 	sc->sc_freetds = std->link.std;
 	memset(&std->td, 0, sizeof(uhci_td_t));
 	return std;
+}
 void
 uhci_free_std(uhci_softc_t *sc, uhci_soft_td_t *std)
+{
 #ifdef DIAGNOSTIC
 #define TD_IS_FREE 0x12345678
 	if (le32toh(std->td.td_token) == TD_IS_FREE) {
 		printf("uhci_free_std: freeing free TD %p\n", std);
 		return;
+	}
 	std->td.td_token = htole32(TD_IS_FREE);
 #endif
 	std->link.std = sc->sc_freetds;
 	sc->sc_freetds = std;
+}
 uhci_soft_qh_t *
 uhci_alloc_sqh(uhci_softc_t *sc)
+{
 	uhci_soft_qh_t *sqh;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	if (sc->sc_freeqhs == NULL) {
 		DPRINTFN(2, ("uhci_alloc_sqh: allocating chunk\n"));
 		err = usb_allocmem(&sc->sc_bus, UHCI_SQH_SIZE * UHCI_SQH_CHUNK,
 			  UHCI_QH_ALIGN, &dma);
 		if (err)
 			return (0);
 		for(i = 0; i < UHCI_SQH_CHUNK; i++) {
 			offs = i * UHCI_SQH_SIZE;
 			sqh = KERNADDR(&dma, offs);
 			sqh->physaddr = DMAADDR(&dma, offs);
 			sqh->dma = dma;
 			sqh->offs = offs;
 			sqh->hlink = sc->sc_freeqhs;
 			sc->sc_freeqhs = sqh;
+		}
+	}
 	sqh = sc->sc_freeqhs;
 	sc->sc_freeqhs = sqh->hlink;
 	memset(&sqh->qh, 0, sizeof(uhci_qh_t));
 	return (sqh);
+}
 void
 uhci_free_sqh(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
+{
 	sqh->hlink = sc->sc_freeqhs;
 	sc->sc_freeqhs = sqh;
+}
 void
 uhci_free_std_chain(uhci_softc_t *sc, uhci_soft_td_t *std,
 		    uhci_soft_td_t *stdend)
+{
 	uhci_soft_td_t *p;
 	/*
 	 * to avoid race condition with the controller which may be looking
 	 * at this chain, we need to first invalidate all links, and
 	 * then wait for the controller to move to another queue
 	 */
 	for (p = std; p != stdend; p = p->link.std) {
 		usb_syncmem(&p->dma,
 		    p->offs + offsetof(uhci_td_t, td_link),
 		    sizeof(p->td.td_link),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		if ((p->td.td_link & UHCI_PTR_T) == 0) {
 			p->td.td_link = UHCI_PTR_T;
 			usb_syncmem(&p->dma,
 			    p->offs + offsetof(uhci_td_t, td_link),
 			    sizeof(p->td.td_link),
 			    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+		}
+	}
 	delay(UHCI_QH_REMOVE_DELAY);
 	for (; std != stdend; std = p) {
 		p = std->link.std;
 		uhci_free_std(sc, std);
+	}
+}
 usbd_status
 uhci_alloc_std_chain(struct uhci_pipe *upipe, uhci_softc_t *sc, int len,
 		     int rd, u_int16_t flags, usb_dma_t *dma,
 		     uhci_soft_td_t **sp, uhci_soft_td_t **ep)
+{
 	uhci_soft_td_t *p, *lastp;
 	uhci_physaddr_t lastlink;
 	int i, ntd, l, tog, maxp;
 	u_int32_t status;
 	int addr = upipe->pipe.device->address;
 	int endpt = upipe->pipe.endpoint->edesc->bEndpointAddress;
 	DPRINTFN(8, ("uhci_alloc_std_chain: addr=%d endpt=%d len=%d speed=%d "
 		      "flags=0x%x\n", addr, UE_GET_ADDR(endpt), len,
 		      upipe->pipe.device->speed, flags));
 	KASSERT(mutex_owned(&sc->sc_lock));
 	maxp = UGETW(upipe->pipe.endpoint->edesc->wMaxPacketSize);
 	if (maxp == 0) {
 		printf("uhci_alloc_std_chain: maxp=0\n");
 		return (USBD_INVAL);
+	}
 	ntd = (len + maxp - 1) / maxp;
 	if ((flags & USBD_FORCE_SHORT_XFER) && len % maxp == 0)
 		ntd++;
 	DPRINTFN(10, ("uhci_alloc_std_chain: maxp=%d ntd=%d\n", maxp, ntd));
 	if (ntd == 0) {
 		*sp = *ep = 0;
 		DPRINTFN(-1,("uhci_alloc_std_chain: ntd=0\n"));
 		return (USBD_NORMAL_COMPLETION);
+	}
 	tog = upipe->nexttoggle;
 	if (ntd % 2 == 0)
 		tog ^= 1;
 	upipe->nexttoggle = tog ^ 1;
 	lastp = NULL;
 	lastlink = UHCI_PTR_T;
 	ntd--;
 	status = UHCI_TD_ZERO_ACTLEN(UHCI_TD_SET_ERRCNT(3) | UHCI_TD_ACTIVE);
 	if (upipe->pipe.device->speed == USB_SPEED_LOW)
 		status |= UHCI_TD_LS;
 	if (flags & USBD_SHORT_XFER_OK)
 		status |= UHCI_TD_SPD;
 	usb_syncmem(dma, 0, len,
 	    rd ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE);
 	for (i = ntd; i >= 0; i--) {
 		p = uhci_alloc_std(sc);
 		if (p == NULL) {
 			KASSERT(lastp != NULL);
 			uhci_free_std_chain(sc, lastp, NULL);
 			return (USBD_NOMEM);
+		}
 		p->link.std = lastp;
 		p->td.td_link = htole32(lastlink | UHCI_PTR_VF | UHCI_PTR_TD);
 		lastp = p;
 		lastlink = p->physaddr;
 		p->td.td_status = htole32(status);
 		if (i == ntd) {
 			/* last TD */
 			l = len % maxp;
 			if (l == 0 && !(flags & USBD_FORCE_SHORT_XFER))
 				l = maxp;
 			*ep = p;
 		} else
 			l = maxp;
 		p->td.td_token =
 		    htole32(rd ? UHCI_TD_IN (l, endpt, addr, tog) :
 				 UHCI_TD_OUT(l, endpt, addr, tog));
 		p->td.td_buffer = htole32(DMAADDR(dma, i * maxp));
 		usb_syncmem(&p->dma, p->offs, sizeof(p->td),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		tog ^= 1;
+	}
 	*sp = lastp;
 	DPRINTFN(10, ("uhci_alloc_std_chain: nexttog=%d\n",
 		      upipe->nexttoggle));
 	return (USBD_NORMAL_COMPLETION);
+}
 void
 uhci_device_clear_toggle(usbd_pipe_handle pipe)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	upipe->nexttoggle = 0;
+}
 void
 uhci_noop(usbd_pipe_handle pipe)
+{
+}
 usbd_status
 uhci_device_bulk_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * so start it first.
 	 */
 	return (uhci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 usbd_status
 uhci_device_bulk_start(usbd_xfer_handle xfer)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	uhci_soft_td_t *data, *dataend;
 	uhci_soft_qh_t *sqh;
 	usbd_status err;
 	int len, isread, endpt;
 	DPRINTFN(3, ("uhci_device_bulk_start: xfer=%p len=%d flags=%d ii=%p\n",
 		     xfer, xfer->length, xfer->flags, ii));
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (xfer->rqflags & URQ_REQUEST)
 		panic("uhci_device_bulk_transfer: a request");
 #endif
 	mutex_enter(&sc->sc_lock);
 	len = xfer->length;
 	endpt = upipe->pipe.endpoint->edesc->bEndpointAddress;
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	sqh = upipe->u.bulk.sqh;
 	upipe->u.bulk.isread = isread;
 	upipe->u.bulk.length = len;
 	err = uhci_alloc_std_chain(upipe, sc, len, isread, xfer->flags,
 				   &xfer->dmabuf, &data, &dataend);
 	if (err) {
 		mutex_exit(&sc->sc_lock);
 		return (err);
+	}
 	dataend->td.td_status |= htole32(UHCI_TD_IOC);
 	usb_syncmem(&dataend->dma,
 	    dataend->offs + offsetof(uhci_td_t, td_status),
 	    sizeof(dataend->td.td_status),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 8) {
 		DPRINTF(("uhci_device_bulk_transfer: data(1)\n"));
 		uhci_dump_tds(data);
+	}
 #endif
 	/* Set up interrupt info. */
 	ii->xfer = xfer;
 	ii->stdstart = data;
 	ii->stdend = dataend;
 #ifdef DIAGNOSTIC
 	if (!ii->isdone) {
 		printf("uhci_device_bulk_transfer: not done, ii=%p\n", ii);
+	}
 	ii->isdone = 0;
 #endif
 	sqh->elink = data;
 	sqh->qh.qh_elink = htole32(data->physaddr | UHCI_PTR_TD);
 	/* uhci_add_bulk() will do usb_syncmem(sqh) */
 	uhci_add_bulk(sc, sqh);
 	uhci_add_intr_info(sc, ii);
 	if (xfer->timeout && !sc->sc_bus.use_polling) {
 		callout_reset(&xfer->timeout_handle, mstohz(xfer->timeout),
 			    uhci_timeout, ii);
+	}
 	xfer->status = USBD_IN_PROGRESS;
 #ifdef UHCI_DEBUG
 	if (uhcidebug > 10) {
 		DPRINTF(("uhci_device_bulk_transfer: data(2)\n"));
 		uhci_dump_tds(data);
+	}
 #endif
 	if (sc->sc_bus.use_polling)
 		uhci_waitintr(sc, xfer);
 	mutex_exit(&sc->sc_lock);
 	return (USBD_IN_PROGRESS);
+}
 /* Abort a device bulk request. */
 void
 uhci_device_bulk_abort(usbd_xfer_handle xfer)
+{
 	DPRINTF(("uhci_device_bulk_abort:\n"));
 	uhci_abort_xfer(xfer, USBD_CANCELLED);
+}
 /*
  * Abort a device request.
  * If this routine is called at splusb() it guarantees that the request
  * will be removed from the hardware scheduling and that the callback
  * for it will be called with USBD_CANCELLED status.
  * It's impossible to guarantee that the requested transfer will not
  * have happened since the hardware runs concurrently.
  * If the transaction has already happened we rely on the ordinary
  * interrupt processing to process it.
  */
 void
 uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
+{
 	uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
 	uhci_softc_t *sc = upipe->pipe.device->bus->hci_private;
 	uhci_soft_td_t *std;
 	int wake;
 	DPRINTFN(1,("uhci_abort_xfer: xfer=%p, status=%d\n", xfer, status));
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
 		mutex_enter(&sc->sc_lock);
 		xfer->status = status;	/* make software ignore it */
 		callout_stop(&xfer->timeout_handle);
 		usb_transfer_complete(xfer);
 		mutex_exit(&sc->sc_lock);
 		return;
+	}
 	if (xfer->device->bus->intr_context || !curproc)
 		panic("uhci_abort_xfer: not in process context");
 	mutex_enter(&sc->sc_lock);
 	/*
 	 * If an abort is already in progress then just wait for it to
 	 * complete and return.
 	 */
 	if (xfer->hcflags & UXFER_ABORTING) {
 		DPRINTFN(2, ("uhci_abort_xfer: already aborting\n"));
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("uhci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		/* Override the status which might be USBD_TIMEOUT. */
 		xfer->status = status;
 		DPRINTFN(2, ("uhci_abort_xfer: waiting for abort to finish\n"));
 		xfer->hcflags |= UXFER_ABORTWAIT;
 		while (xfer->hcflags & UXFER_ABORTING)
 			cv_wait(&xfer->hccv, &sc->sc_lock);
 		goto done;
+	}
 	xfer->hcflags |= UXFER_ABORTING;
 	/*
 	 * Step 1: Make interrupt routine and hardware ignore xfer.
 	 */
 	xfer->status = status;	/* make software ignore it */
 	callout_stop(&xfer->timeout_handle);
 	DPRINTFN(1,("uhci_abort_xfer: stop ii=%p\n", ii));
 	for (std = ii->stdstart; std != NULL; std = std->link.std) {
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(std->td.td_status),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		std->td.td_status &= htole32(~(UHCI_TD_ACTIVE | UHCI_TD_IOC));
 		usb_syncmem(&std->dma,
 		    std->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(std->td.td_status),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	/*
 	 * Step 2: Wait until we know hardware has finished any possible
 	 * use of the xfer.  Also make sure the soft interrupt routine
 	 * has run.
 	 */
 	usb_delay_ms(upipe->pipe.device->bus, 2); /* Hardware finishes in 1ms */
 	sc->sc_softwake = 1;
 	usb_schedsoftintr(&sc->sc_bus);
 	DPRINTFN(1,("uhci_abort_xfer: cv_wait\n"));
 	cv_wait(&sc->sc_softwake_cv, &sc->sc_lock);
 	/*
 	 * Step 3: Execute callback.
 	 */
 	DPRINTFN(1,("uhci_abort_xfer: callback\n"));
 #ifdef DIAGNOSTIC
 	ii->isdone = 1;
 #endif
 	wake = xfer->hcflags & UXFER_ABORTWAIT;
 	xfer->hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake)
 		cv_broadcast(&xfer->hccv);
 done:
 	mutex_exit(&sc->sc_lock);
+}
 /* Close a device bulk pipe. */
 void
 uhci_device_bulk_close(usbd_pipe_handle pipe)
+{
 	struct uhci_pipe *upipe = (struct uhci_pipe *)pipe;
 	usbd_device_handle dev = upipe->pipe.device;
 	uhci_softc_t *sc = dev->bus->hci_private;
 	uhci_free_sqh(sc, upipe->u.bulk.sqh);
 	pipe->endpoint->datatoggle = upipe->nexttoggle;
+}
 usbd_status
 uhci_device_ctrl_transfer(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	/* Insert last in queue. */
 	mutex_enter(&sc->sc_lock);
 	err = usb_insert_transfer(xfer);
 	mutex_exit(&sc->sc_lock);
 	if (err)
 		return (err);
 	/*
 	 * Pipe isn't running (otherwise err would be USBD_INPROG),
 	 * so start it first.
 	 */
 	return (uhci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
+}
 usbd_status
 uhci_device_ctrl_start(usbd_xfer_handle xfer)
+{
 	uhci_softc_t *sc = xfer->pipe->device->bus->hci_private;
 	usbd_status err;
 	if (sc->sc_dying)
 		return (USBD_IOERROR);
 #ifdef DIAGNOSTIC
 	if (!(xfer->rqflags & URQ_REQUEST))
 		panic("uhci_device_ctrl_transfer: not a request");
 #endif

 @@ -1,1037 +1,1044 @@
-/*	$NetBSD: usb.c,v 1.125.6.3 2011/12/07 22:52:17 mrg Exp $	*/
+/*	$NetBSD: usb.c,v 1.125.6.4 2011/12/08 02:51:08 mrg Exp $	*/
 /*
  * Copyright (c) 1998, 2002, 2008 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.
  */
 /*
  * USB specifications and other documentation can be found at
  * http://www.usb.org/developers/docs/ and
  * http://www.usb.org/developers/devclass_docs/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.3 2011/12/07 22:52:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.125.6.4 2011/12/08 02:51:08 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/malloc.h>
 #include <sys/device.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/intr.h>
 #include <sys/module.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usb_verbose.h>
 #define USB_DEV_MINOR 255
 #include <sys/bus.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_quirks.h>
 #ifdef USB_DEBUG
 #define DPRINTF(x)	if (usbdebug) printf x
 #define DPRINTFN(n,x)	if (usbdebug>(n)) printf x
 int	usbdebug = 0;
 /*
  * 0  - do usual exploration
  * 1  - do not use timeout exploration
  * >1 - do no exploration
  */
 int	usb_noexplore = 0;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #define	usb_noexplore 0
 #endif
 struct usb_softc {
 #if 0
 	device_t	sc_dev;		/* base device */
 #endif
 	usbd_bus_handle sc_bus;		/* USB controller */
 	struct usbd_port sc_port;	/* dummy port for root hub */
 	struct lwp	*sc_event_thread;
 	char		sc_dying;
 };
 struct usb_taskq {
 	TAILQ_HEAD(, usb_task) tasks;
 	struct lwp *task_thread_lwp;
 	const char *name;
 	int taskcreated;	/* task thread exists. */
 };
 static struct usb_taskq usb_taskq[USB_NUM_TASKQS];
 dev_type_open(usbopen);
 dev_type_close(usbclose);
 dev_type_read(usbread);
 dev_type_ioctl(usbioctl);
 dev_type_poll(usbpoll);
 dev_type_kqfilter(usbkqfilter);
 const struct cdevsw usb_cdevsw = {
 	usbopen, usbclose, usbread, nowrite, usbioctl,
 	nostop, notty, usbpoll, nommap, usbkqfilter, D_OTHER,
 };
 Static void	usb_discover(struct usb_softc *);
 Static void	usb_create_event_thread(device_t);
 Static void	usb_event_thread(void *);
 Static void	usb_task_thread(void *);
 #define USB_MAX_EVENTS 100
 struct usb_event_q {
 	struct usb_event ue;
 	SIMPLEQ_ENTRY(usb_event_q) next;
 };
 Static SIMPLEQ_HEAD(, usb_event_q) usb_events =
 	SIMPLEQ_HEAD_INITIALIZER(usb_events);
 Static int usb_nevents = 0;
 Static struct selinfo usb_selevent;
 Static proc_t *usb_async_proc;  /* process that wants USB SIGIO */
 Static void *usb_async_sih;
 Static int usb_dev_open = 0;
 Static struct usb_event *usb_alloc_event(void);
 Static void usb_free_event(struct usb_event *);
 Static void usb_add_event(int, struct usb_event *);
 Static int usb_get_next_event(struct usb_event *);
 Static void usb_async_intr(void *);
 #ifdef COMPAT_30
 Static void usb_copy_old_devinfo(struct usb_device_info_old *, const struct usb_device_info *);
 #endif
 Static const char *usbrev_str[] = USBREV_STR;
 static int usb_match(device_t, cfdata_t, void *);
 static void usb_attach(device_t, device_t, void *);
 static int usb_detach(device_t, int);
 static int usb_activate(device_t, enum devact);
 static void usb_childdet(device_t, device_t);
 static void usb_doattach(device_t);
 extern struct cfdriver usb_cd;
 CFATTACH_DECL3_NEW(usb, sizeof(struct usb_softc),
     usb_match, usb_attach, usb_detach, usb_activate, NULL, usb_childdet,
     DVF_DETACH_SHUTDOWN);
 int
 usb_match(device_t parent, cfdata_t match, void *aux)
+{
 	DPRINTF(("usbd_match\n"));
 	return (UMATCH_GENERIC);
+}
 void
 usb_attach(device_t parent, device_t self, void *aux)
+{
 	struct usb_softc *sc = device_private(self);
 	int usbrev;
 	sc->sc_bus = aux;
 	usbrev = sc->sc_bus->usbrev;
 	aprint_naive("\n");
 	aprint_normal(": USB revision %s", usbrev_str[usbrev]);
 	switch (usbrev) {
 	case USBREV_1_0:
 	case USBREV_1_1:
 	case USBREV_2_0:
 		break;
 	default:
 		aprint_error(", not supported\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	aprint_normal("\n");
 	config_interrupts(self, usb_doattach);
+}
 static void
 usb_doattach(device_t self)
+{
 	static bool usb_selevent_init;	/* XXX */
 	struct usb_softc *sc = device_private(self);
 	usbd_device_handle dev;
 	usbd_status err;
 	int speed;
 	struct usb_event *ue;
 	bool mpsafe = sc->sc_bus->methods->get_locks ? true : false;
 	if (!usb_selevent_init) {
 		selinit(&usb_selevent);
 		usb_selevent_init = true;
+	}
 	DPRINTF(("usbd_doattach\n"));
 	sc->sc_bus->usbctl = self;
 	sc->sc_port.power = USB_MAX_POWER;
 	switch (sc->sc_bus->usbrev) {
 	case USBREV_1_0:
 	case USBREV_1_1:
 		speed = USB_SPEED_FULL;
 		break;
 	case USBREV_2_0:
 		speed = USB_SPEED_HIGH;
 		break;
 	default:
 		panic("usb_doattach");
+	}
 	if (mpsafe) {
 		sc->sc_bus->methods->get_locks(sc->sc_bus,
 		    &sc->sc_bus->intr_lock, &sc->sc_bus->lock);
 	} else {
 		sc->sc_bus->intr_lock = sc->sc_bus->lock = NULL;
+	}
 	ue = usb_alloc_event();
 	ue->u.ue_ctrlr.ue_bus = device_unit(self);
 	usb_add_event(USB_EVENT_CTRLR_ATTACH, ue);
 	/* XXX we should have our own level */
 	sc->sc_bus->soft = softint_establish(
 	    SOFTINT_NET | (mpsafe ? SOFTINT_MPSAFE : 0),
 	    sc->sc_bus->methods->soft_intr, sc->sc_bus);
 	if (sc->sc_bus->soft == NULL) {
 		aprint_error("%s: can't register softintr\n",
 			     device_xname(self));
 		sc->sc_dying = 1;
 		return;
+	}
 	err = usbd_new_device(self, sc->sc_bus, 0, speed, 0,
 		  &sc->sc_port);
 	if (!err) {
 		dev = sc->sc_port.device;
 		if (dev->hub == NULL) {
 			sc->sc_dying = 1;
 			aprint_error("%s: root device is not a hub\n",
 				     device_xname(self));
 			return;
+		}
 		sc->sc_bus->root_hub = dev;
 #if 1
 		/*
 		 * Turning this code off will delay attachment of USB devices
 		 * until the USB event thread is running, which means that
 		 * the keyboard will not work until after cold boot.
 		 */
 		if (cold && (device_cfdata(self)->cf_flags & 1))
 			dev->hub->explore(sc->sc_bus->root_hub);
 #endif
 	} else {
 		aprint_error("%s: root hub problem, error=%d\n",
 			     device_xname(self), err);
 		sc->sc_dying = 1;
+	}
 	config_pending_incr();
 	usb_create_event_thread(self);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	usb_async_sih = softint_establish(SOFTINT_CLOCK | SOFTINT_MPSAFE,
 	   usb_async_intr, NULL);
 	return;
+}
 static const char *taskq_names[] = USB_TASKQ_NAMES;
 void
 usb_create_event_thread(device_t self)
+{
 	struct usb_softc *sc = device_private(self);
 	struct usb_taskq *taskq;
 	int i;
 	if (kthread_create(PRI_NONE, 0, NULL, usb_event_thread, sc,
 			&sc->sc_event_thread, "%s", device_xname(self))) {
 		printf("%s: unable to create event thread for\n",
 		       device_xname(self));
 		panic("usb_create_event_thread");
+	}
 	for (i = 0; i < USB_NUM_TASKQS; i++) {
 		taskq = &usb_taskq[i];
 		if (taskq->taskcreated)
 			continue;
 		TAILQ_INIT(&taskq->tasks);
 		taskq->taskcreated = 1;
 		taskq->name = taskq_names[i];
 		if (kthread_create(PRI_NONE, 0, NULL, usb_task_thread,
 		    taskq, &taskq->task_thread_lwp, "%s", taskq->name)) {
 			printf("unable to create task thread: %s\n", taskq->name);
 			panic("usb_create_event_thread task");
+		}
+	}
+}
 /*
  * Add a task to be performed by the task thread.  This function can be
  * called from any context and the task will be executed in a process
  * context ASAP.
  */
 void
 usb_add_task(usbd_device_handle dev, struct usb_task *task, int queue)
+{
 	struct usb_taskq *taskq;
 	int s;
 	taskq = &usb_taskq[queue];
 	s = splusb();
 	if (task->queue == -1) {
 		DPRINTFN(2,("usb_add_task: task=%p\n", task));
 		TAILQ_INSERT_TAIL(&taskq->tasks, task, next);
 		task->queue = queue;
 	} else {
 		DPRINTFN(3,("usb_add_task: task=%p on q\n", task));
+	}
 	wakeup(&taskq->tasks);
 	splx(s);
+}
 void
 usb_rem_task(usbd_device_handle dev, struct usb_task *task)
+{
 	struct usb_taskq *taskq;
 	int s;
 	taskq = &usb_taskq[task->queue];
 	s = splusb();
 	if (task->queue != -1) {
 		TAILQ_REMOVE(&taskq->tasks, task, next);
 		task->queue = -1;
+	}
 	splx(s);
+}
 void
 usb_event_thread(void *arg)
+{
 	struct usb_softc *sc = arg;
 	DPRINTF(("usb_event_thread: start\n"));
 	/*
 	 * In case this controller is a companion controller to an
 	 * EHCI controller we need to wait until the EHCI controller
 	 * has grabbed the port.
 	 * XXX It would be nicer to do this with a tsleep(), but I don't
 	 * know how to synchronize the creation of the threads so it
 	 * will work.
 	 */
 	usb_delay_ms(sc->sc_bus, 500);
 	/* Make sure first discover does something. */
 	sc->sc_bus->needs_explore = 1;
 	usb_discover(sc);
 	config_pending_decr();
 	while (!sc->sc_dying) {
 		if (usb_noexplore < 2)
 			usb_discover(sc);
 		(void)tsleep(&sc->sc_bus->needs_explore, PWAIT, "usbevt",
 		    usb_noexplore ? 0 : hz * 60);
 		DPRINTFN(2,("usb_event_thread: woke up\n"));
+	}
 	sc->sc_event_thread = NULL;
 	/* In case parent is waiting for us to exit. */
 	wakeup(sc);
 	DPRINTF(("usb_event_thread: exit\n"));
 	kthread_exit(0);
+}
 void
 usb_task_thread(void *arg)
+{
 	struct usb_task *task;
 	struct usb_taskq *taskq;
 	int s;
 	taskq = arg;
 	DPRINTF(("usb_task_thread: start taskq %s\n", taskq->name));
 	s = splusb();
 	for (;;) {
 		task = TAILQ_FIRST(&taskq->tasks);
 		if (task == NULL) {
 			tsleep(&taskq->tasks, PWAIT, "usbtsk", 0);
 			task = TAILQ_FIRST(&taskq->tasks);
+		}
 		DPRINTFN(2,("usb_task_thread: woke up task=%p\n", task));
 		if (task != NULL) {
 			TAILQ_REMOVE(&taskq->tasks, task, next);
 			task->queue = -1;
 			splx(s);
 			task->fun(task->arg);
 			s = splusb();
+		}
+	}
+}
 int
 usbctlprint(void *aux, const char *pnp)
+{
 	/* only "usb"es can attach to host controllers */
 	if (pnp)
 		aprint_normal("usb at %s", pnp);
 	return (UNCONF);
+}
 int
 usbopen(dev_t dev, int flag, int mode, struct lwp *l)
+{
 	int unit = minor(dev);
 	struct usb_softc *sc;
 	if (unit == USB_DEV_MINOR) {
 		if (usb_dev_open)
 			return (EBUSY);
 		usb_dev_open = 1;
 		mutex_enter(proc_lock);
 		usb_async_proc = 0;
 		mutex_exit(proc_lock);
 		return (0);
+	}
 	sc = device_lookup_private(&usb_cd, unit);
 	if (!sc)
 		return (ENXIO);
 	if (sc->sc_dying)
 		return (EIO);
 	return (0);
+}
 int
 usbread(dev_t dev, struct uio *uio, int flag)
+{
 	struct usb_event *ue;
 #ifdef COMPAT_30
 	struct usb_event_old *ueo = NULL;	/* XXXGCC */
 #endif
 	int s, error, n, useold;
 	if (minor(dev) != USB_DEV_MINOR)
 		return (ENXIO);
 	useold = 0;
 	switch (uio->uio_resid) {
 #ifdef COMPAT_30
 	case sizeof(struct usb_event_old):
 		ueo = malloc(sizeof(struct usb_event_old), M_USBDEV,
 			     M_WAITOK|M_ZERO);
 		useold = 1;
 		/* FALLTHRU */
 #endif
 	case sizeof(struct usb_event):
 		ue = usb_alloc_event();
 		break;
 	default:
 		return (EINVAL);
+	}
 	error = 0;
 	s = splusb();
 	for (;;) {
 		n = usb_get_next_event(ue);
 		if (n != 0)
 			break;
 		if (flag & IO_NDELAY) {
 			error = EWOULDBLOCK;
 			break;
+		}
 		error = tsleep(&usb_events, PZERO | PCATCH, "usbrea", 0);
 		if (error)
 			break;
+	}
 	splx(s);
 	if (!error) {
 #ifdef COMPAT_30
 		if (useold) { /* copy fields to old struct */
 			ueo->ue_type = ue->ue_type;
 			memcpy(&ueo->ue_time, &ue->ue_time,
 			      sizeof(struct timespec));
 			switch (ue->ue_type) {
 				case USB_EVENT_DEVICE_ATTACH:
 				case USB_EVENT_DEVICE_DETACH:
 					usb_copy_old_devinfo(&ueo->u.ue_device, &ue->u.ue_device);
 					break;
 				case USB_EVENT_CTRLR_ATTACH:
 				case USB_EVENT_CTRLR_DETACH:
 					ueo->u.ue_ctrlr.ue_bus=ue->u.ue_ctrlr.ue_bus;
 					break;
 				case USB_EVENT_DRIVER_ATTACH:
 				case USB_EVENT_DRIVER_DETACH:
 					ueo->u.ue_driver.ue_cookie=ue->u.ue_driver.ue_cookie;
 					memcpy(ueo->u.ue_driver.ue_devname,
 					       ue->u.ue_driver.ue_devname,
 					       sizeof(ue->u.ue_driver.ue_devname));
 					break;
 				default:
+					;
+			}
 			error = uiomove((void *)ueo, sizeof *ueo, uio);
 		} else
 #endif
 			error = uiomove((void *)ue, sizeof *ue, uio);
+	}
 	usb_free_event(ue);
 #ifdef COMPAT_30
 	if (useold)
 		free(ueo, M_USBDEV);
 #endif
 	return (error);
+}
 int
 usbclose(dev_t dev, int flag, int mode,
     struct lwp *l)
+{
 	int unit = minor(dev);
 	if (unit == USB_DEV_MINOR) {
 		mutex_enter(proc_lock);
 		usb_async_proc = 0;
 		mutex_exit(proc_lock);
 		usb_dev_open = 0;
+	}
 	return (0);
+}
 int
 usbioctl(dev_t devt, u_long cmd, void *data, int flag, struct lwp *l)
+{
 	struct usb_softc *sc;
 	int unit = minor(devt);
 	if (unit == USB_DEV_MINOR) {
 		switch (cmd) {
 		case FIONBIO:
 			/* All handled in the upper FS layer. */
 			return (0);
 		case FIOASYNC:
 			mutex_enter(proc_lock);
 			if (*(int *)data)
 				usb_async_proc = l->l_proc;
 			else
 				usb_async_proc = 0;
 			mutex_exit(proc_lock);
 			return (0);
 		default:
 			return (EINVAL);
+		}
+	}
 	sc = device_lookup_private(&usb_cd, unit);
 	if (sc->sc_dying)
 		return (EIO);
 	switch (cmd) {
 #ifdef USB_DEBUG
 	case USB_SETDEBUG:
 		if (!(flag & FWRITE))
 			return (EBADF);
 		usbdebug  = ((*(int *)data) & 0x000000ff);
 		break;
 #endif /* USB_DEBUG */
 	case USB_REQUEST:
+	{
 		struct usb_ctl_request *ur = (void *)data;
 		int len = UGETW(ur->ucr_request.wLength);
 		struct iovec iov;
 		struct uio uio;
 		void *ptr = 0;
 		int addr = ur->ucr_addr;
 		usbd_status err;
 		int error = 0;
 		if (!(flag & FWRITE))
 			return (EBADF);
 		DPRINTF(("usbioctl: USB_REQUEST addr=%d len=%d\n", addr, len));
 		if (len < 0 || len > 32768)
 			return (EINVAL);
 		if (addr < 0 || addr >= USB_MAX_DEVICES ||
 		    sc->sc_bus->devices[addr] == 0)
 			return (EINVAL);
 		if (len != 0) {
 			iov.iov_base = (void *)ur->ucr_data;
 			iov.iov_len = len;
 			uio.uio_iov = &iov;
 			uio.uio_iovcnt = 1;
 			uio.uio_resid = len;
 			uio.uio_offset = 0;
 			uio.uio_rw =
 				ur->ucr_request.bmRequestType & UT_READ ?
 				UIO_READ : UIO_WRITE;
 			uio.uio_vmspace = l->l_proc->p_vmspace;
 			ptr = malloc(len, M_TEMP, M_WAITOK);
 			if (uio.uio_rw == UIO_WRITE) {
 				error = uiomove(ptr, len, &uio);
 				if (error)
 					goto ret;
+			}
+		}
 		err = usbd_do_request_flags(sc->sc_bus->devices[addr],
 			  &ur->ucr_request, ptr, ur->ucr_flags, &ur->ucr_actlen,
 			  USBD_DEFAULT_TIMEOUT);
 		if (err) {
 			error = EIO;
 			goto ret;
+		}
 		if (len > ur->ucr_actlen)
 			len = ur->ucr_actlen;
 		if (len != 0) {
 			if (uio.uio_rw == UIO_READ) {
 				error = uiomove(ptr, len, &uio);
 				if (error)
 					goto ret;
+			}
+		}
 	ret:
 		if (ptr)
 			free(ptr, M_TEMP);
 		return (error);
+	}
 	case USB_DEVICEINFO:
+	{
 		usbd_device_handle dev;
 		struct usb_device_info *di = (void *)data;
 		int addr = di->udi_addr;
 		if (addr < 1 || addr >= USB_MAX_DEVICES)
 			return EINVAL;
 		if ((dev = sc->sc_bus->devices[addr]) == NULL)
 			return ENXIO;
 		usbd_fill_deviceinfo(dev, di, 1);
 		break;
+	}
 #ifdef COMPAT_30
 	case USB_DEVICEINFO_OLD:
+	{
 		usbd_device_handle dev;
 		struct usb_device_info_old *di = (void *)data;
 		int addr = di->udi_addr;
 		if (addr < 1 || addr >= USB_MAX_DEVICES)
 			return EINVAL;
 		if ((dev = sc->sc_bus->devices[addr]) == NULL)
 			return ENXIO;
 		usbd_fill_deviceinfo_old(dev, di, 1);
 		break;
+	}
 #endif
 	case USB_DEVICESTATS:
 		*(struct usb_device_stats *)data = sc->sc_bus->stats;
 		break;
 	default:
 		return (EINVAL);
+	}
 	return (0);
+}
 int
 usbpoll(dev_t dev, int events, struct lwp *l)
+{
 	int revents, mask, s;
 	if (minor(dev) == USB_DEV_MINOR) {
 		revents = 0;
 		mask = POLLIN | POLLRDNORM;
 		s = splusb();
 		if (events & mask && usb_nevents > 0)
 			revents |= events & mask;
 		if (revents == 0 && events & mask)
 			selrecord(l, &usb_selevent);
 		splx(s);
 		return (revents);
 	} else {
 		return (0);
+	}
+}
 static void
 filt_usbrdetach(struct knote *kn)
+{
 	int s;
 	s = splusb();
 	SLIST_REMOVE(&usb_selevent.sel_klist, kn, knote, kn_selnext);
 	splx(s);
+}
 static int
 filt_usbread(struct knote *kn, long hint)
+{
 	if (usb_nevents == 0)
 		return (0);
 	kn->kn_data = sizeof(struct usb_event);
 	return (1);
+}
 static const struct filterops usbread_filtops =
 	{ 1, NULL, filt_usbrdetach, filt_usbread };
 int
 usbkqfilter(dev_t dev, struct knote *kn)
+{
 	struct klist *klist;
 	int s;
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		if (minor(dev) != USB_DEV_MINOR)
 			return (1);
 		klist = &usb_selevent.sel_klist;
 		kn->kn_fop = &usbread_filtops;
 		break;
 	default:
 		return (EINVAL);
+	}
 	kn->kn_hook = NULL;
 	s = splusb();
 	SLIST_INSERT_HEAD(klist, kn, kn_selnext);
 	splx(s);
 	return (0);
+}
 /* Explore device tree from the root. */
 Static void
 usb_discover(struct usb_softc *sc)
+{
 	DPRINTFN(2,("usb_discover\n"));
 	if (usb_noexplore > 1)
 		return;
 	/*
 	 * We need mutual exclusion while traversing the device tree,
 	 * but this is guaranteed since this function is only called
 	 * from the event thread for the controller.
 	 */
 	while (sc->sc_bus->needs_explore && !sc->sc_dying) {
 		sc->sc_bus->needs_explore = 0;
 		sc->sc_bus->root_hub->hub->explore(sc->sc_bus->root_hub);
+	}
+}
 void
 usb_needs_explore(usbd_device_handle dev)
+{
 	DPRINTFN(2,("usb_needs_explore\n"));
 	dev->bus->needs_explore = 1;
 	wakeup(&dev->bus->needs_explore);
+}
 void
 usb_needs_reattach(usbd_device_handle dev)
+{
 	DPRINTFN(2,("usb_needs_reattach\n"));
 	dev->powersrc->reattach = 1;
 	dev->bus->needs_explore = 1;
 	wakeup(&dev->bus->needs_explore);
+}
 /* Called at splusb() */
 int
 usb_get_next_event(struct usb_event *ue)
+{
 	struct usb_event_q *ueq;
 	if (usb_nevents <= 0)
 		return (0);
 	ueq = SIMPLEQ_FIRST(&usb_events);
 #ifdef DIAGNOSTIC
 	if (ueq == NULL) {
 		printf("usb: usb_nevents got out of sync! %d\n", usb_nevents);
 		usb_nevents = 0;
 		return (0);
+	}
 #endif
 	if (ue)
 		*ue = ueq->ue;
 	SIMPLEQ_REMOVE_HEAD(&usb_events, next);
 	usb_free_event((struct usb_event *)(void *)ueq);
 	usb_nevents--;
 	return (1);
+}
 void
 usbd_add_dev_event(int type, usbd_device_handle udev)
+{
 	struct usb_event *ue = usb_alloc_event();
 	usbd_fill_deviceinfo(udev, &ue->u.ue_device, USB_EVENT_IS_ATTACH(type));
 	usb_add_event(type, ue);
+}
 void
 usbd_add_drv_event(int type, usbd_device_handle udev, device_t dev)
+{
 	struct usb_event *ue = usb_alloc_event();
 	ue->u.ue_driver.ue_cookie = udev->cookie;
 	strncpy(ue->u.ue_driver.ue_devname, device_xname(dev),
 	    sizeof ue->u.ue_driver.ue_devname);
 	usb_add_event(type, ue);
+}
 Static struct usb_event *
 usb_alloc_event(void)
+{
 	/* Yes, this is right; we allocate enough so that we can use it later */
 	return malloc(sizeof(struct usb_event_q), M_USBDEV, M_WAITOK|M_ZERO);
+}
 Static void
 usb_free_event(struct usb_event *uep)
+{
 	free(uep, M_USBDEV);
+}
 Static void
 usb_add_event(int type, struct usb_event *uep)
+{
 	struct usb_event_q *ueq;
 	struct timeval thetime;
 	int s;
 	microtime(&thetime);
 	/* Don't want to wait here inside splusb() */
 	ueq = (struct usb_event_q *)(void *)uep;
 	ueq->ue = *uep;
 	ueq->ue.ue_type = type;
 	TIMEVAL_TO_TIMESPEC(&thetime, &ueq->ue.ue_time);
 	s = splusb();
 	if (++usb_nevents >= USB_MAX_EVENTS) {
 		/* Too many queued events, drop an old one. */
 		DPRINTFN(-1,("usb: event dropped\n"));
 		(void)usb_get_next_event(0);
+	}
 	SIMPLEQ_INSERT_TAIL(&usb_events, ueq, next);
 	wakeup(&usb_events);
 	selnotify(&usb_selevent, 0, 0);
 	if (usb_async_proc != NULL) {
 		kpreempt_disable();
 		softint_schedule(usb_async_sih);
 		kpreempt_enable();
+	}
 	splx(s);
+}
 Static void
 usb_async_intr(void *cookie)
+{
 	proc_t *proc;
 	mutex_enter(proc_lock);
 	if ((proc = usb_async_proc) != NULL)
 		psignal(proc, SIGIO);
 	mutex_exit(proc_lock);
+}
 void
 usb_schedsoftintr(usbd_bus_handle bus)
+{
 	DPRINTFN(10,("usb_schedsoftintr: polling=%d\n", bus->use_polling));
 	if (bus->use_polling) {
 		bus->methods->soft_intr(bus);
 	} else {
 		kpreempt_disable();
 		softint_schedule(bus->soft);
 		kpreempt_enable();
+	}
+}
 int
 usb_activate(device_t self, enum devact act)
+{
 	struct usb_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
+}
 void
 usb_childdet(device_t self, device_t child)
+{
 	int i;
 	struct usb_softc *sc = device_private(self);
 	struct usbd_device *dev;
 	if ((dev = sc->sc_port.device) == NULL || dev->subdevlen == 0)
 		return;
 	for (i = 0; i < dev->subdevlen; i++)
 		if (dev->subdevs[i] == child)
 			dev->subdevs[i] = NULL;
+}
 int
 usb_detach(device_t self, int flags)
+{
 	struct usb_softc *sc = device_private(self);
 	struct usb_event *ue;
 	int rc;
 	DPRINTF(("usb_detach: start\n"));
 	/* Make all devices disconnect. */
 	if (sc->sc_port.device != NULL &&
 	    (rc = usb_disconnect_port(&sc->sc_port, self, flags)) != 0)
 		return rc;
 	pmf_device_deregister(self);
 	/* Kill off event thread. */
 	sc->sc_dying = 1;
 	while (sc->sc_event_thread != NULL) {
 		wakeup(&sc->sc_bus->needs_explore);
 		tsleep(sc, PWAIT, "usbdet", hz * 60);
+	}
 	DPRINTF(("usb_detach: event thread dead\n"));
 	if (sc->sc_bus->soft != NULL) {
 		softint_disestablish(sc->sc_bus->soft);
 		sc->sc_bus->soft = NULL;
+	}
 	ue = usb_alloc_event();
 	ue->u.ue_ctrlr.ue_bus = device_unit(self);
 	usb_add_event(USB_EVENT_CTRLR_DETACH, ue);
 	return (0);
+}
 #ifdef COMPAT_30
 Static void
 usb_copy_old_devinfo(struct usb_device_info_old *uo,
 		     const struct usb_device_info *ue)
+{
 	const unsigned char *p;
 	unsigned char *q;
 	int i, n;
 	uo->udi_bus = ue->udi_bus;
 	uo->udi_addr = ue->udi_addr;
 	uo->udi_cookie = ue->udi_cookie;
 	for (i = 0, p = (const unsigned char *)ue->udi_product,
 	     q = (unsigned char *)uo->udi_product;
 	     *p && i < USB_MAX_STRING_LEN - 1; p++) {
 		if (*p < 0x80)
 			q[i++] = *p;
 		else {
 			q[i++] = '?';
 			if ((*p & 0xe0) == 0xe0)
 				p++;
 			p++;
+		}
+	}
 	q[i] = 0;
 	for (i = 0, p = ue->udi_vendor, q = uo->udi_vendor;
 	     *p && i < USB_MAX_STRING_LEN - 1; p++) {
 		if (* p < 0x80)
 			q[i++] = *p;
 		else {
 			q[i++] = '?';
 			p++;
 			if ((*p & 0xe0) == 0xe0)
 				p++;
+		}
+	}
 	q[i] = 0;
 	memcpy(uo->udi_release, ue->udi_release, sizeof(uo->udi_release));
 	uo->udi_productNo = ue->udi_productNo;
 	uo->udi_vendorNo = ue->udi_vendorNo;
 	uo->udi_releaseNo = ue->udi_releaseNo;
 	uo->udi_class = ue->udi_class;
 	uo->udi_subclass = ue->udi_subclass;
 	uo->udi_protocol = ue->udi_protocol;
 	uo->udi_config = ue->udi_config;
 	uo->udi_speed = ue->udi_speed;
 	uo->udi_power = ue->udi_power;
 	uo->udi_nports = ue->udi_nports;
 	for (n=0; n<USB_MAX_DEVNAMES; n++)
 		memcpy(uo->udi_devnames[n],
 		       ue->udi_devnames[n], USB_MAX_DEVNAMELEN);
 	memcpy(uo->udi_ports, ue->udi_ports, sizeof(uo->udi_ports));
+}
 #endif

 @@ -1,1577 +1,1572 @@
-/*	$NetBSD: usb_subr.c,v 1.180.6.1 2011/12/04 13:23:17 jmcneill Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.180.6.2 2011/12/08 02:51:08 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 2011/12/04 13:23:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.180.6.2 2011/12/08 02:51:08 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 (dev->bus->methods->get_locks) {
 		dev->bus->methods->get_locks(dev->bus, &p->intr_lock, &p->lock);
 	} else {
 		p->intr_lock = p->lock = NULL;
 	*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,1260 @@
-/*	$NetBSD: usbdi.c,v 1.134.2.1 2011/12/04 13:23:17 jmcneill Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.134.2.2 2011/12/08 02:51:08 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 2011/12/04 13:23:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.2 2011/12/08 02:51:08 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)
+{
 #ifdef DIAGNOSTIC
 	if (pipe == NULL) {
 		printf("usbd_close_pipe: pipe==NULL\n");
 		return (USBD_NORMAL_COMPLETION);
+	}
 #endif
 	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);
 	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->lock);
+	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->lock);
+	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->lock);
+	usbd_lock_pipe(pipe);
 	err = usbd_ar_pipe(pipe);
-	usbd_unlock(pipe->lock);
+	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;
-	SPLUSBCHECK;
+	KASSERT(pipe->device->bus->lock == NULL || mutex_owned(pipe->device->bus->lock));
 	KASSERT(pipe->lock == NULL || mutex_owned(pipe->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->lock)
+		if (pipe->device->bus->lock)
-			mutex_exit(pipe->lock);
+			mutex_exit(pipe->device->bus->lock);
 		pipe->methods->abort(xfer);
-		if (pipe->lock)
+		if (pipe->device->bus->lock)
-			mutex_enter(pipe->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;
 	SPLUSBCHECK;
 	DPRINTFN(5, ("usb_transfer_complete: pipe=%p xfer=%p status=%d "
 		     "actlen=%d\n", pipe, xfer, xfer->status, xfer->actlen));
-	KASSERT(pipe->lock == NULL || mutex_owned(pipe->lock));
+	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->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);
+		}
+	}
 	if (sync && !polling) {
-		if (pipe->lock) {
+		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->lock == NULL || mutex_owned(pipe->lock));
+	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;
-	SPLUSBCHECK;
+	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->lock == NULL || mutex_owned(pipe->lock));
+	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->lock)
+		if (pipe->device->bus->lock)
-			mutex_exit(pipe->lock);
+			mutex_exit(pipe->device->bus->lock);
 		err = pipe->methods->start(xfer);
-		if (pipe->lock)
+		if (pipe->device->bus->lock)
-			mutex_enter(pipe->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);
+}