 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahci.c,v 1.12.6.12 2015/03/19 17:26:42 skrll Exp $	*/
+/*	$NetBSD: ahci.c,v 1.12.6.13 2015/10/11 09:17:50 skrll Exp $	*/
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * All rights reserved.
+ *
  * 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
 @@ -54,27 +54,27 @@
  * 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.
  */
 /*
  * !! HIGHLY EXPERIMENTAL CODE !!
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.12 2015/03/19 17:26:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.13 2015/10/11 09:17:50 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <machine/cpu.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 @@ -85,27 +85,28 @@ __KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.1
 #include <mips/adm5120/include/adm5120reg.h>
 #include <mips/adm5120/include/adm5120var.h>
 #include <mips/adm5120/include/adm5120_obiovar.h>
 #include <mips/adm5120/dev/ahcireg.h>
 #include <mips/adm5120/dev/ahcivar.h>
 static usbd_status	ahci_open(struct usbd_pipe *);
 static void		ahci_softintr(void *);
 static void		ahci_poll(struct usbd_bus *);
 static void		ahci_poll_hub(void *);
 static void		ahci_poll_device(void *arg);
-static struct usbd_xfer *ahci_allocx(struct usbd_bus *);
+static struct usbd_xfer *
 			ahci_allocx(struct usbd_bus *, unsigned int);
 static void		ahci_freex(struct usbd_bus *, struct usbd_xfer *);
 static void		ahci_get_lock(struct usbd_bus *, kmutex_t **);
 static int		ahci_roothub_ctrl(struct usbd_bus *, usb_device_request_t *,
     void *, int);
 static usbd_status	ahci_root_intr_transfer(struct usbd_xfer *);
 static usbd_status	ahci_root_intr_start(struct usbd_xfer *);
 static void		ahci_root_intr_abort(struct usbd_xfer *);
 static void		ahci_root_intr_close(struct usbd_pipe *);
 static void		ahci_root_intr_done(struct usbd_xfer *);
 static usbd_status	ahci_device_ctrl_transfer(struct usbd_xfer *);
 @@ -440,27 +441,27 @@ ahci_poll_hub(void *arg)
 	/* no change, return NAK */
 	if (p[0] == 0)
 		return;
 	xfer->ux_actlen = 1;
 	xfer->ux_status = USBD_NORMAL_COMPLETION;
 	mutex_enter(&sc->sc_lock);
 	usb_transfer_complete(xfer);
 	mutex_exit(&sc->sc_lock);
+}
 struct usbd_xfer *
-ahci_allocx(struct usbd_bus *bus)
+ahci_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct ahci_softc *sc = (struct ahci_softc *)bus;
 	struct usbd_xfer *xfer;
 	DPRINTF(D_MEM, ("SLallocx"));
 	xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 	if (xfer) {
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, ux_next);
 #ifdef DIAGNOSTIC
 		if (xfer->ux_state != XFER_FREE) {
 			printf("ahci_allocx: xfer=%p not free, 0x%08x\n",
 				xfer, xfer->ux_state);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sl811hs.c,v 1.47.6.12 2015/10/11 08:35:04 skrll Exp $	*/
+/*	$NetBSD: sl811hs.c,v 1.47.6.13 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Not (c) 2007 Matthew Orgass
  * This file is public domain, meaning anyone can make any use of part or all
  * of this file including copying into other works without credit.  Any use,
  * modified or not, is solely the responsibility of the user.  If this file is
  * part of a collection then use in the collection is governed by the terms of
  * the collection.
  */
 /*
  * Cypress/ScanLogic SL811HS/T USB Host Controller
  * Datasheet, Errata, and App Note available at www.cypress.com
 @@ -58,27 +58,27 @@
  */
 /*
  * XXX TODO:
  *   copy next output packet while transfering
  *   usb suspend
  *   could keep track of known values of all buffer space?
  *   combined print/log function for errors
+ *
  *   ub_usepolling support is untested and may not work
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.12 2015/10/11 08:35:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.13 2015/10/11 09:17:51 skrll Exp $");
 #include "opt_slhci.h"
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/queue.h>
 #include <sys/gcq.h>
 #include <sys/intr.h>
 @@ -410,27 +410,27 @@ slhci_dump_cc_times(int n) {
 		printf("start " CC_TYPE_FMT " stop " CC_TYPE_FMT
 		    " difference %8i miscdata %#x\n", times->times[i].start,
 		    times->times[i].stop, (int)(times->times[i].stop -
 		    times->times[i].start), times->times[i].miscdata);
+}
 #else
 #define start_cc_time(x, y)
 #define stop_cc_time(x)
 #endif /* SLHCI_PROFILE_TRANSFER */
 typedef usbd_status (*LockCallFunc)(struct slhci_softc *, struct slhci_pipe
     *, struct usbd_xfer *);
-struct usbd_xfer * slhci_allocx(struct usbd_bus *);
+struct usbd_xfer * slhci_allocx(struct usbd_bus *, unsigned int);
 void slhci_freex(struct usbd_bus *, struct usbd_xfer *);
 static void slhci_get_lock(struct usbd_bus *, kmutex_t **);
 usbd_status slhci_transfer(struct usbd_xfer *);
 usbd_status slhci_start(struct usbd_xfer *);
 usbd_status slhci_root_start(struct usbd_xfer *);
 usbd_status slhci_open(struct usbd_pipe *);
 static int slhci_roothub_ctrl(struct usbd_bus *, usb_device_request_t *,
     void *, int);
 /*
  * slhci_supported_rev, slhci_preinit, slhci_attach, slhci_detach,
 @@ -748,27 +748,27 @@ enter_callback(struct slhci_transfers *t
+{
 	gcq_insert_tail(&t->q[Q_CALLBACKS], &spipe->xq);
+}
 static inline void
 enter_all_pipes(struct slhci_transfers *t, struct slhci_pipe *spipe)
+{
 	gcq_insert_tail(&t->ap, &spipe->ap);
+}
 /* Start out of lock functions. */
 struct usbd_xfer *
-slhci_allocx(struct usbd_bus *bus)
+slhci_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct usbd_xfer *xfer;
 	xfer = kmem_zalloc(sizeof(*xfer), KM_SLEEP);
 	DLOG(D_MEM, "allocx %p", xfer, 0,0,0);
 #ifdef SLHCI_MEM_ACCOUNTING
 	slhci_mem_use(bus, 1);
 #endif
 #ifdef DIAGNOSTIC
 	if (xfer != NULL)
 		xfer->ux_state = XFER_BUSY;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci.c,v 1.234.2.53 2015/10/11 08:13:11 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.54 2015/10/11 09:17:51 skrll 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:
 @@ -43,27 +43,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.234.2.53 2015/10/11 08:13:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.54 2015/10/11 09:17:51 skrll 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>
 @@ -155,27 +155,27 @@ Static int		ehci_intr1(ehci_softc_t *);
 Static void		ehci_waitintr(ehci_softc_t *, struct usbd_xfer *);
 Static void		ehci_check_intr(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_check_qh_intr(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_check_itd_intr(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_check_sitd_intr(ehci_softc_t *, struct ehci_xfer *);
 Static void		ehci_idone(struct ehci_xfer *);
 Static void		ehci_timeout(void *);
 Static void		ehci_timeout_task(void *);
 Static void		ehci_intrlist_timeout(void *);
 Static void		ehci_doorbell(void *);
 Static void		ehci_pcd(void *);
 Static struct usbd_xfer *
-			ehci_allocx(struct usbd_bus *);
+			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 usbd_status	ehci_device_ctrl_transfer(struct usbd_xfer *);
 Static usbd_status	ehci_device_ctrl_start(struct usbd_xfer *);
 @@ -1503,27 +1503,27 @@ ehci_resume(device_t dv, const pmf_qual_
 bool
 ehci_shutdown(device_t self, int flags)
+{
 	ehci_softc_t *sc = device_private(self);
 	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
 	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)
+ehci_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct ehci_softc *sc = bus->ub_hcpriv;
 	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
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: motg.c,v 1.12.2.18 2015/09/22 12:06:01 skrll Exp $	*/
+/*	$NetBSD: motg.c,v 1.12.2.19 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca),
  * Matthew R. Green (mrg@eterna.com.au), and Manuel Bouyer (bouyer@netbsd.org).
+ *
  * 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 @@
  */
 /*
  * This file contains the driver for the Mentor Graphics Inventra USB
  * 2.0 High Speed Dual-Role controller.
+ *
  * NOTE: The current implementation only supports Device Side Mode!
  */
 #include "opt_motg.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.18 2015/09/22 12:06:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.19 2015/10/11 09:17:51 skrll Exp $");
 #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/proc.h>
 #include <sys/queue.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 @@ -134,27 +134,28 @@ fail:
 #define NAK_TO_BULK_HIGH 0
 static void 		motg_hub_change(struct motg_softc *);
 static usbd_status	motg_root_intr_transfer(struct usbd_xfer *);
 static usbd_status	motg_root_intr_start(struct usbd_xfer *);
 static void		motg_root_intr_abort(struct usbd_xfer *);
 static void		motg_root_intr_close(struct usbd_pipe *);
 static void		motg_root_intr_done(struct usbd_xfer *);
 static usbd_status	motg_open(struct usbd_pipe *);
 static void		motg_poll(struct usbd_bus *);
 static void		motg_softintr(void *);
-static struct usbd_xfer *	motg_allocx(struct usbd_bus *);
+static struct usbd_xfer *
 			motg_allocx(struct usbd_bus *, unsigned int);
 static void		motg_freex(struct usbd_bus *, struct usbd_xfer *);
 static void		motg_get_lock(struct usbd_bus *, kmutex_t **);
 static int		motg_roothub_ctrl(struct usbd_bus *, usb_device_request_t *,
     void *, int);
 static void		motg_noop(struct usbd_pipe *pipe);
 static usbd_status	motg_portreset(struct motg_softc*);
 static usbd_status	motg_device_ctrl_transfer(struct usbd_xfer *);
 static usbd_status	motg_device_ctrl_start(struct usbd_xfer *);
 static void		motg_device_ctrl_abort(struct usbd_xfer *);
 static void		motg_device_ctrl_close(struct usbd_pipe *);
 static void		motg_device_ctrl_done(struct usbd_xfer *);
 @@ -735,27 +736,27 @@ motg_intr_vbus(struct motg_softc *sc, in
 	MOTGHIST_FUNC(); MOTGHIST_CALLED();
 	if (sc->sc_mode == MOTG_MODE_HOST && vbus == 0) {
 		DPRINTF("vbus down, try to re-enable", 0, 0, 0, 0);
 		/* try to re-enter session for Host mode */
 		val = UREAD1(sc, MUSB2_REG_DEVCTL);
 		val |= MUSB2_MASK_SESS;
 		UWRITE1(sc, MUSB2_REG_DEVCTL, val);
+	}
 	return 1;
+}
 struct usbd_xfer *
-motg_allocx(struct usbd_bus *bus)
+motg_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct motg_softc *sc = bus->ub_hcpriv;
 	struct usbd_xfer *xfer;
 	xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct motg_xfer));
 		UXFER(xfer)->sc = sc;
 #ifdef DIAGNOSTIC
 		// XXX UXFER(xfer)->iinfo.isdone = 1;
 		xfer->ux_state = XFER_BUSY;
 #endif
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohci.c,v 1.254.2.22 2015/09/22 12:06:01 skrll Exp $	*/
+/*	$NetBSD: ohci.c,v 1.254.2.23 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2005, 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) at
  * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca)
  * and Matthew R. Green (mrg@eterna.com.au).
  * 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.254.2.22 2015/09/22 12:06:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.23 2015/10/11 09:17:51 skrll Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
 @@ -152,27 +152,28 @@ Static void		ohci_add_ed(ohci_softc_t *,
 Static void		ohci_rem_ed(ohci_softc_t *, ohci_soft_ed_t *,
 				    ohci_soft_ed_t *);
 Static void		ohci_hash_add_td(ohci_softc_t *, ohci_soft_td_t *);
 Static void		ohci_hash_rem_td(ohci_softc_t *, ohci_soft_td_t *);
 Static ohci_soft_td_t  *ohci_hash_find_td(ohci_softc_t *, ohci_physaddr_t);
 Static void		ohci_hash_add_itd(ohci_softc_t *, ohci_soft_itd_t *);
 Static void		ohci_hash_rem_itd(ohci_softc_t *, ohci_soft_itd_t *);
 Static ohci_soft_itd_t  *ohci_hash_find_itd(ohci_softc_t *, ohci_physaddr_t);
 Static usbd_status	ohci_setup_isoc(struct usbd_pipe *);
 Static void		ohci_device_isoc_enter(struct usbd_xfer *);
-Static struct usbd_xfer *	ohci_allocx(struct usbd_bus *);
+Static struct usbd_xfer *
 			ohci_allocx(struct usbd_bus *, unsigned int);
 Static void		ohci_freex(struct usbd_bus *, struct usbd_xfer *);
 Static void		ohci_get_lock(struct usbd_bus *, kmutex_t **);
 Static int		ohci_roothub_ctrl(struct usbd_bus *,
     usb_device_request_t *, void *, int);
 Static usbd_status	ohci_root_intr_transfer(struct usbd_xfer *);
 Static usbd_status	ohci_root_intr_start(struct usbd_xfer *);
 Static void		ohci_root_intr_abort(struct usbd_xfer *);
 Static void		ohci_root_intr_close(struct usbd_pipe *);
 Static void		ohci_root_intr_done(struct usbd_xfer *);
 Static usbd_status	ohci_device_ctrl_transfer(struct usbd_xfer *);
 Static usbd_status	ohci_device_ctrl_start(struct usbd_xfer *);
 @@ -938,27 +939,27 @@ ohci_init(ohci_softc_t *sc)
  bad4:
 	ohci_free_sed(sc, sc->sc_isoc_head);
  bad3:
 	ohci_free_sed(sc, sc->sc_bulk_head);
  bad2:
 	ohci_free_sed(sc, sc->sc_ctrl_head);
  bad1:
 	usb_freemem(&sc->sc_bus, &sc->sc_hccadma);
 	sc->sc_hcca = NULL;
 	return err;
+}
 struct usbd_xfer *
-ohci_allocx(struct usbd_bus *bus)
+ohci_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct ohci_softc *sc = bus->ub_hcpriv;
 	struct usbd_xfer *xfer;
 	xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct ohci_xfer));
 #ifdef DIAGNOSTIC
 		xfer->ux_state = XFER_BUSY;
 #endif
+	}
 	return xfer;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhci.c,v 1.264.4.35 2015/09/29 11:38:29 skrll Exp $	*/
+/*	$NetBSD: uhci.c,v 1.264.4.36 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2011, 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) at
  * Carlstedt Research & Technology, 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:
 @@ -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.264.4.35 2015/09/29 11:38:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.36 2015/10/11 09:17:51 skrll Exp $");
 #include "opt_usb.h"
 #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>
 @@ -192,27 +192,28 @@ Static void		uhci_timeout(void *);
 Static void		uhci_timeout_task(void *);
 Static void		uhci_add_ls_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
 Static void		uhci_add_hs_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
 Static void		uhci_add_bulk(uhci_softc_t *, uhci_soft_qh_t *);
 Static void		uhci_remove_ls_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_remove_hs_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_remove_bulk(uhci_softc_t *,uhci_soft_qh_t *);
 Static void		uhci_add_loop(uhci_softc_t *);
 Static void		uhci_rem_loop(uhci_softc_t *);
 Static usbd_status	uhci_setup_isoc(struct usbd_pipe *);
 Static void		uhci_device_isoc_enter(struct usbd_xfer *);
-Static struct usbd_xfer *	uhci_allocx(struct usbd_bus *);
+Static struct usbd_xfer *
 			uhci_allocx(struct usbd_bus *, unsigned int);
 Static void		uhci_freex(struct usbd_bus *, struct usbd_xfer *);
 Static void		uhci_get_lock(struct usbd_bus *, kmutex_t **);
 Static int		uhci_roothub_ctrl(struct usbd_bus *,
     usb_device_request_t *, void *, int);
 Static usbd_status	uhci_device_ctrl_transfer(struct usbd_xfer *);
 Static usbd_status	uhci_device_ctrl_start(struct usbd_xfer *);
 Static void		uhci_device_ctrl_abort(struct usbd_xfer *);
 Static void		uhci_device_ctrl_close(struct usbd_pipe *);
 Static void		uhci_device_ctrl_done(struct usbd_xfer *);
 Static usbd_status	uhci_device_intr_transfer(struct usbd_xfer *);
 Static usbd_status	uhci_device_intr_start(struct usbd_xfer *);
 @@ -603,27 +604,27 @@ uhci_detach(struct uhci_softc *sc, int f
 	cv_destroy(&sc->sc_softwake_cv);
 	mutex_destroy(&sc->sc_lock);
 	mutex_destroy(&sc->sc_intr_lock);
 	pool_cache_destroy(sc->sc_xferpool);
 	/* XXX free other data structures XXX */
 	return rv;
+}
 struct usbd_xfer *
-uhci_allocx(struct usbd_bus *bus)
+uhci_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct uhci_softc *sc = bus->ub_hcpriv;
 	struct usbd_xfer *xfer;
 	xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct uhci_xfer));
 		struct uhci_xfer *uxfer = UXFER(xfer);
 		uxfer->iinfo.sc = sc;
 #ifdef DIAGNOSTIC
 		uxfer->iinfo.isdone = true;
 		xfer->ux_state = XFER_BUSY;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.162.2.30 2015/10/10 07:23:25 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.162.2.31 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 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) at
  * Carlstedt Research & Technology 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
 @@ -21,27 +21,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.162.2.30 2015/10/10 07:23:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.31 2015/10/11 09:17:51 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_compat_netbsd.h"
 #include "usb_dma.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 @@ -57,27 +57,27 @@ __KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.
 #include <dev/usb/usbhist.h>
 /* UTF-8 encoding stuff */
 #include <fs/unicode.h>
 extern int usbdebug;
 Static usbd_status usbd_ar_pipe(struct usbd_pipe *);
 Static void usbd_start_next(struct usbd_pipe *);
 Static usbd_status usbd_open_pipe_ival
 	(struct usbd_interface *, uint8_t, uint8_t, struct usbd_pipe **, int);
 static void *usbd_alloc_buffer(struct usbd_xfer *, uint32_t);
 static void usbd_free_buffer(struct usbd_xfer *);
-static struct usbd_xfer *usbd_alloc_xfer(struct usbd_device *);
+static struct usbd_xfer *usbd_alloc_xfer(struct usbd_device *, unsigned int);
 static usbd_status usbd_free_xfer(struct usbd_xfer *);
 #if defined(USB_DEBUG)
 void
 usbd_dump_iface(struct usbd_interface *iface)
+{
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	USBHIST_LOG(usbdebug, "iface %p", iface, 0, 0, 0);
 	if (iface == NULL)
 		return;
 	USBHIST_LOG(usbdebug, "     device = %p idesc = %p index = %d",
 	    iface->ui_dev, iface->ui_idesc, iface->ui_index, 0);
 @@ -435,35 +435,35 @@ void *
 usbd_get_buffer(struct usbd_xfer *xfer)
+{
 	return xfer->ux_buf;
+}
 struct usbd_pipe *
 usbd_get_pipe0(struct usbd_device *dev)
+{
 	return dev->ud_pipe0;
+}
 static struct usbd_xfer *
-usbd_alloc_xfer(struct usbd_device *dev)
+usbd_alloc_xfer(struct usbd_device *dev, unsigned int nframes)
+{
 	struct usbd_xfer *xfer;
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	ASSERT_SLEEPABLE();
-	xfer = dev->ud_bus->ub_methods->ubm_allocx(dev->ud_bus);
+	xfer = dev->ud_bus->ub_methods->ubm_allocx(dev->ud_bus, nframes);
 	if (xfer == NULL)
 		return NULL;
 	xfer->ux_dev = dev;
 	callout_init(&xfer->ux_callout, CALLOUT_MPSAFE);
 	cv_init(&xfer->ux_cv, "usbxfer");
 	cv_init(&xfer->ux_hccv, "usbhcxfer");
 	USBHIST_LOG(usbdebug, "returns %p", xfer, 0, 0, 0);
 	return xfer;
+}
 static usbd_status
 @@ -483,27 +483,27 @@ usbd_free_xfer(struct usbd_xfer *xfer)
 #endif
 	cv_destroy(&xfer->ux_cv);
 	cv_destroy(&xfer->ux_hccv);
 	xfer->ux_dev->ud_bus->ub_methods->ubm_freex(xfer->ux_dev->ud_bus, xfer);
 	return USBD_NORMAL_COMPLETION;
+}
 int
 usbd_create_xfer(struct usbd_pipe *pipe, size_t len, unsigned int flags,
     unsigned int nframes, struct usbd_xfer **xp)
+{
 	KASSERT(xp != NULL);
-	struct usbd_xfer *xfer = usbd_alloc_xfer(pipe->up_dev);
+	struct usbd_xfer *xfer = usbd_alloc_xfer(pipe->up_dev, nframes);
 	if (xfer == NULL)
 		return ENOMEM;
 	if (len) {
 		void *buf = usbd_alloc_buffer(xfer, len);
 		if (!buf) {
 			usbd_free_xfer(xfer);
 			return ENOMEM;
+		}
+	}
 	xfer->ux_pipe = pipe;
 	xfer->ux_flags = flags;
 	xfer->ux_nframes = nframes;
 @@ -1043,27 +1043,27 @@ usbd_do_request_flags(struct usbd_device
 usbd_status
 usbd_do_request_flags_pipe(struct usbd_device *dev, struct usbd_pipe *pipe,
 	usb_device_request_t *req, void *data, uint16_t flags, int *actlen,
 	uint32_t timeout)
+{
 	struct usbd_xfer *xfer;
 	usbd_status err;
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	ASSERT_SLEEPABLE();
-	xfer = usbd_alloc_xfer(dev);
+	xfer = usbd_alloc_xfer(dev, 0);
 	if (xfer == NULL)
 		return USBD_NOMEM;
 	if (UGETW(req->wLength) != 0) {
 		void *buf = usbd_alloc_buffer(xfer, UGETW(req->wLength));
 		if (buf == NULL) {
 			err = USBD_NOMEM;
 			goto bad;
+		}
+	}
 	usbd_setup_default_xfer(xfer, dev, 0, timeout, req,
 				data, UGETW(req->wLength), flags, 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdivar.h,v 1.109.2.17 2015/06/06 15:26:15 skrll Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.109.2.18 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 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) at
  * Carlstedt Research & Technology 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
 @@ -84,27 +84,27 @@ struct usbd_xfer;
 struct usbd_pipe;
 struct usbd_port;
 struct usbd_endpoint {
 	usb_endpoint_descriptor_t *ue_edesc;
 	int			ue_refcnt;
 	int			ue_toggle;
 };
 struct usbd_bus_methods {
 	usbd_status	      (*ubm_open)(struct usbd_pipe *);
 	void		      (*ubm_softint)(void *);
 	void		      (*ubm_dopoll)(struct usbd_bus *);
-	struct usbd_xfer     *(*ubm_allocx)(struct usbd_bus *);
+	struct usbd_xfer     *(*ubm_allocx)(struct usbd_bus *, unsigned int);
 	void		      (*ubm_freex)(struct usbd_bus *, struct usbd_xfer *);
 	void		      (*ubm_getlock)(struct usbd_bus *, kmutex_t **);
 	usbd_status	      (*ubm_newdev)(device_t, struct usbd_bus *, int,
 					    int, int, struct usbd_port *);
 	int			(*ubm_rhctrl)(struct usbd_bus *,
 				    usb_device_request_t *, void *, int);
 };
 struct usbd_pipe_methods {
 	usbd_status	      (*upm_transfer)(struct usbd_xfer *);
 	usbd_status	      (*upm_start)(struct usbd_xfer *);
 	void		      (*upm_abort)(struct usbd_xfer *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xhci.c,v 1.28.2.40 2015/10/03 16:33:33 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.28.2.41 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
  * All rights reserved.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB rev 3.1 specification
  *  http://www.usb.org/developers/docs/usb_31_040315.zip
  * USB rev 2.0 specification
  *  http://www.usb.org/developers/docs/usb20_docs/usb_20_031815.zip
  * xHCI rev 1.1 specification
  *  http://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/extensible-host-controler-interface-usb-xhci.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.40 2015/10/03 16:33:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.41 2015/10/11 09:17:51 skrll Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 @@ -119,27 +119,27 @@ struct xhci_pipe {
 	struct usb_task xp_async_task;
 };
 #define XHCI_COMMAND_RING_TRBS 256
 #define XHCI_EVENT_RING_TRBS 256
 #define XHCI_EVENT_RING_SEGMENTS 1
 #define XHCI_TRB_3_ED_BIT XHCI_TRB_3_ISP_BIT
 static usbd_status xhci_open(struct usbd_pipe *);
 static void xhci_close_pipe(struct usbd_pipe *);
 static int xhci_intr1(struct xhci_softc * const);
 static void xhci_softintr(void *);
 static void xhci_poll(struct usbd_bus *);
-static struct usbd_xfer *xhci_allocx(struct usbd_bus *);
+static struct usbd_xfer *xhci_allocx(struct usbd_bus *, unsigned int);
 static void xhci_freex(struct usbd_bus *, struct usbd_xfer *);
 static void xhci_get_lock(struct usbd_bus *, kmutex_t **);
 static usbd_status xhci_new_device(device_t, struct usbd_bus *, int, int, int,
     struct usbd_port *);
 static int xhci_roothub_ctrl(struct usbd_bus *, usb_device_request_t *,
     void *, int);
 static usbd_status xhci_configure_endpoint(struct usbd_pipe *);
 //static usbd_status xhci_unconfigure_endpoint(struct usbd_pipe *);
 static usbd_status xhci_reset_endpoint(struct usbd_pipe *);
 static usbd_status xhci_stop_endpoint(struct usbd_pipe *);
 static usbd_status xhci_set_dequeue(struct usbd_pipe *);
 @@ -2044,27 +2044,27 @@ xhci_poll(struct usbd_bus *bus)
+{
 	struct xhci_softc * const sc = bus->ub_hcpriv;
 	XHCIHIST_FUNC(); XHCIHIST_CALLED();
 	mutex_spin_enter(&sc->sc_intr_lock);
 	xhci_intr1(sc);
 	mutex_spin_exit(&sc->sc_intr_lock);
 	return;
+}
 static struct usbd_xfer *
-xhci_allocx(struct usbd_bus *bus)
+xhci_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct xhci_softc * const sc = bus->ub_hcpriv;
 	struct usbd_xfer *xfer;
 	XHCIHIST_FUNC(); XHCIHIST_CALLED();
 	xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct xhci_xfer));
 #ifdef DIAGNOSTIC
 		xfer->ux_state = XFER_BUSY;
 #endif
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dwc2.c,v 1.32.2.12 2015/10/04 10:45:37 skrll Exp $	*/
+/*	$NetBSD: dwc2.c,v 1.32.2.13 2015/10/11 09:17:51 skrll Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -20,27 +20,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: dwc2.c,v 1.32.2.12 2015/10/04 10:45:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.13 2015/10/11 09:17:51 skrll Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/cpu.h>
 @@ -74,27 +74,28 @@ __KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.3
 } while (0)
 #define	DPRINTF(...)	DPRINTFN(1, __VA_ARGS__)
 int dwc2debug = 0;
 #else
 #define	DPRINTF(...) do { } while (0)
 #define	DPRINTFN(...) do { } while (0)
 #endif
 Static usbd_status	dwc2_open(struct usbd_pipe *);
 Static void		dwc2_poll(struct usbd_bus *);
 Static void		dwc2_softintr(void *);
 Static void		dwc2_waitintr(struct dwc2_softc *, struct usbd_xfer *);
-Static struct usbd_xfer *	dwc2_allocx(struct usbd_bus *);
+Static struct usbd_xfer *
 			dwc2_allocx(struct usbd_bus *, unsigned int);
 Static void		dwc2_freex(struct usbd_bus *, struct usbd_xfer *);
 Static void		dwc2_get_lock(struct usbd_bus *, kmutex_t **);
 Static int		dwc2_roothub_ctrl(struct usbd_bus *, usb_device_request_t *,
     void *, int);
 Static usbd_status	dwc2_root_intr_transfer(struct usbd_xfer *);
 Static usbd_status	dwc2_root_intr_start(struct usbd_xfer *);
 Static void		dwc2_root_intr_abort(struct usbd_xfer *);
 Static void		dwc2_root_intr_close(struct usbd_pipe *);
 Static void		dwc2_root_intr_done(struct usbd_xfer *);
 Static usbd_status	dwc2_device_ctrl_transfer(struct usbd_xfer *);
 Static usbd_status	dwc2_device_ctrl_start(struct usbd_xfer *);
 @@ -194,64 +195,64 @@ Static const struct usbd_pipe_methods dw
 	.upm_done =	dwc2_device_bulk_done,
 };
 Static const struct usbd_pipe_methods dwc2_device_isoc_methods = {
 	.upm_transfer =	dwc2_device_isoc_transfer,
 	.upm_start =	dwc2_device_isoc_start,
 	.upm_abort =	dwc2_device_isoc_abort,
 	.upm_close =	dwc2_device_isoc_close,
 	.upm_cleartoggle =	dwc2_noop,
 	.upm_done =	dwc2_device_isoc_done,
 };
 struct usbd_xfer *
-dwc2_allocx(struct usbd_bus *bus)
+dwc2_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct dwc2_softc *sc = DWC2_BUS2SC(bus);
 	struct dwc2_xfer *dxfer;
 	DPRINTFN(10, "\n");
 	DWC2_EVCNT_INCR(sc->sc_ev_xferpoolget);
 	dxfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (dxfer != NULL) {
 		memset(dxfer, 0, sizeof(*dxfer));
 		dxfer->urb = dwc2_hcd_urb_alloc(sc->sc_hsotg,
-		    DWC2_MAXISOCPACKETS, GFP_KERNEL);
+		    nframes, GFP_KERNEL);
 #ifdef DIAGNOSTIC
 		dxfer->xfer.ux_state = XFER_BUSY;
 #endif
+	}
 	return (struct usbd_xfer *)dxfer;
+}
 void
 dwc2_freex(struct usbd_bus *bus, struct usbd_xfer *xfer)
+{
 	struct dwc2_xfer *dxfer = DWC2_XFER2DXFER(xfer);
 	struct dwc2_softc *sc = DWC2_BUS2SC(bus);
 	DPRINTFN(10, "\n");
 #ifdef DIAGNOSTIC
 	if (xfer->ux_state != XFER_BUSY) {
 		DPRINTF("xfer=%p not busy, 0x%08x\n", xfer, xfer->ux_state);
+	}
 	xfer->ux_state = XFER_FREE;
 #endif
 	DWC2_EVCNT_INCR(sc->sc_ev_xferpoolput);
-	dwc2_hcd_urb_free(sc->sc_hsotg, dxfer->urb, DWC2_MAXISOCPACKETS);
+	dwc2_hcd_urb_free(sc->sc_hsotg, dxfer->urb, dxfer->urb->packet_count);
 	pool_cache_put(sc->sc_xferpool, xfer);
+}
 Static void
 dwc2_get_lock(struct usbd_bus *bus, kmutex_t **lock)
+{
 	struct dwc2_softc *sc = DWC2_BUS2SC(bus);
 	*lock = &sc->sc_lock;
+}
 Static void
 dwc2_rhc(void *addr)
 @@ -1050,27 +1051,27 @@ dwc2_device_start(struct usbd_xfer *xfer
 	} else {
 		DPRINTFN(3, "xfer=%p len=%d flags=%d addr=%d endpt=%d,"
 		    " mps=%d dir %s\n", xfer, xfer->ux_length, xfer->ux_flags, addr,
 		    epnum, mps, dir == UT_READ ? "in" :"out");
 		len = xfer->ux_length;
+	}
 	dwc2_urb = dxfer->urb;
 	if (!dwc2_urb)
 		    return USBD_NOMEM;
 	memset(dwc2_urb, 0, sizeof(*dwc2_urb) +
-	    sizeof(dwc2_urb->iso_descs[0]) * DWC2_MAXISOCPACKETS);
+	    sizeof(dwc2_urb->iso_descs[0]) * dwc2_urb->packet_count);
 	dwc2_urb->priv = xfer;
 	dwc2_hcd_urb_set_pipeinfo(hsotg, dwc2_urb, addr, epnum, xfertype, dir,
 				  mps);
 	if (xfertype == UE_CONTROL) {
 		dwc2_urb->setup_usbdma = &dpipe->req_dma;
 		dwc2_urb->setup_packet = KERNADDR(&dpipe->req_dma, 0);
 		dwc2_urb->setup_dma = DMAADDR(&dpipe->req_dma, 0);
 	} else {
 		/* XXXNH - % mps required? */
 		if ((xfer->ux_flags & USBD_FORCE_SHORT_XFER) && (len % mps) == 0)
 @@ -1080,27 +1081,26 @@ dwc2_device_start(struct usbd_xfer *xfer
 	/*
 	 * control transfers with no data phase don't touch usbdma, but
 	 * everything else does.
 	 */
 	if (!(xfertype == UE_CONTROL && len == 0)) {
 		dwc2_urb->usbdma = &xfer->ux_dmabuf;
 		dwc2_urb->buf = KERNADDR(dwc2_urb->usbdma, 0);
 		dwc2_urb->dma = DMAADDR(dwc2_urb->usbdma, 0);
+ 	}
 	dwc2_urb->length = len;
  	dwc2_urb->flags = flags;
 	dwc2_urb->status = -EINPROGRESS;
 	dwc2_urb->packet_count = xfer->ux_nframes;
 	if (xfertype == UE_INTERRUPT ||
 	    xfertype == UE_ISOCHRONOUS) {
 		uint16_t ival;
 		if (xfertype == UE_INTERRUPT &&
 		    dpipe->pipe.up_interval != USBD_DEFAULT_INTERVAL) {
 			ival = dpipe->pipe.up_interval;
 		} else {
 			ival = ed->bInterval;
+		}
 		if (ival < 1) {
 @@ -1121,27 +1121,27 @@ dwc2_device_start(struct usbd_xfer *xfer
 		} else {
 			if (xfertype == UE_INTERRUPT && ival < 10)
 				ival = 10;
+		}
 		dwc2_urb->interval = ival;
+	}
 	/* XXXNH bring down from callers?? */
 // 	mutex_enter(&sc->sc_lock);
 	xfer->ux_actlen = 0;
 	KASSERT(xfertype != UE_ISOCHRONOUS ||
-	    xfer->ux_nframes < DWC2_MAXISOCPACKETS);
+	    xfer->ux_nframes < dwc2_urb->packet_count);
 	KASSERTMSG(xfer->ux_nframes == 0 || xfertype == UE_ISOCHRONOUS,
 	    "nframes %d xfertype %d\n", xfer->ux_nframes, xfertype);
 	for (off = i = 0; i < xfer->ux_nframes; ++i) {
 		DPRINTFN(3, "xfer=%p frame=%d offset=%d length=%d\n", xfer, i,
 		    off, xfer->ux_frlengths[i]);
 		dwc2_hcd_urb_set_iso_desc_params(dwc2_urb, i, off,
 		    xfer->ux_frlengths[i]);
 		off += xfer->ux_frlengths[i];
+	}
 	struct dwc2_qh *qh = dpipe->priv;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ugenhc.c,v 1.22.4.9 2015/03/19 17:26:42 skrll Exp $	*/
+/*	$NetBSD: ugenhc.c,v 1.22.4.10 2015/10/11 09:17:51 skrll Exp $	*/
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
+ *
  * 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.
+ *
 @@ -51,27 +51,27 @@
  * 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.
  */
 /*
  * This rump driver attaches ugen as a kernel usb host controller.
  * It's still somewhat under the hammer ....
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.9 2015/03/19 17:26:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.10 2015/10/11 09:17:51 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 @@ -872,27 +872,27 @@ ugenhc_open(struct usbd_pipe *pipe)
 static void
 ugenhc_softint(void *arg)
+{
+}
 static void
 ugenhc_poll(struct usbd_bus *ubus)
+{
+}
 static struct usbd_xfer *
-ugenhc_allocx(struct usbd_bus *bus)
+ugenhc_allocx(struct usbd_bus *bus, unsigned int nframes)
+{
 	struct usbd_xfer *xfer;
 	xfer = kmem_zalloc(sizeof(struct usbd_xfer), KM_SLEEP);
 	xfer->ux_state = XFER_BUSY;
 	return xfer;
+}
 static void
 ugenhc_freex(struct usbd_bus *bus, struct usbd_xfer *xfer)
+{