 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci.c,v 1.183 2011/12/23 00:51:43 jakllsch Exp $ */
+/*	$NetBSD: ehci.c,v 1.184 2012/03/06 02:36:45 mrg Exp $ */
 /*
  * Copyright (c) 2004-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), Charles M. Hannum and
  * Jeremy Morse (jeremy.morse@gmail.com).
+ *
  * 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
 @@ -42,27 +42,27 @@
 /*
  * 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.183 2011/12/23 00:51:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.184 2012/03/06 02:36:45 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/malloc.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 @@ -1720,27 +1720,26 @@ ehci_open(usbd_pipe_handle pipe)
  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)
+{
 	SPLUSBCHECK;
 	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
 @@ -1749,27 +1748,26 @@ ehci_add_qh(ehci_soft_qh_t *sqh, ehci_so
 		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;
 	/* 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);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohci.c,v 1.218 2011/08/07 13:45:46 jmcneill Exp $	*/
+/*	$NetBSD: ohci.c,v 1.219 2012/03/06 02:36:46 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 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.
  * 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
 @@ -31,27 +31,27 @@
  * 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 2011/08/07 13:45:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.219 2012/03/06 02:36:46 mrg Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.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>
 @@ -1802,52 +1802,49 @@ ohci_device_request(usbd_xfer_handle xfe
 	ohci_free_std(sc, stat);
  bad1:
 	return (err);
+}
 /*
  * Add an ED to the schedule.  Called at splusb().
  */
 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;
 	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
 ohci_rem_ed(ohci_soft_ed_t *sed, ohci_soft_ed_t *head)
+{
 	ohci_soft_ed_t *p;
 	SPLUSBCHECK;
 	/* 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);
 @@ -1860,73 +1857,67 @@ ohci_rem_ed(ohci_soft_ed_t *sed, ohci_so
  * 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;
 	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;
 	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;
 	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;
 	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;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhci.c,v 1.242 2011/12/23 00:51:46 jakllsch Exp $	*/
+/*	$NetBSD: uhci.c,v 1.243 2012/03/06 02:36:46 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 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:
 @@ -32,27 +32,27 @@
  */
 /*
  * 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.242 2011/12/23 00:51:46 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.243 2012/03/06 02:36:46 mrg Exp $");
 #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/select.h>
 #include <sys/extent.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 @@ -1066,55 +1066,51 @@ uhci_rem_loop(uhci_softc_t *sc) {
 		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;
 	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;
 	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.
 @@ -1143,51 +1139,47 @@ uhci_remove_hs_ctrl(uhci_softc_t *sc, uh
 	    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;
 	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;
 	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);
+	}
 @@ -1200,52 +1192,48 @@ uhci_remove_ls_ctrl(uhci_softc_t *sc, uh
 	    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;
 	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;
 	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);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.134 2011/11/27 03:25:00 jmcneill Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.135 2012/03/06 02:36:46 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:
 @@ -22,27 +22,27 @@
  * ``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 2011/11/27 03:25:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.135 2012/03/06 02:36:46 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>
 @@ -711,28 +711,26 @@ usbd_get_interface(usbd_interface_handle
 	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;
 	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). */
 		pipe->methods->abort(xfer);
 		/* XXX only for non-0 usbd_clear_endpoint_stall(pipe); */
 @@ -742,28 +740,26 @@ usbd_ar_pipe(usbd_pipe_handle pipe)
+}
 /* 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(KERNEL_LOCKED_P());
 #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
 @@ -875,28 +871,26 @@ usb_insert_transfer(usbd_xfer_handle xfe
 		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;
 #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
 	/* Get next request in queue. */
 	xfer = SIMPLEQ_FIRST(&pipe->queue);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdivar.h,v 1.93 2011/05/27 17:19:18 drochner Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.94 2012/03/06 02:36:46 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -248,27 +248,13 @@ usbd_status	usbd_reattach_device(device_
 void		usbd_remove_device(usbd_device_handle, struct usbd_port *);
 int		usbd_printBCD(char *, size_t, int);
 usbd_status	usbd_fill_iface_data(usbd_device_handle, int, int);
 void		usb_free_device(usbd_device_handle);
 usbd_status	usb_insert_transfer(usbd_xfer_handle);
 void		usb_transfer_complete(usbd_xfer_handle);
 int		usb_disconnect_port(struct usbd_port *, device_t, int);
 /* Routines from usb.c */
 void		usb_needs_explore(usbd_device_handle);
 void		usb_needs_reattach(usbd_device_handle);
 void		usb_schedsoftintr(struct usbd_bus *);
 /*
  * XXX This check is extremely bogus. Bad Bad Bad.
  */
 #if defined(DIAGNOSTIC) && 0
 #define SPLUSBCHECK \
 	do { int _s = splusb(), _su = splusb(); \
              if (!cold && _s != _su) printf("SPLUSBCHECK failed 0x%x!=0x%x, %s:%d\n", \
 				   _s, _su, __FILE__, __LINE__); \
 	     splx(_s); \
         } while (0)
 #else
 #define SPLUSBCHECK
 #endif