 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci.c,v 1.184 2012/03/06 02:36:45 mrg Exp $ */
+/*	$NetBSD: ehci.c,v 1.185 2012/03/06 02:49:02 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.184 2012/03/06 02:36:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.185 2012/03/06 02:49:02 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>
 @@ -699,32 +699,30 @@ ehci_softintr(void *v)
 	 * clue what, so we need to scan through all active transfers. :-(
 	 */
 	for (ex = TAILQ_FIRST(&sc->sc_intrhead); ex; ex = nextex) {
 		nextex = TAILQ_NEXT(ex, inext);
 		ehci_check_intr(sc, ex);
+	}
 	/* Schedule a callout to catch any dropped transactions. */
 	if ((sc->sc_flags & EHCIF_DROPPED_INTR_WORKAROUND) &&
 	    !TAILQ_EMPTY(&sc->sc_intrhead))
 		callout_reset(&(sc->sc_tmo_intrlist),
 		    (hz), (ehci_intrlist_timeout), (sc));
 #ifdef USB_USE_SOFTINTR
 	if (sc->sc_softwake) {
 		sc->sc_softwake = 0;
 		wakeup(&sc->sc_softwake);
+	}
 #endif /* USB_USE_SOFTINTR */
 	sc->sc_bus.intr_context--;
+}
 /* Check for an interrupt. */
 Static void
 ehci_check_intr(ehci_softc_t *sc, struct ehci_xfer *ex)
+{
 	int attr;
 	DPRINTFN(/*15*/2, ("ehci_check_intr: ex=%p\n", ex));
 	attr = ex->xfer.pipe->endpoint->edesc->bmAttributes;
 @@ -2970,33 +2968,29 @@ ehci_abort_xfer(usbd_xfer_handle xfer, u
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 		if (sqtd == exfer->sqtdend)
 			break;
+	}
 	splx(s);
 	/*
 	 * Step 2: Wait until we know hardware has finished any possible
 	 * use of the xfer.  Also make sure the soft interrupt routine
 	 * has run.
 	 */
 	ehci_sync_hc(sc);
 	s = splusb();
 #ifdef USB_USE_SOFTINTR
 	sc->sc_softwake = 1;
 #endif /* USB_USE_SOFTINTR */
 	usb_schedsoftintr(&sc->sc_bus);
 #ifdef USB_USE_SOFTINTR
 	tsleep(&sc->sc_softwake, PZERO, "ehciab", 0);
 #endif /* USB_USE_SOFTINTR */
 	splx(s);
 	/*
 	 * Step 3: Remove any vestiges of the xfer from the hardware.
 	 * The complication here is that the hardware may have executed
 	 * beyond the xfer we're trying to abort.  So as we're scanning
 	 * the TDs of this xfer we check if the hardware points to
 	 * any of them.
 	 */
 	s = splusb();		/* XXX why? */
 	usb_syncmem(&sqh->dma,
 	    sqh->offs + offsetof(ehci_qh_t, qh_curqtd),
 @@ -3099,33 +3093,29 @@ ehci_abort_isoc_xfer(usbd_xfer_handle xf
 			trans_status = le32toh(itd->itd.itd_ctl[i]);
 			trans_status &= ~EHCI_ITD_ACTIVE;
 			itd->itd.itd_ctl[i] = htole32(trans_status);
+		}
 		usb_syncmem(&itd->dma,
 		    itd->offs + offsetof(ehci_itd_t, itd_ctl),
 		    sizeof(itd->itd.itd_ctl),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	splx(s);
         s = splusb();
 #ifdef USB_USE_SOFTINTR
         sc->sc_softwake = 1;
 #endif /* USB_USE_SOFTINTR */
         usb_schedsoftintr(&sc->sc_bus);
 #ifdef USB_USE_SOFTINTR
         tsleep(&sc->sc_softwake, PZERO, "ehciab", 0);
 #endif /* USB_USE_SOFTINTR */
         splx(s);
 #ifdef DIAGNOSTIC
 	exfer->isdone = 1;
 #endif
 	wake = xfer->hcflags & UXFER_ABORTWAIT;
 	xfer->hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);
 	if (wake)
 		wakeup(&xfer->hcflags);
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehcivar.h,v 1.38 2011/01/18 08:29:24 matt Exp $ */
+/*	$NetBSD: ehcivar.h,v 1.39 2012/03/06 02:49:02 mrg Exp $ */
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * 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.
 @@ -142,29 +142,27 @@ typedef struct ehci_softc {
 	TAILQ_HEAD(, ehci_xfer) sc_intrhead;
 	kmutex_t sc_intrhead_lock;
 	ehci_soft_qh_t *sc_freeqhs;
 	ehci_soft_qtd_t *sc_freeqtds;
 	LIST_HEAD(sc_freeitds, ehci_soft_itd) sc_freeitds;
 	int sc_noport;
 	u_int8_t sc_hasppc;		/* has Port Power Control */
 	u_int8_t sc_addr;		/* device address */
 	u_int8_t sc_conf;		/* device configuration */
 	usbd_xfer_handle sc_intrxfer;
 	char sc_isreset[EHCI_MAX_PORTS];
 #ifdef USB_USE_SOFTINTR
 	char sc_softwake;
 #endif /* USB_USE_SOFTINTR */
 	u_int32_t sc_eintrs;
 	ehci_soft_qh_t *sc_async_head;
 	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
 	kmutex_t sc_doorbell_lock;
 	struct callout sc_tmo_intrlist;
 	device_t sc_child; /* /dev/usb# device */
 	char sc_dying;
 	struct usb_dma_reserve sc_dma_reserve;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohci.c,v 1.219 2012/03/06 02:36:46 mrg Exp $	*/
+/*	$NetBSD: ohci.c,v 1.220 2012/03/06 02:49:03 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.219 2012/03/06 02:36:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.220 2012/03/06 02:49:03 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>
 @@ -1447,32 +1447,30 @@ ohci_softintr(void *v)
+			}
 			ohci_free_sitd(sc, sitd);
 			if (uedir == UE_DIR_IN &&
 			    xfer->status == USBD_NORMAL_COMPLETION)
 				xfer->actlen = actlen;
 			xfer->hcpriv = NULL;
 			s = splusb();
 			usb_transfer_complete(xfer);
 			splx(s);
+		}
+	}
 #ifdef USB_USE_SOFTINTR
 	if (sc->sc_softwake) {
 		sc->sc_softwake = 0;
 		wakeup(&sc->sc_softwake);
+	}
 #endif /* USB_USE_SOFTINTR */
 	sc->sc_bus.intr_context--;
 	DPRINTFN(10,("ohci_softintr: done:\n"));
+}
 void
 ohci_device_ctrl_done(usbd_xfer_handle xfer)
+{
 	struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
 	int len = UGETW(xfer->request.wLength);
 	int isread = (xfer->request.bmRequestType & UT_READ);
 	DPRINTFN(10,("ohci_device_ctrl_done: xfer=%p\n", xfer));
 @@ -2278,33 +2276,29 @@ ohci_abort_xfer(usbd_xfer_handle xfer, u
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	sed->ed.ed_flags |= HTOO32(OHCI_ED_SKIP); /* force hardware skip */
 	usb_syncmem(&sed->dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
 	    sizeof(sed->ed.ed_flags),
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	/*
 	 * Step 2: Wait until we know hardware has finished any possible
 	 * use of the xfer.  Also make sure the soft interrupt routine
 	 * has run.
 	 */
 	usb_delay_ms(opipe->pipe.device->bus, 20); /* Hardware finishes in 1ms */
 	s = splusb();
 #ifdef USB_USE_SOFTINTR
 	sc->sc_softwake = 1;
 #endif /* USB_USE_SOFTINTR */
 	usb_schedsoftintr(&sc->sc_bus);
 #ifdef USB_USE_SOFTINTR
 	tsleep(&sc->sc_softwake, PZERO, "ohciab", 0);
 #endif /* USB_USE_SOFTINTR */
 	splx(s);
 	/*
 	 * Step 3: Remove any vestiges of the xfer from the hardware.
 	 * The complication here is that the hardware may have executed
 	 * beyond the xfer we're trying to abort.  So as we're scanning
 	 * the TDs of this xfer we check if the hardware points to
 	 * any of them.
 	 */
 	s = splusb();		/* XXX why? */
 	p = xfer->hcpriv;
 #ifdef DIAGNOSTIC
 	if (p == NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohcivar.h,v 1.51 2011/05/28 15:47:17 tsutsui Exp $	*/
+/*	$NetBSD: ohcivar.h,v 1.52 2012/03/06 02:49:03 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.13 1999/11/17 22:33:41 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:
 @@ -99,29 +99,27 @@ typedef struct ohci_softc {
 	LIST_HEAD(, ohci_soft_td)  sc_hash_tds[OHCI_HASH_SIZE];
 	LIST_HEAD(, ohci_soft_itd) sc_hash_itds[OHCI_HASH_SIZE];
 	int sc_noport;
 	u_int8_t sc_addr;		/* device address */
 	u_int8_t sc_conf;		/* device configuration */
 	int sc_endian;
 #define	OHCI_LITTLE_ENDIAN	0	/* typical (uninitialized default) */
 #define	OHCI_BIG_ENDIAN		1	/* big endian OHCI? never seen it */
 #define	OHCI_HOST_ENDIAN	2	/* if OHCI always matches CPU */
 #ifdef USB_USE_SOFTINTR
 	char sc_softwake;
 #endif /* USB_USE_SOFTINTR */
 	ohci_soft_ed_t *sc_freeeds;
 	ohci_soft_td_t *sc_freetds;
 	ohci_soft_itd_t *sc_freeitds;
 	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
 	usbd_xfer_handle sc_intrxfer;
 	char sc_vendor[32];
 	int sc_id_vendor;
 	u_int32_t sc_control;		/* Preserved during suspend/standby */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhci.c,v 1.243 2012/03/06 02:36:46 mrg Exp $	*/
+/*	$NetBSD: uhci.c,v 1.244 2012/03/06 02:49:03 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.243 2012/03/06 02:36:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.244 2012/03/06 02:49:03 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>
 @@ -1360,32 +1360,30 @@ uhci_softintr(void *v)
 	 * way of knowing which transfer it was.  You can scan down
 	 * the TDs and QHs of the previous frame to limit the search,
 	 * but that assumes that the interrupt was not delayed by more
 	 * than 1 ms, which may not always be true (e.g. after debug
 	 * output on a slow console).
 	 * We scan all interrupt descriptors to see if any have
 	 * completed.
 	 */
 	for (ii = LIST_FIRST(&sc->sc_intrhead); ii; ii = nextii) {
 		nextii = LIST_NEXT(ii, list);
 		uhci_check_intr(sc, ii);
+	}
 #ifdef USB_USE_SOFTINTR
 	if (sc->sc_softwake) {
 		sc->sc_softwake = 0;
 		wakeup(&sc->sc_softwake);
+	}
 #endif /* USB_USE_SOFTINTR */
 	sc->sc_bus.intr_context--;
+}
 /* Check for an interrupt. */
 void
 uhci_check_intr(uhci_softc_t *sc, uhci_intr_info_t *ii)
+{
 	uhci_soft_td_t *std, *lstd;
 	u_int32_t status;
 	DPRINTFN(15, ("uhci_check_intr: ii=%p\n", ii));
 #ifdef DIAGNOSTIC
 @@ -2120,34 +2118,30 @@ uhci_abort_xfer(usbd_xfer_handle xfer, u
 		    std->offs + offsetof(uhci_td_t, td_status),
 		    sizeof(std->td.td_status),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	splx(s);
 	/*
 	 * Step 2: Wait until we know hardware has finished any possible
 	 * use of the xfer.  Also make sure the soft interrupt routine
 	 * has run.
 	 */
 	usb_delay_ms(upipe->pipe.device->bus, 2); /* Hardware finishes in 1ms */
 	s = splusb();
 #ifdef USB_USE_SOFTINTR
 	sc->sc_softwake = 1;
 #endif /* USB_USE_SOFTINTR */
 	usb_schedsoftintr(&sc->sc_bus);
 #ifdef USB_USE_SOFTINTR
 	DPRINTFN(1,("uhci_abort_xfer: tsleep\n"));
 	tsleep(&sc->sc_softwake, PZERO, "uhciab", 0);
 #endif /* USB_USE_SOFTINTR */
 	splx(s);
 	/*
 	 * Step 3: Execute callback.
 	 */
 	DPRINTFN(1,("uhci_abort_xfer: callback\n"));
 	s = splusb();
 #ifdef DIAGNOSTIC
 	ii->isdone = 1;
 #endif
 	wake = xfer->hcflags & UXFER_ABORTWAIT;
 	xfer->hcflags &= ~(UXFER_ABORTING | UXFER_ABORTWAIT);
 	usb_transfer_complete(xfer);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhcivar.h,v 1.49 2012/02/24 06:48:25 mrg Exp $	*/
+/*	$NetBSD: uhcivar.h,v 1.50 2012/03/06 02:49:03 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 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:
 @@ -147,29 +147,27 @@ typedef struct uhci_softc {
 	u_int32_t sc_loops;		/* number of QHs that wants looping */
 	uhci_soft_td_t *sc_freetds;	/* TD free list */
 	uhci_soft_qh_t *sc_freeqhs;	/* QH free list */
 	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
 	u_int8_t sc_addr;		/* device address */
 	u_int8_t sc_conf;		/* device configuration */
 	u_int8_t sc_saved_sof;
 	u_int16_t sc_saved_frnum;
 #ifdef USB_USE_SOFTINTR
 	char sc_softwake;
 #endif /* USB_USE_SOFTINTR */
 	char sc_isreset;
 	char sc_suspend;
 	char sc_dying;
 	LIST_HEAD(, uhci_intr_info) sc_intrhead;
 	/* Info for the root hub interrupt "pipe". */
 	int sc_ival;			/* time between root hub intrs */
 	usbd_xfer_handle sc_intr_xfer;	/* root hub interrupt transfer */
 	struct callout sc_poll_handle;
 	char sc_vendor[32];		/* vendor string for root hub */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usb.c,v 1.127 2011/12/23 00:51:48 jakllsch Exp $	*/
+/*	$NetBSD: usb.c,v 1.128 2012/03/06 02:49:03 mrg Exp $	*/
 /*
  * Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -27,27 +27,27 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB specifications and other documentation can be found at
  * http://www.usb.org/developers/docs/ and
  * http://www.usb.org/developers/devclass_docs/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.127 2011/12/23 00:51:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.128 2012/03/06 02:49:03 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 @@ -218,37 +218,35 @@ usb_doattach(device_t self)
 		speed = USB_SPEED_FULL;
 		break;
 	case USBREV_2_0:
 		speed = USB_SPEED_HIGH;
 		break;
 	default:
 		panic("usb_doattach");
+	}
 	ue = usb_alloc_event();
 	ue->u.ue_ctrlr.ue_bus = device_unit(self);
 	usb_add_event(USB_EVENT_CTRLR_ATTACH, ue);
 #ifdef USB_USE_SOFTINTR
 	/* XXX we should have our own level */
 	sc->sc_bus->soft = softint_establish(SOFTINT_NET,
 	    sc->sc_bus->methods->soft_intr, sc->sc_bus);
 	if (sc->sc_bus->soft == NULL) {
 		aprint_error("%s: can't register softintr\n",
 			     device_xname(self));
 		sc->sc_dying = 1;
 		return;
+	}
 #endif
 	err = usbd_new_device(self, sc->sc_bus, 0, speed, 0,
 		  &sc->sc_port);
 	if (!err) {
 		dev = sc->sc_port.device;
 		if (dev->hub == NULL) {
 			sc->sc_dying = 1;
 			aprint_error("%s: root device is not a hub\n",
 				     device_xname(self));
 			return;
+		}
 		sc->sc_bus->root_hub = dev;
 #if 1
 @@ -900,35 +898,31 @@ usb_async_intr(void *cookie)
+{
 	proc_t *proc;
 	mutex_enter(proc_lock);
 	if ((proc = usb_async_proc) != NULL)
 		psignal(proc, SIGIO);
 	mutex_exit(proc_lock);
+}
 void
 usb_schedsoftintr(usbd_bus_handle bus)
+{
 	DPRINTFN(10,("usb_schedsoftintr: polling=%d\n", bus->use_polling));
 #ifdef USB_USE_SOFTINTR
 	if (bus->use_polling) {
 		bus->methods->soft_intr(bus);
 	} else {
 		softint_schedule(bus->soft);
+	}
 #else
 	bus->methods->soft_intr(bus);
 #endif /* USB_USE_SOFTINTR */
+}
 int
 usb_activate(device_t self, enum devact act)
+{
 	struct usb_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		return 0;
 	default:
 		return EOPNOTSUPP;
 @@ -963,32 +957,30 @@ usb_detach(device_t self, int flags)
 	if (sc->sc_port.device != NULL &&
 	    (rc = usb_disconnect_port(&sc->sc_port, self, flags)) != 0)
 		return rc;
 	pmf_device_deregister(self);
 	/* Kill off event thread. */
 	sc->sc_dying = 1;
 	while (sc->sc_event_thread != NULL) {
 		wakeup(&sc->sc_bus->needs_explore);
 		tsleep(sc, PWAIT, "usbdet", hz * 60);
+	}
 	DPRINTF(("usb_detach: event thread dead\n"));
 #ifdef USB_USE_SOFTINTR
 	if (sc->sc_bus->soft != NULL) {
 		softint_disestablish(sc->sc_bus->soft);
 		sc->sc_bus->soft = NULL;
+	}
 #endif
 	ue = usb_alloc_event();
 	ue->u.ue_ctrlr.ue_bus = device_unit(self);
 	usb_add_event(USB_EVENT_CTRLR_DETACH, ue);
 	return (0);
+}
 #ifdef COMPAT_30
 Static void
 usb_copy_old_devinfo(struct usb_device_info_old *uo,
 		     const struct usb_device_info *ue)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usb.h,v 1.93 2011/08/23 16:16:43 christos Exp $	*/
+/*	$NetBSD: usb.h,v 1.94 2012/03/06 02:49:03 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 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:
 @@ -41,28 +41,26 @@
 #include <sys/ioctl.h>
 #if defined(_KERNEL)
 #include <sys/mallocvar.h>
 MALLOC_DECLARE(M_USB);
 MALLOC_DECLARE(M_USBDEV);
 MALLOC_DECLARE(M_USBHC);
 #include <sys/device.h>
 #endif
 #define USB_USE_SOFTINTR
 #ifdef USB_DEBUG
 #define UKBD_DEBUG 1
 #define UHIDEV_DEBUG 1
 #define UHID_DEBUG 1
 #define OHCI_DEBUG 1
 #define UGEN_DEBUG 1
 #define UHCI_DEBUG 1
 #define UHUB_DEBUG 1
 #define ULPT_DEBUG 1
 #define UCOM_DEBUG 1
 #define UPLCOM_DEBUG 1
 #define UMCT_DEBUG 1
 #define UMODEM_DEBUG 1