From owner-p4-projects@FreeBSD.ORG  Tue Oct 12 14:47: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 16E341065698; Tue, 12 Oct 2010 14:47:00 +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 CDD2D1065695
	for <perforce@FreeBSD.org>; Tue, 12 Oct 2010 14:46:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B9D758FC15
	for <perforce@FreeBSD.org>; Tue, 12 Oct 2010 14:46:59 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9CEkxar013557
	for <perforce@FreeBSD.org>; Tue, 12 Oct 2010 14:46:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9CEkxZQ013554
	for perforce@freebsd.org; Tue, 12 Oct 2010 14:46:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 12 Oct 2010 14:46:59 GMT
Message-Id: <201010121446.o9CEkxZQ013554@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 184621 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, 12 Oct 2010 14:47:00 -0000

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

Change 184621 by hselasky@hselasky_laptop001 on 2010/10/12 14:46:43

	
	IFC

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#57 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#57 (text+ko) ====

@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.37 2010/09/02 04:39:45 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.38 2010/10/04 23:30:44 hselasky Exp $");
 
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.37 2010/09/02 04:39:45 thompsa Exp $
+ *	$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.38 2010/10/04 23:30:44 hselasky Exp $
  *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
  */
 
@@ -231,7 +231,7 @@
 /* Approximate maximum transfer speeds (assumes 33% overhead). */
 #define	UMASS_FULL_TRANSFER_SPEED	1000
 #define	UMASS_HIGH_TRANSFER_SPEED	40000
-#define	UMASS_SUPER_TRANSFER_SPEED	100000
+#define	UMASS_SUPER_TRANSFER_SPEED	400000
 #define	UMASS_FLOPPY_TRANSFER_SPEED	20
 
 #define	UMASS_TIMEOUT			5000	/* ms */