From owner-p4-projects@FreeBSD.ORG  Thu Jun  5 06:57:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 57ABA1065680; Thu,  5 Jun 2008 06:57:07 +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 193DB106566B
	for <perforce@FreeBSD.org>; Thu,  5 Jun 2008 06:57:07 +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 0850E8FC15
	for <perforce@FreeBSD.org>; Thu,  5 Jun 2008 06:57:07 +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 m556v6KJ052418
	for <perforce@FreeBSD.org>; Thu, 5 Jun 2008 06:57:06 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m556v6TU052416
	for perforce@freebsd.org; Thu, 5 Jun 2008 06:57:06 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 5 Jun 2008 06:57:06 GMT
Message-Id: <200806050657.m556v6TU052416@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 142928 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: Thu, 05 Jun 2008 06:57:07 -0000

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

Change 142928 by hselasky@hselasky_laptop001 on 2008/06/05 06:56:47

	
	USB Device Side Mode: Only Device Mode has clear stall. Add
	check for USB mode in clear stall callback.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#13 edit

Differences ...

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

@@ -1414,6 +1414,11 @@
 
 	mtx_assert(&(udev->bus->mtx), MA_OWNED);
 
+	/* check mode */
+	if (udev->flags.usb_mode != USB_MODE_DEVICE) {
+		/* not supported */
+		return;
+	}
 	/* get softc */
 	sc = AT9100_DCI_BUS2SC(udev->bus);
 

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

@@ -1347,11 +1347,18 @@
 
 	DPRINTFN(4, "pipe=%p\n", pipe);
 
-	/* reset pipe state */
+	/* check mode */
+	if (udev->flags.usb_mode != USB_MODE_DEVICE) {
+		/* not supported */
+		return;
+	}
+	/* get softc */
+	sc = USS820_DCI_BUS2SC(udev->bus);
 
-	sc = USS820_DCI_BUS2SC(udev->bus);
+	/* get endpoint descriptor */
 	ed = pipe->edesc;
 
+	/* reset endpoint */
 	uss820_dci_clear_stall_sub(sc,
 	    (ed->bEndpointAddress & UE_ADDR),
 	    (ed->bmAttributes & UE_XFERTYPE),