31c31
< * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 193045 2009-05-29 18:46:57Z thompsa $
---
> * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 194228 2009-06-15 01:02:43Z thompsa $
40c40
< #define USB_DEBUG_VAR usb2_debug
---
> #define USB_DEBUG_VAR usb_debug
183c183
< return (usb2_lookup_id_by_uaa(devs, sizeof(devs), uaa));
---
> return (usbd_lookup_id_by_uaa(devs, sizeof(devs), uaa));
200c200
< device_set_usb2_desc(dev);
---
> device_set_usb_desc(dev);
205c205
< error = usb2_transfer_setup(uaa->device, &iface_index, sc->sc_xfer,
---
> error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer,
210c210
< usb2_errstr(error));
---
> usbd_errstr(error));
214c214
< error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
---
> error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
220c220
< usb2_errstr(error));
---
> usbd_errstr(error));
241c241
< usb2_fifo_detach(&sc->sc_fifo);
---
> usb_fifo_detach(&sc->sc_fifo);
243c243
< usb2_transfer_unsetup(sc->sc_xfer, UBTBCMFW_N_TRANSFER);
---
> usbd_transfer_unsetup(sc->sc_xfer, UBTBCMFW_N_TRANSFER);
265c265
< if (usb2_fifo_get_data(f, xfer->frbuffers, 0,
---
> if (usb_fifo_get_data(f, xfer->frbuffers, 0,
268c268
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
294c294
< usb2_fifo_put_data(fifo, xfer->frbuffers, 0, xfer->actlen, 1);
---
> usb_fifo_put_data(fifo, xfer->frbuffers, 0, xfer->actlen, 1);
299c299
< if (usb2_fifo_put_bytes_max(fifo) > 0) {
---
> if (usb_fifo_put_bytes_max(fifo) > 0) {
301c301
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
324c324
< usb2_transfer_start(sc->sc_xfer[UBTBCMFW_INTR_DT_RD]);
---
> usbd_transfer_start(sc->sc_xfer[UBTBCMFW_INTR_DT_RD]);
336c336
< usb2_transfer_stop(sc->sc_xfer[UBTBCMFW_INTR_DT_RD]);
---
> usbd_transfer_stop(sc->sc_xfer[UBTBCMFW_INTR_DT_RD]);
349c349
< usb2_transfer_start(sc->sc_xfer[UBTBCMFW_BULK_DT_WR]);
---
> usbd_transfer_start(sc->sc_xfer[UBTBCMFW_BULK_DT_WR]);
361c361
< usb2_transfer_stop(sc->sc_xfer[UBTBCMFW_BULK_DT_WR]);
---
> usbd_transfer_stop(sc->sc_xfer[UBTBCMFW_BULK_DT_WR]);
386c386
< if (usb2_fifo_alloc_buffer(fifo, xfer->max_data_length,
---
> if (usb_fifo_alloc_buffer(fifo, xfer->max_data_length,
401c401
< usb2_fifo_free_buffer(fifo);
---
> usb_fifo_free_buffer(fifo);
417c417
< memcpy(data, usb2_get_device_descriptor(sc->sc_udev),
---
> memcpy(data, usbd_get_device_descriptor(sc->sc_udev),