2c2
< __FBSDID("$FreeBSD: head/sys/dev/usb/controller/avr32dci.c 193644 2009-06-07 19:41:11Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/controller/avr32dci.c 194228 2009-06-15 01:02:43Z thompsa $");
240c240
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
292c292
< usb2_copy_in(td->pc, 0, &req, sizeof(req));
---
> usbd_copy_in(td->pc, 0, &req, sizeof(req));
393c393
< usb2_get_page(td->pc, td->offset, &buf_res);
---
> usbd_get_page(td->pc, td->offset, &buf_res);
469c469
< usb2_get_page(td->pc, td->offset, &buf_res);
---
> usbd_get_page(td->pc, td->offset, &buf_res);
741c741
< xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
---
> xfer->sumlen, usbd_get_speed(xfer->xroot->udev));
903c903
< usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
---
> usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
907c907
< usb2_transfer_timeout_ms(xfer,
---
> usbd_transfer_timeout_ms(xfer,
1060c1060
< usb2_transfer_done(xfer, error);
---
> usbd_transfer_done(xfer, error);
1201c1201
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20);
1390c1390
< usb2_isoc_time_expand(&sc->sc_bus, nframes) + temp +
---
> usb_isoc_time_expand(&sc->sc_bus, nframes) + temp +
1953c1953
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
1968c1968
< * check if "usb2_transfer_setup_sub" set an error
---
> * check if "usbd_transfer_setup_sub" set an error