From owner-p4-projects@FreeBSD.ORG  Fri Jan 19 22:26:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A33F616A40A; Fri, 19 Jan 2007 22:26:29 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 772A616A408
	for <perforce@FreeBSD.org>; Fri, 19 Jan 2007 22:26:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2691913C46A
	for <perforce@FreeBSD.org>; Fri, 19 Jan 2007 22:26:28 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0JMQS8K004168
	for <perforce@FreeBSD.org>; Fri, 19 Jan 2007 22:26:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0JMQSqM004165
	for perforce@freebsd.org; Fri, 19 Jan 2007 22:26:28 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 19 Jan 2007 22:26:28 GMT
Message-Id: <200701192226.l0JMQSqM004165@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 113182 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: Fri, 19 Jan 2007 22:26:30 -0000

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

Change 113182 by hselasky@hselasky_mini_itx on 2007/01/19 22:25:45

	Fix a data-toggle error that was introduced by change 113175.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ehci.c#17 edit

Differences ...

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

@@ -1039,8 +1039,7 @@
 {
 	u_int32_t status = 0;
 	u_int32_t actlen = 0;
-	uint32_t qtd_next;
-	u_int16_t len;
+	u_int16_t len = 0;
 	ehci_qtd_t *td = xfer->td_transfer_first;
 
 	DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n",
@@ -1059,51 +1058,44 @@
 	     td = td->obj_next)
 	{
 		usbd_page_sync(td->page, BUS_DMASYNC_PREREAD);
-
 		status = le32toh(td->qtd_status);
-		qtd_next = le32toh(td->qtd_next);
-
 		usbd_page_sync(td->page, BUS_DMASYNC_POSTREAD);
 
 		if (status & EHCI_QTD_ACTIVE) {
+
+			/* if there are left over TDs 
+			 * the toggle needs to be updated
+			 */
+			xfer->pipe->toggle_next =
+			  (status & EHCI_QTD_SET_TOGGLE(1)) ? 1 : 0;
 			break;
 		}
 
-		/* halt is ok if descriptor is last, and complete */
-		if((qtd_next == EHCI_LINK_TERMINATE) &&
-		   (EHCI_QTD_GET_BYTES(status) == 0))
-		{
-			status &= ~EHCI_QTD_HALTED;
-		}
-
 		len = EHCI_QTD_GET_BYTES(status);
 
-		if(len <= td->len)
-		{
+		if (len <= td->len) {
 			actlen += td->len - len;
 		}
 
 		if (((void *)td) == xfer->td_transfer_last) {
+			if (len == 0) {
+			    /* halt is ok if descriptor is last,
+			     * and complete:
+			     */
+			    status &= ~EHCI_QTD_HALTED;
+			}
 			td = NULL;
 			break;
 		}
 	}
 
-	/* if there are left over TDs 
-	 * the toggle needs to be updated
-	 */
-	if(td != NULL)
-	{
-		xfer->pipe->toggle_next =
-		  (td->qtd_status & htole32(EHCI_QTD_SET_TOGGLE(1))) ? 1 : 0;
+	if (len) {
+	    /* update toggle in case of
+	     * a short transfer
+	     */
+	    xfer->pipe->toggle_next ^= (len / xfer->max_packet_size) & 1;
 	}
 
-	/* update toggle in case of
-	 * a short transfer
-	 */
-	xfer->pipe->toggle_next ^= (EHCI_QTD_GET_BYTES(status) / 
-				    xfer->max_packet_size) & 1;
-
 	DPRINTFN(10, ("actlen=%d\n", actlen));
 
 	xfer->actlen = actlen;