From owner-p4-projects@FreeBSD.ORG  Tue Sep  2 18:44:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E44C21065672; Tue,  2 Sep 2008 18:44:28 +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 A6433106567D
	for <perforce@FreeBSD.org>; Tue,  2 Sep 2008 18:44:28 +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 968B08FC20
	for <perforce@FreeBSD.org>; Tue,  2 Sep 2008 18:44:28 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82IiSZm056935
	for <perforce@FreeBSD.org>; Tue, 2 Sep 2008 18:44:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82IiSis056933
	for perforce@freebsd.org; Tue, 2 Sep 2008 18:44:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 2 Sep 2008 18:44:28 GMT
Message-Id: <200809021844.m82IiSis056933@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 149072 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, 02 Sep 2008 18:44:29 -0000

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

Change 149072 by hselasky@hselasky_laptop001 on 2008/09/02 18:43:52

	
	Fix two bugs.
	
	1) The system factored out clear-stall function
	   was not iterating the USB pipes correctly.
	
	2) When re-enumerating an USB device, the device
	   address must be restored a little bit earlier.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#14 (text+ko) ====

@@ -96,7 +96,7 @@
 	struct usb2_pipe *pipe;
 	struct usb2_pipe *pipe_end;
 	struct usb2_pipe *pipe_first;
-	struct usb2_pipe *pipe_start;
+	uint8_t to = USB_EP_MAX;
 
 	mtx_lock(xfer->usb2_mtx);
 
@@ -107,9 +107,6 @@
 	pipe_first = xfer->udev->pipes;
 	if (pipe == NULL) {
 		pipe = pipe_first;
-		pipe_start = pipe_first;
-	} else {
-		pipe_start = pipe;
 	}
 
 	switch (USB_GET_STATE(xfer)) {
@@ -126,14 +123,9 @@
 
 	case USB_ST_SETUP:
 tr_setup:
-		while (1) {
 			if (pipe == pipe_end) {
 				pipe = pipe_first;
 			}
-			if (pipe == pipe_start) {
-				/* nothing to do */
-				break;
-			}
 			if (pipe->edesc &&
 			    pipe->is_stalled) {
 
@@ -161,7 +153,8 @@
 				break;
 			}
 			pipe++;
-		}
+			if (--to) 
+				goto tr_setup;
 		break;
 
 	default:
@@ -1312,6 +1305,9 @@
 		    old_addr);
 		err = 0;
 	}
+	/* restore device address */
+	udev->address = old_addr;
+
 	/* allow device time to set new address */
 	usb2_pause_mtx(mtx, USB_SET_ADDRESS_SETTLE);