From owner-p4-projects@FreeBSD.ORG  Sun Nov 23 09:48:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AFE441065675; Sun, 23 Nov 2008 09:48:13 +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 726C11065670
	for <perforce@FreeBSD.org>; Sun, 23 Nov 2008 09:48:13 +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 61FE18FC0A
	for <perforce@FreeBSD.org>; Sun, 23 Nov 2008 09:48:13 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAN9mDKE000875
	for <perforce@FreeBSD.org>; Sun, 23 Nov 2008 09:48:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAN9mDNQ000873
	for perforce@freebsd.org; Sun, 23 Nov 2008 09:48:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 23 Nov 2008 09:48:13 GMT
Message-Id: <200811230948.mAN9mDNQ000873@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 153382 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: Sun, 23 Nov 2008 09:48:13 -0000

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

Change 153382 by hselasky@hselasky_laptop001 on 2008/11/23 09:47:22

	
	USB mass storage test improvements.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#11 edit

Differences ...

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

@@ -72,8 +72,7 @@
 	DIR_NONE,
 };
 
-#define	BULK_SIZE 64			/* dummy */
-
+#define	BULK_SIZE		64	/* dummy */
 
 /* Command Block Wrapper */
 struct bbb_cbw {
@@ -171,7 +170,7 @@
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.mh.bufsize = BULK_SIZE,
-		.mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
+		.mh.flags = {.proxy_buffer = 1,},
 		.mh.callback = &bbb_data_write_callback,
 		.mh.timeout = 4 * USB_MS_HZ,	/* 4 seconds */
 	},
@@ -279,6 +278,7 @@
 			DPRINTFN(0, "Truncating long command!\n");
 		}
 		xfer->frlengths[0] = sizeof(sc->cbw);
+		xfer->flags.stall_pipe = 1;
 
 		usb2_set_frame_data(xfer, &sc->cbw, 0);
 		usb2_start_hardware(xfer);
@@ -537,12 +537,14 @@
 repeat_inquiry:
 
 	sc->cbw.CBWCDB[0] = 0x12;	/* INQUIRY */
-
-	err = bbb_command_start(sc, DIR_IN, 0, sc->buffer, 256, 6, USB_MS_HZ);
-	if (err) {
-		err = bbb_command_start(sc, DIR_IN, 0, sc->buffer, 256, 12, USB_MS_HZ);
-		if (err) {
-			err = bbb_command_start(sc, DIR_IN, 0, sc->buffer, 256, 16, USB_MS_HZ);
+	err = bbb_command_start(sc, DIR_IN, 0,
+	    sc->buffer, 256, 6, USB_MS_HZ);
+	if (err == 1) {
+		err = bbb_command_start(sc, DIR_IN, 0,
+		    sc->buffer, 256, 12, USB_MS_HZ);
+		if (err == 1) {
+			err = bbb_command_start(sc, DIR_IN, 0,
+			    sc->buffer, 256, 16, USB_MS_HZ);
 		}
 	}
 	if ((sc->actlen != 0) && (err == 0)) {
@@ -570,7 +572,7 @@
 			err = 0;
 			goto done;
 		}
-	} else if (--timeout) {
+	} else if ((err != 2) && --timeout) {
 		usb2_pause_mtx(&sc->mtx, USB_MS_HZ);
 		goto repeat_inquiry;
 	}