8c8
< __FBSDID("$FreeBSD: head/sys/dev/usb/input/uhid.c 193045 2009-05-29 18:46:57Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/input/uhid.c 194228 2009-06-15 01:02:43Z thompsa $");
162c162
< usb2_fifo_put_data(
---
> usb_fifo_put_data(
174c174
< if (usb2_fifo_put_bytes_max(
---
> if (usb_fifo_put_bytes_max(
177c177
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
230c230
< if (usb2_fifo_get_data(
---
> if (usb_fifo_get_data(
237c237
< usb2_copy_out(xfer->frbuffers, 0, &id, 1);
---
> usbd_copy_out(xfer->frbuffers, 0, &id, 1);
249c249
< if (usb2_fifo_get_data(
---
> if (usb_fifo_get_data(
260c260
< usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
---
> usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
265c265
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
272c272
< usb2_fifo_get_data_error(sc->sc_fifo.fp[USB_FIFO_TX]);
---
> usb_fifo_get_data_error(sc->sc_fifo.fp[USB_FIFO_TX]);
285c285
< usb2_fifo_put_data(sc->sc_fifo.fp[USB_FIFO_RX], xfer->frbuffers,
---
> usb_fifo_put_data(sc->sc_fifo.fp[USB_FIFO_RX], xfer->frbuffers,
291c291
< if (usb2_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) > 0) {
---
> if (usb_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) > 0) {
297c297
< usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
---
> usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
302c302
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
308c308
< usb2_fifo_put_data_error(sc->sc_fifo.fp[USB_FIFO_RX]);
---
> usb_fifo_put_data_error(sc->sc_fifo.fp[USB_FIFO_RX]);
349c349
< usb2_transfer_start(sc->sc_xfer[UHID_CTRL_DT_RD]);
---
> usbd_transfer_start(sc->sc_xfer[UHID_CTRL_DT_RD]);
351c351
< usb2_transfer_start(sc->sc_xfer[UHID_INTR_DT_RD]);
---
> usbd_transfer_start(sc->sc_xfer[UHID_INTR_DT_RD]);
360,361c360,361
< usb2_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_RD]);
< usb2_transfer_stop(sc->sc_xfer[UHID_INTR_DT_RD]);
---
> usbd_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_RD]);
> usbd_transfer_stop(sc->sc_xfer[UHID_INTR_DT_RD]);
369c369
< usb2_transfer_start(sc->sc_xfer[UHID_CTRL_DT_WR]);
---
> usbd_transfer_start(sc->sc_xfer[UHID_CTRL_DT_WR]);
377c377
< usb2_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_WR]);
---
> usbd_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_WR]);
396c396
< err = usb2_req_get_report(sc->sc_udev, NULL, kern_data,
---
> err = usbd_req_get_report(sc->sc_udev, NULL, kern_data,
436c436
< err = usb2_req_set_report(sc->sc_udev, NULL, kern_data,
---
> err = usbd_req_set_report(sc->sc_udev, NULL, kern_data,
462c462
< if (usb2_fifo_alloc_buffer(fifo,
---
> if (usb_fifo_alloc_buffer(fifo,
468c468
< if (usb2_fifo_alloc_buffer(fifo,
---
> if (usb_fifo_alloc_buffer(fifo,
480c480
< usb2_fifo_free_buffer(fifo);
---
> usb_fifo_free_buffer(fifo);
619c619
< if (usb2_test_quirk(uaa, UQ_HID_IGNORE)) {
---
> if (usb_test_quirk(uaa, UQ_HID_IGNORE)) {
635c635
< device_set_usb2_desc(dev);
---
> device_set_usb_desc(dev);
644c644
< error = usb2_transfer_setup(uaa->device,
---
> error = usbd_transfer_setup(uaa->device,
649c649
< DPRINTF("error=%s\n", usb2_errstr(error));
---
> DPRINTF("error=%s\n", usbd_errstr(error));
671c671
< error = usb2_req_set_report(uaa->device, NULL,
---
> error = usbd_req_set_report(uaa->device, NULL,
677c677
< usb2_errstr(error));
---
> usbd_errstr(error));
694c694
< error = usb2_req_get_hid_desc(uaa->device, NULL,
---
> error = usbd_req_get_hid_desc(uaa->device, NULL,
703c703
< error = usb2_req_set_idle(uaa->device, NULL,
---
> error = usbd_req_set_idle(uaa->device, NULL,
708c708
< usb2_errstr(error));
---
> usbd_errstr(error));
738c738
< error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
---
> error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
757c757
< usb2_fifo_detach(&sc->sc_fifo);
---
> usb_fifo_detach(&sc->sc_fifo);
759c759
< usb2_transfer_unsetup(sc->sc_xfer, UHID_N_TRANSFER);
---
> usbd_transfer_unsetup(sc->sc_xfer, UHID_N_TRANSFER);