From owner-p4-projects@FreeBSD.ORG  Wed Jan 23 21:09:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2127816A419; Wed, 23 Jan 2008 21:09:41 +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 C1F4D16A417
	for <perforce@FreeBSD.org>; Wed, 23 Jan 2008 21:09:40 +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 BE7FB13C448
	for <perforce@FreeBSD.org>; Wed, 23 Jan 2008 21:09:40 +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 m0NL9eg7004228
	for <perforce@FreeBSD.org>; Wed, 23 Jan 2008 21:09:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0NL9ebu004209
	for perforce@freebsd.org; Wed, 23 Jan 2008 21:09:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 23 Jan 2008 21:09:40 GMT
Message-Id: <200801232109.m0NL9ebu004209@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 133944 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: Wed, 23 Jan 2008 21:09:41 -0000

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

Change 133944 by hselasky@hselasky_laptop001 on 2008/01/23 21:09:08

	
	Make the USB status stage delay tunable through "hw.usb.ss_delay".
	This sysctl is used for advanced USB device testing.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#109 edit

Differences ...

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

@@ -432,7 +432,8 @@
 	USETW(req.wLength, 0);
 
 	/* Setting the address should not take more than 1 second ! */
-	return (usbd_do_request_flags(udev, mtx, &req, NULL, 0, NULL, 1000));
+	return (usbd_do_request_flags(udev, mtx, &req, NULL,
+	    USBD_DELAY_STATUS_STAGE, NULL, 1000));
 }
 
 /*------------------------------------------------------------------------*

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

@@ -3570,6 +3570,13 @@
 	return;
 }
 
+#ifdef USB_DEBUG
+static int usb_ss_delay = 0;
+
+SYSCTL_INT(_hw_usb, OID_AUTO, ss_delay, CTLFLAG_RW,
+    &usb_ss_delay, 0, "USB status stage delay");
+#endif
+
 /*------------------------------------------------------------------------*
  *	usbd_do_request_flags and usbd_do_request
  *
@@ -3702,12 +3709,18 @@
 		} else {
 			if (xfer->frlengths[0] == 0) {
 				if (xfer->flags.manual_status) {
-					/*
-					 * Delay 70 milliseconds
-					 * before doing the status
-					 * stage:
-					 */
-					usbd_pause_mtx(xfer->priv_mtx, 70);
+#ifdef USB_DEBUG
+					int temp;
+
+					temp = usb_ss_delay;
+					if (temp > 5000) {
+						temp = 5000;
+					}
+					if (temp > 0) {
+						usbd_pause_mtx(
+						    xfer->priv_mtx, temp);
+					}
+#endif
 					xfer->flags.manual_status = 0;
 				} else {
 					break;