2c2
< __FBSDID("$FreeBSD: head/sys/dev/usb/input/ukbd.c 194099 2009-06-13 04:56:45Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/input/ukbd.c 194228 2009-06-15 01:02:43Z thompsa $");
300c300
< usb2_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
---
> usbd_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
307c307
< usb2_do_poll(sc->sc_xfer, UKBD_N_TRANSFER);
---
> usbd_do_poll(sc->sc_xfer, UKBD_N_TRANSFER);
457c457
< usb2_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc);
---
> usb_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc);
504c504
< usb2_copy_out(xfer->frbuffers, 0, &id, 1);
---
> usbd_copy_out(xfer->frbuffers, 0, &id, 1);
521c521
< usb2_copy_out(xfer->frbuffers, offset,
---
> usbd_copy_out(xfer->frbuffers, offset,
571c571
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
578c578
< DPRINTF("error=%s\n", usb2_errstr(xfer->error));
---
> DPRINTF("error=%s\n", usbd_errstr(xfer->error));
620,621c620,621
< usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
< usb2_copy_in(xfer->frbuffers + 1, 0, buf, sizeof(buf));
---
> usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
> usbd_copy_in(xfer->frbuffers + 1, 0, buf, sizeof(buf));
626c626
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
631c631
< DPRINTFN(0, "error=%s\n", usb2_errstr(xfer->error));
---
> DPRINTFN(0, "error=%s\n", usbd_errstr(xfer->error));
680c680
< if (usb2_test_quirk(uaa, UQ_KBD_IGNORE))
---
> if (usb_test_quirk(uaa, UQ_KBD_IGNORE))
686c686
< error = usb2_req_get_hid_desc(uaa->device, NULL,
---
> error = usbd_req_get_hid_desc(uaa->device, NULL,
694c694
< if (usb2_test_quirk(uaa, UQ_KBD_IGNORE))
---
> if (usb_test_quirk(uaa, UQ_KBD_IGNORE))
724c724
< device_set_usb2_desc(dev);
---
> device_set_usb_desc(dev);
732c732
< usb2_callout_init_mtx(&sc->sc_callout, &Giant, 0);
---
> usb_callout_init_mtx(&sc->sc_callout, &Giant, 0);
734c734
< err = usb2_transfer_setup(uaa->device,
---
> err = usbd_transfer_setup(uaa->device,
739c739
< DPRINTF("error=%s\n", usb2_errstr(err));
---
> DPRINTF("error=%s\n", usbd_errstr(err));
764c764
< err = usb2_req_get_hid_desc(uaa->device, NULL, &hid_ptr,
---
> err = usbd_req_get_hid_desc(uaa->device, NULL, &hid_ptr,
804c804
< err = usb2_req_set_idle(sc->sc_udev, &Giant, sc->sc_iface_index, 0, 0);
---
> err = usbd_req_set_idle(sc->sc_udev, &Giant, sc->sc_iface_index, 0, 0);
833c833
< usb2_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
---
> usbd_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
861c861
< usb2_callout_stop(&sc->sc_callout);
---
> usb_callout_stop(&sc->sc_callout);
885c885
< usb2_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER);
---
> usbd_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER);
887c887
< usb2_callout_drain(&sc->sc_callout);
---
> usb_callout_drain(&sc->sc_callout);
1495c1495
< usb2_transfer_start(sc->sc_xfer[UKBD_CTRL_LED]);
---
> usbd_transfer_start(sc->sc_xfer[UKBD_CTRL_LED]);