PERFORCE change 170109 for review

[Hans Petter Selasky]

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

Change 170109 by hselasky at 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;