From owner-p4-projects@FreeBSD.ORG  Tue Dec 25 20:57:43 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07D3716A468; Tue, 25 Dec 2007 20:57:43 +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 856AB16A420
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 20:57:42 +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 5128B13C455
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 20:57:42 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBPKvgHO052706
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 20:57:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBPKvgig052703
	for perforce@freebsd.org; Tue, 25 Dec 2007 20:57:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 25 Dec 2007 20:57:42 GMT
Message-Id: <200712252057.lBPKvgig052703@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>
Cc: 
Subject: PERFORCE change 131617 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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, 25 Dec 2007 20:57:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=131617

Change 131617 by hselasky@hselasky_laptop001 on 2007/12/25 20:57:07

	
	Factor out clearing of "stall_pipe" flag,
	for sake of convenience. The "stall_pipe"
	flag is mostly used in USB Device Side Mode.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/README#31 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#90 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/README#31 (text+ko) ====

@@ -380,7 +380,9 @@
 	started. The transfer is started at the moment the host issues
 	a clear-stall command on the STALL'ed endpoint. This flag can
 	be changed during operation. This flag does only have effect
-	in USB device mode except for control endpoints.
+	in USB device side mode except for control endpoints. This
+	flag is cleared before the callback is called in case the USB
+	transfer state is "USBD_ST_TRANSFERRED".
 
 - The "bufsize" field sets the total buffer size in bytes. If
   this field is zero, "wMaxPacketSize" will be used, multiplied by the

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

@@ -2388,6 +2388,8 @@
 			    (!xfer->flags_int.bdma_no_post_sync)) {
 				usbd_bdma_post_sync(xfer);
 			}
+			/* clear any previous stall command */
+			xfer->flags.stall_pipe = 0;
 	callback:
 			/* call processing routine */
 			(xfer->callback) (xfer);
@@ -3336,7 +3338,6 @@
 		xfer->flags.manual_status = 0;
 		xfer->frlengths[1] = 0;
 	}
-	xfer->flags.stall_pipe = 0;	/* do not stall pipe */
 	PRINTFN(0, ("success\n"));
 	return (0);			/* success */