47c47
< __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ehci2.c 187172 2009-01-13 19:03:01Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ehci2.c 187173 2009-01-13 19:03:12Z thompsa $");
974c974
< usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer);
---
> usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
1138c1138
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
1242c1242
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
1294c1294
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
1524c1524
< USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
1734c1734
< xfer->sumlen, usb2_get_speed(xfer->udev));
---
> xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
1738c1738
< temp.sc = xfer->usb2_sc;
---
> temp.sc = EHCI_BUS2SC(xfer->xroot->bus);
1766c1766
< if (usb2_get_speed(xfer->udev) != USB_SPEED_HIGH) {
---
> if (usb2_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) {
1897c1897
< if (usb2_get_speed(xfer->udev) == USB_SPEED_HIGH) {
---
> if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
1902c1902
< if (usb2_get_speed(xfer->udev) == USB_SPEED_FULL) {
---
> if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {
1925,1926c1925,1926
< EHCI_QH_SET_HUBA(xfer->udev->hs_hub_addr) |
< EHCI_QH_SET_PORT(xfer->udev->hs_port_no));
---
> EHCI_QH_SET_HUBA(xfer->xroot->udev->hs_hub_addr) |
> EHCI_QH_SET_PORT(xfer->xroot->udev->hs_port_no));
1954c1954
< if (xfer->udev->pwr_save.suspended == 0) {
---
> if (xfer->xroot->udev->pwr_save.suspended == 0) {
1963c1963
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2120c2120
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2133c2133
< ehci_dump_sqtds(xfer->usb2_sc,
---
> ehci_dump_sqtds(sc,
2188c2188
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2231c2231
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2256c2256
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2265c2265
< (xfer->udev, xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX);
---
> (xfer->xroot->udev, xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX);
2267c2267
< if (usb2_get_speed(xfer->udev) == USB_SPEED_HIGH) {
---
> if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
2309c2309
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2313c2313
< (xfer->udev, -(xfer->max_frame_size), xfer->usb2_uframe);
---
> (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb2_uframe);
2329c2329
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2354c2354
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2362,2363c2362,2363
< EHCI_SITD_SET_HUBA(xfer->udev->hs_hub_addr) |
< EHCI_SITD_SET_PORT(xfer->udev->hs_port_no);
---
> EHCI_SITD_SET_HUBA(xfer->xroot->udev->hs_hub_addr) |
> EHCI_SITD_SET_PORT(xfer->xroot->udev->hs_port_no);
2402c2402
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2463c2463
< (xfer->udev, &fss_start, &fss_end, nframes) + buf_offset +
---
> (xfer->xroot->udev, &fss_start, &fss_end, nframes) + buf_offset +
2639c2639
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2693c2693
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
2917c2917
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
3024c3024
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
3030c3030
< usb2_bus_roothub_exec(xfer->udev->bus);
---
> usb2_bus_roothub_exec(xfer->xroot->bus);
3043c3043
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
3069c3069
< use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0;
3486c3486
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
3503c3503
< ehci_softc_t *sc = xfer->usb2_sc;
---
> ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
3541,3545d3540
< * setup xfer
< */
< xfer->usb2_sc = sc;
<
< /*
3867c3862
< if (xfer->udev == udev) {
---
> if (xfer->xroot->udev == udev) {
3901c3896
< if (xfer->udev == udev) {
---
> if (xfer->xroot->udev == udev) {