From owner-p4-projects@FreeBSD.ORG  Sun Aug 24 17:09:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C25F1065670; Sun, 24 Aug 2008 17:09:41 +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 60A79106564A
	for <perforce@FreeBSD.org>; Sun, 24 Aug 2008 17:09:41 +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 47E478FC1B
	for <perforce@FreeBSD.org>; Sun, 24 Aug 2008 17:09:41 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OH9ftq033000
	for <perforce@FreeBSD.org>; Sun, 24 Aug 2008 17:09:41 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OH9fkQ032998
	for perforce@freebsd.org; Sun, 24 Aug 2008 17:09:41 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 24 Aug 2008 17:09:41 GMT
Message-Id: <200808241709.m7OH9fkQ032998@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 148257 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, 24 Aug 2008 17:09:41 -0000

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

Change 148257 by hselasky@hselasky_laptop001 on 2008/08/24 17:09:02

	
	Some fixes for the musbotg driver.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#5 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#5 (text+ko) ====

@@ -127,7 +127,7 @@
 
 	sc = MUSBOTG_BUS2SC(udev->bus);
 
-	if (ep_addr < sc->sc_ep_max) {
+	if (ep_addr <= sc->sc_ep_max) {
 		if (ep_addr == 0) {
 			/* control endpoint */
 			*ppf = musbotg_ep_profile;
@@ -1495,6 +1495,7 @@
 {
 	uint8_t nrx;
 	uint8_t ntx;
+	uint8_t temp;
 
 	DPRINTFN(1, "start\n");
 
@@ -1512,21 +1513,12 @@
 	/* wait a little for things to stabilise */
 	usb2_pause_mtx(&sc->sc_bus.mtx, 1);
 
-	/* disable and clear all interrupts */
+	/* disable all interrupts */
 
 	MUSB2_WRITE_1(sc, MUSB2_REG_INTUSBE, 0);
 	MUSB2_WRITE_2(sc, MUSB2_REG_INTTXE, 0);
 	MUSB2_WRITE_2(sc, MUSB2_REG_INTRXE, 0);
 
-	if (MUSB2_READ_1(sc, MUSB2_REG_INTUSB)) {
-		/* ignore */
-	}
-	if (MUSB2_READ_2(sc, MUSB2_REG_INTTX)) {
-		/* ignore */
-	}
-	if (MUSB2_READ_2(sc, MUSB2_REG_INTRX)) {
-		/* ignore */
-	}
 	/* disable pullup */
 
 	musbotg_pull_common(sc, 0);
@@ -1544,6 +1536,14 @@
 	MUSB2_WRITE_1(sc, MUSB2_REG_POWER,
 	    MUSB2_MASK_HSENAB | MUSB2_MASK_ISOUPD);
 
+	/* clear Session bit, if set */
+
+	temp = MUSB2_READ_1(sc, MUSB2_REG_DEVCTL);
+	temp &= ~MUSB2_MASK_SESS;
+	MUSB2_WRITE_1(sc, MUSB2_REG_DEVCTL, temp);
+
+	DPRINTF("DEVCTL=0x%02x\n", temp);
+
 	/* disable testmode */
 
 	MUSB2_WRITE_1(sc, MUSB2_REG_TESTMODE, 0);