 @@ -1,1055 +1,1055 @@
-/*	$NetBSD: ehci.c,v 1.253 2016/08/14 14:42:22 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.254 2016/10/03 00:32:37 dholland Exp $ */
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum,
  * Jeremy Morse (jeremy.morse@gmail.com), Jared D. McNeill
  * (jmcneill@invisible.ca) and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    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.253 2016/08/14 14:42:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254 2016/10/03 00:32:37 dholland Exp $");
 #include "ohci.h"
 #include "uhci.h"
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <machine/endian.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbhist.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.h>
 #ifdef USB_DEBUG
 #ifndef EHCI_DEBUG
 #define ehcidebug 0
 #else
 static int ehcidebug = 0;
 SYSCTL_SETUP(sysctl_hw_ehci_setup, "sysctl hw.ehci setup")
+{
 	int err;
 	const struct sysctlnode *rnode;
 	const struct sysctlnode *cnode;
 	err = sysctl_createv(clog, 0, NULL, &rnode,
 	    CTLFLAG_PERMANENT, CTLTYPE_NODE, "ehci",
 	    SYSCTL_DESCR("ehci global controls"),
 	    NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
 	if (err)
 		goto fail;
 	/* control debugging printfs */
 	err = sysctl_createv(clog, 0, &rnode, &cnode,
 	    CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
 	    "debug", SYSCTL_DESCR("Enable debugging output"),
 	    NULL, 0, &ehcidebug, sizeof(ehcidebug), CTL_CREATE, CTL_EOL);
 	if (err)
 		goto fail;
 	return;
 fail:
 	aprint_error("%s: sysctl_createv failed (err = %d)\n", __func__, err);
+}
 #endif /* EHCI_DEBUG */
 #endif /* USB_DEBUG */
 #define	DPRINTF(FMT,A,B,C,D)	USBHIST_LOG(ehcidebug,FMT,A,B,C,D)
 #define	DPRINTFN(N,FMT,A,B,C,D)	USBHIST_LOGN(ehcidebug,N,FMT,A,B,C,D)
 #define	EHCIHIST_FUNC()		USBHIST_FUNC()
 #define	EHCIHIST_CALLED()	USBHIST_CALLED(ehcidebug)
 struct ehci_pipe {
 	struct usbd_pipe pipe;
 	int nexttoggle;
 	ehci_soft_qh_t *sqh;
 	union {
 		/* Control pipe */
 		struct {
 			usb_dma_t reqdma;
 		} ctrl;
 		/* Interrupt pipe */
 		struct {
 			u_int length;
 		} intr;
 		/* Iso pipe */
 		struct {
 			u_int next_frame;
 			u_int cur_xfers;
 		} isoc;
 	};
 };
 typedef TAILQ_HEAD(ex_completeq, ehci_xfer) ex_completeq_t;
 Static usbd_status	ehci_open(struct usbd_pipe *);
 Static void		ehci_poll(struct usbd_bus *);
 Static void		ehci_softintr(void *);
 Static int		ehci_intr1(ehci_softc_t *);
 Static void		ehci_check_qh_intr(ehci_softc_t *, struct ehci_xfer *,
 			    ex_completeq_t *);
 Static void		ehci_check_itd_intr(ehci_softc_t *, struct ehci_xfer *,
 			    ex_completeq_t *);
 Static void		ehci_check_sitd_intr(ehci_softc_t *, struct ehci_xfer *,
 			    ex_completeq_t *);
 Static void		ehci_idone(struct ehci_xfer *, ex_completeq_t *);
 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 struct usbd_xfer *
 			ehci_allocx(struct usbd_bus *, unsigned int);
 Static void		ehci_freex(struct usbd_bus *, struct usbd_xfer *);
 Static void		ehci_get_lock(struct usbd_bus *, kmutex_t **);
 Static int		ehci_roothub_ctrl(struct usbd_bus *,
 			    usb_device_request_t *, void *, int);
 Static usbd_status	ehci_root_intr_transfer(struct usbd_xfer *);
 Static usbd_status	ehci_root_intr_start(struct usbd_xfer *);
 Static void		ehci_root_intr_abort(struct usbd_xfer *);
 Static void		ehci_root_intr_close(struct usbd_pipe *);
 Static void		ehci_root_intr_done(struct usbd_xfer *);
 Static int		ehci_device_ctrl_init(struct usbd_xfer *);
 Static void		ehci_device_ctrl_fini(struct usbd_xfer *);
 Static usbd_status	ehci_device_ctrl_transfer(struct usbd_xfer *);
 Static usbd_status	ehci_device_ctrl_start(struct usbd_xfer *);
 Static void		ehci_device_ctrl_abort(struct usbd_xfer *);
 Static void		ehci_device_ctrl_close(struct usbd_pipe *);
 Static void		ehci_device_ctrl_done(struct usbd_xfer *);
 Static int		ehci_device_bulk_init(struct usbd_xfer *);
 Static void		ehci_device_bulk_fini(struct usbd_xfer *);
 Static usbd_status	ehci_device_bulk_transfer(struct usbd_xfer *);
 Static usbd_status	ehci_device_bulk_start(struct usbd_xfer *);
 Static void		ehci_device_bulk_abort(struct usbd_xfer *);
 Static void		ehci_device_bulk_close(struct usbd_pipe *);
 Static void		ehci_device_bulk_done(struct usbd_xfer *);
 Static int		ehci_device_intr_init(struct usbd_xfer *);
 Static void		ehci_device_intr_fini(struct usbd_xfer *);
 Static usbd_status	ehci_device_intr_transfer(struct usbd_xfer *);
 Static usbd_status	ehci_device_intr_start(struct usbd_xfer *);
 Static void		ehci_device_intr_abort(struct usbd_xfer *);
 Static void		ehci_device_intr_close(struct usbd_pipe *);
 Static void		ehci_device_intr_done(struct usbd_xfer *);
 Static int		ehci_device_isoc_init(struct usbd_xfer *);
 Static void		ehci_device_isoc_fini(struct usbd_xfer *);
 Static usbd_status	ehci_device_isoc_transfer(struct usbd_xfer *);
 Static void		ehci_device_isoc_abort(struct usbd_xfer *);
 Static void		ehci_device_isoc_close(struct usbd_pipe *);
 Static void		ehci_device_isoc_done(struct usbd_xfer *);
 Static int		ehci_device_fs_isoc_init(struct usbd_xfer *);
 Static void		ehci_device_fs_isoc_fini(struct usbd_xfer *);
 Static usbd_status	ehci_device_fs_isoc_transfer(struct usbd_xfer *);
 Static void		ehci_device_fs_isoc_abort(struct usbd_xfer *);
 Static void		ehci_device_fs_isoc_close(struct usbd_pipe *);
 Static void		ehci_device_fs_isoc_done(struct usbd_xfer *);
 Static void		ehci_device_clear_toggle(struct usbd_pipe *);
 Static void		ehci_noop(struct usbd_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 int		ehci_alloc_sqtd_chain(ehci_softc_t *,
 			    struct usbd_xfer *, int, int, ehci_soft_qtd_t **);
 Static void		ehci_free_sqtds(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_reset_sqtd_chain(ehci_softc_t *, struct usbd_xfer *,
 			    int, int, int *, ehci_soft_qtd_t **);
 Static void		ehci_append_sqtd(ehci_soft_qtd_t *, ehci_soft_qtd_t *);
 Static ehci_soft_itd_t *ehci_alloc_itd(ehci_softc_t *);
 Static ehci_soft_sitd_t *
 			ehci_alloc_sitd(ehci_softc_t *);
 Static void 		ehci_remove_itd_chain(ehci_softc_t *, ehci_soft_itd_t *);
 Static void		ehci_remove_sitd_chain(ehci_softc_t *, ehci_soft_sitd_t *);
 Static void 		ehci_free_itd_chain(ehci_softc_t *, ehci_soft_itd_t *);
 Static void		ehci_free_sitd_chain(ehci_softc_t *, ehci_soft_sitd_t *);
 static inline void
 ehci_free_itd_locked(ehci_softc_t *sc, ehci_soft_itd_t *itd)
+{
 	LIST_INSERT_HEAD(&sc->sc_freeitds, itd, free_list);
+}
 static inline void
 ehci_free_sitd_locked(ehci_softc_t *sc, ehci_soft_sitd_t *sitd)
+{
 	LIST_INSERT_HEAD(&sc->sc_freesitds, sitd, free_list);
+}
 Static void 		ehci_abort_isoc_xfer(struct usbd_xfer *, usbd_status);
 Static usbd_status	ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *,
 			    int);
 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(struct usbd_pipe *, ehci_soft_qh_t *);
 Static void		ehci_abort_xfer(struct usbd_xfer *, usbd_status);
 #ifdef EHCI_DEBUG
 Static ehci_softc_t 	*theehci;
 void			ehci_dump(void);
 #endif
 #ifdef EHCI_DEBUG
 Static void		ehci_dump_regs(ehci_softc_t *);
 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 *);
 Static void		ehci_dump_sitd(struct ehci_soft_itd *);
 Static void 		ehci_dump_itds(ehci_soft_itd_t *);
 Static void		ehci_dump_itd(struct ehci_soft_itd *);
 Static void		ehci_dump_exfer(struct ehci_xfer *);
 #endif
 #define EHCI_NULL htole32(EHCI_LINK_TERMINATE)
 static inline void
 ehci_add_intr_list(ehci_softc_t *sc, struct ehci_xfer *ex)
+{
 	TAILQ_INSERT_TAIL(&sc->sc_intrhead, ex, ex_next);
+}
 static inline void
 ehci_del_intr_list(ehci_softc_t *sc, struct ehci_xfer *ex)
+{
 	TAILQ_REMOVE(&sc->sc_intrhead, ex, ex_next);
+}
 Static const struct usbd_bus_methods ehci_bus_methods = {
 	.ubm_open =	ehci_open,
 	.ubm_softint =	ehci_softintr,
 	.ubm_dopoll =	ehci_poll,
 	.ubm_allocx =	ehci_allocx,
 	.ubm_freex =	ehci_freex,
 	.ubm_getlock =	ehci_get_lock,
 	.ubm_rhctrl =	ehci_roothub_ctrl,
 };
 Static const struct usbd_pipe_methods ehci_root_intr_methods = {
 	.upm_transfer =	ehci_root_intr_transfer,
 	.upm_start =	ehci_root_intr_start,
 	.upm_abort =	ehci_root_intr_abort,
 	.upm_close =	ehci_root_intr_close,
 	.upm_cleartoggle =	ehci_noop,
 	.upm_done =	ehci_root_intr_done,
 };
 Static const struct usbd_pipe_methods ehci_device_ctrl_methods = {
 	.upm_init =	ehci_device_ctrl_init,
 	.upm_fini =	ehci_device_ctrl_fini,
 	.upm_transfer =	ehci_device_ctrl_transfer,
 	.upm_start =	ehci_device_ctrl_start,
 	.upm_abort =	ehci_device_ctrl_abort,
 	.upm_close =	ehci_device_ctrl_close,
 	.upm_cleartoggle =	ehci_noop,
 	.upm_done =	ehci_device_ctrl_done,
 };
 Static const struct usbd_pipe_methods ehci_device_intr_methods = {
 	.upm_init =	ehci_device_intr_init,
 	.upm_fini =	ehci_device_intr_fini,
 	.upm_transfer =	ehci_device_intr_transfer,
 	.upm_start =	ehci_device_intr_start,
 	.upm_abort =	ehci_device_intr_abort,
 	.upm_close =	ehci_device_intr_close,
 	.upm_cleartoggle =	ehci_device_clear_toggle,
 	.upm_done =	ehci_device_intr_done,
 };
 Static const struct usbd_pipe_methods ehci_device_bulk_methods = {
 	.upm_init =	ehci_device_bulk_init,
 	.upm_fini =	ehci_device_bulk_fini,
 	.upm_transfer =	ehci_device_bulk_transfer,
 	.upm_start =	ehci_device_bulk_start,
 	.upm_abort =	ehci_device_bulk_abort,
 	.upm_close =	ehci_device_bulk_close,
 	.upm_cleartoggle =	ehci_device_clear_toggle,
 	.upm_done =	ehci_device_bulk_done,
 };
 Static const struct usbd_pipe_methods ehci_device_isoc_methods = {
 	.upm_init =	ehci_device_isoc_init,
 	.upm_fini =	ehci_device_isoc_fini,
 	.upm_transfer =	ehci_device_isoc_transfer,
 	.upm_abort =	ehci_device_isoc_abort,
 	.upm_close =	ehci_device_isoc_close,
 	.upm_cleartoggle =	ehci_noop,
 	.upm_done =	ehci_device_isoc_done,
 };
 Static const struct usbd_pipe_methods ehci_device_fs_isoc_methods = {
 	.upm_init =	ehci_device_fs_isoc_init,
 	.upm_fini =	ehci_device_fs_isoc_fini,
 	.upm_transfer =	ehci_device_fs_isoc_transfer,
 	.upm_abort =	ehci_device_fs_isoc_abort,
 	.upm_close =	ehci_device_fs_isoc_close,
 	.upm_cleartoggle = ehci_noop,
 	.upm_done =	ehci_device_fs_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,
 };
 int
 ehci_init(ehci_softc_t *sc)
+{
 	uint32_t vers, sparams, cparams, hcr;
 	u_int i;
 	usbd_status err;
 	ehci_soft_qh_t *sqh;
 	u_int ncomp;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 #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_xferpool = pool_cache_init(sizeof(struct ehci_xfer), 0, 0, 0,
 	    "ehcixfer", NULL, IPL_USB, NULL, NULL, NULL);
 	sc->sc_doorbell_si = softint_establish(SOFTINT_USB | SOFTINT_MPSAFE,
 	    ehci_doorbell, sc);
 	KASSERT(sc->sc_doorbell_si != NULL);
 	sc->sc_pcd_si = softint_establish(SOFTINT_USB | SOFTINT_MPSAFE,
 	    ehci_pcd, sc);
 	KASSERT(sc->sc_pcd_si != NULL);
 	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("sparams=%#x", sparams, 0, 0, 0);
 	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);
 	sc->sc_hasppc = EHCI_HCS_PPC(sparams);
 	cparams = EREAD4(sc, EHCI_HCCPARAMS);
 	DPRINTF("cparams=%#x", cparams, 0, 0, 0);
 	if (EHCI_HCC_64BIT(cparams)) {
 		/* MUST clear segment register if 64 bit capable. */
 		EOWRITE4(sc, EHCI_CTRLDSSEGMENT, 0);
+	}
 	if (cparams & EHCI_HCC_IST_FULLFRAME) {
 		sc->sc_istthreshold = 0;
 	} else {
 		sc->sc_istthreshold = EHCI_HCC_GET_IST_THRESHOLD(cparams);
+	}
 	sc->sc_bus.ub_revision = USBREV_2_0;
 	sc->sc_bus.ub_usedma = true;
 	sc->sc_bus.ub_dmaflags = USBMALLOC_MULTISEG;
 	/* Reset the controller */
 	DPRINTF("resetting", 0, 0, 0, 0);
 	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 EIO;
+	}
 	if (sc->sc_vendor_init)
 		sc->sc_vendor_init(sc);
 	/* 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 EIO;
+	}
 	err = usb_allocmem(&sc->sc_bus, sc->sc_flsize * sizeof(ehci_link_t),
 	    EHCI_FLALIGN_ALIGN, &sc->sc_fldma);
 	if (err)
 		return err;
 	DPRINTF("flsize=%d", sc->sc_flsize, 0, 0, 0);
 	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);
 	LIST_INIT(&sc->sc_freesitds);
 	TAILQ_INIT(&sc->sc_intrhead);
 	/* Set up the bus struct. */
 	sc->sc_bus.ub_methods = &ehci_bus_methods;
 	sc->sc_bus.ub_pipesize= 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 = ENOMEM;
 			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_endphub = htole32(EHCI_QH_SET_MULT(1));
 		sqh->qh.qh_curqtd = EHCI_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 = ENOMEM;
 		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
 	DPRINTFN(5, "--- dump start ---", 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
 	DPRINTFN(5, "--- dump end ---", 0, 0, 0, 0);
 #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 EIO;
+	}
 	/* Enable interrupts */
 	DPRINTF("enabling interupts", 0, 0, 0, 0);
 	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
 	return 0;
 #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;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	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.ub_usepolling) {
 		uint32_t intrs = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS));
 		if (intrs)
 			EOWRITE4(sc, EHCI_USBSTS, intrs); /* Acknowledge */
 		DPRINTFN(16, "ignored interrupt while polling", 0, 0, 0, 0);
 		goto done;
+	}
 	ret = ehci_intr1(sc);
 done:
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return ret;
+}
 Static int
 ehci_intr1(ehci_softc_t *sc)
+{
 	uint32_t intrs, eintrs;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	/* 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;
 	DPRINTF("sc=%p intrs=%#x(%#x) eintrs=%#x", sc, intrs,
 	    EOREAD4(sc, EHCI_USBSTS), eintrs);
 	if (!eintrs)
 		return 0;
 	EOWRITE4(sc, EHCI_USBSTS, intrs); /* Acknowledge */
 	if (eintrs & EHCI_STS_IAA) {
 		DPRINTF("door bell", 0, 0, 0, 0);
 		kpreempt_disable();
 		KASSERT(sc->sc_doorbell_si != NULL);
 		softint_schedule(sc->sc_doorbell_si);
 		kpreempt_enable();
 		eintrs &= ~EHCI_STS_IAA;
+	}
 	if (eintrs & (EHCI_STS_INT | EHCI_STS_ERRINT)) {
 		DPRINTF("INT=%d  ERRINT=%d",
 		    eintrs & EHCI_STS_INT ? 1 : 0,
 		    eintrs & EHCI_STS_ERRINT ? 1 : 0, 0, 0);
 		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();
 		KASSERT(sc->sc_pcd_si != NULL);
 		softint_schedule(sc->sc_pcd_si);
 		kpreempt_enable();
 		eintrs &= ~EHCI_STS_PCD;
+	}
 	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;
 	struct usbd_xfer *xfer;
 	u_char *p;
 	int i, m;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	mutex_enter(&sc->sc_lock);
 	xfer = sc->sc_intrxfer;
 	if (xfer == NULL) {
 		/* Just ignore the change. */
 		goto done;
+	}
 	p = xfer->ux_buf;
 	m = min(sc->sc_noport, xfer->ux_length * 8 - 1);
 	memset(p, 0, xfer->ux_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);
 		if (i % 8 == 7)
 			DPRINTF("change(%d)=0x%02x", i / 8, p[i/8], 0, 0);
+	}
 	xfer->ux_actlen = xfer->ux_length;
 	xfer->ux_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 = EHCI_BUS2SC(bus);
 	struct ehci_xfer *ex, *nextex;
 	KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	ex_completeq_t cq;
 	TAILQ_INIT(&cq);
 	/*
 	 * 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. :-(
 	 */
 	/*
 	 * ehci_idone will remove transfer from sc->sc_intrhead if it's
 	 * complete and add to our cq list
+	 *
 	 */
 	TAILQ_FOREACH_SAFE(ex, &sc->sc_intrhead, ex_next, nextex) {
 		switch (ex->ex_type) {
 		case EX_CTRL:
 		case EX_BULK:
 		case EX_INTR:
 			ehci_check_qh_intr(sc, ex, &cq);
 			break;
 		case EX_ISOC:
 			ehci_check_itd_intr(sc, ex, &cq);
 			break;
 		case EX_FS_ISOC:
 			ehci_check_sitd_intr(sc, ex, &cq);
 			break;
 		default:
 			KASSERT(false);
+		}
+	}
 	/*
 	 * We abuse ex_next for the interrupt and complete lists and
 	 * interrupt transfers will get re-added here so use
 	 * the _SAFE version of TAILQ_FOREACH.
 	 */
 	TAILQ_FOREACH_SAFE(ex, &cq, ex_next, nextex) {
 		usb_transfer_complete(&ex->ex_xfer);
+	}
 	/* 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);
+	}
+}
 Static void
 ehci_check_qh_intr(ehci_softc_t *sc, struct ehci_xfer *ex, ex_completeq_t *cq)
+{
 	ehci_soft_qtd_t *sqtd, *fsqtd, *lsqtd;
 	uint32_t status;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 	if (ex->ex_type == EX_CTRL) {
 		fsqtd = ex->ex_setup;
 		lsqtd = ex->ex_status;
 	} else {
 		fsqtd = ex->ex_sqtdstart;
 		lsqtd = ex->ex_sqtdend;
+	}
 	KASSERTMSG(fsqtd != NULL && lsqtd != NULL,
 	    "xfer %p xt %d fsqtd %p lsqtd %p", ex, ex->ex_type, fsqtd, lsqtd);
 	/*
 	 * 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(&lsqtd->dma,
 	    lsqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 	    sizeof(lsqtd->qtd.qtd_status),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	status = le32toh(lsqtd->qtd.qtd_status);
 	usb_syncmem(&lsqtd->dma,
 	    lsqtd->offs + offsetof(ehci_qtd_t, qtd_status),
 	    sizeof(lsqtd->qtd.qtd_status), BUS_DMASYNC_PREREAD);
 	if (status & EHCI_QTD_ACTIVE) {
 		DPRINTFN(10, "active ex=%p", ex, 0, 0, 0);
 		/* last qTD has already been checked */
 		for (sqtd = fsqtd; 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;
 			/* Handle short packets */
 			if (EHCI_QTD_GET_BYTES(status) != 0) {
 				/*
 				 * If we get here for a control transfer then
 				 * we need to let the hardware complete the
 				 * status phase.  That is, we're not done
 				 * quite yet.
+				 *
 				 * Otherwise, we're done.
 				 */
 				if (ex->ex_type == EX_CTRL) {
 					break;
+				}
 				goto done;
+			}
+		}
 		DPRINTFN(10, "ex=%p std=%p still active", ex, ex->ex_sqtdstart,
 , 0);
 #ifdef EHCI_DEBUG
 		DPRINTFN(5, "--- still active start ---", 0, 0, 0, 0);
 		ehci_dump_sqtds(ex->ex_sqtdstart);
 		DPRINTFN(5, "--- still active end ---", 0, 0, 0, 0);
 #endif
 		return;
+	}
  done:
 	DPRINTFN(10, "ex=%p done", ex, 0, 0, 0);
 	callout_stop(&ex->ex_xfer.ux_callout);
 	ehci_idone(ex, cq);
+}
 Static void
 ehci_check_itd_intr(ehci_softc_t *sc, struct ehci_xfer *ex, ex_completeq_t *cq)
+{
 	ehci_soft_itd_t *itd;
 	int i;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (&ex->ex_xfer != SIMPLEQ_FIRST(&ex->ex_xfer.ux_pipe->up_queue))
 		return;
 	KASSERTMSG(ex->ex_itdstart != NULL && ex->ex_itdend != NULL,
 	    "xfer %p fitd %p litd %p", ex, ex->ex_itdstart, ex->ex_itdend);
 	itd = ex->ex_itdend;
 	/*
 	 * 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 */
+	}
 	usb_syncmem(&itd->dma, itd->offs + offsetof(ehci_itd_t, itd_ctl),
 	    sizeof(itd->itd.itd_ctl), BUS_DMASYNC_PREREAD);
 	DPRINTFN(10, "ex %p itd %p still active", ex, ex->ex_itdstart, 0, 0);
 	return;
 done:
 	DPRINTF("ex %p done", ex, 0, 0, 0);
 	callout_stop(&ex->ex_xfer.ux_callout);
 	ehci_idone(ex, cq);
+}
 void
 ehci_check_sitd_intr(ehci_softc_t *sc, struct ehci_xfer *ex, ex_completeq_t *cq)
+{
 	ehci_soft_sitd_t *sitd;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (&ex->ex_xfer != SIMPLEQ_FIRST(&ex->ex_xfer.ux_pipe->up_queue))
 		return;
 	KASSERTMSG(ex->ex_sitdstart != NULL && ex->ex_sitdend != NULL,
 	    "xfer %p fsitd %p lsitd %p", ex, ex->ex_sitdstart, ex->ex_sitdend);
 	sitd = ex->ex_sitdend;
 	/*
 	 * check no active transfers in last sitd, meaning we're finished
 	 */
 	usb_syncmem(&sitd->dma, sitd->offs + offsetof(ehci_sitd_t, sitd_trans),
 	    sizeof(sitd->sitd.sitd_trans),
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	bool active = ((le32toh(sitd->sitd.sitd_trans) & EHCI_SITD_ACTIVE) != 0);
 	usb_syncmem(&sitd->dma, sitd->offs + offsetof(ehci_sitd_t, sitd_trans),
 	    sizeof(sitd->sitd.sitd_trans), BUS_DMASYNC_PREREAD);
 	if (active)
 		return;
 	DPRINTFN(10, "ex=%p done", ex, 0, 0, 0);
 	callout_stop(&(ex->ex_xfer.ux_callout));
 	ehci_idone(ex, cq);
+}
 Static void
 ehci_idone(struct ehci_xfer *ex, ex_completeq_t *cq)
+{
 	struct usbd_xfer *xfer = &ex->ex_xfer;
 	struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);
 	struct ehci_softc *sc = EHCI_XFER2SC(xfer);
 	ehci_soft_qtd_t *sqtd, *fsqtd, *lsqtd;
 	uint32_t status = 0, nstatus = 0;
 	int actlen = 0;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 	DPRINTF("ex=%p", ex, 0, 0, 0);
 	if (xfer->ux_status == USBD_CANCELLED ||
 	    xfer->ux_status == USBD_TIMEOUT) {
 		DPRINTF("aborted xfer=%p", xfer, 0, 0, 0);
 		return;
+	}
 #ifdef DIAGNOSTIC
 #ifdef EHCI_DEBUG
 	if (ex->ex_isdone) {
 @@ -1172,2000 +1172,2003 @@ ehci_idone(struct ehci_xfer *ex, ex_comp
 		goto end;
+	}
 	KASSERT(ex->ex_type == EX_CTRL || ex->ex_type == EX_INTR ||
 	   ex->ex_type == EX_BULK);
 	/* Continue processing xfers using queue heads */
 	if (ex->ex_type == EX_CTRL) {
 		fsqtd = ex->ex_setup;
 		lsqtd = ex->ex_status;
 	} else {
 		fsqtd = ex->ex_sqtdstart;
 		lsqtd = ex->ex_sqtdend;
+	}
 #ifdef EHCI_DEBUG
 	DPRINTFN(5, "--- dump start ---", 0, 0, 0, 0);
 	ehci_dump_sqtds(fsqtd);
 	DPRINTFN(5, "--- dump end ---", 0, 0, 0, 0);
 #endif
 	for (sqtd = fsqtd; 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);
 		usb_syncmem(&sqtd->dma, sqtd->offs, sizeof(sqtd->qtd),
 		    BUS_DMASYNC_PREREAD);
 		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->ux_pipe->up_dev->ud_pipe0 != xfer->ux_pipe) {
 		DPRINTF("toggle update status=0x%08x nstatus=0x%08x",
 		    status, nstatus, 0, 0);
 #if 0
 		ehci_dump_sqh(epipe->sqh);
 		ehci_dump_sqtds(ex->ex_sqtdstart);
 #endif
 		epipe->nexttoggle = EHCI_QTD_GET_TOGGLE(nstatus);
+	}
 	DPRINTF("len=%d actlen=%d status=0x%08x", xfer->ux_length, actlen,
 	    status, 0);
 	xfer->ux_actlen = actlen;
 	if (status & EHCI_QTD_HALTED) {
 #ifdef EHCI_DEBUG
 		DPRINTF("halted addr=%d endpt=0x%02x",
 		    xfer->ux_pipe->up_dev->ud_addr,
 		    xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress,
 , 0);
 		DPRINTF("cerr=%d pid=%d",
 		    EHCI_QTD_GET_CERR(status), EHCI_QTD_GET_PID(status),
 , 0);
 		DPRINTF("active =%d halted=%d buferr=%d babble=%d",
 		    status & EHCI_QTD_ACTIVE ? 1 : 0,
 		    status & EHCI_QTD_HALTED ? 1 : 0,
 		    status & EHCI_QTD_BUFERR ? 1 : 0,
 		    status & EHCI_QTD_BABBLE ? 1 : 0);
 		DPRINTF("xacterr=%d missed=%d split =%d ping  =%d",
 		    status & EHCI_QTD_XACTERR ? 1 : 0,
 		    status & EHCI_QTD_MISSEDMICRO ? 1 : 0,
 		    status & EHCI_QTD_SPLITXSTATE ? 1 : 0,
 		    status & EHCI_QTD_PINGSTATE ? 1 : 0);
 		DPRINTFN(5, "--- dump start ---", 0, 0, 0, 0);
 		ehci_dump_sqh(epipe->sqh);
 		ehci_dump_sqtds(ex->ex_sqtdstart);
 		DPRINTFN(5, "--- dump end ---", 0, 0, 0, 0);
 #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->ux_status = USBD_STALLED;
 		} else {
 			xfer->ux_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->ux_status = USBD_NORMAL_COMPLETION;
+	}
     end:
 	ehci_del_intr_list(sc, ex);
 	TAILQ_INSERT_TAIL(cq, ex, ex_next);
 	DPRINTF("ex=%p done", ex, 0, 0, 0);
+}
 Static void
 ehci_poll(struct usbd_bus *bus)
+{
 	ehci_softc_t *sc = EHCI_BUS2SC(bus);
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 #ifdef EHCI_DEBUG
 	static int last;
 	int new;
 	new = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS));
 	if (new != last) {
 		DPRINTF("intrs=0x%04x", new, 0, 0, 0);
 		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)
+{
 	int rv = 0;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	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);
 #if 0
 	/* XXX destroyed in ehci_pci.c as it controls ehci_intr access */
 	softint_disestablish(sc->sc_doorbell_si);
 	softint_disestablish(sc->sc_pcd_si);
 	mutex_destroy(&sc->sc_lock);
 	mutex_destroy(&sc->sc_intr_lock);
 #endif
 	pool_cache_destroy(sc->sc_xferpool);
 	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;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	mutex_spin_enter(&sc->sc_intr_lock);
 	sc->sc_bus.ub_usepolling++;
 	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.ub_usepolling--;
 	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;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	/* 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);
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	EOWRITE4(sc, EHCI_USBCMD, 0);	/* Halt controller */
 	EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
 	return true;
+}
 Static struct usbd_xfer *
 ehci_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct ehci_softc *sc = EHCI_BUS2SC(bus);
 	struct usbd_xfer *xfer;
 	xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct ehci_xfer));
 #ifdef DIAGNOSTIC
 		struct ehci_xfer *ex = EHCI_XFER2EXFER(xfer);
 		ex->ex_isdone = true;
 		xfer->ux_state = XFER_BUSY;
 #endif
+	}
 	return xfer;
+}
 Static void
 ehci_freex(struct usbd_bus *bus, struct usbd_xfer *xfer)
+{
 	struct ehci_softc *sc = EHCI_BUS2SC(bus);
 	struct ehci_xfer *ex __diagused = EHCI_XFER2EXFER(xfer);
 	KASSERTMSG(xfer->ux_state == XFER_BUSY, "xfer %p state %d\n", xfer,
 	    xfer->ux_state);
 	KASSERT(ex->ex_isdone);
 #ifdef DIAGNOSTIC
 	xfer->ux_state = XFER_FREE;
 #endif
 	pool_cache_put(sc->sc_xferpool, xfer);
+}
 Static void
 ehci_get_lock(struct usbd_bus *bus, kmutex_t **lock)
+{
 	struct ehci_softc *sc = EHCI_BUS2SC(bus);
 	*lock = &sc->sc_lock;
+}
 Static void
 ehci_device_clear_toggle(struct usbd_pipe *pipe)
+{
 	struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("epipe=%p status=0x%08x", epipe,
 	    epipe->sqh->qh.qh_qtd.qtd_status, 0, 0);
 #ifdef EHCI_DEBUG
 	if (ehcidebug)
 		usbd_dump_pipe(pipe);
 #endif
 	epipe->nexttoggle = 0;
+}
 Static void
 ehci_noop(struct usbd_pipe *pipe)
+{
+}
 #ifdef EHCI_DEBUG
 /*
  * Unused function - this is meant to be called from a kernel
  * debugger.
  */
 void
 ehci_dump(void)
+{
 	ehci_softc_t *sc = theehci;
 	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)));
+}
 Static void
 ehci_dump_regs(ehci_softc_t *sc)
+{
 	int i;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("cmd     = 0x%08x  sts      = 0x%08x  ien      = 0x%08x",
 	    EOREAD4(sc, EHCI_USBCMD), EOREAD4(sc, EHCI_USBSTS),
 	    EOREAD4(sc, EHCI_USBINTR), 0);
 	DPRINTF("frindex = 0x%08x  ctrdsegm = 0x%08x  periodic = 0x%08x  "
 	    "async   = 0x%08x",
 	    EOREAD4(sc, EHCI_FRINDEX), EOREAD4(sc, EHCI_CTRLDSSEGMENT),
 	    EOREAD4(sc, EHCI_PERIODICLISTBASE),
 	    EOREAD4(sc, EHCI_ASYNCLISTADDR));
 	for (i = 1; i <= sc->sc_noport; i += 2) {
 		if (i == sc->sc_noport) {
 			DPRINTF("port %d status = 0x%08x", i,
 			    EOREAD4(sc, EHCI_PORTSC(i)), 0, 0);
 		} else {
 			DPRINTF(
 			    "port %d status = 0x%08x  port %d status = 0x%08x",
 			    i, EOREAD4(sc, EHCI_PORTSC(i)),
 			    i+1, EOREAD4(sc, EHCI_PORTSC(i+1)));
+		}
+	}
+}
 #define ehci_dump_link(link, type) do {					\
 	DPRINTF("    link 0x%08x (T = %d):",		\
 	    link,							\
 	    link & EHCI_LINK_TERMINATE ? 1 : 0, 0, 0);			\
 	if (type) {							\
 		DPRINTF(					\
 		    "        ITD  = %d  QH   = %d  SITD = %d  FSTN = %d",\
 		    EHCI_LINK_TYPE(link) == EHCI_LINK_ITD ? 1 : 0,	\
 		    EHCI_LINK_TYPE(link) == EHCI_LINK_QH ? 1 : 0,	\
 		    EHCI_LINK_TYPE(link) == EHCI_LINK_SITD ? 1 : 0,	\
 		    EHCI_LINK_TYPE(link) == EHCI_LINK_FSTN ? 1 : 0);	\
 	}								\
 } while(0)
 Static void
 ehci_dump_sqtds(ehci_soft_qtd_t *sqtd)
+{
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	int i;
 	uint32_t 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 (!stop)
 		DPRINTF("dump aborted, too many TDs", 0, 0, 0, 0);
+}
 Static void
 ehci_dump_sqtd(ehci_soft_qtd_t *sqtd)
+{
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	usb_syncmem(&sqtd->dma, sqtd->offs,
 	    sizeof(sqtd->qtd), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	DPRINTFN(10, "QTD(%p) at 0x%08x:", sqtd, sqtd->physaddr, 0, 0);
 	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)
+{
 	EHCIHIST_FUNC();	EHCIHIST_CALLED();
 	uint32_t s = le32toh(qtd->qtd_status);
 	DPRINTFN(10,
 	    "     next = 0x%08x  altnext = 0x%08x  status = 0x%08x",
 	    qtd->qtd_next, qtd->qtd_altnext, s, 0);
 	DPRINTFN(10,
 	    "   toggle = %d ioc = %d bytes = %#x "
 	    "c_page = %#x", EHCI_QTD_GET_TOGGLE(s), EHCI_QTD_GET_IOC(s),
 	    EHCI_QTD_GET_BYTES(s), EHCI_QTD_GET_C_PAGE(s));
 	DPRINTFN(10,
 	    "     cerr = %d pid = %d stat  = %x",
 	    EHCI_QTD_GET_CERR(s), EHCI_QTD_GET_PID(s), EHCI_QTD_GET_STATUS(s),
 );
 	DPRINTFN(10,
 	    "active =%d halted=%d buferr=%d babble=%d",
 	    s & EHCI_QTD_ACTIVE ? 1 : 0,
 	    s & EHCI_QTD_HALTED ? 1 : 0,
 	    s & EHCI_QTD_BUFERR ? 1 : 0,
 	    s & EHCI_QTD_BABBLE ? 1 : 0);
 	DPRINTFN(10,
 	    "xacterr=%d missed=%d split =%d ping  =%d",
 	    s & EHCI_QTD_XACTERR ? 1 : 0,
 	    s & EHCI_QTD_MISSEDMICRO ? 1 : 0,
 	    s & EHCI_QTD_SPLITXSTATE ? 1 : 0,
 	    s & EHCI_QTD_PINGSTATE ? 1 : 0);
 	DPRINTFN(10,
 	    "buffer[0] = %#x  buffer[1] = %#x  "
 	    "buffer[2] = %#x  buffer[3] = %#x",
 	    le32toh(qtd->qtd_buffer[0]), le32toh(qtd->qtd_buffer[1]),
 	    le32toh(qtd->qtd_buffer[2]), le32toh(qtd->qtd_buffer[3]));
 	DPRINTFN(10,
 	    "buffer[4] = %#x", le32toh(qtd->qtd_buffer[4]), 0, 0, 0);
+}
 Static void
 ehci_dump_sqh(ehci_soft_qh_t *sqh)
+{
 	ehci_qh_t *qh = &sqh->qh;
 	ehci_link_t link;
 	uint32_t endp, endphub;
 	EHCIHIST_FUNC();	EHCIHIST_CALLED();
 	usb_syncmem(&sqh->dma, sqh->offs,
 	    sizeof(sqh->qh), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	DPRINTFN(10, "QH(%p) at %#x:", sqh, sqh->physaddr, 0, 0);
 	link = le32toh(qh->qh_link);
 	ehci_dump_link(link, true);
 	endp = le32toh(qh->qh_endp);
 	DPRINTFN(10, "    endp = %#x", endp, 0, 0, 0);
 	DPRINTFN(10, "        addr = 0x%02x  inact = %d  endpt = %d  eps = %d",
 	    EHCI_QH_GET_ADDR(endp), EHCI_QH_GET_INACT(endp),
 	    EHCI_QH_GET_ENDPT(endp), EHCI_QH_GET_EPS(endp));
 	DPRINTFN(10, "        dtc  = %d     hrecl = %d",
 	    EHCI_QH_GET_DTC(endp), EHCI_QH_GET_HRECL(endp), 0, 0);
 	DPRINTFN(10, "        ctl  = %d     nrl   = %d  mpl   = %#x(%d)",
 	    EHCI_QH_GET_CTL(endp),EHCI_QH_GET_NRL(endp),
 	    EHCI_QH_GET_MPL(endp), EHCI_QH_GET_MPL(endp));
 	endphub = le32toh(qh->qh_endphub);
 	DPRINTFN(10, " endphub = %#x", endphub, 0, 0, 0);
 	DPRINTFN(10, "      smask = 0x%02x  cmask = 0x%02x",
 	    EHCI_QH_GET_SMASK(endphub), EHCI_QH_GET_CMASK(endphub), 1, 0);
 	DPRINTFN(10, "      huba  = 0x%02x  port  = %d  mult = %d",
 	    EHCI_QH_GET_HUBA(endphub), EHCI_QH_GET_PORT(endphub),
 	    EHCI_QH_GET_MULT(endphub), 0);
 	link = le32toh(qh->qh_curqtd);
 	ehci_dump_link(link, false);
 	DPRINTFN(10, "Overlay qTD:", 0, 0, 0, 0);
 	ehci_dump_qtd(&qh->qh_qtd);
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREREAD);
+}
 Static void
 ehci_dump_itds(ehci_soft_itd_t *itd)
+{
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	int i;
 	uint32_t stop = 0;
 	for (i = 0; itd && i < 20 && !stop; itd = itd->xfer_next, i++) {
 		ehci_dump_itd(itd);
 		usb_syncmem(&itd->dma,
 		    itd->offs + offsetof(ehci_itd_t, itd_next),
 		    sizeof(itd->itd),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 		stop = itd->itd.itd_next & htole32(EHCI_LINK_TERMINATE);
 		usb_syncmem(&itd->dma,
 		    itd->offs + offsetof(ehci_itd_t, itd_next),
 		    sizeof(itd->itd), BUS_DMASYNC_PREREAD);
+	}
 	if (!stop)
 		DPRINTF("dump aborted, too many TDs", 0, 0, 0, 0);
+}
 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;
 	EHCIHIST_FUNC();	EHCIHIST_CALLED();
 	DPRINTF("ITD: next phys = %#x", itd->itd.itd_next, 0, 0, 0);
 	for (i = 0; i < EHCI_ITD_NUFRAMES; i++) {
 		t = le32toh(itd->itd.itd_ctl[i]);
 		DPRINTF("ITDctl %d: stat = %x len = %x",
 		    i, EHCI_ITD_GET_STATUS(t), EHCI_ITD_GET_LEN(t), 0);
 		DPRINTF("     ioc = %x pg = %x offs = %x",
 		    EHCI_ITD_GET_IOC(t), EHCI_ITD_GET_PG(t),
 		    EHCI_ITD_GET_OFFS(t), 0);
+	}
 	DPRINTF("ITDbufr: ", 0, 0, 0, 0);
 	for (i = 0; i < EHCI_ITD_NBUFFERS; i++)
 		DPRINTF("      %x",
 		    EHCI_ITD_GET_BPTR(le32toh(itd->itd.itd_bufr[i])), 0, 0, 0);
 	b = le32toh(itd->itd.itd_bufr[0]);
 	b2 = le32toh(itd->itd.itd_bufr[1]);
 	b3 = le32toh(itd->itd.itd_bufr[2]);
 	DPRINTF("     ep = %x daddr = %x dir = %d",
 	    EHCI_ITD_GET_EP(b), EHCI_ITD_GET_DADDR(b), EHCI_ITD_GET_DIR(b2), 0);
 	DPRINTF("     maxpkt = %x multi = %x",
 	    EHCI_ITD_GET_MAXPKT(b2), EHCI_ITD_GET_MULTI(b3), 0, 0);
+}
 Static void
 ehci_dump_sitd(struct ehci_soft_itd *itd)
+{
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("SITD %p next = %p prev = %p",
 	    itd, itd->frame_list.next, itd->frame_list.prev, 0);
 	DPRINTF("        xfernext=%p physaddr=%X slot=%d",
 	    itd->xfer_next, itd->physaddr, itd->slot, 0);
+}
 Static void
 ehci_dump_exfer(struct ehci_xfer *ex)
+{
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("ex = %p type %d isdone", ex, ex->ex_type,
 	    ex->ex_isdone, 0);
 	switch (ex->ex_type) {
 	case EX_CTRL:
 		DPRINTF("   setup = %p data = %p status = %p",
 		    ex->ex_setup, ex->ex_data, ex->ex_status, 0);
 		break;
 	case EX_BULK:
 	case EX_INTR:
 		DPRINTF("   qtdstart = %p qtdend = %p",
 		    ex->ex_sqtdstart, ex->ex_sqtdend, 0, 0);
 		break;
 	case EX_ISOC:
 		DPRINTF("   itdstart = %p itdend = %p",
 		    ex->ex_itdstart, ex->ex_itdend, 0, 0);
 		break;
 	case EX_FS_ISOC:
 		DPRINTF("   sitdstart = %p sitdend = %p",
 		    ex->ex_sitdstart, ex->ex_sitdend, 0, 0);
 		break;
 	default:
 		DPRINTF("   unknown type", 0, 0, 0, 0);
+	}
+}
 #endif
 Static usbd_status
 ehci_open(struct usbd_pipe *pipe)
+{
 	struct usbd_device *dev = pipe->up_dev;
 	ehci_softc_t *sc = EHCI_PIPE2SC(pipe);
 	usb_endpoint_descriptor_t *ed = pipe->up_endpoint->ue_edesc;
 	uint8_t rhaddr = dev->ud_bus->ub_rhaddr;
 	uint8_t addr = dev->ud_addr;
 	uint8_t xfertype = UE_GET_XFERTYPE(ed->bmAttributes);
 	struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);
 	ehci_soft_qh_t *sqh;
 	usbd_status err;
 	int ival, speed, naks;
 	int hshubaddr, hshubport;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("pipe=%p, addr=%d, endpt=%d (%d)", pipe, addr,
 	    ed->bEndpointAddress, rhaddr);
 	if (dev->ud_myhsport) {
 		/*
 		 * When directly attached FS/LS device while doing embedded
 		 * transaction translations and we are the hub, set the hub
 		 * address to 0 (us).
 		 */
 		if (!(sc->sc_flags & EHCIF_ETTF)
 		    || (dev->ud_myhsport->up_parent->ud_addr != rhaddr)) {
 			hshubaddr = dev->ud_myhsport->up_parent->ud_addr;
 		} else {
 			hshubaddr = 0;
+		}
 		hshubport = dev->ud_myhsport->up_portno;
 	} else {
 		hshubaddr = 0;
 		hshubport = 0;
+	}
 	if (sc->sc_dying)
 		return USBD_IOERROR;
 	/* toggle state needed for bulk endpoints */
 	epipe->nexttoggle = pipe->up_endpoint->ue_toggle;
 	if (addr == rhaddr) {
 		switch (ed->bEndpointAddress) {
 		case USB_CONTROL_ENDPOINT:
 			pipe->up_methods = &roothub_ctrl_methods;
 			break;
 		case UE_DIR_IN | USBROOTHUB_INTR_ENDPT:
 			pipe->up_methods = &ehci_root_intr_methods;
 			break;
 		default:
 			DPRINTF("bad bEndpointAddress 0x%02x",
 			    ed->bEndpointAddress, 0, 0, 0);
 			return USBD_INVAL;
+		}
 		return USBD_NORMAL_COMPLETION;
+	}
 	/* XXX All this stuff is only valid for async. */
 	switch (dev->ud_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->ud_speed);
+	}
 	if (speed == EHCI_QH_SPEED_LOW && xfertype == UE_ISOCHRONOUS) {
 		DPRINTF("hshubaddr=%d hshubport=%d", hshubaddr, hshubport, 0,
 );
 		return USBD_INVAL;
+	}
 	/*
 	 * For interrupt transfer, nak throttling must be disabled, but for
 	 * the other transfer type, nak throttling should be enabled from the
 	 * viewpoint 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) |
 			    (xfertype == UE_INTERRUPT ?
 				 EHCI_QH_SET_CMASK(0x08) : 0)
 			);
 		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->ctrl.reqdma);
 #ifdef EHCI_DEBUG
 		if (err)
 			printf("ehci_open: usb_allocmem()=%d\n", err);
 #endif
 		if (err)
 			goto bad;
 		pipe->up_methods = &ehci_device_ctrl_methods;
 		mutex_enter(&sc->sc_lock);
 		ehci_add_qh(sc, sqh, sc->sc_async_head);
 		mutex_exit(&sc->sc_lock);
 		break;
 	case UE_BULK:
 		pipe->up_methods = &ehci_device_bulk_methods;
 		mutex_enter(&sc->sc_lock);
 		ehci_add_qh(sc, sqh, sc->sc_async_head);
 		mutex_exit(&sc->sc_lock);
 		break;
 	case UE_INTERRUPT:
 		pipe->up_methods = &ehci_device_intr_methods;
 		ival = pipe->up_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->up_serialise = false;
 		if (speed == EHCI_QH_SPEED_HIGH)
 			pipe->up_methods = &ehci_device_isoc_methods;
 		else
 			pipe->up_methods = &ehci_device_fs_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->isoc.next_frame = 0;
 		epipe->isoc.cur_xfers = 0;
 		break;
 	default:
 		DPRINTF("bad xfer type %d", xfertype, 0, 0, 0);
 		err = USBD_INVAL;
 		goto bad;
+	}
 	return USBD_NORMAL_COMPLETION;
  bad:
 	if (sqh != NULL) {
 		mutex_enter(&sc->sc_lock);
 		ehci_free_sqh(sc, sqh);
 		mutex_exit(&sc->sc_lock);
+	}
 	return err;
+}
 /*
  * Add an ED to the schedule.  Called with USB lock held.
  */
 Static void
 ehci_add_qh(ehci_softc_t *sc, ehci_soft_qh_t *sqh, ehci_soft_qh_t *head)
+{
 	KASSERT(mutex_owned(&sc->sc_lock));
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	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
 	DPRINTFN(5, "--- dump start ---", 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
 	DPRINTFN(5, "--- dump end ---", 0, 0, 0, 0);
 #endif
+}
 /*
  * Remove an ED from the schedule.  Called with USB lock held.
  */
 Static void
 ehci_rem_qh(ehci_softc_t *sc, ehci_soft_qh_t *sqh, ehci_soft_qh_t *head)
+{
 	ehci_soft_qh_t *p;
 	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;
 	uint32_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 __diagused;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	if (sc->sc_dying) {
 		DPRINTF("dying", 0, 0, 0, 0);
 		return;
+	}
 	/* ask for doorbell */
 	EOWRITE4(sc, EHCI_USBCMD, EOREAD4(sc, EHCI_USBCMD) | EHCI_CMD_IAAD);
 	DPRINTF("cmd = 0x%08x sts = 0x%08x",
 	    EOREAD4(sc, EHCI_USBCMD), EOREAD4(sc, EHCI_USBSTS), 0, 0);
 	error = cv_timedwait(&sc->sc_doorbell, &sc->sc_lock, hz); /* bell wait */
 	DPRINTF("cmd = 0x%08x sts = 0x%08x ... done",
 	    EOREAD4(sc, EHCI_USBCMD), EOREAD4(sc, EHCI_USBSTS), 0, 0);
 #ifdef DIAGNOSTIC
-	if (error)
+	if (error == EWOULDBLOCK) {
-		printf("ehci_sync_hc: cv_timedwait() = %d\n", error);
+		printf("ehci_sync_hc: timed out\n");
 	} else if (error) {
 		printf("ehci_sync_hc: cv_timedwait: error %d\n", error);
+	}
 #endif
+}
 Static void
 ehci_remove_itd_chain(ehci_softc_t *sc, struct ehci_soft_itd *itd)
+{
 	KASSERT(mutex_owned(&sc->sc_lock));
 	for (; itd != NULL; itd = itd->xfer_next) {
 		struct ehci_soft_itd *prev = itd->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->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->frame_list.next != NULL)
 				itd->frame_list.next->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->frame_list.next = itd->frame_list.next;
 			if (itd->frame_list.next != NULL)
 				itd->frame_list.next->frame_list.prev = prev;
+		}
+	}
+}
 Static void
 ehci_free_itd_chain(ehci_softc_t *sc, struct ehci_soft_itd *itd)
+{
 	struct ehci_soft_itd *next;
 	mutex_enter(&sc->sc_lock);
 	next = NULL;
 	for (; itd != NULL; itd = next) {
 		next = itd->xfer_next;
 		ehci_free_itd_locked(sc, itd);
+	}
 	mutex_exit(&sc->sc_lock);
+}
 Static void
 ehci_remove_sitd_chain(ehci_softc_t *sc, struct ehci_soft_sitd *sitd)
+{
 	KASSERT(mutex_owned(&sc->sc_lock));
 	for (; sitd != NULL; sitd = sitd->xfer_next) {
 		struct ehci_soft_sitd *prev = sitd->frame_list.prev;
 		/* Unlink sitd from hardware chain, or frame array */
 		if (prev == NULL) { /* We're at the table head */
 			sc->sc_softsitds[sitd->slot] = sitd->frame_list.next;
 			sc->sc_flist[sitd->slot] = sitd->sitd.sitd_next;
 			usb_syncmem(&sc->sc_fldma,
 			    sizeof(ehci_link_t) * sitd->slot,
 			    sizeof(ehci_link_t),
 			    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 			if (sitd->frame_list.next != NULL)
 				sitd->frame_list.next->frame_list.prev = NULL;
 		} else {
 			/* XXX this part is untested... */
 			prev->sitd.sitd_next = sitd->sitd.sitd_next;
 			usb_syncmem(&sitd->dma,
 			    sitd->offs + offsetof(ehci_sitd_t, sitd_next),
 			    sizeof(sitd->sitd.sitd_next), BUS_DMASYNC_PREWRITE);
 			prev->frame_list.next = sitd->frame_list.next;
 			if (sitd->frame_list.next != NULL)
 				sitd->frame_list.next->frame_list.prev = prev;
+		}
+	}
+}
 Static void
 ehci_free_sitd_chain(ehci_softc_t *sc, struct ehci_soft_sitd *sitd)
+{
 	mutex_enter(&sc->sc_lock);
 	struct ehci_soft_sitd *next  = NULL;
 	for (; sitd != NULL; sitd = next) {
 		next = sitd->xfer_next;
 		ehci_free_sitd_locked(sc, sitd);
+	}
 	mutex_exit(&sc->sc_lock);
+}
 /***********/
 Static int
 ehci_roothub_ctrl(struct usbd_bus *bus, usb_device_request_t *req,
     void *buf, int buflen)
+{
 	ehci_softc_t *sc = EHCI_BUS2SC(bus);
 	usb_hub_descriptor_t hubd;
 	usb_port_status_t ps;
 	uint16_t len, value, index;
 	int l, totlen = 0;
 	int port, i;
 	uint32_t v;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	if (sc->sc_dying)
 		return -1;
 	DPRINTF("type=0x%02x request=%02x", req->bmRequestType, req->bRequest,
 , 0);
 	len = UGETW(req->wLength);
 	value = UGETW(req->wValue);
 	index = UGETW(req->wIndex);
 #define C(x,y) ((x) | ((y) << 8))
 	switch (C(req->bRequest, req->bmRequestType)) {
 	case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
 		if (len == 0)
 			break;
 		switch (value) {
 		case C(0, UDESC_DEVICE): {
 			usb_device_descriptor_t devd;
 			totlen = min(buflen, sizeof(devd));
 			memcpy(&devd, buf, totlen);
 			USETW(devd.idVendor, sc->sc_id_vendor);
 			memcpy(buf, &devd, totlen);
 			break;
+		}
 #define sd ((usb_string_descriptor_t *)buf)
 		case C(1, UDESC_STRING):
 			/* Vendor */
 			totlen = usb_makestrdesc(sd, len, sc->sc_vendor);
 			break;
 		case C(2, UDESC_STRING):
 			/* Product */
 			totlen = usb_makestrdesc(sd, len, "EHCI root hub");
 			break;
 #undef sd
 		default:
 			/* default from usbroothub */
 			return buflen;
+		}
 		break;
 	/* Hub requests */
 	case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_DEVICE):
 		break;
 	case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_OTHER):
 		DPRINTF("UR_CLEAR_PORT_FEATURE port=%d feature=%d", index,
 		    value, 0, 0);
 		if (index < 1 || index > sc->sc_noport) {
 			return -1;
+		}
 		port = EHCI_PORTSC(index);
 		v = EOREAD4(sc, port);
 		DPRINTF("portsc=0x%08x", v, 0, 0, 0);
 		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:
 			DPRINTF("clear port test %d", index, 0, 0, 0);
 			break;
 		case UHF_PORT_INDICATOR:
 			DPRINTF("clear port ind %d", index, 0, 0, 0);
 			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:
 			return -1;
+		}
 #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) {
 			return -1;
+		}
 		totlen = min(buflen, sizeof(hubd));
 		memcpy(&hubd, buf, totlen);
 		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;
 		totlen = min(totlen, hubd.bDescLength);
 		memcpy(buf, &hubd, totlen);
 		break;
 	case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE):
 		if (len != 4) {
 			return -1;
+		}
 		memset(buf, 0, len); /* ? XXX */
 		totlen = len;
 		break;
 	case C(UR_GET_STATUS, UT_READ_CLASS_OTHER):
 		DPRINTF("get port status i=%d", index, 0, 0, 0);
 		if (index < 1 || index > sc->sc_noport) {
 			return -1;
+		}
 		if (len != 4) {
 			return -1;
+		}
 		v = EOREAD4(sc, EHCI_PORTSC(index));
 		DPRINTF("port status=0x%04x", v, 0, 0, 0);
 		i = UPS_HIGH_SPEED;
 		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;
+		}
 		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);
 		totlen = min(len, sizeof(ps));
 		memcpy(buf, &ps, totlen);
 		break;
 	case C(UR_SET_DESCRIPTOR, UT_WRITE_CLASS_DEVICE):
 		return -1;
 	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) {
 			return -1;
+		}
 		port = EHCI_PORTSC(index);
 		v = EOREAD4(sc, port);
 		DPRINTF("portsc=0x%08x", v, 0, 0, 0);
 		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:
 			DPRINTF("reset port %d", index, 0, 0, 0);
 			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) {
 				return -1;
+			}
 			/*
 			 * An embedded transaction translator 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) {
 					return -1;
+				}
+			}
 			v = EOREAD4(sc, port);
 			DPRINTF("ehci after reset, status=0x%08x", v, 0, 0, 0);
 			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", index,
 			    v, 0, 0);
 			break;
 		case UHF_PORT_POWER:
 			DPRINTF("set port power %d (has PPC = %d)", index,
 			    sc->sc_hasppc, 0, 0);
 			if (sc->sc_hasppc)
 				EOWRITE4(sc, port, v | EHCI_PS_PP);
 			break;
 		case UHF_PORT_TEST:
 			DPRINTF("set port test %d", index, 0, 0, 0);
 			break;
 		case UHF_PORT_INDICATOR:
 			DPRINTF("set port ind %d", index, 0, 0, 0);
 			EOWRITE4(sc, port, v | EHCI_PS_PIC);
 			break;
 		default:
 			return -1;
+		}
 		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:
 		/* default from usbroothub */
 		DPRINTF("returning %d (usbroothub default)", buflen, 0, 0, 0);
 		return buflen;
+	}
 	DPRINTF("returning %d", totlen, 0, 0, 0);
 	return totlen;
+}
 Static void
 ehci_disown(ehci_softc_t *sc, int index, int lowspeed)
+{
 	int port;
 	uint32_t v;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("index=%d lowspeed=%d", index, lowspeed, 0, 0);
 #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);
+}
 Static usbd_status
 ehci_root_intr_transfer(struct usbd_xfer *xfer)
+{
 	ehci_softc_t *sc = EHCI_XFER2SC(xfer);
 	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->ux_pipe->up_queue));
+}
 Static usbd_status
 ehci_root_intr_start(struct usbd_xfer *xfer)
+{
 	ehci_softc_t *sc = EHCI_XFER2SC(xfer);
 	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(struct usbd_xfer *xfer)
+{
 	ehci_softc_t *sc = EHCI_XFER2SC(xfer);
 	KASSERT(mutex_owned(&sc->sc_lock));
 	KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
 	sc->sc_intrxfer = NULL;
 	xfer->ux_status = USBD_CANCELLED;
 	usb_transfer_complete(xfer);
+}
 /* Close the root pipe. */
 Static void
 ehci_root_intr_close(struct usbd_pipe *pipe)
+{
 	ehci_softc_t *sc = EHCI_PIPE2SC(pipe);
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	KASSERT(mutex_owned(&sc->sc_lock));
 	sc->sc_intrxfer = NULL;
+}
 Static void
 ehci_root_intr_done(struct usbd_xfer *xfer)
+{
+}
 /************************/
 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;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	mutex_enter(&sc->sc_lock);
 	if (sc->sc_freeqhs == NULL) {
 		DPRINTF("allocating chunk", 0, 0, 0, 0);
 		mutex_exit(&sc->sc_lock);
 		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;
 		mutex_enter(&sc->sc_lock);
 		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;
 	mutex_exit(&sc->sc_lock);
 	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)
+{
 	KASSERT(mutex_owned(&sc->sc_lock));
 	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;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	mutex_enter(&sc->sc_lock);
 	if (sc->sc_freeqtds == NULL) {
 		DPRINTF("allocating chunk", 0, 0, 0, 0);
 		mutex_exit(&sc->sc_lock);
 		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;
 		mutex_enter(&sc->sc_lock);
 		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;
 	mutex_exit(&sc->sc_lock);
 	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)
+{
 	mutex_enter(&sc->sc_lock);
 	sqtd->nextqtd = sc->sc_freeqtds;
 	sc->sc_freeqtds = sqtd;
 	mutex_exit(&sc->sc_lock);
+}
 Static int
 ehci_alloc_sqtd_chain(ehci_softc_t *sc, struct usbd_xfer *xfer,
     int alen, int rd, ehci_soft_qtd_t **sp)
+{
 	struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
 	uint16_t flags = xfer->ux_flags;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	ASSERT_SLEEPABLE();
 	KASSERT(sp);
 	KASSERT(alen != 0 || (!rd && (flags & USBD_FORCE_SHORT_XFER)));
 	size_t nsqtd = (!rd && (flags & USBD_FORCE_SHORT_XFER)) ? 1 : 0;
 	nsqtd += ((alen + EHCI_PAGE_SIZE - 1) / EHCI_PAGE_SIZE);
 	exfer->ex_sqtds = kmem_zalloc(sizeof(ehci_soft_qtd_t *) * nsqtd,
 	    KM_SLEEP);
 	exfer->ex_nsqtd = nsqtd;
 	DPRINTF("xfer %p len %d nsqtd %d flags %x", xfer, alen, nsqtd, flags);
 	for (size_t j = 0; j < exfer->ex_nsqtd;) {
 		ehci_soft_qtd_t *cur = ehci_alloc_sqtd(sc);
 		if (cur == NULL)
 			goto nomem;
 		exfer->ex_sqtds[j++] = cur;
 		cur->xfer = xfer;
 		cur->len = 0;
+	}
 	*sp = exfer->ex_sqtds[0];
 	DPRINTF("return sqtd=%p", *sp, 0, 0, 0);
 	return 0;
  nomem:
 	ehci_free_sqtds(sc, exfer);
 	kmem_free(exfer->ex_sqtds, sizeof(ehci_soft_qtd_t *) * nsqtd);
 	DPRINTF("no memory", 0, 0, 0, 0);
 	return ENOMEM;
+}
 Static void
 ehci_free_sqtds(ehci_softc_t *sc, struct ehci_xfer *exfer)
+{
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("exfer=%p", exfer, 0, 0, 0);
 	mutex_enter(&sc->sc_lock);
 	for (size_t i = 0; i < exfer->ex_nsqtd; i++) {
 		ehci_soft_qtd_t *sqtd = exfer->ex_sqtds[i];
 		if (sqtd == NULL)
 			break;
 		sqtd->nextqtd = sc->sc_freeqtds;
 		sc->sc_freeqtds = sqtd;
+	}
 	mutex_exit(&sc->sc_lock);
+}
 Static void
 ehci_append_sqtd(ehci_soft_qtd_t *sqtd, ehci_soft_qtd_t *prev)
+{
 	if (prev) {
 		prev->nextqtd = sqtd;
 		prev->qtd.qtd_next = htole32(sqtd->physaddr);
 		prev->qtd.qtd_altnext = prev->qtd.qtd_next;
 		usb_syncmem(&prev->dma, prev->offs, sizeof(prev->qtd),
 		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+	}
+}
 Static void
 ehci_reset_sqtd_chain(ehci_softc_t *sc, struct usbd_xfer *xfer,
     int length, int isread, int *toggle, ehci_soft_qtd_t **lsqtd)
+{
 	struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
 	usb_dma_t *dma = &xfer->ux_dmabuf;
 	uint16_t flags = xfer->ux_flags;
 	ehci_soft_qtd_t *sqtd, *prev;
 	int tog = *toggle;
 	int mps = UGETW(xfer->ux_pipe->up_endpoint->ue_edesc->wMaxPacketSize);
 	int len = length;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("xfer=%p len %d isread %d toggle %d", xfer, len, isread, tog);
 	DPRINTF("    VA %p", KERNADDR(&xfer->ux_dmabuf, 0), 0, 0, 0);
 	KASSERT(length != 0 || (!isread && (flags & USBD_FORCE_SHORT_XFER)));
 	const uint32_t qtdstatus = EHCI_QTD_ACTIVE |
 	    EHCI_QTD_SET_PID(isread ? EHCI_QTD_PID_IN : EHCI_QTD_PID_OUT) |
 	    EHCI_QTD_SET_CERR(3)
+	    ;
 	sqtd = prev = NULL;
 	size_t curoffs = 0;
 	size_t j = 0;
 	for (; len != 0 && j < exfer->ex_nsqtd; prev = sqtd) {
 		sqtd = exfer->ex_sqtds[j++];
 		DPRINTF("sqtd[%d]=%p prev %p", j, sqtd, prev, 0);
 		/*
 		 * The EHCI hardware can handle at most 5 pages and they do
 		 * not have to be contiguous
 		 */
 		vaddr_t va = (vaddr_t)KERNADDR(dma, curoffs);
 		vaddr_t va_offs = EHCI_PAGE_OFFSET(va);
 		size_t curlen = len;
 		if (curlen >= EHCI_QTD_MAXTRANSFER - va_offs) {
 			/* must use multiple TDs, fill as much as possible. */
 			curlen = EHCI_QTD_MAXTRANSFER - va_offs;
 			/* the length must be a multiple of the max size */
 			curlen -= curlen % mps;
+		}
 		KASSERT(curlen != 0);
 		DPRINTF("    len=%d curlen=%d curoffs=%zu", len, curlen,
 		    curoffs, 0);
 		/* Fill the qTD */
 		sqtd->qtd.qtd_next = sqtd->qtd.qtd_altnext = EHCI_NULL;
 		sqtd->qtd.qtd_status = htole32(
 		    qtdstatus |
 		    EHCI_QTD_SET_BYTES(curlen) |
 		    EHCI_QTD_SET_TOGGLE(tog));
 		/* Find number of pages we'll be using, insert dma addresses */
 		size_t pages = EHCI_NPAGES(curlen);
 		KASSERT(pages <= EHCI_QTD_NBUFFERS);
 		size_t pageoffs = EHCI_PAGE(curoffs);
 		for (size_t i = 0; i < pages; i++) {
 			paddr_t a = DMAADDR(dma,
 			    pageoffs + i * EHCI_PAGE_SIZE);
 			sqtd->qtd.qtd_buffer[i] = htole32(EHCI_PAGE(a));
 			/* Cast up to avoid compiler warnings */
 			sqtd->qtd.qtd_buffer_hi[i] = htole32((uint64_t)a >> 32);
 			DPRINTF("      buffer[%d/%d] 0x%08x 0x%08x", i, pages,
 			    le32toh(sqtd->qtd.qtd_buffer_hi[i]),
 			    le32toh(sqtd->qtd.qtd_buffer[i]));
+		}
 		/* First buffer pointer requires a page offset to start at */
 		sqtd->qtd.qtd_buffer[0] |= htole32(va_offs);
 		usb_syncmem(&sqtd->dma, sqtd->offs, sizeof(sqtd->qtd),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		sqtd->len = curlen;
 		DPRINTF("    va %p pa %p len %d", va,
 		    DMAADDR(&xfer->ux_dmabuf, curoffs), curlen, 0);
 		ehci_append_sqtd(sqtd, prev);
 		if (((curlen + mps - 1) / mps) & 1) {
 			tog ^= 1;
+		}
 		curoffs += curlen;
 		len -= curlen;
+	}
 	KASSERTMSG(len == 0, "xfer %p olen %d len %d mps %d ex_nsqtd %zu j %zu",
 	    xfer, length, len, mps, exfer->ex_nsqtd, j);
 	if (!isread &&
 	    (flags & USBD_FORCE_SHORT_XFER) &&
 	    length % mps == 0) {
 		/* Force a 0 length transfer at the end. */
 		KASSERTMSG(j < exfer->ex_nsqtd, "j=%zu nsqtd=%zu", j,
 		    exfer->ex_nsqtd);
 		prev = sqtd;
 		sqtd = exfer->ex_sqtds[j++];
 		memset(&sqtd->qtd, 0, sizeof(sqtd->qtd));
 		sqtd->qtd.qtd_next = sqtd->qtd.qtd_altnext = EHCI_NULL;
 		sqtd->qtd.qtd_status = htole32(
 		    qtdstatus |
 		    EHCI_QTD_SET_BYTES(0) |
 		    EHCI_QTD_SET_TOGGLE(tog));
 		usb_syncmem(&sqtd->dma, sqtd->offs, sizeof(sqtd->qtd),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		ehci_append_sqtd(sqtd, prev);
 		tog ^= 1;
+	}
 	*lsqtd = sqtd;
 	*toggle = tog;
+}
 Static ehci_soft_itd_t *
 ehci_alloc_itd(ehci_softc_t *sc)
+{
 	struct ehci_soft_itd *itd, *freeitd;
 	usbd_status err;
 	usb_dma_t dma;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	mutex_enter(&sc->sc_lock);
 	freeitd = LIST_FIRST(&sc->sc_freeitds);
 	if (freeitd == NULL) {
 		DPRINTF("allocating chunk", 0, 0, 0, 0);
 		mutex_exit(&sc->sc_lock);
 		err = usb_allocmem(&sc->sc_bus, EHCI_ITD_SIZE * EHCI_ITD_CHUNK,
 				EHCI_PAGE_SIZE, &dma);
 		if (err) {
 			DPRINTF("alloc returned %d", err, 0, 0, 0);
 			return NULL;
+		}
 		mutex_enter(&sc->sc_lock);
 		for (int i = 0; i < EHCI_ITD_CHUNK; i++) {
 			int 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, free_list);
+		}
 		freeitd = LIST_FIRST(&sc->sc_freeitds);
+	}
 	itd = freeitd;
 	LIST_REMOVE(itd, free_list);
 	mutex_exit(&sc->sc_lock);
 	memset(&itd->itd, 0, sizeof(ehci_itd_t));
 	itd->frame_list.next = NULL;
 	itd->frame_list.prev = NULL;
 	itd->xfer_next = NULL;
 	itd->slot = 0;
 	return itd;
+}
 Static ehci_soft_sitd_t *
 ehci_alloc_sitd(ehci_softc_t *sc)
+{
 	struct ehci_soft_sitd *sitd, *freesitd;
 	usbd_status err;
 	int i, offs;
 	usb_dma_t dma;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	mutex_enter(&sc->sc_lock);
 	freesitd = LIST_FIRST(&sc->sc_freesitds);
 	if (freesitd == NULL) {
 		DPRINTF("allocating chunk", 0, 0, 0, 0);
 		mutex_exit(&sc->sc_lock);
 		err = usb_allocmem(&sc->sc_bus, EHCI_SITD_SIZE * EHCI_SITD_CHUNK,
 				EHCI_PAGE_SIZE, &dma);
 		if (err) {
 			DPRINTF("alloc returned %d", err, 0, 0,
 );
 			return NULL;
+		}
 		mutex_enter(&sc->sc_lock);
 		for (i = 0; i < EHCI_SITD_CHUNK; i++) {
 			offs = i * EHCI_SITD_SIZE;
 			sitd = KERNADDR(&dma, offs);
 			sitd->physaddr = DMAADDR(&dma, offs);
 	 		sitd->dma = dma;
 			sitd->offs = offs;
 			LIST_INSERT_HEAD(&sc->sc_freesitds, sitd, free_list);
+		}
 		freesitd = LIST_FIRST(&sc->sc_freesitds);
+	}
 	sitd = freesitd;
 	LIST_REMOVE(sitd, free_list);
 	mutex_exit(&sc->sc_lock);
 	memset(&sitd->sitd, 0, sizeof(ehci_sitd_t));
 	sitd->frame_list.next = NULL;
 	sitd->frame_list.prev = NULL;
 	sitd->xfer_next = NULL;
 	sitd->slot = 0;
 	return sitd;
+}
 /****************/
 /*
  * Close a reqular pipe.
  * Assumes that there are no pending transactions.
  */
 Static void
 ehci_close_pipe(struct usbd_pipe *pipe, ehci_soft_qh_t *head)
+{
 	struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);
 	ehci_softc_t *sc = EHCI_PIPE2SC(pipe);
 	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.
  * XXXMRG this doesn't make sense anymore.
  */
 Static void
 ehci_abort_xfer(struct usbd_xfer *xfer, usbd_status status)
+{
 	struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);
 	struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
 	ehci_softc_t *sc = EHCI_XFER2SC(xfer);
 	ehci_soft_qh_t *sqh = epipe->sqh;
 	ehci_soft_qtd_t *sqtd, *fsqtd, *lsqtd;
 	ehci_physaddr_t cur;
 	uint32_t qhstatus;
 	int hit;
 	int wake;
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	DPRINTF("xfer=%p pipe=%p", xfer, epipe, 0, 0);
 	KASSERT(mutex_owned(&sc->sc_lock));
 	ASSERT_SLEEPABLE();
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
 		xfer->ux_status = status;	/* make software ignore it */
 		callout_stop(&xfer->ux_callout);
 		usb_transfer_complete(xfer);
 		return;
+	}
 	/*
 	 * If an abort is already in progress then just wait for it to
 	 * complete and return.
 	 */
 	if (xfer->ux_hcflags & UXFER_ABORTING) {
 		DPRINTF("already aborting", 0, 0, 0, 0);
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("ehci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		/* Override the status which might be USBD_TIMEOUT. */
 		xfer->ux_status = status;
 		DPRINTF("waiting for abort to finish", 0, 0, 0, 0);
 		xfer->ux_hcflags |= UXFER_ABORTWAIT;
 		while (xfer->ux_hcflags & UXFER_ABORTING)
 			cv_wait(&xfer->ux_hccv, &sc->sc_lock);
 		return;
+	}
 	xfer->ux_hcflags |= UXFER_ABORTING;
 	/*
 	 * Step 1: Make interrupt routine and hardware ignore xfer.
 	 */
 	xfer->ux_status = status;	/* make software ignore it */
 	callout_stop(&xfer->ux_callout);
 	ehci_del_intr_list(sc, exfer);
 	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);