1c1
< /* $FreeBSD: head/sys/dev/usb/serial/ugensa.c 193644 2009-06-07 19:41:11Z thompsa $ */
---
> /* $FreeBSD: head/sys/dev/usb/serial/ugensa.c 194228 2009-06-15 01:02:43Z thompsa $ */
51c51
< #define USB_DEBUG_VAR usb2_debug
---
> #define USB_DEBUG_VAR usb_debug
75c75
< struct ucom_softc *sc_usb2_com_ptr;
---
> struct ucom_softc *sc_ucom_ptr;
125,128c125,128
< .usb2_com_start_read = &ugensa_start_read,
< .usb2_com_stop_read = &ugensa_stop_read,
< .usb2_com_start_write = &ugensa_start_write,
< .usb2_com_stop_write = &ugensa_stop_write,
---
> .ucom_start_read = &ugensa_start_read,
> .ucom_stop_read = &ugensa_stop_read,
> .ucom_start_write = &ugensa_start_write,
> .ucom_stop_write = &ugensa_stop_write,
173c173
< return (usb2_lookup_id_by_uaa(ugensa_devs, sizeof(ugensa_devs), uaa));
---
> return (usbd_lookup_id_by_uaa(ugensa_devs, sizeof(ugensa_devs), uaa));
187c187
< device_set_usb2_desc(dev);
---
> device_set_usb_desc(dev);
192,193c192,193
< if ((usb2_get_endpoint(uaa->device, cnt, ugensa_xfer_config + 0) == NULL) ||
< (usb2_get_endpoint(uaa->device, cnt, ugensa_xfer_config + 1) == NULL)) {
---
> if ((usbd_get_endpoint(uaa->device, cnt, ugensa_xfer_config + 0) == NULL) ||
> (usbd_get_endpoint(uaa->device, cnt, ugensa_xfer_config + 1) == NULL)) {
204c204
< iface = usb2_get_iface(uaa->device, x);
---
> iface = usbd_get_iface(uaa->device, x);
210c210
< ssc->sc_usb2_com_ptr = sc->sc_ucom + sc->sc_niface;
---
> ssc->sc_ucom_ptr = sc->sc_ucom + sc->sc_niface;
213c213
< error = usb2_transfer_setup(uaa->device,
---
> error = usbd_transfer_setup(uaa->device,
224,225c224,225
< usb2_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
< usb2_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
---
> usbd_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
> usbd_transfer_set_stall(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
229c229
< ssc->sc_usb2_com_ptr->sc_portno = sc->sc_niface;
---
> ssc->sc_ucom_ptr->sc_portno = sc->sc_niface;
232c232
< usb2_set_parent_iface(uaa->device, x,
---
> usbd_set_parent_iface(uaa->device, x,
237c237
< error = usb2_com_attach(&sc->sc_super_ucom, sc->sc_ucom, sc->sc_niface, sc,
---
> error = ucom_attach(&sc->sc_super_ucom, sc->sc_ucom, sc->sc_niface, sc,
256c256
< usb2_com_detach(&sc->sc_super_ucom, sc->sc_ucom, sc->sc_niface);
---
> ucom_detach(&sc->sc_super_ucom, sc->sc_ucom, sc->sc_niface);
259c259
< usb2_transfer_unsetup(sc->sc_sub[x].sc_xfer, UGENSA_N_TRANSFER);
---
> usbd_transfer_unsetup(sc->sc_sub[x].sc_xfer, UGENSA_N_TRANSFER);
276c276
< if (usb2_com_get_data(ssc->sc_usb2_com_ptr, xfer->frbuffers, 0,
---
> if (ucom_get_data(ssc->sc_ucom_ptr, xfer->frbuffers, 0,
279c279
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
300c300
< usb2_com_put_data(ssc->sc_usb2_com_ptr, xfer->frbuffers, 0,
---
> ucom_put_data(ssc->sc_ucom_ptr, xfer->frbuffers, 0,
306c306
< usb2_start_hardware(xfer);
---
> usbd_transfer_submit(xfer);
325c325
< usb2_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
---
> usbd_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
334c334
< usb2_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
---
> usbd_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
343c343
< usb2_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
---
> usbd_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
352c352
< usb2_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
---
> usbd_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_WR]);