47c47
< __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ehci2.c 184610 2008-11-04 02:31:03Z alfred $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ehci2.c 184824 2008-11-10 20:54:31Z thompsa $");
167c167
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
183c183
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
211c211
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
215c215
< usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.mtx,
---
> usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx,
468c468
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
480c480
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
495c495
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
505c505
< usb2_pause_mtx(&sc->sc_bus.mtx, 50);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 50);
507c507
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
521c521
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
544c544
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
558c558
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
565c565
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
577c577
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
602c602
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,
621c621
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
626c626
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,
629c629
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
642c642
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
647c647
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1418c1418
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1429c1429
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1463c1463
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1520c1520
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1535c1535
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1540c1540
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1550c1550
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1553c1553
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1968c1968
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
2127c2127
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
3079c3079
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
3095c3095
< use_polling = mtx_owned(xfer->priv_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;
3376c3376
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,
3388c3388
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,