 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.162.2.10 2015/02/01 13:09:15 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.162.2.11 2015/03/05 08:34:47 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.10 2015/02/01 13:09:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.11 2015/03/05 08:34:47 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_compat_netbsd.h"
 #endif
 #include "usb_dma.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 @@ -212,39 +212,46 @@ usbd_open_pipe_intr(usbd_interface_handl
 	USBHIST_LOG(usbdebug, "address = 0x%x flags = 0x%x len = %d",
 	    address, flags, len, 0);
 	err = usbd_open_pipe_ival(iface, address,
 				  USBD_EXCLUSIVE_USE | (flags & USBD_MPSAFE),
 				  &ipipe, ival);
 	if (err)
 		return err;
 	xfer = usbd_alloc_xfer(iface->ui_dev);
 	if (xfer == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	void *buf = usbd_alloc_buffer(xfer, len);
 	if (buf == NULL) {
 		err = ENOMEM;
 		goto bad2;
+	}
 	usbd_setup_xfer(xfer, ipipe, priv, buffer, len, flags,
 	    USBD_NO_TIMEOUT, cb);
 	ipipe->up_intrxfer = xfer;
 	ipipe->up_repeat = 1;
 	err = usbd_transfer(xfer);
 	*pipe = ipipe;
 	if (err != USBD_IN_PROGRESS)
-		goto bad2;
+		goto bad3;
 	return USBD_NORMAL_COMPLETION;
- bad2:
+ bad3:
 	ipipe->up_intrxfer = NULL;
 	ipipe->up_repeat = 0;
  bad2:
 	usbd_free_xfer(xfer);
  bad1:
 	usbd_close_pipe(ipipe);
 	return err;
+}
 usbd_status
 usbd_close_pipe(usbd_pipe_handle pipe)
+{
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 #ifdef DIAGNOSTIC
 @@ -288,77 +295,51 @@ usbd_transfer(usbd_xfer_handle xfer)
 #ifdef USB_DEBUG
 	if (usbdebug > 5)
 		usbd_dump_queue(pipe);
 #endif
 	xfer->ux_done = 0;
 	if (pipe->up_aborting) {
 		USBHIST_LOG(usbdebug, "<- done xfer %p, aborting", xfer, 0, 0,
 );
 		return USBD_CANCELLED;
+	}
-	struct usbd_bus *bus = pipe->up_dev->ud_bus;
+	KASSERT(xfer->ux_length == 0 || xfer->ux_buf != NULL);
 	size = xfer->ux_length;
 	flags = xfer->ux_flags;
-	/*
+	struct usbd_bus *bus = pipe->up_dev->ud_bus;
 	 * isoc transfers are always size == 0, whereas other transfers can
 	 * require a URQ_AUTO_BUFFER buffer.
 	 * URQ_AUTO_BUFFER will be removed at some point, i.e. the transfer
 	 * should provide the buffer.
 	 */
 	if (size != 0) {
 		if (xfer->ux_buf == NULL) {
 			xfer->ux_buf = usbd_alloc_buffer(xfer, size);
 			if (xfer->ux_buf == NULL)
 				return USBD_NOMEM;
 #ifdef DIAGNOSTIC
 			if (xfer->ux_rqflags & URQ_AUTO_BUFFER)
 				printf("usbd_transfer: has old buffer!\n");
 #endif
 			xfer->ux_rqflags |= URQ_AUTO_BUFFER;
 	if (bus->ub_usedma) {
 		/*
 		 * Copy data if not using the xfer buffer.  isoc transfers
 		 * always use DMA buffer, i.e. buffer == NULL
 		 */
 		if (xfer->ux_buffer == NULL) {
 			xfer->ux_buffer = xfer->ux_buf;
 		} else if (xfer->ux_buffer != xfer->ux_buf) {
 			memcpy(xfer->ux_buf, xfer->ux_buffer, size);
+		}
 	} else {
 		xfer->ux_buffer = xfer->ux_buf;
+	}
 	/* xfer is not valid after the transfer method unless synchronous */
 	err = pipe->up_methods->upm_transfer(xfer);
 	USBHIST_LOG(usbdebug, "<- done transfer %p, err = %d", xfer, err, 0, 0);
 	if (err != USBD_IN_PROGRESS && err) {
 		/* The transfer has not been queued, so free buffer. */
 		if (xfer->ux_rqflags & URQ_AUTO_BUFFER) {
 			usbd_free_buffer(xfer);
 			xfer->ux_rqflags &= ~URQ_AUTO_BUFFER;
 	if (!(flags & USBD_SYNCHRONOUS)) {
 		USBHIST_LOG(usbdebug, "<- done xfer %p, not sync", xfer, 0, 0,
 );
 		return err;
+	}
 	/* Sync transfer, wait for completion. */
 	if (err != USBD_IN_PROGRESS) {
 		USBHIST_LOG(usbdebug, "<- done xfer %p, not in progress", xfer,
 , 0, 0);
 		return err;
+	}
 	usbd_lock_pipe(pipe);
 @@ -395,27 +376,26 @@ usbd_sync_transfer(usbd_xfer_handle xfer
 usbd_status
 usbd_sync_transfer_sig(usbd_xfer_handle xfer)
+{
 	xfer->ux_flags |= USBD_SYNCHRONOUS | USBD_SYNCHRONOUS_SIG;
 	return usbd_transfer(xfer);
+}
 void *
 usbd_alloc_buffer(usbd_xfer_handle xfer, uint32_t size)
+{
 	KASSERT(xfer->ux_buf == NULL);
 	KASSERT(size != 0);
 	KASSERT(!(xfer->ux_rqflags & URQ_AUTO_BUFFER));
 	xfer->ux_bufsize = 0;
 #if NUSB_DMA > 0
 	struct usbd_bus *bus = xfer->ux_dev->ud_bus;
 	if (bus->ub_usedma) {
 		usb_dma_t *dmap = &xfer->ux_dmabuf;
 		int err = usb_allocmem_flags(bus, size, 0, dmap, bus->ub_dmaflags);
 		if (err) {
 			return NULL;
+		}
 		xfer->ux_buf = KERNADDR(&xfer->ux_dmabuf, 0);
 @@ -433,27 +413,26 @@ usbd_alloc_buffer(usbd_xfer_handle xfer,
 	return xfer->ux_buf;
+}
 void
 usbd_free_buffer(usbd_xfer_handle xfer)
+{
 	KASSERT(xfer->ux_buf != NULL);
 	KASSERT(xfer->ux_bufsize != 0);
 	void *buf = xfer->ux_buf;
 	uint32_t size = xfer->ux_bufsize;
 	xfer->ux_rqflags &= ~URQ_AUTO_BUFFER;
 	xfer->ux_buf = NULL;
 	xfer->ux_bufsize = 0;
 #if NUSB_DMA > 0
 	struct usbd_bus *bus = xfer->ux_dev->ud_bus;
 	if (bus->ub_usedma) {
 		usb_dma_t *dmap = &xfer->ux_dmabuf;
 		usb_freemem(bus, dmap);
 		return;
+	}
 #endif
 @@ -897,34 +876,26 @@ usb_transfer_complete(usbd_xfer_handle x
 	/* XXXX */
 	if (polling)
 		pipe->up_running = 0;
 	if (xfer->ux_buffer != xfer->ux_buf) {
 		/* can only be different for DMA busses */
 		KASSERT(bus->ub_usedma);
 		KDASSERTMSG(xfer->ux_actlen <= xfer->ux_length,
 		    "actlen %d length %d",xfer->ux_actlen, xfer->ux_length);
 		memcpy(xfer->ux_buffer, xfer->ux_buf, xfer->ux_actlen);
+	}
 	/* XXX remove at some point */
 	/* if we allocated the buffer in usbd_transfer() we free it here. */
 	if (xfer->ux_rqflags & URQ_AUTO_BUFFER) {
 		if (!repeat) {
 			usbd_free_buffer(xfer);
 			xfer->ux_rqflags &= ~URQ_AUTO_BUFFER;
 	if (!repeat) {
 		/* Remove request from queue. */
 		KASSERTMSG(!SIMPLEQ_EMPTY(&pipe->up_queue),
 		    "pipe %p is empty, but xfer %p wants to complete", pipe,
 		     xfer);
 #ifdef DIAGNOSTIC
 		if (xfer != SIMPLEQ_FIRST(&pipe->up_queue))
 			printf("%s: bad dequeue %p != %p\n", __func__,
 			       xfer, SIMPLEQ_FIRST(&pipe->up_queue));
 		xfer->ux_state = XFER_BUSY;
 #endif
 @@ -1096,26 +1067,36 @@ usbd_do_request_flags_pipe(usbd_device_h
 	usb_device_request_t *req, void *data, uint16_t flags, int *actlen,
 	uint32_t timeout)
+{
 	usbd_xfer_handle xfer;
 	usbd_status err;
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	ASSERT_SLEEPABLE();
 	xfer = usbd_alloc_xfer(dev);
 	if (xfer == NULL)
 		return USBD_NOMEM;
 	if (UGETW(req->wLength) != 0) {
 		void *buf = usbd_alloc_buffer(xfer, UGETW(req->wLength));
 		if (buf == NULL) {
 			err = ENOMEM;
 			goto bad;
+		}
+	}
 	usbd_setup_default_xfer(xfer, dev, 0, timeout, req,
 				data, UGETW(req->wLength), flags, 0);
 	xfer->ux_pipe = pipe;
 	err = usbd_sync_transfer(xfer);
 #if defined(USB_DEBUG) || defined(DIAGNOSTIC)
 	if (xfer->ux_actlen > xfer->ux_length) {
 		USBHIST_LOG(usbdebug, "overrun addr = %d type = 0x%02x",
 		    dev->ud_addr, xfer->ux_request.bmRequestType, 0, 0);
 		USBHIST_LOG(usbdebug, "     req = 0x%02x val = %d index = %d",
 		    xfer->ux_request.bRequest, UGETW(xfer->ux_request.wValue),
 		    UGETW(xfer->ux_request.wIndex), 0);
 		USBHIST_LOG(usbdebug, "     rlen = %d length = %d actlen = %d",
 		    UGETW(xfer->ux_request.wLength),

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdivar.h,v 1.109.2.11 2015/02/22 14:50:07 skrll Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.109.2.12 2015/03/05 08:34:47 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
 @@ -255,27 +255,26 @@ struct usbd_xfer {
 	/* For isoc */
 	uint16_t		*ux_frlengths;
 	int			ux_nframes;
 	/* For memory allocation */
 	struct usbd_device     *ux_dev;
 	usb_dma_t		ux_dmabuf;
 	void		       *ux_buf;
 	uint32_t		ux_bufsize;
 	uint8_t			ux_rqflags;
 #define URQ_REQUEST	0x01
 #define URQ_AUTO_BUFFER	0x10
 	SIMPLEQ_ENTRY(usbd_xfer) ux_next;
 	void		       *ux_hcpriv;	/* private use by the HC driver */
 	uint8_t			ux_hcflags;	/* private use by the HC driver */
 #define UXFER_ABORTING	0x01	/* xfer is aborting. */
 #define UXFER_ABORTWAIT	0x02	/* abort completion is being awaited. */
 	kcondvar_t		ux_hccv;	/* private use by the HC driver */
 	struct callout		ux_callout;
 };
 void usbd_init(void);