From owner-p4-projects@FreeBSD.ORG  Wed Jun  4 20:17:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B43D41065679; Wed,  4 Jun 2008 20:17:19 +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 75F151065677
	for <perforce@FreeBSD.org>; Wed,  4 Jun 2008 20:17:19 +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 5A8258FC0A
	for <perforce@FreeBSD.org>; Wed,  4 Jun 2008 20:17:19 +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 m54KHJI4041121
	for <perforce@FreeBSD.org>; Wed, 4 Jun 2008 20:17:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m54KHJBx041119
	for perforce@freebsd.org; Wed, 4 Jun 2008 20:17:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 4 Jun 2008 20:17:19 GMT
Message-Id: <200806042017.m54KHJBx041119@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 142908 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: Wed, 04 Jun 2008 20:17:20 -0000

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

Change 142908 by hselasky@hselasky_laptop001 on 2008/06/04 20:16:45

	
	USB Device Side related bugfixes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#12 edit

Differences ...

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

@@ -1320,6 +1320,16 @@
 		/* clearing stall is not needed */
 		return;
 	}
+	/* compute CSR register offset */
+	csr_reg = AT91_UDP_CSR(ep_no);
+
+	/* compute default CSR value */
+	csr_val = 0;
+	AT91_CSR_ACK(csr_val, 0);
+
+	/* disable endpoint */
+	AT91_UDP_WRITE_4(sc, csr_reg, csr_val);
+
 	/* get endpoint profile */
 	at9100_dci_get_hw_ep_profile(NULL, &pf, ep_no);
 
@@ -1332,7 +1342,6 @@
 	 * FIFO banks aswell, but it doesn't! We have to do this
 	 * manually!
 	 */
-	csr_reg = AT91_UDP_CSR(ep_no);
 
 	/* release FIFO banks, if any */
 	for (to = 0; to != 2; to++) {
@@ -1366,6 +1375,8 @@
 		AT91_UDP_WRITE_4(sc, csr_reg, csr_val);
 	}
 
+	/* compute default CSR value */
+	csr_val = 0;
 	AT91_CSR_ACK(csr_val, 0);
 
 	/* enable endpoint */
@@ -1412,8 +1423,8 @@
 	/* reset endpoint */
 	at9100_dci_clear_stall_sub(sc,
 	    (ed->bEndpointAddress & UE_ADDR),
-	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)),
-	    (ed->bmAttributes & UE_XFERTYPE));
+	    (ed->bmAttributes & UE_XFERTYPE),
+	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 	return;
 }
 

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

@@ -1354,8 +1354,8 @@
 
 	uss820_dci_clear_stall_sub(sc,
 	    (ed->bEndpointAddress & UE_ADDR),
-	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)),
-	    (ed->bmAttributes & UE_XFERTYPE));
+	    (ed->bmAttributes & UE_XFERTYPE),
+	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 
 	return;
 }