From owner-p4-projects@FreeBSD.ORG  Wed Dec 12 22:52:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 515B416A419; Wed, 12 Dec 2007 22:52:35 +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 038AC16A418
	for <perforce@FreeBSD.org>; Wed, 12 Dec 2007 22:52:35 +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 00EFB13C455
	for <perforce@FreeBSD.org>; Wed, 12 Dec 2007 22:52:35 +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 lBCMqY5o079940
	for <perforce@FreeBSD.org>; Wed, 12 Dec 2007 22:52:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMqYNb079935
	for perforce@freebsd.org; Wed, 12 Dec 2007 22:52:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 12 Dec 2007 22:52:34 GMT
Message-Id: <200712122252.lBCMqYNb079935@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 130746 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, 12 Dec 2007 22:52:35 -0000

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

Change 130746 by hselasky@hselasky_laptop001 on 2007/12/12 22:52:00

	
	Neither of OHCI, UHCI or EHCI supports USB device mode.
	
	Check for that when setting up pipes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ehci.c#61 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#50 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#51 edit

Differences ...

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

@@ -3924,10 +3924,15 @@
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(udev->bus);
 
-	DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d (%d)\n",
+	DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n",
 	    pipe, udev->address,
-	    edesc->bEndpointAddress, sc->sc_addr));
+	    edesc->bEndpointAddress, udev->flags.usb_mode,
+	    sc->sc_addr));
 
+	if (udev->flags.usb_mode != USB_MODE_HOST) {
+		/* not supported */
+		return;
+	}
 	if (udev->address == sc->sc_addr) {
 		switch (edesc->bEndpointAddress) {
 		case USB_CONTROL_ENDPOINT:

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

@@ -2842,10 +2842,15 @@
 {
 	ohci_softc_t *sc = OHCI_BUS2SC(udev->bus);
 
-	DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d (%d)\n",
+	DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n",
 	    pipe, udev->address,
-	    edesc->bEndpointAddress, sc->sc_addr));
+	    edesc->bEndpointAddress, udev->flags.usb_mode,
+	    sc->sc_addr));
 
+	if (udev->flags.usb_mode != USB_MODE_HOST) {
+		/* not supported */
+		return;
+	}
 	if (udev->address == sc->sc_addr) {
 		switch (edesc->bEndpointAddress) {
 		case USB_CONTROL_ENDPOINT:

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

@@ -3332,10 +3332,15 @@
 {
 	uhci_softc_t *sc = UHCI_BUS2SC(udev->bus);
 
-	DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d (%d)\n",
+	DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n",
 	    pipe, udev->address,
-	    edesc->bEndpointAddress, sc->sc_addr));
+	    edesc->bEndpointAddress, udev->flags.usb_mode,
+	    sc->sc_addr));
 
+	if (udev->flags.usb_mode != USB_MODE_HOST) {
+		/* not supported */
+		return;
+	}
 	if (udev->address == sc->sc_addr) {
 		switch (edesc->bEndpointAddress) {
 		case USB_CONTROL_ENDPOINT: