diff options
Diffstat (limited to 'sys/dev/usb/serial/uvscom.c')
-rw-r--r-- | sys/dev/usb/serial/uvscom.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/sys/dev/usb/serial/uvscom.c b/sys/dev/usb/serial/uvscom.c index 435c738..40b09a6 100644 --- a/sys/dev/usb/serial/uvscom.c +++ b/sys/dev/usb/serial/uvscom.c @@ -204,19 +204,19 @@ static const struct usb_config uvscom_config[UVSCOM_N_TRANSFER] = { }; static const struct ucom_callback uvscom_callback = { - .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, }; static const struct usb_device_id uvscom_devs[] = { @@ -266,7 +266,7 @@ uvscom_probe(device_t dev) if (uaa->info.bIfaceIndex != UVSCOM_IFACE_INDEX) { return (ENXIO); } - return (usb2_lookup_id_by_uaa(uvscom_devs, sizeof(uvscom_devs), uaa)); + return (usbd_lookup_id_by_uaa(uvscom_devs, sizeof(uvscom_devs), uaa)); } static int @@ -276,7 +276,7 @@ uvscom_attach(device_t dev) struct uvscom_softc *sc = device_get_softc(dev); int error; - device_set_usb2_desc(dev); + device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uvscom", NULL, MTX_DEF); sc->sc_udev = uaa->device; @@ -286,7 +286,7 @@ uvscom_attach(device_t dev) sc->sc_iface_no = uaa->info.bIfaceNum; sc->sc_iface_index = UVSCOM_IFACE_INDEX; - error = usb2_transfer_setup(uaa->device, &sc->sc_iface_index, + error = usbd_transfer_setup(uaa->device, &sc->sc_iface_index, sc->sc_xfer, uvscom_config, UVSCOM_N_TRANSFER, sc, &sc->sc_mtx); if (error) { @@ -297,18 +297,18 @@ uvscom_attach(device_t dev) /* clear stall at first run */ mtx_lock(&sc->sc_mtx); - 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]); mtx_unlock(&sc->sc_mtx); - 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, &uvscom_callback, &sc->sc_mtx); if (error) { goto detach; } /* start interrupt pipe */ mtx_lock(&sc->sc_mtx); - usb2_transfer_start(sc->sc_xfer[UVSCOM_INTR_DT_RD]); + usbd_transfer_start(sc->sc_xfer[UVSCOM_INTR_DT_RD]); mtx_unlock(&sc->sc_mtx); return (0); @@ -328,10 +328,10 @@ uvscom_detach(device_t dev) /* stop interrupt pipe */ if (sc->sc_xfer[UVSCOM_INTR_DT_RD]) - usb2_transfer_stop(sc->sc_xfer[UVSCOM_INTR_DT_RD]); + usbd_transfer_stop(sc->sc_xfer[UVSCOM_INTR_DT_RD]); - 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); mtx_destroy(&sc->sc_mtx); return (0); @@ -347,11 +347,11 @@ uvscom_write_callback(struct usb_xfer *xfer) case USB_ST_SETUP: case USB_ST_TRANSFERRED: tr_setup: - if (usb2_com_get_data(&sc->sc_ucom, xfer->frbuffers, 0, + if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers, 0, UVSCOM_BULK_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); } return; @@ -372,12 +372,12 @@ uvscom_read_callback(struct usb_xfer *xfer) switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers, 0, xfer->actlen); + ucom_put_data(&sc->sc_ucom, xfer->frbuffers, 0, xfer->actlen); case USB_ST_SETUP: tr_setup: xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: /* Error */ @@ -400,7 +400,7 @@ uvscom_intr_callback(struct usb_xfer *xfer) case USB_ST_TRANSFERRED: if (xfer->actlen >= 2) { - usb2_copy_out(xfer->frbuffers, 0, buf, sizeof(buf)); + usbd_copy_out(xfer->frbuffers, 0, buf, sizeof(buf)); sc->sc_lsr = 0; sc->sc_msr = 0; @@ -425,12 +425,12 @@ uvscom_intr_callback(struct usb_xfer *xfer) * the UCOM layer will ignore this call if the TTY * device is closed! */ - usb2_com_status_change(&sc->sc_ucom); + ucom_status_change(&sc->sc_ucom); } case USB_ST_SETUP: tr_setup: xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: /* Error */ @@ -632,7 +632,7 @@ uvscom_start_read(struct ucom_softc *ucom) { struct uvscom_softc *sc = ucom->sc_parent; - usb2_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_RD]); + usbd_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_RD]); } static void @@ -640,7 +640,7 @@ uvscom_stop_read(struct ucom_softc *ucom) { struct uvscom_softc *sc = ucom->sc_parent; - usb2_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_RD]); + usbd_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_RD]); } static void @@ -648,7 +648,7 @@ uvscom_start_write(struct ucom_softc *ucom) { struct uvscom_softc *sc = ucom->sc_parent; - usb2_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_WR]); + usbd_transfer_start(sc->sc_xfer[UVSCOM_BULK_DT_WR]); } static void @@ -656,7 +656,7 @@ uvscom_stop_write(struct ucom_softc *ucom) { struct uvscom_softc *sc = ucom->sc_parent; - usb2_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_WR]); + usbd_transfer_stop(sc->sc_xfer[UVSCOM_BULK_DT_WR]); } static void @@ -680,11 +680,11 @@ uvscom_cfg_write(struct uvscom_softc *sc, uint8_t index, uint16_t value) USETW(req.wIndex, 0); USETW(req.wLength, 0); - err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000); if (err) { DPRINTFN(0, "device request failed, err=%s " - "(ignored)\n", usb2_errstr(err)); + "(ignored)\n", usbd_errstr(err)); } } @@ -701,11 +701,11 @@ uvscom_cfg_read_status(struct uvscom_softc *sc) USETW(req.wIndex, 0); USETW(req.wLength, 2); - err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, data, 0, 1000); if (err) { DPRINTFN(0, "device request failed, err=%s " - "(ignored)\n", usb2_errstr(err)); + "(ignored)\n", usbd_errstr(err)); } return (data[0] | (data[1] << 8)); } |