From owner-p4-projects@FreeBSD.ORG  Tue Aug  3 19:39:00 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF9B81065672; Tue,  3 Aug 2010 19:38:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3DEF1106566B
	for <perforce@FreeBSD.org>; Tue,  3 Aug 2010 19:38:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 107798FC1A
	for <perforce@FreeBSD.org>; Tue,  3 Aug 2010 19:38:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o73JcwIt039229
	for <perforce@FreeBSD.org>; Tue, 3 Aug 2010 19:38:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o73JcwZG039227
	for perforce@freebsd.org; Tue, 3 Aug 2010 19:38:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 3 Aug 2010 19:38:58 GMT
Message-Id: <201008031938.o73JcwZG039227@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181800 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Aug 2010 19:39:00 -0000

http://p4web.freebsd.org/@@181800?ac=10

Change 181800 by hselasky@hselasky_laptop001 on 2010/08/03 19:38:48

	USB core:
		- call "start_dma_delay" method on all errors, if it is non-NULL.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#23 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#181 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_controller.h#23 (text+ko) ====

@@ -136,7 +136,7 @@
 
 	/* Optional */
 
-	void	(*dma_delay)(struct usb_xfer *);
+	void	(*start_dma_delay)(struct usb_xfer *);
 
 	void   *info;
 };

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#181 (text+ko) ====

@@ -2578,9 +2578,10 @@
 	 * If we have a non-hardware induced error we
 	 * need to do the DMA delay!
 	 */
-	if (((xfer->error == USB_ERR_CANCELLED) ||
-	    (xfer->error == USB_ERR_TIMEOUT)) &&
-	    (!xfer->flags_int.did_dma_delay)) {
+	if ((xfer->error != 0) && (!xfer->flags_int.did_dma_delay) &&
+	    ((xfer->error == USB_ERR_CANCELLED) ||
+	    (xfer->error == USB_ERR_TIMEOUT) ||
+	    (xfer->endpoint->methods->start_dma_delay != NULL))) {
 
 		usb_timeout_t temp;
 
@@ -2603,8 +2604,8 @@
 			 * memory. For the other hardware platforms we
 			 * use a static delay.
 			 */
-			if (xfer->endpoint->methods->dma_delay != NULL) {
-				(xfer->endpoint->methods->dma_delay) (xfer);
+			if (xfer->endpoint->methods->start_dma_delay != NULL) {
+				(xfer->endpoint->methods->start_dma_delay) (xfer);
 			} else {
 				usbd_transfer_timeout_ms(xfer,
 				    (void *)&usb_dma_delay_done_cb, temp);