32c32
< __FBSDID("$FreeBSD: head/sys/dev/usb/misc/udbp.c 193045 2009-05-29 18:46:57Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/misc/udbp.c 194228 2009-06-15 01:02:43Z thompsa $");
320c320
< device_set_usb2_desc(dev);
---
> device_set_usb_desc(dev);
327c327
< error = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex,
---
> error = usbd_transfer_setup(uaa->device, &uaa->info.bIfaceIndex,
330c330
< DPRINTF("error=%s\n", usb2_errstr(error));
---
> DPRINTF("error=%s\n", usbd_errstr(error));
379c379
< usb2_transfer_unsetup(sc->sc_xfer, UDBP_T_MAX);
---
> usbd_transfer_unsetup(sc->sc_xfer, UDBP_T_MAX);
421c421
< usb2_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen);
---
> usbd_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen);
435c435
< usb2_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
439c439
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
446c446
< usb2_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
459c459
< if (usb2_clear_stall_callback(xfer, xfer_other)) {
---
> if (usbd_clear_stall_callback(xfer, xfer_other)) {
462c462
< usb2_transfer_start(xfer_other);
---
> usbd_transfer_start(xfer_other);
501c501
< usb2_transfer_start(sc->sc_xfer[UDBP_T_RD]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_RD]);
519c519
< usb2_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
538c538
< usb2_m_copy_in(xfer->frbuffers, 0, m, 0, m->m_pkthdr.len);
---
> usbd_m_copy_in(xfer->frbuffers, 0, m, 0, m->m_pkthdr.len);
547c547
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
554c554
< usb2_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
567c567
< if (usb2_clear_stall_callback(xfer, xfer_other)) {
---
> if (usbd_clear_stall_callback(xfer, xfer_other)) {
570c570
< usb2_transfer_start(xfer_other);
---
> usbd_transfer_start(xfer_other);
728c728
< usb2_transfer_start(sc->sc_xfer[UDBP_T_WR]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_WR]);
796c796
< usb2_transfer_start(sc->sc_xfer[UDBP_T_RD]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_RD]);
799c799
< usb2_transfer_start(sc->sc_xfer[UDBP_T_WR]);
---
> usbd_transfer_start(sc->sc_xfer[UDBP_T_WR]);
826,827c826,827
< usb2_transfer_stop(sc->sc_xfer[UDBP_T_RD_CS]);
< usb2_transfer_stop(sc->sc_xfer[UDBP_T_RD]);
---
> usbd_transfer_stop(sc->sc_xfer[UDBP_T_RD_CS]);
> usbd_transfer_stop(sc->sc_xfer[UDBP_T_RD]);
830,831c830,831
< usb2_transfer_stop(sc->sc_xfer[UDBP_T_WR_CS]);
< usb2_transfer_stop(sc->sc_xfer[UDBP_T_WR]);
---
> usbd_transfer_stop(sc->sc_xfer[UDBP_T_WR_CS]);
> usbd_transfer_stop(sc->sc_xfer[UDBP_T_WR]);