From owner-p4-projects@FreeBSD.ORG  Sun Mar  2 12:49:10 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F4211065674; Sun,  2 Mar 2008 12:49:10 +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 2E715106566B
	for <perforce@FreeBSD.org>; Sun,  2 Mar 2008 12:49:10 +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 222038FC18
	for <perforce@FreeBSD.org>; Sun,  2 Mar 2008 12:49:10 +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 m22CnA21083790
	for <perforce@FreeBSD.org>; Sun, 2 Mar 2008 12:49:10 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m22CnACe083788
	for perforce@freebsd.org; Sun, 2 Mar 2008 12:49:10 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 2 Mar 2008 12:49:10 GMT
Message-Id: <200803021249.m22CnACe083788@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 136655 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, 02 Mar 2008 12:49:11 -0000

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

Change 136655 by hselasky@hselasky_laptop001 on 2008/03/02 12:48:26

	
	This commit is related to USB Device Side support.
	
	Bugfix: We need to reset the data toggle when configuring
	the device for non-control endpoints.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#8 edit

Differences ...

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

@@ -397,7 +397,8 @@
 	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
 	    td->rx_stat_reg);
 
-	DPRINTFN(4, "rx_stat=0x%02x rem=%u\n", rx_stat, td->remainder);
+	DPRINTFN(4, "rx_stat=0x%02x rx_flag=0x%02x rem=%u\n",
+	    rx_stat, rx_flag, td->remainder);
 
 	if (rx_stat & (USS820_RXSTAT_RXSETUP |
 	    USS820_RXSTAT_RXSOVW |
@@ -445,6 +446,8 @@
 	    td->rx_count_high_reg) << 8);
 	count &= 0x3FF;
 
+	DPRINTFN(4, "count=0x%04x\n", count);
+
 	/* verify the packet byte count */
 	if (count != td->max_packet_size) {
 		if (count < td->max_packet_size) {
@@ -1443,12 +1446,24 @@
 		USS820_WRITE_1(sc, USS820_EPINDEX, n);
 
 		if ((ep_dir == UE_DIR_IN) || (ep_type == UE_CONTROL)) {
+
+			if (ep_type != UE_CONTROL) {
+				/* reset data toggle */
+				USS820_WRITE_1(sc, USS820_TXSTAT,
+				    USS820_TXSTAT_TXSOVW);
+			}
 			/* configure endpoint */
 			USS820_WRITE_1(sc, USS820_TXCON, temp |
 			    USS820_TXCON_TXCLR);
 			USS820_WRITE_1(sc, USS820_TXCON, temp);
 		}
 		if ((ep_dir == UE_DIR_OUT) || (ep_type == UE_CONTROL)) {
+
+			if (ep_type != UE_CONTROL) {
+				/* reset data toggle */
+				uss820_dci_update_shared_1(sc, USS820_RXSTAT,
+				    0, USS820_RXSTAT_RXSOVW);
+			}
 			/* configure endpoint */
 			USS820_WRITE_1(sc, USS820_RXCON, temp |
 			    USS820_RXCON_RXCLR);