29c29
< __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ohci2.c 187172 2009-01-13 19:03:01Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ohci2.c 187173 2009-01-13 19:03:12Z thompsa $");
672c672
< usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer);
---
> usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
1236c1236
< USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
1407c1407
< xfer->sumlen, usb2_get_speed(xfer->udev));
---
> xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
1552c1552
< if (xfer->udev->speed == USB_SPEED_LOW) {
---
> if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
1561c1561
< if (xfer->udev->pwr_save.suspended == 0) {
---
> if (xfer->xroot->udev->pwr_save.suspended == 0) {
1566c1566
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1571c1571
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1584c1584
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1632c1632
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1688c1688
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1731c1731
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1756c1756
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1789c1789
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1805c1805
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
1844c1844
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
2002c2002
< if (xfer->udev->speed == USB_SPEED_LOW) {
---
> if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
2050c2050
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
2130c2130
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
2134c2134
< usb2_bus_roothub_exec(xfer->udev->bus);
---
> usb2_bus_roothub_exec(xfer->xroot->bus);
2147c2147
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
2172c2172
< use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0;
2473c2473
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
2490c2490
< ohci_softc_t *sc = xfer->usb2_sc;
---
> ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
2521,2525d2520
< /*
< * setup xfer
< */
< xfer->usb2_sc = sc;
<
2756c2751
< if (xfer->udev == udev) {
---
> if (xfer->xroot->udev == udev) {
2794c2789
< if (xfer->udev == udev) {
---
> if (xfer->xroot->udev == udev) {