29c29
< __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/uhci2.c 187172 2009-01-13 19:03:01Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/uhci2.c 187173 2009-01-13 19:03:12Z thompsa $");
881c881
< usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer);
---
> usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
1493c1493
< USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
1662c1662
< xfer->sumlen, usb2_get_speed(xfer->udev));
---
> xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
1686c1686
< if (xfer->udev->speed == USB_SPEED_LOW) {
---
> if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
1819c1819
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
1839c1839
< if (xfer->udev->speed == USB_SPEED_LOW) {
---
> if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
1888c1888
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
1901c1901
< if (xfer->udev->pwr_save.suspended == 0) {
---
> if (xfer->xroot->udev->pwr_save.suspended == 0) {
1947c1947
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
1964,1965c1964,1965
< if (xfer->udev->pwr_save.suspended == 0) {
< if (xfer->udev->speed == USB_SPEED_LOW) {
---
> if (xfer->xroot->udev->pwr_save.suspended == 0) {
> if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
1993c1993
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2026c2026
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2042c2042
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2055c2055
< if (xfer->udev->pwr_save.suspended == 0) {
---
> if (xfer->xroot->udev->pwr_save.suspended == 0) {
2120c2120
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2304c2304
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2495c2495
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2501c2501
< usb2_bus_roothub_exec(xfer->udev->bus);
---
> usb2_bus_roothub_exec(xfer->xroot->bus);
2514c2514
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2540c2540
< use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0;
2869c2869
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2886c2886
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2898c2898
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2924c2924
< uhci_softc_t *sc = xfer->usb2_sc;
---
> uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
2978,2982d2977
< /*
< * setup xfer
< */
< xfer->usb2_sc = sc;
<
3244c3239
< if (xfer->udev == udev) {
---
> if (xfer->xroot->udev == udev) {
3255c3250
< if (xfer->udev->speed == USB_SPEED_LOW) {
---
> if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
3286c3281
< if (xfer->udev == udev) {
---
> if (xfer->xroot->udev == udev) {
3299c3294
< if (xfer->udev->speed == USB_SPEED_LOW) {
---
> if (xfer->xroot->udev->speed == USB_SPEED_LOW) {