32c32
< __FBSDID("$FreeBSD: head/sys/dev/usb/storage/urio.c 193045 2009-05-29 18:46:57Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/storage/urio.c 194228 2009-06-15 01:02:43Z thompsa $");
212c212
< device_set_usb2_desc(dev);
---
> device_set_usb_desc(dev);
221c221
< error = usb2_transfer_setup(uaa->device,
---
> error = usbd_transfer_setup(uaa->device,
226c226
< DPRINTF("error=%s\n", usb2_errstr(error));
---
> DPRINTF("error=%s\n", usbd_errstr(error));
230c230
< error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
---
> error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
255c255
< usb2_transfer_start(sc->sc_xfer[URIO_T_WR_CS]);
---
> usbd_transfer_start(sc->sc_xfer[URIO_T_WR_CS]);
258c258
< if (usb2_fifo_get_data(f, xfer->frbuffers, 0,
---
> if (usb_fifo_get_data(f, xfer->frbuffers, 0,
262c262
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
270c270
< usb2_transfer_start(sc->sc_xfer[URIO_T_WR_CS]);
---
> usbd_transfer_start(sc->sc_xfer[URIO_T_WR_CS]);
282c282
< if (usb2_clear_stall_callback(xfer, xfer_other)) {
---
> if (usbd_clear_stall_callback(xfer, xfer_other)) {
285c285
< usb2_transfer_start(xfer_other);
---
> usbd_transfer_start(xfer_other);
297c297
< usb2_fifo_put_data(f, xfer->frbuffers, 0,
---
> usb_fifo_put_data(f, xfer->frbuffers, 0,
302c302
< usb2_transfer_start(sc->sc_xfer[URIO_T_RD_CS]);
---
> usbd_transfer_start(sc->sc_xfer[URIO_T_RD_CS]);
305c305
< if (usb2_fifo_put_bytes_max(f) != 0) {
---
> if (usb_fifo_put_bytes_max(f) != 0) {
307c307
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
315c315
< usb2_transfer_start(sc->sc_xfer[URIO_T_RD_CS]);
---
> usbd_transfer_start(sc->sc_xfer[URIO_T_RD_CS]);
327c327
< if (usb2_clear_stall_callback(xfer, xfer_other)) {
---
> if (usbd_clear_stall_callback(xfer, xfer_other)) {
330c330
< usb2_transfer_start(xfer_other);
---
> usbd_transfer_start(xfer_other);
339c339
< usb2_transfer_start(sc->sc_xfer[URIO_T_RD]);
---
> usbd_transfer_start(sc->sc_xfer[URIO_T_RD]);
347,348c347,348
< usb2_transfer_stop(sc->sc_xfer[URIO_T_RD_CS]);
< usb2_transfer_stop(sc->sc_xfer[URIO_T_RD]);
---
> usbd_transfer_stop(sc->sc_xfer[URIO_T_RD_CS]);
> usbd_transfer_stop(sc->sc_xfer[URIO_T_RD]);
356c356
< usb2_transfer_start(sc->sc_xfer[URIO_T_WR]);
---
> usbd_transfer_start(sc->sc_xfer[URIO_T_WR]);
364,365c364,365
< usb2_transfer_stop(sc->sc_xfer[URIO_T_WR_CS]);
< usb2_transfer_stop(sc->sc_xfer[URIO_T_WR]);
---
> usbd_transfer_stop(sc->sc_xfer[URIO_T_WR_CS]);
> usbd_transfer_stop(sc->sc_xfer[URIO_T_WR]);
382c382
< if (usb2_fifo_alloc_buffer(fifo,
---
> if (usb_fifo_alloc_buffer(fifo,
392c392
< if (usb2_fifo_alloc_buffer(fifo,
---
> if (usb_fifo_alloc_buffer(fifo,
405c405
< usb2_fifo_free_buffer(fifo);
---
> usb_fifo_free_buffer(fifo);
468c468
< usb2_fifo_detach(&sc->sc_fifo);
---
> usb_fifo_detach(&sc->sc_fifo);
470c470
< usb2_transfer_unsetup(sc->sc_xfer, URIO_T_MAX);
---
> usbd_transfer_unsetup(sc->sc_xfer, URIO_T_MAX);