4c4
< __FBSDID("$FreeBSD: head/sys/dev/usb/serial/uvscom.c 193045 2009-05-29 18:46:57Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/serial/uvscom.c 194228 2009-06-15 01:02:43Z thompsa $");
207,219c207,219
< .usb2_com_cfg_get_status = &uvscom_cfg_get_status,
< .usb2_com_cfg_set_dtr = &uvscom_cfg_set_dtr,
< .usb2_com_cfg_set_rts = &uvscom_cfg_set_rts,
< .usb2_com_cfg_set_break = &uvscom_cfg_set_break,
< .usb2_com_cfg_param = &uvscom_cfg_param,
< .usb2_com_cfg_open = &uvscom_cfg_open,
< .usb2_com_cfg_close = &uvscom_cfg_close,
< .usb2_com_pre_open = &uvscom_pre_open,
< .usb2_com_pre_param = &uvscom_pre_param,
< .usb2_com_start_read = &uvscom_start_read,
< .usb2_com_stop_read = &uvscom_stop_read,
< .usb2_com_start_write = &uvscom_start_write,
< .usb2_com_stop_write = &uvscom_stop_write,
---
> .ucom_cfg_get_status = &uvscom_cfg_get_status,
> .ucom_cfg_set_dtr = &uvscom_cfg_set_dtr,
> .ucom_cfg_set_rts = &uvscom_cfg_set_rts,
> .ucom_cfg_set_break = &uvscom_cfg_set_break,
> .ucom_cfg_param = &uvscom_cfg_param,
> .ucom_cfg_open = &uvscom_cfg_open,
> .ucom_cfg_close = &uvscom_cfg_close,
> .ucom_pre_open = &uvscom_pre_open,
> .ucom_pre_param = &uvscom_pre_param,
> .ucom_start_read = &uvscom_start_read,
> .ucom_stop_read = &uvscom_stop_read,
> .ucom_start_write = &uvscom_start_write,
> .ucom_stop_write = &uvscom_stop_write,
269c269
< return (usb2_lookup_id_by_uaa(uvscom_devs, sizeof(uvscom_devs), uaa));
---
> return (usbd_lookup_id_by_uaa(uvscom_devs, sizeof(uvscom_devs), uaa));
279c279
< device_set_usb2_desc(dev);
---
> device_set_usb_desc(dev);
289c289
< error = usb2_transfer_setup(uaa->device, &sc->sc_iface_index,
---
> error = usbd_transfer_setup(uaa->device, &sc->sc_iface_index,
300,301c300,301
< usb2_transfer_set_stall(sc->sc_xfer[UVSCOM_BULK_DT_WR]);
< usb2_transfer_set_stall(sc->sc_xfer[UVSCOM_BULK_DT_RD]);
---
> usbd_transfer_set_stall(sc->sc_xfer[UVSCOM_BULK_DT_WR]);
> usbd_transfer_set_stall(sc->sc_xfer[UVSCOM_BULK_DT_RD]);
304c304
< error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc,
---
> error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc,
311c311
< usb2_transfer_start(sc->sc_xfer[UVSCOM_INTR_DT_RD]);
---
> usbd_transfer_start(sc->sc_xfer[UVSCOM_INTR_DT_RD]);
331c331
< usb2_transfer_stop(sc->sc_xfer[UVSCOM_INTR_DT_RD]);
---
> usbd_transfer_stop(sc->sc_xfer[UVSCOM_INTR_DT_RD]);
333,334c333,334
< usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
< usb2_transfer_unsetup(sc->sc_xfer, UVSCOM_N_TRANSFER);
---
> ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
> usbd_transfer_unsetup(sc->sc_xfer, UVSCOM_N_TRANSFER);
350c350
< if (usb2_com_get_data(&sc->sc_ucom, xfer->frbuffers, 0,
---
> if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers, 0,
354c354
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
375c375
< usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers, 0, xfer->actlen);
---
> ucom_put_data(&sc->sc_ucom, xfer->frbuffers, 0, xfer->actlen);
380c380
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
403c403
< usb2_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
---
> usbd_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
428c428
< usb2_com_status_change(&sc->sc_ucom);
---
> ucom_status_change(&sc->sc_ucom);
433c433
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
635c635
< usb2_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_RD]);
---
> usbd_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_RD]);
643c643
< usb2_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_RD]);
---
> usbd_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_RD]);
651c651
< usb2_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_WR]);
---
> usbd_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_WR]);
659c659
< usb2_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_WR]);
---
> usbd_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_WR]);
683c683
< err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
---
> err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
687c687
< "(ignored)\n", usb2_errstr(err));
---
> "(ignored)\n", usbd_errstr(err));
704c704
< err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
---
> err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
708c708
< "(ignored)\n", usb2_errstr(err));
---
> "(ignored)\n", usbd_errstr(err));