diff options
Diffstat (limited to 'sys/dev/usb/serial/uslcom.c')
-rw-r--r-- | sys/dev/usb/serial/uslcom.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/sys/dev/usb/serial/uslcom.c b/sys/dev/usb/serial/uslcom.c index 66d9461..2047cb2 100644 --- a/sys/dev/usb/serial/uslcom.c +++ b/sys/dev/usb/serial/uslcom.c @@ -144,18 +144,18 @@ static const struct usb_config uslcom_config[USLCOM_N_TRANSFER] = { }; static struct ucom_callback uslcom_callback = { - .usb2_com_cfg_open = &uslcom_open, - .usb2_com_cfg_close = &uslcom_close, - .usb2_com_cfg_get_status = &uslcom_get_status, - .usb2_com_cfg_set_dtr = &uslcom_set_dtr, - .usb2_com_cfg_set_rts = &uslcom_set_rts, - .usb2_com_cfg_set_break = &uslcom_set_break, - .usb2_com_cfg_param = &uslcom_param, - .usb2_com_pre_param = &uslcom_pre_param, - .usb2_com_start_read = &uslcom_start_read, - .usb2_com_stop_read = &uslcom_stop_read, - .usb2_com_start_write = &uslcom_start_write, - .usb2_com_stop_write = &uslcom_stop_write, + .ucom_cfg_open = &uslcom_open, + .ucom_cfg_close = &uslcom_close, + .ucom_cfg_get_status = &uslcom_get_status, + .ucom_cfg_set_dtr = &uslcom_set_dtr, + .ucom_cfg_set_rts = &uslcom_set_rts, + .ucom_cfg_set_break = &uslcom_set_break, + .ucom_cfg_param = &uslcom_param, + .ucom_pre_param = &uslcom_pre_param, + .ucom_start_read = &uslcom_start_read, + .ucom_stop_read = &uslcom_stop_read, + .ucom_start_write = &uslcom_start_write, + .ucom_stop_write = &uslcom_stop_write, }; static const struct usb_device_id uslcom_devs[] = { @@ -215,7 +215,7 @@ uslcom_probe(device_t dev) if (uaa->info.bIfaceIndex != USLCOM_IFACE_INDEX) { return (ENXIO); } - return (usb2_lookup_id_by_uaa(uslcom_devs, sizeof(uslcom_devs), uaa)); + return (usbd_lookup_id_by_uaa(uslcom_devs, sizeof(uslcom_devs), uaa)); } static int @@ -227,26 +227,26 @@ uslcom_attach(device_t dev) DPRINTFN(11, "\n"); - device_set_usb2_desc(dev); + device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uslcom", NULL, MTX_DEF); sc->sc_udev = uaa->device; - error = usb2_transfer_setup(uaa->device, + error = usbd_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, sc->sc_xfer, uslcom_config, USLCOM_N_TRANSFER, sc, &sc->sc_mtx); if (error) { DPRINTF("one or more missing USB endpoints, " - "error=%s\n", usb2_errstr(error)); + "error=%s\n", usbd_errstr(error)); goto detach; } /* clear stall at first run */ mtx_lock(&sc->sc_mtx); - usb2_transfer_set_stall(sc->sc_xfer[USLCOM_BULK_DT_WR]); - usb2_transfer_set_stall(sc->sc_xfer[USLCOM_BULK_DT_RD]); + usbd_transfer_set_stall(sc->sc_xfer[USLCOM_BULK_DT_WR]); + usbd_transfer_set_stall(sc->sc_xfer[USLCOM_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, &uslcom_callback, &sc->sc_mtx); if (error) { goto detach; @@ -265,8 +265,8 @@ uslcom_detach(device_t dev) DPRINTF("sc=%p\n", sc); - usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); - usb2_transfer_unsetup(sc->sc_xfer, USLCOM_N_TRANSFER); + ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); + usbd_transfer_unsetup(sc->sc_xfer, USLCOM_N_TRANSFER); mtx_destroy(&sc->sc_mtx); return (0); @@ -284,7 +284,7 @@ uslcom_open(struct ucom_softc *ucom) USETW(req.wIndex, USLCOM_PORT_NO); USETW(req.wLength, 0); - if (usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + if (ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000)) { DPRINTF("UART enable failed (ignored)\n"); } @@ -302,7 +302,7 @@ uslcom_close(struct ucom_softc *ucom) USETW(req.wIndex, USLCOM_PORT_NO); USETW(req.wLength, 0); - if (usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + if (ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000)) { DPRINTF("UART disable failed (ignored)\n"); } @@ -326,7 +326,7 @@ uslcom_set_dtr(struct ucom_softc *ucom, uint8_t onoff) USETW(req.wIndex, USLCOM_PORT_NO); USETW(req.wLength, 0); - if (usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + if (ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000)) { DPRINTF("Setting DTR failed (ignored)\n"); } @@ -350,7 +350,7 @@ uslcom_set_rts(struct ucom_softc *ucom, uint8_t onoff) USETW(req.wIndex, USLCOM_PORT_NO); USETW(req.wLength, 0); - if (usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + if (ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000)) { DPRINTF("Setting DTR failed (ignored)\n"); } @@ -379,7 +379,7 @@ uslcom_param(struct ucom_softc *ucom, struct termios *t) USETW(req.wIndex, USLCOM_PORT_NO); USETW(req.wLength, 0); - if (usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + if (ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000)) { DPRINTF("Set baudrate failed (ignored)\n"); } @@ -416,7 +416,7 @@ uslcom_param(struct ucom_softc *ucom, struct termios *t) USETW(req.wIndex, USLCOM_PORT_NO); USETW(req.wLength, 0); - if (usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + if (ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000)) { DPRINTF("Set format failed (ignored)\n"); } @@ -447,7 +447,7 @@ uslcom_set_break(struct ucom_softc *ucom, uint8_t onoff) USETW(req.wIndex, USLCOM_PORT_NO); USETW(req.wLength, 0); - if (usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + if (ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, &req, NULL, 0, 1000)) { DPRINTF("Set BREAK failed (ignored)\n"); } @@ -463,13 +463,13 @@ uslcom_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, USLCOM_BULK_BUF_SIZE, &actlen)) { DPRINTF("actlen = %d\n", actlen); xfer->frlengths[0] = actlen; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); } return; @@ -490,12 +490,12 @@ uslcom_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 */ @@ -514,7 +514,7 @@ uslcom_start_read(struct ucom_softc *ucom) struct uslcom_softc *sc = ucom->sc_parent; /* start read endpoint */ - usb2_transfer_start(sc->sc_xfer[USLCOM_BULK_DT_RD]); + usbd_transfer_start(sc->sc_xfer[USLCOM_BULK_DT_RD]); } static void @@ -523,7 +523,7 @@ uslcom_stop_read(struct ucom_softc *ucom) struct uslcom_softc *sc = ucom->sc_parent; /* stop read endpoint */ - usb2_transfer_stop(sc->sc_xfer[USLCOM_BULK_DT_RD]); + usbd_transfer_stop(sc->sc_xfer[USLCOM_BULK_DT_RD]); } static void @@ -531,7 +531,7 @@ uslcom_start_write(struct ucom_softc *ucom) { struct uslcom_softc *sc = ucom->sc_parent; - usb2_transfer_start(sc->sc_xfer[USLCOM_BULK_DT_WR]); + usbd_transfer_start(sc->sc_xfer[USLCOM_BULK_DT_WR]); } static void @@ -539,5 +539,5 @@ uslcom_stop_write(struct ucom_softc *ucom) { struct uslcom_softc *sc = ucom->sc_parent; - usb2_transfer_stop(sc->sc_xfer[USLCOM_BULK_DT_WR]); + usbd_transfer_stop(sc->sc_xfer[USLCOM_BULK_DT_WR]); } |