From owner-p4-projects@FreeBSD.ORG  Tue Nov  3 10:59:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C319D1065676; Tue,  3 Nov 2009 10:59:42 +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 87B1B106566B
	for <perforce@FreeBSD.org>; Tue,  3 Nov 2009 10:59:42 +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 74F868FC14
	for <perforce@FreeBSD.org>; Tue,  3 Nov 2009 10:59:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA3AxgCS018281
	for <perforce@FreeBSD.org>; Tue, 3 Nov 2009 10:59:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA3AxgVB018279
	for perforce@freebsd.org; Tue, 3 Nov 2009 10:59:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 3 Nov 2009 10:59:42 GMT
Message-Id: <200911031059.nA3AxgVB018279@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 170109 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 03 Nov 2009 10:59:43 -0000

http://p4web.freebsd.org/chv.cgi?CH=170109

Change 170109 by hselasky@hselasky_laptop001 on 2009/11/03 10:59:39

	
	USB controller:
	
	  - ehci_init() will do reset and set the usbrev flag.
	  - fix problem where ehci_reset() was called before ehci_init().
	  - patch from: Sebastian Huber
	
	
	PR:		usb/140242

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#17 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#11 (text+ko) ====

@@ -157,8 +157,6 @@
 		return (ENOMEM);
 	}
 
-	sc->sc_bus.usbrev = USB_REV_2_0;
-
 	/* NB: hints fix the memory location and irq */
 
 	rid = 0;
@@ -230,7 +228,6 @@
 		     | EHCI_SCFLG_BIGEMMIO
 		     | EHCI_SCFLG_NORESTERM
 		     ;
-	(void) ehci_reset(sc);
 
 	err = ehci_init(sc);
 	if (!err) {

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#10 (text+ko) ====

@@ -166,8 +166,6 @@
 		return (ENOMEM);
 	}
 
-	sc->sc_bus.usbrev = USB_REV_2_0;
-
 	rid = 0;
 	sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
 	if (!sc->sc_io_res) {

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

@@ -318,13 +318,11 @@
 		device_printf(self, "pre-2.0 USB revision (ignored)\n");
 		/* fallthrough */
 	case PCI_USB_REV_2_0:
-		sc->sc_bus.usbrev = USB_REV_2_0;
 		break;
 	default:
 		/* Quirk for Parallels Desktop 4.0 */
 		device_printf(self, "USB revision is unknown. Assuming v2.0.\n");
-		sc->sc_bus.usbrev = USB_REV_2_0;
-                break;
+		break;
 	}
 
 	rid = PCI_CBMEM;