summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/serial/uvisor.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/serial/uvisor.c')
-rw-r--r--sys/dev/usb/serial/uvisor.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/sys/dev/usb/serial/uvisor.c b/sys/dev/usb/serial/uvisor.c
index 11d8fad..1e39947 100644
--- a/sys/dev/usb/serial/uvisor.c
+++ b/sys/dev/usb/serial/uvisor.c
@@ -212,12 +212,12 @@ static const struct usb_config uvisor_config[UVISOR_N_TRANSFER] = {
};
static const struct ucom_callback uvisor_callback = {
- .usb2_com_cfg_open = &uvisor_cfg_open,
- .usb2_com_cfg_close = &uvisor_cfg_close,
- .usb2_com_start_read = &uvisor_start_read,
- .usb2_com_stop_read = &uvisor_stop_read,
- .usb2_com_start_write = &uvisor_start_write,
- .usb2_com_stop_write = &uvisor_stop_write,
+ .ucom_cfg_open = &uvisor_cfg_open,
+ .ucom_cfg_close = &uvisor_cfg_close,
+ .ucom_start_read = &uvisor_start_read,
+ .ucom_stop_read = &uvisor_stop_read,
+ .ucom_start_write = &uvisor_start_write,
+ .ucom_stop_write = &uvisor_stop_write,
};
static device_method_t uvisor_methods[] = {
@@ -282,7 +282,7 @@ uvisor_probe(device_t dev)
if (uaa->info.bIfaceIndex != UVISOR_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(uvisor_devs, sizeof(uvisor_devs), uaa));
+ return (usbd_lookup_id_by_uaa(uvisor_devs, sizeof(uvisor_devs), uaa));
}
static int
@@ -296,7 +296,7 @@ uvisor_attach(device_t dev)
DPRINTF("sc=%p\n", sc);
bcopy(uvisor_config, uvisor_config_copy,
sizeof(uvisor_config_copy));
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uvisor", NULL, MTX_DEF);
@@ -312,10 +312,10 @@ uvisor_attach(device_t dev)
if (error) {
DPRINTF("init failed, error=%s\n",
- usb2_errstr(error));
+ usbd_errstr(error));
goto detach;
}
- error = usb2_transfer_setup(uaa->device, &sc->sc_iface_index,
+ error = usbd_transfer_setup(uaa->device, &sc->sc_iface_index,
sc->sc_xfer, uvisor_config_copy, UVISOR_N_TRANSFER,
sc, &sc->sc_mtx);
if (error) {
@@ -324,14 +324,14 @@ uvisor_attach(device_t dev)
}
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UVISOR_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UVISOR_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UVISOR_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UVISOR_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,
&uvisor_callback, &sc->sc_mtx);
if (error) {
- DPRINTF("usb2_com_attach failed\n");
+ DPRINTF("ucom_attach failed\n");
goto detach;
}
return (0);
@@ -348,8 +348,8 @@ uvisor_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, UVISOR_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UVISOR_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -373,7 +373,7 @@ uvisor_init(struct uvisor_softc *sc, struct usb_device *udev, struct usb_config
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE);
- err = usb2_do_request_flags(udev, NULL,
+ err = usbd_do_request_flags(udev, NULL,
&req, &coninfo, USB_SHORT_XFER_OK,
&actlen, USB_DEFAULT_TIMEOUT);
@@ -426,7 +426,7 @@ uvisor_init(struct uvisor_softc *sc, struct usb_device *udev, struct usb_config
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN);
- err = usb2_do_request_flags
+ err = usbd_do_request_flags
(udev, NULL, &req, &pconinfo, USB_SHORT_XFER_OK,
&actlen, USB_DEFAULT_TIMEOUT);
@@ -453,7 +453,7 @@ uvisor_init(struct uvisor_softc *sc, struct usb_device *udev, struct usb_config
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN);
- err = usb2_do_request(udev, &req, buffer);
+ err = usbd_do_request(udev, &req, buffer);
if (err) {
goto done;
}
@@ -468,7 +468,7 @@ uvisor_init(struct uvisor_softc *sc, struct usb_device *udev, struct usb_config
USETW(req.wIndex, 0);
USETW(req.wLength, 1);
- err = usb2_do_request(udev, NULL, &req, buffer);
+ err = usbd_do_request(udev, NULL, &req, buffer);
if (err) {
goto done;
}
@@ -479,7 +479,7 @@ uvisor_init(struct uvisor_softc *sc, struct usb_device *udev, struct usb_config
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, 1);
- err = usb2_do_request(udev, NULL, &req, buffer);
+ err = usbd_do_request(udev, NULL, &req, buffer);
if (err) {
goto done;
}
@@ -490,7 +490,7 @@ uvisor_init(struct uvisor_softc *sc, struct usb_device *udev, struct usb_config
USETW(req.wValue, 0);
USETW(req.wIndex, 5);
USETW(req.wLength, sizeof(wAvail));
- err = usb2_do_request(udev, NULL, &req, &wAvail);
+ err = usbd_do_request(udev, NULL, &req, &wAvail);
if (err) {
goto done;
}
@@ -521,11 +521,11 @@ uvisor_cfg_close(struct ucom_softc *ucom)
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE);
- err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, buffer, 0, 1000);
if (err) {
DPRINTFN(0, "close notification failed, error=%s\n",
- usb2_errstr(err));
+ usbd_errstr(err));
}
}
@@ -534,7 +534,7 @@ uvisor_start_read(struct ucom_softc *ucom)
{
struct uvisor_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UVISOR_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UVISOR_BULK_DT_RD]);
}
static void
@@ -542,7 +542,7 @@ uvisor_stop_read(struct ucom_softc *ucom)
{
struct uvisor_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UVISOR_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UVISOR_BULK_DT_RD]);
}
static void
@@ -550,7 +550,7 @@ uvisor_start_write(struct ucom_softc *ucom)
{
struct uvisor_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UVISOR_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UVISOR_BULK_DT_WR]);
}
static void
@@ -558,7 +558,7 @@ uvisor_stop_write(struct ucom_softc *ucom)
{
struct uvisor_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UVISOR_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UVISOR_BULK_DT_WR]);
}
static void
@@ -571,11 +571,11 @@ uvisor_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,
UVISOR_BUFSIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -596,12 +596,12 @@ uvisor_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 */
OpenPOWER on IntegriCloud