From owner-p4-projects@FreeBSD.ORG  Mon Jun 21 15:58:29 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 90F6D106566B; Mon, 21 Jun 2010 15:58:29 +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 474FE1065675
	for <perforce@FreeBSD.org>; Mon, 21 Jun 2010 15:58:29 +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 352D48FC1D
	for <perforce@FreeBSD.org>; Mon, 21 Jun 2010 15:58:29 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LFwTiU035804
	for <perforce@FreeBSD.org>; Mon, 21 Jun 2010 15:58:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LFwTtx035802
	for perforce@freebsd.org; Mon, 21 Jun 2010 15:58:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 21 Jun 2010 15:58:29 GMT
Message-Id: <201006211558.o5LFwTtx035802@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 180040 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: Mon, 21 Jun 2010 15:58:29 -0000

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

Change 180040 by hselasky@hselasky_laptop001 on 2010/06/21 15:58:03

	
	USB controller:
		- integrate some fixes
		- remove unused file
		http://svn.freebsd.org/viewvc/base/user/jmallett/octeon/sys/mips/cavium/usb/octusb.c

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/octusb_mips.c#3 delete

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#3 (text+ko) ====

@@ -334,7 +334,7 @@
 
 	if (td->remainder > rem) {
 		td->error_any = 1;
-		DPRINTF(1, "Excess setup transmit data\n");
+		DPRINTFN(1, "Excess setup transmit data\n");
 		return (0);		/* done */
 	}
 	usbd_copy_out(td->pc, td->offset, td->qh->fixup_buf + td->qh->fixup_off, td->remainder);
@@ -371,7 +371,7 @@
 	td->remainder -= rem;
 	td->qh->fixup_off += rem;
 
-	return (1);			/* done */
+	return (0);			/* done */
 }
 
 static uint8_t
@@ -459,7 +459,7 @@
 
 		if (rem == 0) {
 			/* should not happen */
-			DPRINTF(1, "Fixup buffer is too small\n");
+			DPRINTFN(1, "Fixup buffer is too small\n");
 			td->error_any = 1;
 			return (0);	/* done */
 		}
@@ -587,7 +587,7 @@
 
 		if (rem == 0) {
 			/* should not happen */
-			DPRINTF(1, "Fixup buffer is too small\n");
+			DPRINTFN(1, "Fixup buffer is too small\n");
 			td->error_any = 1;
 			return (0);	/* done */
 		}
@@ -864,6 +864,9 @@
 	if (sc->sc_noport > OCTUSB_MAX_PORTS)
 		sc->sc_noport = OCTUSB_MAX_PORTS;
 
+	/* set USB revision */
+	sc->sc_bus.usbrev = USB_REV_2_0;
+
 	USB_BUS_LOCK(&sc->sc_bus);
 
 	/* setup all ports */