 @@ -1,14 +1,14 @@
-/*	$NetBSD: dwc_otg.c,v 1.32 2013/01/21 13:25:44 skrll Exp $	*/
+/*	$NetBSD: dwc_otg.c,v 1.33 2013/01/22 13:03:25 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
  * Copyright (c) 2010-2011 Aleksandr Rybalko. 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.
 @@ -50,27 +50,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.
  */
 /*
  * Designware USB 2.0 OTG
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.32 2013/01/21 13:25:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.33 2013/01/22 13:03:25 skrll Exp $");
 #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>
 #include <machine/endian.h>
 @@ -3686,27 +3686,27 @@ dwc_otg_setup_ctrl_chain(usbd_xfer_handl
 		temp.buf = len ? KERNADDR(&xfer->dmabuf, done) : NULL;
 		temp.len = len - done;
 		temp.short_pkt = ( (xfer->flags & USBD_FORCE_SHORT_XFER) ? 0 : 1);
 		if (temp.len > UGETW(ed->wMaxPacketSize))
 			temp.len = UGETW(ed->wMaxPacketSize);
 		dwc_otg_setup_standard_chain_sub(&temp);
 		done += temp.len;
 		if (temp.len)
 			temp.buf = (char *)KERNADDR(&xfer->dmabuf, 0) + done;
 	};
 	/* Status Stage */
 	temp.buf = &req;	/* XXXNH not needed */
 	temp.len = 0;
 	temp.short_pkt = 0;
 	temp.setup_alt_next = 0;
 	/*
 	 * Send a DATA1 message and invert the current endpoint direction.
 	 */
 	if (dir == UT_READ) {
 		temp.func = &dwc_otg_host_data_tx;
 	} else {
 @@ -3773,27 +3773,27 @@ dwc_otg_setup_data_chain(usbd_xfer_handl
 	len = xfer->length;
 	while (len > 0) {
 		/* DATA0 / DATA1 message */
 		temp.buf = KERNADDR(&xfer->dmabuf, off);
 		temp.len = MIN(len, UGETW(ed->wMaxPacketSize));
 		temp.short_pkt = (xfer->flags & USBD_FORCE_SHORT_XFER) ? 0 : 1;
 		if (len <= UGETW(ed->wMaxPacketSize))
 			temp.setup_alt_next = 0;
 		dwc_otg_setup_standard_chain_sub(&temp);
 		len -= temp.len;
 		off += temp.len;
 	};
 	/* must have at least one frame! */
 	td = temp.td;
 	dxfer->td_transfer_last = td;
 	dwc_otg_setup_standard_chain(xfer);
+}
 Static void
 dwc_otg_setup_intr_chain(usbd_xfer_handle xfer)
+{
 	dwc_otg_setup_data_chain(xfer);
+}
 @@ -4069,27 +4069,27 @@ dwc_otg_standard_done(usbd_xfer_handle x
 	/* reset scanner */
 	dxfer->td_transfer_cache = dxfer->td_transfer_first;
 	td = dxfer->td_transfer_first;
 	while (td != NULL) {
 		err = dwc_otg_standard_done_sub(xfer);
 		if (dxfer->td_transfer_cache == NULL) {
 			goto done;
+		}
 		if (td == dxfer->td_transfer_last)
 			break;
 		td = td->obj_next;
 	};
 done:
 	dwc_otg_device_done(xfer, err);
+}
 /*------------------------------------------------------------------------*
  *	dwc_otg_device_done
+ *
  * NOTE: this function can be called more than one time on the
  * same USB transfer!
  *------------------------------------------------------------------------*/
 Static void
 dwc_otg_device_done(usbd_xfer_handle xfer, usbd_status error)