summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/serial
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/serial')
-rw-r--r--sys/dev/usb/serial/u3g.c66
-rw-r--r--sys/dev/usb/serial/uark.c56
-rw-r--r--sys/dev/usb/serial/ubsa.c68
-rw-r--r--sys/dev/usb/serial/ubser.c58
-rw-r--r--sys/dev/usb/serial/uchcom.c68
-rw-r--r--sys/dev/usb/serial/ucycom.c62
-rw-r--r--sys/dev/usb/serial/ufoma.c134
-rw-r--r--sys/dev/usb/serial/uftdi.c76
-rw-r--r--sys/dev/usb/serial/ugensa.c56
-rw-r--r--sys/dev/usb/serial/uipaq.c58
-rw-r--r--sys/dev/usb/serial/ulpt.c80
-rw-r--r--sys/dev/usb/serial/umct.c64
-rw-r--r--sys/dev/usb/serial/umodem.c80
-rw-r--r--sys/dev/usb/serial/umoscom.c68
-rw-r--r--sys/dev/usb/serial/uplcom.c90
-rw-r--r--sys/dev/usb/serial/usb_serial.c318
-rw-r--r--sys/dev/usb/serial/usb_serial.h50
-rw-r--r--sys/dev/usb/serial/uslcom.c72
-rw-r--r--sys/dev/usb/serial/uvisor.c64
-rw-r--r--sys/dev/usb/serial/uvscom.c76
20 files changed, 832 insertions, 832 deletions
diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c
index 91190d4..fb25936 100644
--- a/sys/dev/usb/serial/u3g.c
+++ b/sys/dev/usb/serial/u3g.c
@@ -131,10 +131,10 @@ static const struct usb_config u3g_config[U3G_N_TRANSFER] = {
};
static const struct ucom_callback u3g_callback = {
- .usb2_com_start_read = &u3g_start_read,
- .usb2_com_stop_read = &u3g_stop_read,
- .usb2_com_start_write = &u3g_start_write,
- .usb2_com_stop_write = &u3g_stop_write,
+ .ucom_start_read = &u3g_start_read,
+ .ucom_stop_read = &u3g_stop_read,
+ .ucom_start_write = &u3g_start_write,
+ .ucom_stop_write = &u3g_stop_write,
};
static device_method_t u3g_methods[] = {
@@ -238,7 +238,7 @@ u3g_sierra_init(struct usb_device *udev)
USETW(req.wIndex, UHF_PORT_CONNECTION);
USETW(req.wLength, 0);
- if (usb2_do_request_flags(udev, NULL, &req,
+ if (usbd_do_request_flags(udev, NULL, &req,
NULL, 0, NULL, USB_MS_HZ)) {
/* ignore any errors */
}
@@ -258,7 +258,7 @@ u3g_huawei_init(struct usb_device *udev)
USETW(req.wIndex, UHF_PORT_SUSPEND);
USETW(req.wLength, 0);
- if (usb2_do_request_flags(udev, NULL, &req,
+ if (usbd_do_request_flags(udev, NULL, &req,
NULL, 0, NULL, USB_MS_HZ)) {
/* ignore any errors */
}
@@ -306,7 +306,7 @@ u3g_sael_m460_init(struct usb_device *udev)
DPRINTFN(1, "\n");
- if (usb2_req_set_alt_interface_no(udev, NULL, 0, 0)) {
+ if (usbd_req_set_alt_interface_no(udev, NULL, 0, 0)) {
DPRINTFN(0, "Alt setting 0 failed\n");
return;
}
@@ -321,13 +321,13 @@ u3g_sael_m460_init(struct usb_device *udev)
DPRINTFN(0, "too small buffer\n");
continue;
}
- err = usb2_do_request(udev, NULL, &req, buf);
+ err = usbd_do_request(udev, NULL, &req, buf);
} else {
if (len > (sizeof(setup[0]) - 8)) {
DPRINTFN(0, "too small buffer\n");
continue;
}
- err = usb2_do_request(udev, NULL, &req,
+ err = usbd_do_request(udev, NULL, &req,
__DECONST(uint8_t *, &setup[n][8]));
}
if (err) {
@@ -349,7 +349,7 @@ static int
u3g_lookup_huawei(struct usb_attach_arg *uaa)
{
/* Calling the lookup function will also set the driver info! */
- return (usb2_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa));
+ return (usbd_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa));
}
/*
@@ -369,7 +369,7 @@ u3g_test_huawei_autoinst(struct usb_device *udev,
if (udev == NULL) {
return (USB_ERR_INVAL);
}
- iface = usb2_get_iface(udev, 0);
+ iface = usbd_get_iface(udev, 0);
if (iface == NULL) {
return (USB_ERR_INVAL);
}
@@ -389,7 +389,7 @@ u3g_test_huawei_autoinst(struct usb_device *udev,
if (flags & U3GFL_HUAWEI_INIT) {
u3g_huawei_init(udev);
} else if (flags & U3GFL_SCSI_EJECT) {
- return (usb2_test_autoinstall(udev, 0, 1));
+ return (usb_test_autoinstall(udev, 0, 1));
} else if (flags & U3GFL_SIERRA_INIT) {
u3g_sierra_init(udev);
} else {
@@ -405,10 +405,10 @@ u3g_driver_loaded(struct module *mod, int what, void *arg)
switch (what) {
case MOD_LOAD:
/* register our autoinstall handler */
- usb2_test_huawei_autoinst_p = &u3g_test_huawei_autoinst;
+ usb_test_huawei_autoinst_p = &u3g_test_huawei_autoinst;
break;
case MOD_UNLOAD:
- usb2_test_huawei_unload(NULL);
+ usb_test_huawei_unload(NULL);
break;
default:
return (EOPNOTSUPP);
@@ -457,7 +457,7 @@ u3g_attach(device_t dev)
for (n = 0; n != U3G_N_TRANSFER; n++)
u3g_config_tmp[n] = u3g_config[n];
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "u3g", NULL, MTX_DEF);
sc->sc_udev = uaa->device;
@@ -465,13 +465,13 @@ u3g_attach(device_t dev)
/* Claim all interfaces on the device */
iface_valid = 0;
for (i = uaa->info.bIfaceIndex; i < USB_IFACE_MAX; i++) {
- iface = usb2_get_iface(uaa->device, i);
+ iface = usbd_get_iface(uaa->device, i);
if (iface == NULL)
break;
- id = usb2_get_interface_descriptor(iface);
+ id = usbd_get_interface_descriptor(iface);
if (id == NULL || id->bInterfaceClass != UICLASS_VENDOR)
continue;
- usb2_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
+ usbd_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
iface_valid |= (1<<i);
}
@@ -489,7 +489,7 @@ u3g_attach(device_t dev)
u3g_config_tmp[n].ep_index = ep;
/* try to allocate a set of BULK endpoints */
- error = usb2_transfer_setup(uaa->device, &i,
+ error = usbd_transfer_setup(uaa->device, &i,
sc->sc_xfer[nports], u3g_config_tmp, U3G_N_TRANSFER,
&sc->sc_ucom[nports], &sc->sc_mtx);
if (error) {
@@ -501,8 +501,8 @@ u3g_attach(device_t dev)
/* set stall by default */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[nports][U3G_BULK_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[nports][U3G_BULK_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[nports][U3G_BULK_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[nports][U3G_BULK_RD]);
mtx_unlock(&sc->sc_mtx);
nports++; /* found one port */
@@ -516,10 +516,10 @@ u3g_attach(device_t dev)
}
sc->sc_numports = nports;
- error = usb2_com_attach(&sc->sc_super_ucom, sc->sc_ucom,
+ error = ucom_attach(&sc->sc_super_ucom, sc->sc_ucom,
sc->sc_numports, sc, &u3g_callback, &sc->sc_mtx);
if (error) {
- DPRINTF("usb2_com_attach failed\n");
+ DPRINTF("ucom_attach failed\n");
goto detach;
}
if (sc->sc_numports > 1)
@@ -540,10 +540,10 @@ u3g_detach(device_t dev)
DPRINTF("sc=%p\n", sc);
/* NOTE: It is not dangerous to detach more ports than attached! */
- usb2_com_detach(&sc->sc_super_ucom, sc->sc_ucom, U3G_MAXPORTS);
+ ucom_detach(&sc->sc_super_ucom, sc->sc_ucom, U3G_MAXPORTS);
for (m = 0; m != U3G_MAXPORTS; m++)
- usb2_transfer_unsetup(sc->sc_xfer[m], U3G_N_TRANSFER);
+ usbd_transfer_unsetup(sc->sc_xfer[m], U3G_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -555,7 +555,7 @@ u3g_start_read(struct ucom_softc *ucom)
struct u3g_softc *sc = ucom->sc_parent;
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_RD]);
+ usbd_transfer_start(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_RD]);
return;
}
@@ -565,7 +565,7 @@ u3g_stop_read(struct ucom_softc *ucom)
struct u3g_softc *sc = ucom->sc_parent;
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_RD]);
+ usbd_transfer_stop(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_RD]);
return;
}
@@ -574,7 +574,7 @@ u3g_start_write(struct ucom_softc *ucom)
{
struct u3g_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_WR]);
+ usbd_transfer_start(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_WR]);
return;
}
@@ -583,7 +583,7 @@ u3g_stop_write(struct ucom_softc *ucom)
{
struct u3g_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_WR]);
+ usbd_transfer_stop(sc->sc_xfer[ucom->sc_local_unit][U3G_BULK_WR]);
return;
}
@@ -597,10 +597,10 @@ u3g_write_callback(struct usb_xfer *xfer)
case USB_ST_TRANSFERRED:
case USB_ST_SETUP:
tr_setup:
- if (usb2_com_get_data(ucom, xfer->frbuffers, 0,
+ if (ucom_get_data(ucom, xfer->frbuffers, 0,
U3G_BSIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
break;
@@ -622,12 +622,12 @@ u3g_read_callback(struct usb_xfer *xfer)
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
- usb2_com_put_data(ucom, xfer->frbuffers, 0, xfer->actlen);
+ ucom_put_data(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);
break;
default: /* Error */
diff --git a/sys/dev/usb/serial/uark.c b/sys/dev/usb/serial/uark.c
index 69c5602..04861ba 100644
--- a/sys/dev/usb/serial/uark.c
+++ b/sys/dev/usb/serial/uark.c
@@ -29,7 +29,7 @@
#include <dev/usb/usb_error.h>
#include <dev/usb/usb_cdc.h>
-#define USB_DEBUG_VAR usb2_debug
+#define USB_DEBUG_VAR usb_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
@@ -122,14 +122,14 @@ static const struct usb_config
};
static const struct ucom_callback uark_callback = {
- .usb2_com_cfg_get_status = &uark_cfg_get_status,
- .usb2_com_cfg_set_break = &uark_cfg_set_break,
- .usb2_com_cfg_param = &uark_cfg_param,
- .usb2_com_pre_param = &uark_pre_param,
- .usb2_com_start_read = &uark_start_read,
- .usb2_com_stop_read = &uark_stop_read,
- .usb2_com_start_write = &uark_start_write,
- .usb2_com_stop_write = &uark_stop_write,
+ .ucom_cfg_get_status = &uark_cfg_get_status,
+ .ucom_cfg_set_break = &uark_cfg_set_break,
+ .ucom_cfg_param = &uark_cfg_param,
+ .ucom_pre_param = &uark_pre_param,
+ .ucom_start_read = &uark_start_read,
+ .ucom_stop_read = &uark_stop_read,
+ .ucom_start_write = &uark_start_write,
+ .ucom_stop_write = &uark_stop_write,
};
static device_method_t uark_methods[] = {
@@ -170,7 +170,7 @@ uark_probe(device_t dev)
if (uaa->info.bIfaceIndex != UARK_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(uark_devs, sizeof(uark_devs), uaa));
+ return (usbd_lookup_id_by_uaa(uark_devs, sizeof(uark_devs), uaa));
}
static int
@@ -181,13 +181,13 @@ uark_attach(device_t dev)
int32_t error;
uint8_t iface_index;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uark", NULL, MTX_DEF);
sc->sc_udev = uaa->device;
iface_index = UARK_IFACE_INDEX;
- error = usb2_transfer_setup
+ error = usbd_transfer_setup
(uaa->device, &iface_index, sc->sc_xfer,
uark_xfer_config, UARK_N_TRANSFER, sc, &sc->sc_mtx);
@@ -198,14 +198,14 @@ uark_attach(device_t dev)
}
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UARK_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UARK_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UARK_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UARK_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,
&uark_callback, &sc->sc_mtx);
if (error) {
- DPRINTF("usb2_com_attach failed\n");
+ DPRINTF("ucom_attach failed\n");
goto detach;
}
return (0); /* success */
@@ -220,8 +220,8 @@ uark_detach(device_t dev)
{
struct uark_softc *sc = device_get_softc(dev);
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_xfer, UARK_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UARK_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -237,10 +237,10 @@ uark_bulk_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,
UARK_BUF_SIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -262,13 +262,13 @@ uark_bulk_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,
+ 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 */
@@ -286,7 +286,7 @@ uark_start_read(struct ucom_softc *ucom)
{
struct uark_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UARK_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UARK_BULK_DT_RD]);
}
static void
@@ -294,7 +294,7 @@ uark_stop_read(struct ucom_softc *ucom)
{
struct uark_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UARK_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UARK_BULK_DT_RD]);
}
static void
@@ -302,7 +302,7 @@ uark_start_write(struct ucom_softc *ucom)
{
struct uark_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UARK_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UARK_BULK_DT_WR]);
}
static void
@@ -310,7 +310,7 @@ uark_stop_write(struct ucom_softc *ucom)
{
struct uark_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UARK_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UARK_BULK_DT_WR]);
}
static int
@@ -402,10 +402,10 @@ uark_cfg_write(struct uark_softc *sc, uint16_t index, uint16_t value)
USETW(req.wIndex, index);
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));
}
}
diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c
index cb7a337..cc584c3 100644
--- a/sys/dev/usb/serial/ubsa.c
+++ b/sys/dev/usb/serial/ubsa.c
@@ -213,16 +213,16 @@ static const struct usb_config ubsa_config[UBSA_N_TRANSFER] = {
};
static const struct ucom_callback ubsa_callback = {
- .usb2_com_cfg_get_status = &ubsa_cfg_get_status,
- .usb2_com_cfg_set_dtr = &ubsa_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &ubsa_cfg_set_rts,
- .usb2_com_cfg_set_break = &ubsa_cfg_set_break,
- .usb2_com_cfg_param = &ubsa_cfg_param,
- .usb2_com_pre_param = &ubsa_pre_param,
- .usb2_com_start_read = &ubsa_start_read,
- .usb2_com_stop_read = &ubsa_stop_read,
- .usb2_com_start_write = &ubsa_start_write,
- .usb2_com_stop_write = &ubsa_stop_write,
+ .ucom_cfg_get_status = &ubsa_cfg_get_status,
+ .ucom_cfg_set_dtr = &ubsa_cfg_set_dtr,
+ .ucom_cfg_set_rts = &ubsa_cfg_set_rts,
+ .ucom_cfg_set_break = &ubsa_cfg_set_break,
+ .ucom_cfg_param = &ubsa_cfg_param,
+ .ucom_pre_param = &ubsa_pre_param,
+ .ucom_start_read = &ubsa_start_read,
+ .ucom_stop_read = &ubsa_stop_read,
+ .ucom_start_write = &ubsa_start_write,
+ .ucom_stop_write = &ubsa_stop_write,
};
static const struct usb_device_id ubsa_devs[] = {
@@ -277,7 +277,7 @@ ubsa_probe(device_t dev)
if (uaa->info.bIfaceIndex != UBSA_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(ubsa_devs, sizeof(ubsa_devs), uaa));
+ return (usbd_lookup_id_by_uaa(ubsa_devs, sizeof(ubsa_devs), uaa));
}
static int
@@ -289,14 +289,14 @@ ubsa_attach(device_t dev)
DPRINTF("sc=%p\n", sc);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "ubsa", NULL, MTX_DEF);
sc->sc_udev = uaa->device;
sc->sc_iface_no = uaa->info.bIfaceNum;
sc->sc_iface_index = UBSA_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, ubsa_config, UBSA_N_TRANSFER, sc, &sc->sc_mtx);
if (error) {
@@ -305,14 +305,14 @@ ubsa_attach(device_t dev)
}
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UBSA_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UBSA_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UBSA_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UBSA_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,
&ubsa_callback, &sc->sc_mtx);
if (error) {
- DPRINTF("usb2_com_attach failed\n");
+ DPRINTF("ucom_attach failed\n");
goto detach;
}
return (0);
@@ -329,8 +329,8 @@ ubsa_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, UBSA_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UBSA_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -349,11 +349,11 @@ ubsa_cfg_request(struct ubsa_softc *sc, uint8_t index, uint16_t value)
req.wIndex[1] = 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));
}
}
@@ -491,10 +491,10 @@ ubsa_start_read(struct ucom_softc *ucom)
struct ubsa_softc *sc = ucom->sc_parent;
/* start interrupt endpoint */
- usb2_transfer_start(sc->sc_xfer[UBSA_INTR_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UBSA_INTR_DT_RD]);
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[UBSA_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UBSA_BULK_DT_RD]);
}
static void
@@ -503,10 +503,10 @@ ubsa_stop_read(struct ucom_softc *ucom)
struct ubsa_softc *sc = ucom->sc_parent;
/* stop interrupt endpoint */
- usb2_transfer_stop(sc->sc_xfer[UBSA_INTR_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UBSA_INTR_DT_RD]);
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[UBSA_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UBSA_BULK_DT_RD]);
}
static void
@@ -514,7 +514,7 @@ ubsa_start_write(struct ucom_softc *ucom)
{
struct ubsa_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UBSA_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UBSA_BULK_DT_WR]);
}
static void
@@ -522,7 +522,7 @@ ubsa_stop_write(struct ucom_softc *ucom)
{
struct ubsa_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UBSA_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UBSA_BULK_DT_WR]);
}
static void
@@ -546,11 +546,11 @@ ubsa_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,
UBSA_BSIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -572,12 +572,12 @@ ubsa_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 */
@@ -602,7 +602,7 @@ ubsa_intr_callback(struct usb_xfer *xfer)
if (xfer->actlen >= sizeof(buf)) {
- usb2_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
+ usbd_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
/*
* incidentally, Belkin adapter status bits match
@@ -614,7 +614,7 @@ ubsa_intr_callback(struct usb_xfer *xfer)
DPRINTF("lsr = 0x%02x, msr = 0x%02x\n",
sc->sc_lsr, sc->sc_msr);
- usb2_com_status_change(&sc->sc_ucom);
+ ucom_status_change(&sc->sc_ucom);
} else {
DPRINTF("ignoring short packet, %d bytes\n",
xfer->actlen);
@@ -623,7 +623,7 @@ ubsa_intr_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
tr_setup:
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c
index 3857a5a..f184ecd 100644
--- a/sys/dev/usb/serial/ubser.c
+++ b/sys/dev/usb/serial/ubser.c
@@ -172,13 +172,13 @@ static const struct usb_config ubser_config[UBSER_N_TRANSFER] = {
};
static const struct ucom_callback ubser_callback = {
- .usb2_com_cfg_set_break = &ubser_cfg_set_break,
- .usb2_com_cfg_get_status = &ubser_cfg_get_status,
- .usb2_com_pre_param = &ubser_pre_param,
- .usb2_com_start_read = &ubser_start_read,
- .usb2_com_stop_read = &ubser_stop_read,
- .usb2_com_start_write = &ubser_start_write,
- .usb2_com_stop_write = &ubser_stop_write,
+ .ucom_cfg_set_break = &ubser_cfg_set_break,
+ .ucom_cfg_get_status = &ubser_cfg_get_status,
+ .ucom_pre_param = &ubser_pre_param,
+ .ucom_start_read = &ubser_start_read,
+ .ucom_stop_read = &ubser_stop_read,
+ .ucom_start_write = &ubser_start_write,
+ .ucom_stop_write = &ubser_stop_write,
};
static device_method_t ubser_methods[] = {
@@ -226,7 +226,7 @@ ubser_attach(device_t dev)
uint8_t n;
int error;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "ubser", NULL, MTX_DEF);
snprintf(sc->sc_name, sizeof(sc->sc_name), "%s",
@@ -243,14 +243,14 @@ ubser_attach(device_t dev)
req.wIndex[0] = sc->sc_iface_no;
req.wIndex[1] = 0;
USETW(req.wLength, 1);
- error = usb2_do_request_flags(uaa->device, NULL,
+ error = usbd_do_request_flags(uaa->device, NULL,
&req, &sc->sc_numser,
0, NULL, USB_DEFAULT_TIMEOUT);
if (error || (sc->sc_numser == 0)) {
device_printf(dev, "failed to get number "
"of serial ports: %s\n",
- usb2_errstr(error));
+ usbd_errstr(error));
goto detach;
}
if (sc->sc_numser > UBSER_UNIT_MAX)
@@ -258,7 +258,7 @@ ubser_attach(device_t dev)
device_printf(dev, "found %i serials\n", sc->sc_numser);
- error = usb2_transfer_setup(uaa->device, &sc->sc_iface_index,
+ error = usbd_transfer_setup(uaa->device, &sc->sc_iface_index,
sc->sc_xfer, ubser_config, UBSER_N_TRANSFER, sc, &sc->sc_mtx);
if (error) {
goto detach;
@@ -275,16 +275,16 @@ ubser_attach(device_t dev)
sc->sc_ucom[n].sc_portno = n;
}
- error = usb2_com_attach(&sc->sc_super_ucom, sc->sc_ucom,
+ error = ucom_attach(&sc->sc_super_ucom, sc->sc_ucom,
sc->sc_numser, sc, &ubser_callback, &sc->sc_mtx);
if (error) {
goto detach;
}
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_RD]);
- usb2_transfer_start(sc->sc_xfer[UBSER_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UBSER_BULK_DT_RD]);
mtx_unlock(&sc->sc_mtx);
return (0); /* success */
@@ -301,8 +301,8 @@ ubser_detach(device_t dev)
DPRINTF("\n");
- usb2_com_detach(&sc->sc_super_ucom, sc->sc_ucom, sc->sc_numser);
- usb2_transfer_unsetup(sc->sc_xfer, UBSER_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, sc->sc_ucom, sc->sc_numser);
+ usbd_transfer_unsetup(sc->sc_xfer, UBSER_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -379,16 +379,16 @@ ubser_write_callback(struct usb_xfer *xfer)
case USB_ST_TRANSFERRED:
tr_setup:
do {
- if (usb2_com_get_data(sc->sc_ucom + sc->sc_curr_tx_unit,
+ if (ucom_get_data(sc->sc_ucom + sc->sc_curr_tx_unit,
xfer->frbuffers, 1, sc->sc_tx_size - 1,
&actlen)) {
buf[0] = sc->sc_curr_tx_unit;
- usb2_copy_in(xfer->frbuffers, 0, buf, 1);
+ usbd_copy_in(xfer->frbuffers, 0, buf, 1);
xfer->frlengths[0] = actlen + 1;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
ubser_inc_tx_unit(sc); /* round robin */
@@ -423,19 +423,19 @@ ubser_read_callback(struct usb_xfer *xfer)
DPRINTF("invalid actlen=0!\n");
goto tr_setup;
}
- usb2_copy_out(xfer->frbuffers, 0, buf, 1);
+ usbd_copy_out(xfer->frbuffers, 0, buf, 1);
if (buf[0] >= sc->sc_numser) {
DPRINTF("invalid serial number!\n");
goto tr_setup;
}
- usb2_com_put_data(sc->sc_ucom + buf[0],
+ ucom_put_data(sc->sc_ucom + buf[0],
xfer->frbuffers, 1, xfer->actlen - 1);
case USB_ST_SETUP:
tr_setup:
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
@@ -467,11 +467,11 @@ ubser_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- err = usb2_com_cfg_do_request(sc->sc_udev, ucom,
+ err = ucom_cfg_do_request(sc->sc_udev, ucom,
&req, NULL, 0, 1000);
if (err) {
DPRINTFN(0, "send break failed, error=%s\n",
- usb2_errstr(err));
+ usbd_errstr(err));
}
}
}
@@ -489,7 +489,7 @@ ubser_start_read(struct ucom_softc *ucom)
{
struct ubser_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UBSER_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UBSER_BULK_DT_RD]);
}
static void
@@ -497,7 +497,7 @@ ubser_stop_read(struct ucom_softc *ucom)
{
struct ubser_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UBSER_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UBSER_BULK_DT_RD]);
}
static void
@@ -505,7 +505,7 @@ ubser_start_write(struct ucom_softc *ucom)
{
struct ubser_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UBSER_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UBSER_BULK_DT_WR]);
}
static void
@@ -513,5 +513,5 @@ ubser_stop_write(struct ucom_softc *ucom)
{
struct ubser_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UBSER_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UBSER_BULK_DT_WR]);
}
diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c
index 6ed4905..009a37d 100644
--- a/sys/dev/usb/serial/uchcom.c
+++ b/sys/dev/usb/serial/uchcom.c
@@ -258,16 +258,16 @@ static const struct usb_config uchcom_config_data[UCHCOM_N_TRANSFER] = {
};
static struct ucom_callback uchcom_callback = {
- .usb2_com_cfg_get_status = &uchcom_cfg_get_status,
- .usb2_com_cfg_set_dtr = &uchcom_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &uchcom_cfg_set_rts,
- .usb2_com_cfg_set_break = &uchcom_cfg_set_break,
- .usb2_com_cfg_param = &uchcom_cfg_param,
- .usb2_com_pre_param = &uchcom_pre_param,
- .usb2_com_start_read = &uchcom_start_read,
- .usb2_com_stop_read = &uchcom_stop_read,
- .usb2_com_start_write = &uchcom_start_write,
- .usb2_com_stop_write = &uchcom_stop_write,
+ .ucom_cfg_get_status = &uchcom_cfg_get_status,
+ .ucom_cfg_set_dtr = &uchcom_cfg_set_dtr,
+ .ucom_cfg_set_rts = &uchcom_cfg_set_rts,
+ .ucom_cfg_set_break = &uchcom_cfg_set_break,
+ .ucom_cfg_param = &uchcom_cfg_param,
+ .ucom_pre_param = &uchcom_pre_param,
+ .ucom_start_read = &uchcom_start_read,
+ .ucom_stop_read = &uchcom_stop_read,
+ .ucom_start_write = &uchcom_start_write,
+ .ucom_stop_write = &uchcom_stop_write,
};
/* ----------------------------------------------------------------------
@@ -290,7 +290,7 @@ uchcom_probe(device_t dev)
if (uaa->info.bIfaceIndex != UCHCOM_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(uchcom_devs, sizeof(uchcom_devs), uaa));
+ return (usbd_lookup_id_by_uaa(uchcom_devs, sizeof(uchcom_devs), uaa));
}
static int
@@ -303,7 +303,7 @@ uchcom_attach(device_t dev)
DPRINTFN(11, "\n");
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uchcom", NULL, MTX_DEF);
sc->sc_udev = uaa->device;
@@ -318,13 +318,13 @@ uchcom_attach(device_t dev)
}
iface_index = UCHCOM_IFACE_INDEX;
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
&iface_index, sc->sc_xfer, uchcom_config_data,
UCHCOM_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;
}
/*
@@ -341,11 +341,11 @@ uchcom_attach(device_t dev)
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UCHCOM_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UCHCOM_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UCHCOM_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UCHCOM_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,
&uchcom_callback, &sc->sc_mtx);
if (error) {
goto detach;
@@ -364,8 +364,8 @@ uchcom_detach(device_t dev)
DPRINTFN(11, "\n");
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_xfer, UCHCOM_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UCHCOM_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -387,7 +387,7 @@ uchcom_ctrl_write(struct uchcom_softc *sc, uint8_t reqno,
USETW(req.wIndex, index);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev,
+ ucom_cfg_do_request(sc->sc_udev,
&sc->sc_ucom, &req, NULL, 0, 1000);
}
@@ -403,7 +403,7 @@ uchcom_ctrl_read(struct uchcom_softc *sc, uint8_t reqno,
USETW(req.wIndex, index);
USETW(req.wLength, buflen);
- usb2_com_cfg_do_request(sc->sc_udev,
+ ucom_cfg_do_request(sc->sc_udev,
&sc->sc_ucom, &req, buf, USB_SHORT_XFER_OK, 1000);
}
@@ -734,10 +734,10 @@ uchcom_start_read(struct ucom_softc *ucom)
struct uchcom_softc *sc = ucom->sc_parent;
/* start interrupt endpoint */
- usb2_transfer_start(sc->sc_xfer[UCHCOM_INTR_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UCHCOM_INTR_DT_RD]);
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[UCHCOM_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UCHCOM_BULK_DT_RD]);
}
static void
@@ -746,10 +746,10 @@ uchcom_stop_read(struct ucom_softc *ucom)
struct uchcom_softc *sc = ucom->sc_parent;
/* stop interrupt endpoint */
- usb2_transfer_stop(sc->sc_xfer[UCHCOM_INTR_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UCHCOM_INTR_DT_RD]);
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[UCHCOM_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UCHCOM_BULK_DT_RD]);
}
static void
@@ -757,7 +757,7 @@ uchcom_start_write(struct ucom_softc *ucom)
{
struct uchcom_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UCHCOM_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UCHCOM_BULK_DT_WR]);
}
static void
@@ -765,7 +765,7 @@ uchcom_stop_write(struct ucom_softc *ucom)
{
struct uchcom_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UCHCOM_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UCHCOM_BULK_DT_WR]);
}
/* ----------------------------------------------------------------------
@@ -783,7 +783,7 @@ uchcom_intr_callback(struct usb_xfer *xfer)
DPRINTF("actlen = %u\n", xfer->actlen);
if (xfer->actlen >= UCHCOM_INTR_LEAST) {
- usb2_copy_out(xfer->frbuffers, 0, buf,
+ usbd_copy_out(xfer->frbuffers, 0, buf,
UCHCOM_INTR_LEAST);
DPRINTF("data = 0x%02X 0x%02X 0x%02X 0x%02X\n",
@@ -791,12 +791,12 @@ uchcom_intr_callback(struct usb_xfer *xfer)
(unsigned)buf[2], (unsigned)buf[3]);
uchcom_convert_status(sc, buf[UCHCOM_INTR_STAT1]);
- 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);
break;
default: /* Error */
@@ -819,13 +819,13 @@ uchcom_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,
UCHCOM_BULK_BUF_SIZE, &actlen)) {
DPRINTF("actlen = %d\n", actlen);
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -847,12 +847,12 @@ uchcom_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 */
diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c
index 794b86c..7825a22 100644
--- a/sys/dev/usb/serial/ucycom.c
+++ b/sys/dev/usb/serial/ucycom.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_ioctl.h>
#include <dev/usb/usbhid.h>
-#define USB_DEBUG_VAR usb2_debug
+#define USB_DEBUG_VAR usb_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
@@ -136,13 +136,13 @@ static const struct usb_config ucycom_config[UCYCOM_N_TRANSFER] = {
};
static const struct ucom_callback ucycom_callback = {
- .usb2_com_cfg_param = &ucycom_cfg_param,
- .usb2_com_cfg_open = &ucycom_cfg_open,
- .usb2_com_pre_param = &ucycom_pre_param,
- .usb2_com_start_read = &ucycom_start_read,
- .usb2_com_stop_read = &ucycom_stop_read,
- .usb2_com_start_write = &ucycom_start_write,
- .usb2_com_stop_write = &ucycom_stop_write,
+ .ucom_cfg_param = &ucycom_cfg_param,
+ .ucom_cfg_open = &ucycom_cfg_open,
+ .ucom_pre_param = &ucycom_pre_param,
+ .ucom_start_read = &ucycom_start_read,
+ .ucom_stop_read = &ucycom_stop_read,
+ .ucom_start_write = &ucycom_start_write,
+ .ucom_stop_write = &ucycom_stop_write,
};
static device_method_t ucycom_methods[] = {
@@ -188,7 +188,7 @@ ucycom_probe(device_t dev)
if (uaa->info.bIfaceIndex != UCYCOM_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(ucycom_devs, sizeof(ucycom_devs), uaa));
+ return (usbd_lookup_id_by_uaa(ucycom_devs, sizeof(ucycom_devs), uaa));
}
static int
@@ -203,7 +203,7 @@ ucycom_attach(device_t dev)
sc->sc_udev = uaa->device;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "ucycom", NULL, MTX_DEF);
snprintf(sc->sc_name, sizeof(sc->sc_name),
@@ -221,14 +221,14 @@ ucycom_attach(device_t dev)
/* get report descriptor */
- error = usb2_req_get_hid_desc(uaa->device, NULL,
+ error = usbd_req_get_hid_desc(uaa->device, NULL,
&urd_ptr, &urd_len, M_USBDEV,
UCYCOM_IFACE_INDEX);
if (error) {
device_printf(dev, "failed to get report "
"descriptor: %s\n",
- usb2_errstr(error));
+ usbd_errstr(error));
goto detach;
}
/* get report sizes */
@@ -248,7 +248,7 @@ ucycom_attach(device_t dev)
sc->sc_iface_no = uaa->info.bIfaceNum;
iface_index = UCYCOM_IFACE_INDEX;
- error = usb2_transfer_setup(uaa->device, &iface_index,
+ error = usbd_transfer_setup(uaa->device, &iface_index,
sc->sc_xfer, ucycom_config, UCYCOM_N_TRANSFER,
sc, &sc->sc_mtx);
if (error) {
@@ -256,7 +256,7 @@ ucycom_attach(device_t dev)
"transfers failed!\n");
goto detach;
}
- 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,
&ucycom_callback, &sc->sc_mtx);
if (error) {
@@ -280,8 +280,8 @@ ucycom_detach(device_t dev)
{
struct ucycom_softc *sc = device_get_softc(dev);
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_xfer, UCYCOM_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UCYCOM_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -301,7 +301,7 @@ ucycom_start_read(struct ucom_softc *ucom)
{
struct ucycom_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UCYCOM_INTR_RD]);
+ usbd_transfer_start(sc->sc_xfer[UCYCOM_INTR_RD]);
}
static void
@@ -309,7 +309,7 @@ ucycom_stop_read(struct ucom_softc *ucom)
{
struct ucycom_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UCYCOM_INTR_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UCYCOM_INTR_RD]);
}
static void
@@ -317,7 +317,7 @@ ucycom_start_write(struct ucom_softc *ucom)
{
struct ucycom_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UCYCOM_CTRL_RD]);
+ usbd_transfer_start(sc->sc_xfer[UCYCOM_CTRL_RD]);
}
static void
@@ -325,7 +325,7 @@ ucycom_stop_write(struct ucom_softc *ucom)
{
struct ucycom_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UCYCOM_CTRL_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UCYCOM_CTRL_RD]);
}
static void
@@ -354,7 +354,7 @@ tr_transferred:
break;
}
- if (usb2_com_get_data(&sc->sc_ucom, xfer->frbuffers + 1, offset,
+ if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers + 1, offset,
sc->sc_olen - offset, &actlen)) {
req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
@@ -376,13 +376,13 @@ tr_transferred:
break;
}
- usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
- usb2_copy_in(xfer->frbuffers + 1, 0, data, offset);
+ usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
+ usbd_copy_in(xfer->frbuffers + 1, 0, data, offset);
xfer->frlengths[0] = sizeof(req);
xfer->frlengths[1] = sc->sc_olen;
xfer->nframes = xfer->frlengths[1] ? 2 : 1;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -391,7 +391,7 @@ tr_transferred:
return;
}
DPRINTF("error=%s\n",
- usb2_errstr(xfer->error));
+ usbd_errstr(xfer->error));
goto tr_transferred;
}
}
@@ -422,11 +422,11 @@ ucycom_cfg_write(struct ucycom_softc *sc, uint32_t baud, uint8_t cfg)
sc->sc_temp_cfg[3] = (baud >> 24) & 0xff;
sc->sc_temp_cfg[4] = cfg;
- err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, sc->sc_temp_cfg, 0, 1000);
if (err) {
DPRINTFN(0, "device request failed, err=%s "
- "(ignored)\n", usb2_errstr(err));
+ "(ignored)\n", usbd_errstr(err));
}
}
@@ -508,7 +508,7 @@ ucycom_intr_read_callback(struct usb_xfer *xfer)
if (xfer->actlen < 1) {
goto tr_setup;
}
- usb2_copy_out(xfer->frbuffers, 0, buf, 1);
+ usbd_copy_out(xfer->frbuffers, 0, buf, 1);
sc->sc_ist = buf[0] & ~0x07;
len = buf[0] & 0x07;
@@ -523,7 +523,7 @@ ucycom_intr_read_callback(struct usb_xfer *xfer)
if (xfer->actlen < 2) {
goto tr_setup;
}
- usb2_copy_out(xfer->frbuffers, 0, buf, 2);
+ usbd_copy_out(xfer->frbuffers, 0, buf, 2);
sc->sc_ist = buf[0] & ~0x07;
len = buf[1];
@@ -543,13 +543,13 @@ ucycom_intr_read_callback(struct usb_xfer *xfer)
len = xfer->actlen;
}
if (len) {
- usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers,
+ ucom_put_data(&sc->sc_ucom, xfer->frbuffers,
offset, len);
}
case USB_ST_SETUP:
tr_setup:
xfer->frlengths[0] = sc->sc_ilen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c
index 3e1f134..89285ed 100644
--- a/sys/dev/usb/serial/ufoma.c
+++ b/sys/dev/usb/serial/ufoma.c
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_error.h>
#include <dev/usb/usb_cdc.h>
-#define USB_DEBUG_VAR usb2_debug
+#define USB_DEBUG_VAR usb_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
@@ -109,7 +109,7 @@ typedef struct ufoma_mobile_acm_descriptor {
uint8_t bDescriptorSubtype;
uint8_t bType;
uint8_t bMode[1];
-} __packed usb2_mcpc_acm_descriptor;
+} __packed usb_mcpc_acm_descriptor;
#define UISUBCLASS_MCPC 0x88
@@ -280,18 +280,18 @@ static const struct usb_config
};
static const struct ucom_callback ufoma_callback = {
- .usb2_com_cfg_get_status = &ufoma_cfg_get_status,
- .usb2_com_cfg_set_dtr = &ufoma_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &ufoma_cfg_set_rts,
- .usb2_com_cfg_set_break = &ufoma_cfg_set_break,
- .usb2_com_cfg_param = &ufoma_cfg_param,
- .usb2_com_cfg_open = &ufoma_cfg_open,
- .usb2_com_cfg_close = &ufoma_cfg_close,
- .usb2_com_pre_param = &ufoma_pre_param,
- .usb2_com_start_read = &ufoma_start_read,
- .usb2_com_stop_read = &ufoma_stop_read,
- .usb2_com_start_write = &ufoma_start_write,
- .usb2_com_stop_write = &ufoma_stop_write,
+ .ucom_cfg_get_status = &ufoma_cfg_get_status,
+ .ucom_cfg_set_dtr = &ufoma_cfg_set_dtr,
+ .ucom_cfg_set_rts = &ufoma_cfg_set_rts,
+ .ucom_cfg_set_break = &ufoma_cfg_set_break,
+ .ucom_cfg_param = &ufoma_cfg_param,
+ .ucom_cfg_open = &ufoma_cfg_open,
+ .ucom_cfg_close = &ufoma_cfg_close,
+ .ucom_pre_param = &ufoma_pre_param,
+ .ucom_start_read = &ufoma_start_read,
+ .ucom_stop_read = &ufoma_stop_read,
+ .ucom_start_write = &ufoma_start_write,
+ .ucom_stop_write = &ufoma_stop_write,
};
static device_method_t ufoma_methods[] = {
@@ -320,13 +320,13 @@ ufoma_probe(device_t dev)
struct usb_attach_arg *uaa = device_get_ivars(dev);
struct usb_interface_descriptor *id;
struct usb_config_descriptor *cd;
- usb2_mcpc_acm_descriptor *mad;
+ usb_mcpc_acm_descriptor *mad;
if (uaa->usb_mode != USB_MODE_HOST) {
return (ENXIO);
}
- id = usb2_get_interface_descriptor(uaa->iface);
- cd = usb2_get_config_descriptor(uaa->device);
+ id = usbd_get_interface_descriptor(uaa->iface);
+ cd = usbd_get_config_descriptor(uaa->device);
if ((id == NULL) ||
(cd == NULL) ||
@@ -357,7 +357,7 @@ ufoma_attach(device_t dev)
struct sysctl_ctx_list *sctx;
struct sysctl_oid *soid;
- usb2_mcpc_acm_descriptor *mad;
+ usb_mcpc_acm_descriptor *mad;
uint8_t elements;
int32_t error;
@@ -368,7 +368,7 @@ ufoma_attach(device_t dev)
mtx_init(&sc->sc_mtx, "ufoma", NULL, MTX_DEF);
cv_init(&sc->sc_cv, "CWAIT");
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
snprintf(sc->sc_name, sizeof(sc->sc_name),
"%s", device_get_nameunit(dev));
@@ -377,12 +377,12 @@ ufoma_attach(device_t dev)
/* setup control transfers */
- cd = usb2_get_config_descriptor(uaa->device);
- id = usb2_get_interface_descriptor(uaa->iface);
+ cd = usbd_get_config_descriptor(uaa->device);
+ id = usbd_get_interface_descriptor(uaa->iface);
sc->sc_ctrl_iface_no = id->bInterfaceNumber;
sc->sc_ctrl_iface_index = uaa->info.bIfaceIndex;
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
&sc->sc_ctrl_iface_index, sc->sc_ctrl_xfer,
ufoma_ctrl_config, UFOMA_CTRL_ENDPT_MAX, sc, &sc->sc_mtx);
@@ -426,14 +426,14 @@ ufoma_attach(device_t dev)
/* clear stall at first run, if any */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]);
- usb2_transfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]);
+ usbd_transfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]);
+ usbd_transfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]);
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,
&ufoma_callback, &sc->sc_mtx);
if (error) {
- DPRINTF("usb2_com_attach failed\n");
+ DPRINTF("ucom_attach failed\n");
goto detach;
}
/*Sysctls*/
@@ -467,9 +467,9 @@ ufoma_detach(device_t dev)
{
struct ufoma_softc *sc = device_get_softc(dev);
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_ctrl_xfer, UFOMA_CTRL_ENDPT_MAX);
- usb2_transfer_unsetup(sc->sc_bulk_xfer, UFOMA_BULK_ENDPT_MAX);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_ctrl_xfer, UFOMA_CTRL_ENDPT_MAX);
+ usbd_transfer_unsetup(sc->sc_bulk_xfer, UFOMA_BULK_ENDPT_MAX);
if (sc->sc_modetable) {
free(sc->sc_modetable, M_USBDEV);
@@ -486,7 +486,7 @@ ufoma_get_intconf(struct usb_config_descriptor *cd, struct usb_interface_descrip
{
struct usb_descriptor *desc = (void *)id;
- while ((desc = usb2_desc_foreach(cd, desc))) {
+ while ((desc = usb_desc_foreach(cd, desc))) {
if (desc->bDescriptorType == UDESC_INTERFACE) {
return (NULL);
@@ -511,7 +511,7 @@ ufoma_cfg_link_state(struct ufoma_softc *sc)
USETW(req.wIndex, sc->sc_ctrl_iface_no);
USETW(req.wLength, sc->sc_modetable[0]);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, sc->sc_modetable, 0, 1000);
error = cv_timedwait(&sc->sc_cv, &sc->sc_mtx, hz);
@@ -533,7 +533,7 @@ ufoma_cfg_activate_state(struct ufoma_softc *sc, uint16_t state)
USETW(req.wIndex, sc->sc_ctrl_iface_no);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
error = cv_timedwait(&sc->sc_cv, &sc->sc_mtx,
@@ -556,7 +556,7 @@ tr_transferred:
goto tr_setup;
}
if (xfer->frlengths[1] > 0) {
- usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers + 1,
+ ucom_put_data(&sc->sc_ucom, xfer->frbuffers + 1,
0, xfer->frlengths[1]);
}
case USB_ST_SETUP:
@@ -570,18 +570,18 @@ tr_setup:
USETW(req.wValue, 0);
USETW(req.wLength, UFOMA_CMD_BUF_SIZE);
- usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
+ usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
xfer->frlengths[0] = sizeof(req);
xfer->frlengths[1] = UFOMA_CMD_BUF_SIZE;
xfer->nframes = 2;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
default: /* Error */
DPRINTF("error = %s\n",
- usb2_errstr(xfer->error));
+ usbd_errstr(xfer->error));
if (xfer->error == USB_ERR_CANCELLED) {
return;
@@ -605,7 +605,7 @@ ufoma_ctrl_write_callback(struct usb_xfer *xfer)
tr_transferred:
case USB_ST_SETUP:
tr_setup:
- if (usb2_com_get_data(&sc->sc_ucom, xfer->frbuffers + 1,
+ if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers + 1,
0, 1, &actlen)) {
req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
@@ -614,19 +614,19 @@ tr_setup:
USETW(req.wValue, 0);
USETW(req.wLength, 1);
- usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
+ usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
xfer->frlengths[0] = sizeof(req);
xfer->frlengths[1] = 1;
xfer->nframes = 2;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
default: /* Error */
DPRINTF("error = %s\n",
- usb2_errstr(xfer->error));
+ usbd_errstr(xfer->error));
if (xfer->error == USB_ERR_CANCELLED) {
return;
@@ -657,7 +657,7 @@ ufoma_intr_callback(struct usb_xfer *xfer)
DPRINTF("truncating message\n");
xfer->actlen = sizeof(pkt);
}
- usb2_copy_out(xfer->frbuffers, 0, &pkt, xfer->actlen);
+ usbd_copy_out(xfer->frbuffers, 0, &pkt, xfer->actlen);
xfer->actlen -= 8;
@@ -686,7 +686,7 @@ ufoma_intr_callback(struct usb_xfer *xfer)
if (sc->sc_num_msg != 0xFF) {
sc->sc_num_msg++;
}
- usb2_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]);
+ usbd_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]);
break;
case UCDC_N_SERIAL_STATE:
@@ -721,7 +721,7 @@ ufoma_intr_callback(struct usb_xfer *xfer)
if (mstatus & UCDC_N_SERIAL_DCD) {
sc->sc_msr |= SER_DCD;
}
- usb2_com_status_change(&sc->sc_ucom);
+ ucom_status_change(&sc->sc_ucom);
break;
default:
@@ -731,7 +731,7 @@ ufoma_intr_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
tr_setup:
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
@@ -754,10 +754,10 @@ ufoma_bulk_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,
UFOMA_BULK_BUF_SIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -778,13 +778,13 @@ ufoma_bulk_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,
+ 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 */
@@ -846,7 +846,7 @@ ufoma_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -875,7 +875,7 @@ ufoma_cfg_set_line_state(struct ufoma_softc *sc)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -972,7 +972,7 @@ ufoma_cfg_param(struct ucom_softc *ucom, struct termios *t)
req.wIndex[1] = 0;
USETW(req.wLength, UCDC_LINE_STATE_LENGTH);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, &ls, 0, 1000);
}
@@ -988,8 +988,8 @@ ufoma_modem_setup(device_t dev, struct ufoma_softc *sc,
uint8_t i;
int32_t error;
- cd = usb2_get_config_descriptor(uaa->device);
- id = usb2_get_interface_descriptor(uaa->iface);
+ cd = usbd_get_config_descriptor(uaa->device);
+ id = usbd_get_interface_descriptor(uaa->iface);
cmd = ufoma_get_intconf(cd, id, UDESC_CS_INTERFACE, UDESCSUB_CDC_CM);
@@ -1018,15 +1018,15 @@ ufoma_modem_setup(device_t dev, struct ufoma_softc *sc,
for (i = 0;; i++) {
- iface = usb2_get_iface(uaa->device, i);
+ iface = usbd_get_iface(uaa->device, i);
if (iface) {
- id = usb2_get_interface_descriptor(iface);
+ id = usbd_get_interface_descriptor(iface);
if (id && (id->bInterfaceNumber == sc->sc_data_iface_no)) {
sc->sc_data_iface_index = i;
- usb2_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
+ usbd_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
break;
}
} else {
@@ -1035,7 +1035,7 @@ ufoma_modem_setup(device_t dev, struct ufoma_softc *sc,
}
}
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
&sc->sc_data_iface_index, sc->sc_bulk_xfer,
ufoma_bulk_config, UFOMA_BULK_ENDPT_MAX, sc, &sc->sc_mtx);
@@ -1053,13 +1053,13 @@ ufoma_start_read(struct ucom_softc *ucom)
struct ufoma_softc *sc = ucom->sc_parent;
/* start interrupt transfer */
- usb2_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_INTR]);
+ usbd_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_INTR]);
/* start data transfer */
if (sc->sc_nobulk) {
- usb2_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]);
+ usbd_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]);
} else {
- usb2_transfer_start(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]);
+ usbd_transfer_start(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]);
}
}
@@ -1069,13 +1069,13 @@ ufoma_stop_read(struct ucom_softc *ucom)
struct ufoma_softc *sc = ucom->sc_parent;
/* stop interrupt transfer */
- usb2_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_INTR]);
+ usbd_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_INTR]);
/* stop data transfer */
if (sc->sc_nobulk) {
- usb2_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]);
+ usbd_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]);
} else {
- usb2_transfer_stop(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]);
+ usbd_transfer_stop(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]);
}
}
@@ -1085,9 +1085,9 @@ ufoma_start_write(struct ucom_softc *ucom)
struct ufoma_softc *sc = ucom->sc_parent;
if (sc->sc_nobulk) {
- usb2_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_WRITE]);
+ usbd_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_WRITE]);
} else {
- usb2_transfer_start(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]);
+ usbd_transfer_start(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]);
}
}
@@ -1097,9 +1097,9 @@ ufoma_stop_write(struct ucom_softc *ucom)
struct ufoma_softc *sc = ucom->sc_parent;
if (sc->sc_nobulk) {
- usb2_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_WRITE]);
+ usbd_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_WRITE]);
} else {
- usb2_transfer_stop(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]);
+ usbd_transfer_stop(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]);
}
}
diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c
index 7726abd..700d68b 100644
--- a/sys/dev/usb/serial/uftdi.c
+++ b/sys/dev/usb/serial/uftdi.c
@@ -166,17 +166,17 @@ static const struct usb_config uftdi_config[UFTDI_N_TRANSFER] = {
};
static const struct ucom_callback uftdi_callback = {
- .usb2_com_cfg_get_status = &uftdi_cfg_get_status,
- .usb2_com_cfg_set_dtr = &uftdi_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &uftdi_cfg_set_rts,
- .usb2_com_cfg_set_break = &uftdi_cfg_set_break,
- .usb2_com_cfg_param = &uftdi_cfg_param,
- .usb2_com_cfg_open = &uftdi_cfg_open,
- .usb2_com_pre_param = &uftdi_pre_param,
- .usb2_com_start_read = &uftdi_start_read,
- .usb2_com_stop_read = &uftdi_stop_read,
- .usb2_com_start_write = &uftdi_start_write,
- .usb2_com_stop_write = &uftdi_stop_write,
+ .ucom_cfg_get_status = &uftdi_cfg_get_status,
+ .ucom_cfg_set_dtr = &uftdi_cfg_set_dtr,
+ .ucom_cfg_set_rts = &uftdi_cfg_set_rts,
+ .ucom_cfg_set_break = &uftdi_cfg_set_break,
+ .ucom_cfg_param = &uftdi_cfg_param,
+ .ucom_cfg_open = &uftdi_cfg_open,
+ .ucom_pre_param = &uftdi_pre_param,
+ .ucom_start_read = &uftdi_start_read,
+ .ucom_stop_read = &uftdi_stop_read,
+ .ucom_start_write = &uftdi_start_write,
+ .ucom_stop_write = &uftdi_stop_write,
};
static device_method_t uftdi_methods[] = {
@@ -248,7 +248,7 @@ uftdi_probe(device_t dev)
}
/* attach to all present interfaces */
- return (usb2_lookup_id_by_uaa(uftdi_devs, sizeof(uftdi_devs), uaa));
+ return (usbd_lookup_id_by_uaa(uftdi_devs, sizeof(uftdi_devs), uaa));
}
static int
@@ -262,7 +262,7 @@ uftdi_attach(device_t dev)
sc->sc_dev = dev;
sc->sc_unit = device_get_unit(dev);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uftdi", NULL, MTX_DEF);
snprintf(sc->sc_name, sizeof(sc->sc_name),
@@ -283,7 +283,7 @@ uftdi_attach(device_t dev)
break;
}
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
&sc->sc_iface_index, sc->sc_xfer, uftdi_config,
UFTDI_N_TRANSFER, sc, &sc->sc_mtx);
@@ -296,8 +296,8 @@ uftdi_attach(device_t dev)
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_RD]);
mtx_unlock(&sc->sc_mtx);
/* set a valid "lcr" value */
@@ -307,7 +307,7 @@ uftdi_attach(device_t dev)
FTDI_SIO_SET_DATA_PARITY_NONE |
FTDI_SIO_SET_DATA_BITS(8));
- 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,
&uftdi_callback, &sc->sc_mtx);
if (error) {
goto detach;
@@ -324,8 +324,8 @@ uftdi_detach(device_t dev)
{
struct uftdi_softc *sc = device_get_softc(dev);
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_xfer, UFTDI_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UFTDI_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -347,7 +347,7 @@ uftdi_cfg_open(struct ucom_softc *ucom)
USETW(req.wValue, FTDI_SIO_RESET_SIO);
USETW(req.wIndex, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
/* turn on RTS/CTS flow control */
@@ -357,7 +357,7 @@ uftdi_cfg_open(struct ucom_softc *ucom)
USETW(req.wValue, 0);
USETW2(req.wIndex, FTDI_SIO_RTS_CTS_HS, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
/*
@@ -378,17 +378,17 @@ uftdi_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,
+ if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers,
sc->sc_hdrlen, UFTDI_OBUFSIZE - sc->sc_hdrlen,
&actlen)) {
if (sc->sc_hdrlen > 0) {
buf[0] =
FTDI_OUT_TAG(actlen, sc->sc_ucom.sc_portno);
- usb2_copy_in(xfer->frbuffers, 0, buf, 1);
+ usbd_copy_in(xfer->frbuffers, 0, buf, 1);
}
xfer->frlengths[0] = actlen + sc->sc_hdrlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -417,7 +417,7 @@ uftdi_read_callback(struct usb_xfer *xfer)
if (xfer->actlen < 2) {
goto tr_setup;
}
- usb2_copy_out(xfer->frbuffers, 0, buf, 2);
+ usbd_copy_out(xfer->frbuffers, 0, buf, 2);
ftdi_msr = FTDI_GET_MSR(buf);
lsr = FTDI_GET_LSR(buf);
@@ -441,18 +441,18 @@ uftdi_read_callback(struct usb_xfer *xfer)
sc->sc_msr = msr;
sc->sc_lsr = lsr;
- usb2_com_status_change(&sc->sc_ucom);
+ ucom_status_change(&sc->sc_ucom);
}
xfer->actlen -= 2;
if (xfer->actlen > 0) {
- usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers, 2,
+ ucom_put_data(&sc->sc_ucom, xfer->frbuffers, 2,
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 */
@@ -480,7 +480,7 @@ uftdi_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff)
USETW(req.wValue, wValue);
USETW(req.wIndex, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -499,7 +499,7 @@ uftdi_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff)
USETW(req.wValue, wValue);
USETW(req.wIndex, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -524,7 +524,7 @@ uftdi_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
USETW(req.wValue, wValue);
USETW(req.wIndex, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -657,7 +657,7 @@ uftdi_cfg_param(struct ucom_softc *ucom, struct termios *t)
USETW(req.wValue, cfg.rate);
USETW(req.wIndex, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -665,7 +665,7 @@ uftdi_cfg_param(struct ucom_softc *ucom, struct termios *t)
USETW(req.wValue, cfg.lcr);
USETW(req.wIndex, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -673,7 +673,7 @@ uftdi_cfg_param(struct ucom_softc *ucom, struct termios *t)
USETW2(req.wValue, cfg.v_stop, cfg.v_start);
USETW2(req.wIndex, cfg.v_flow, wIndex);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -694,7 +694,7 @@ uftdi_start_read(struct ucom_softc *ucom)
{
struct uftdi_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UFTDI_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UFTDI_BULK_DT_RD]);
}
static void
@@ -702,7 +702,7 @@ uftdi_stop_read(struct ucom_softc *ucom)
{
struct uftdi_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UFTDI_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UFTDI_BULK_DT_RD]);
}
static void
@@ -710,7 +710,7 @@ uftdi_start_write(struct ucom_softc *ucom)
{
struct uftdi_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UFTDI_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UFTDI_BULK_DT_WR]);
}
static void
@@ -718,7 +718,7 @@ uftdi_stop_write(struct ucom_softc *ucom)
{
struct uftdi_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UFTDI_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UFTDI_BULK_DT_WR]);
}
/*------------------------------------------------------------------------*
diff --git a/sys/dev/usb/serial/ugensa.c b/sys/dev/usb/serial/ugensa.c
index 1a16ab5..eada5da 100644
--- a/sys/dev/usb/serial/ugensa.c
+++ b/sys/dev/usb/serial/ugensa.c
@@ -48,7 +48,7 @@
#include <dev/usb/usb_error.h>
#include <dev/usb/usb_cdc.h>
-#define USB_DEBUG_VAR usb2_debug
+#define USB_DEBUG_VAR usb_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
@@ -72,7 +72,7 @@ enum {
};
struct ugensa_sub_softc {
- struct ucom_softc *sc_usb2_com_ptr;
+ struct ucom_softc *sc_ucom_ptr;
struct usb_xfer *sc_xfer[UGENSA_N_TRANSFER];
};
@@ -122,10 +122,10 @@ static const struct usb_config
};
static const struct ucom_callback ugensa_callback = {
- .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,
};
static device_method_t ugensa_methods[] = {
@@ -170,7 +170,7 @@ ugensa_probe(device_t dev)
if (uaa->info.bIfaceIndex != 0) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(ugensa_devs, sizeof(ugensa_devs), uaa));
+ return (usbd_lookup_id_by_uaa(ugensa_devs, sizeof(ugensa_devs), uaa));
}
static int
@@ -184,13 +184,13 @@ ugensa_attach(device_t dev)
uint8_t iface_index;
int x, cnt;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "ugensa", NULL, MTX_DEF);
/* Figure out how many interfaces this device has got */
for (cnt = 0; cnt < UGENSA_IFACE_MAX; cnt++) {
- 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)) {
/* we have reached the end */
break;
}
@@ -201,16 +201,16 @@ ugensa_attach(device_t dev)
goto detach;
}
for (x = 0; x < cnt; x++) {
- iface = usb2_get_iface(uaa->device, x);
+ iface = usbd_get_iface(uaa->device, x);
if (iface->idesc->bInterfaceClass != UICLASS_VENDOR)
/* Not a serial port, most likely a SD reader */
continue;
ssc = sc->sc_sub + sc->sc_niface;
- ssc->sc_usb2_com_ptr = sc->sc_ucom + sc->sc_niface;
+ ssc->sc_ucom_ptr = sc->sc_ucom + sc->sc_niface;
iface_index = (UGENSA_IFACE_INDEX + x);
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
&iface_index, ssc->sc_xfer, ugensa_xfer_config,
UGENSA_N_TRANSFER, ssc, &sc->sc_mtx);
@@ -221,20 +221,20 @@ ugensa_attach(device_t dev)
}
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- 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]);
mtx_unlock(&sc->sc_mtx);
/* initialize port number */
- ssc->sc_usb2_com_ptr->sc_portno = sc->sc_niface;
+ ssc->sc_ucom_ptr->sc_portno = sc->sc_niface;
sc->sc_niface++;
if (x != uaa->info.bIfaceIndex)
- usb2_set_parent_iface(uaa->device, x,
+ usbd_set_parent_iface(uaa->device, x,
uaa->info.bIfaceIndex);
}
device_printf(dev, "Found %d interfaces.\n", sc->sc_niface);
- 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,
&ugensa_callback, &sc->sc_mtx);
if (error) {
DPRINTF("attach failed\n");
@@ -253,10 +253,10 @@ ugensa_detach(device_t dev)
struct ugensa_softc *sc = device_get_softc(dev);
uint8_t x;
- 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);
for (x = 0; x < sc->sc_niface; x++) {
- usb2_transfer_unsetup(sc->sc_sub[x].sc_xfer, UGENSA_N_TRANSFER);
+ usbd_transfer_unsetup(sc->sc_sub[x].sc_xfer, UGENSA_N_TRANSFER);
}
mtx_destroy(&sc->sc_mtx);
@@ -273,10 +273,10 @@ ugensa_bulk_write_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
case USB_ST_TRANSFERRED:
tr_setup:
- if (usb2_com_get_data(ssc->sc_usb2_com_ptr, xfer->frbuffers, 0,
+ if (ucom_get_data(ssc->sc_ucom_ptr, xfer->frbuffers, 0,
UGENSA_BUF_SIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -297,13 +297,13 @@ ugensa_bulk_read_callback(struct usb_xfer *xfer)
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
- usb2_com_put_data(ssc->sc_usb2_com_ptr, xfer->frbuffers, 0,
+ ucom_put_data(ssc->sc_ucom_ptr, 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 */
@@ -322,7 +322,7 @@ ugensa_start_read(struct ucom_softc *ucom)
struct ugensa_softc *sc = ucom->sc_parent;
struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno;
- usb2_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
+ usbd_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
}
static void
@@ -331,7 +331,7 @@ ugensa_stop_read(struct ucom_softc *ucom)
struct ugensa_softc *sc = ucom->sc_parent;
struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno;
- usb2_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
+ usbd_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_RD]);
}
static void
@@ -340,7 +340,7 @@ ugensa_start_write(struct ucom_softc *ucom)
struct ugensa_softc *sc = ucom->sc_parent;
struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno;
- usb2_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
+ usbd_transfer_start(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
}
static void
@@ -349,5 +349,5 @@ ugensa_stop_write(struct ucom_softc *ucom)
struct ugensa_softc *sc = ucom->sc_parent;
struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno;
- usb2_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
+ usbd_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_WR]);
}
diff --git a/sys/dev/usb/serial/uipaq.c b/sys/dev/usb/serial/uipaq.c
index 3ac9942..ca66866 100644
--- a/sys/dev/usb/serial/uipaq.c
+++ b/sys/dev/usb/serial/uipaq.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_error.h>
#include <dev/usb/usb_cdc.h>
-#define USB_DEBUG_VAR usb2_debug
+#define USB_DEBUG_VAR usb_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
@@ -131,13 +131,13 @@ static const struct usb_config uipaq_config_data[UIPAQ_N_TRANSFER] = {
};
static const struct ucom_callback uipaq_callback = {
- .usb2_com_cfg_set_dtr = &uipaq_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &uipaq_cfg_set_rts,
- .usb2_com_cfg_set_break = &uipaq_cfg_set_break,
- .usb2_com_start_read = &uipaq_start_read,
- .usb2_com_stop_read = &uipaq_stop_read,
- .usb2_com_start_write = &uipaq_start_write,
- .usb2_com_stop_write = &uipaq_stop_write,
+ .ucom_cfg_set_dtr = &uipaq_cfg_set_dtr,
+ .ucom_cfg_set_rts = &uipaq_cfg_set_rts,
+ .ucom_cfg_set_break = &uipaq_cfg_set_break,
+ .ucom_start_read = &uipaq_start_read,
+ .ucom_stop_read = &uipaq_stop_read,
+ .ucom_start_write = &uipaq_start_write,
+ .ucom_stop_write = &uipaq_stop_write,
};
/*
@@ -1089,7 +1089,7 @@ uipaq_probe(device_t dev)
if (uaa->info.bIfaceIndex != UIPAQ_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(uipaq_devs, sizeof(uipaq_devs), uaa));
+ return (usbd_lookup_id_by_uaa(uipaq_devs, sizeof(uipaq_devs), uaa));
}
static int
@@ -1104,7 +1104,7 @@ uipaq_attach(device_t dev)
sc->sc_udev = uaa->device;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uipaq", NULL, MTX_DEF);
/*
@@ -1119,15 +1119,15 @@ uipaq_attach(device_t dev)
USETW(req.wLength, 0);
for (i = 0; i != 64; i++) {
error =
- usb2_do_request_flags(uaa->device, NULL, &req,
+ usbd_do_request_flags(uaa->device, NULL, &req,
NULL, 0, NULL, 100);
if (error == 0)
break;
- usb2_pause_mtx(NULL, hz / 10);
+ usb_pause_mtx(NULL, hz / 10);
}
iface_index = UIPAQ_IFACE_INDEX;
- error = usb2_transfer_setup(uaa->device, &iface_index,
+ error = usbd_transfer_setup(uaa->device, &iface_index,
sc->sc_xfer, uipaq_config_data,
UIPAQ_N_TRANSFER, sc, &sc->sc_mtx);
@@ -1136,11 +1136,11 @@ uipaq_attach(device_t dev)
}
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UIPAQ_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UIPAQ_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UIPAQ_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UIPAQ_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,
&uipaq_callback, &sc->sc_mtx);
if (error) {
goto detach;
@@ -1157,8 +1157,8 @@ uipaq_detach(device_t dev)
{
struct uipaq_softc *sc = device_get_softc(dev);
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_xfer, UIPAQ_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UIPAQ_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -1170,7 +1170,7 @@ uipaq_start_read(struct ucom_softc *ucom)
struct uipaq_softc *sc = ucom->sc_parent;
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[UIPAQ_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UIPAQ_BULK_DT_RD]);
}
static void
@@ -1179,7 +1179,7 @@ uipaq_stop_read(struct ucom_softc *ucom)
struct uipaq_softc *sc = ucom->sc_parent;
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[UIPAQ_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UIPAQ_BULK_DT_RD]);
}
static void
@@ -1187,7 +1187,7 @@ uipaq_start_write(struct ucom_softc *ucom)
{
struct uipaq_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UIPAQ_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UIPAQ_BULK_DT_WR]);
}
static void
@@ -1195,7 +1195,7 @@ uipaq_stop_write(struct ucom_softc *ucom)
{
struct uipaq_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UIPAQ_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UIPAQ_BULK_DT_WR]);
}
static void
@@ -1218,7 +1218,7 @@ uipaq_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -1242,7 +1242,7 @@ uipaq_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -1262,7 +1262,7 @@ uipaq_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -1276,10 +1276,10 @@ uipaq_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,
UIPAQ_BUF_SIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -1300,13 +1300,13 @@ uipaq_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,
+ 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 */
diff --git a/sys/dev/usb/serial/ulpt.c b/sys/dev/usb/serial/ulpt.c
index 056b48a..b7b622d 100644
--- a/sys/dev/usb/serial/ulpt.c
+++ b/sys/dev/usb/serial/ulpt.c
@@ -177,10 +177,10 @@ ulpt_reset(struct ulpt_softc *sc)
mtx_lock(&sc->sc_mtx);
req.bmRequestType = UT_WRITE_CLASS_OTHER;
- if (usb2_do_request_flags(sc->sc_udev, &sc->sc_mtx,
+ if (usbd_do_request_flags(sc->sc_udev, &sc->sc_mtx,
&req, NULL, 0, NULL, 2 * USB_MS_HZ)) { /* 1.0 */
req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
- if (usb2_do_request_flags(sc->sc_udev, &sc->sc_mtx,
+ if (usbd_do_request_flags(sc->sc_udev, &sc->sc_mtx,
&req, NULL, 0, NULL, 2 * USB_MS_HZ)) { /* 1.1 */
/* ignore error */
}
@@ -207,10 +207,10 @@ ulpt_write_callback(struct usb_xfer *xfer)
case USB_ST_TRANSFERRED:
case USB_ST_SETUP:
tr_setup:
- if (usb2_fifo_get_data(f, xfer->frbuffers,
+ if (usb_fifo_get_data(f, xfer->frbuffers,
0, xfer->max_data_length, &actlen, 0)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
break;
@@ -255,14 +255,14 @@ ulpt_read_callback(struct usb_xfer *xfer)
sc->sc_zlps = 0;
}
- usb2_fifo_put_data(f, xfer->frbuffers,
+ usb_fifo_put_data(f, xfer->frbuffers,
0, xfer->actlen, 1);
case USB_ST_SETUP:
tr_setup:
- if (usb2_fifo_put_bytes_max(f) != 0) {
+ if (usb_fifo_put_bytes_max(f) != 0) {
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
break;
@@ -291,7 +291,7 @@ ulpt_status_callback(struct usb_xfer *xfer)
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
- usb2_copy_out(xfer->frbuffers + 1, 0, &cur_status, 1);
+ usbd_copy_out(xfer->frbuffers + 1, 0, &cur_status, 1);
cur_status = (cur_status ^ LPS_INVERT) & LPS_MASK;
new_status = cur_status & ~sc->sc_last_status;
@@ -316,16 +316,16 @@ ulpt_status_callback(struct usb_xfer *xfer)
req.wIndex[1] = 0;
USETW(req.wLength, 1);
- usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
+ usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
xfer->frlengths[0] = sizeof(req);
xfer->frlengths[1] = 1;
xfer->nframes = 2;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
break;
default: /* Error */
- DPRINTF("error=%s\n", usb2_errstr(xfer->error));
+ DPRINTF("error=%s\n", usbd_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* wait for next watchdog timeout */
}
@@ -367,7 +367,7 @@ ulpt_start_read(struct usb_fifo *fifo)
{
struct ulpt_softc *sc = fifo->priv_sc0;
- usb2_transfer_start(sc->sc_xfer[ULPT_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[ULPT_BULK_DT_RD]);
}
static void
@@ -375,7 +375,7 @@ ulpt_stop_read(struct usb_fifo *fifo)
{
struct ulpt_softc *sc = fifo->priv_sc0;
- usb2_transfer_stop(sc->sc_xfer[ULPT_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[ULPT_BULK_DT_RD]);
}
static void
@@ -383,7 +383,7 @@ ulpt_start_write(struct usb_fifo *fifo)
{
struct ulpt_softc *sc = fifo->priv_sc0;
- usb2_transfer_start(sc->sc_xfer[ULPT_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[ULPT_BULK_DT_WR]);
}
static void
@@ -391,7 +391,7 @@ ulpt_stop_write(struct usb_fifo *fifo)
{
struct ulpt_softc *sc = fifo->priv_sc0;
- usb2_transfer_stop(sc->sc_xfer[ULPT_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[ULPT_BULK_DT_WR]);
}
static int
@@ -418,9 +418,9 @@ unlpt_open(struct usb_fifo *fifo, int fflags)
if (fflags & FREAD) {
/* clear stall first */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[ULPT_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[ULPT_BULK_DT_RD]);
mtx_unlock(&sc->sc_mtx);
- if (usb2_fifo_alloc_buffer(fifo,
+ if (usb_fifo_alloc_buffer(fifo,
sc->sc_xfer[ULPT_BULK_DT_RD]->max_data_length,
ULPT_IFQ_MAXLEN)) {
return (ENOMEM);
@@ -431,9 +431,9 @@ unlpt_open(struct usb_fifo *fifo, int fflags)
if (fflags & FWRITE) {
/* clear stall first */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[ULPT_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[ULPT_BULK_DT_WR]);
mtx_unlock(&sc->sc_mtx);
- if (usb2_fifo_alloc_buffer(fifo,
+ if (usb_fifo_alloc_buffer(fifo,
sc->sc_xfer[ULPT_BULK_DT_WR]->max_data_length,
ULPT_IFQ_MAXLEN)) {
return (ENOMEM);
@@ -453,7 +453,7 @@ ulpt_close(struct usb_fifo *fifo, int fflags)
sc->sc_fflags &= ~(fflags & (FREAD | FWRITE));
if (fflags & (FREAD | FWRITE)) {
- usb2_fifo_free_buffer(fifo);
+ usb_fifo_free_buffer(fifo);
}
}
@@ -500,15 +500,15 @@ ulpt_attach(device_t dev)
sc->sc_dev = dev;
sc->sc_udev = uaa->device;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "ulpt lock", NULL, MTX_DEF | MTX_RECURSE);
- usb2_callout_init_mtx(&sc->sc_watchdog, &sc->sc_mtx, 0);
+ usb_callout_init_mtx(&sc->sc_watchdog, &sc->sc_mtx, 0);
/* search through all the descriptors looking for bidir mode */
- id = usb2_get_interface_descriptor(uaa->iface);
+ id = usbd_get_interface_descriptor(uaa->iface);
alt_index = 0 - 1;
while (1) {
if (id == NULL) {
@@ -527,8 +527,8 @@ ulpt_attach(device_t dev)
}
}
}
- id = (void *)usb2_desc_foreach(
- usb2_get_config_descriptor(uaa->device), (void *)id);
+ id = (void *)usb_desc_foreach(
+ usbd_get_config_descriptor(uaa->device), (void *)id);
}
goto detach;
@@ -539,22 +539,22 @@ found:
if (alt_index) {
- error = usb2_set_alt_interface_index
+ error = usbd_set_alt_interface_index
(uaa->device, iface_index, alt_index);
if (error) {
DPRINTF("could not set alternate "
- "config, error=%s\n", usb2_errstr(error));
+ "config, error=%s\n", usbd_errstr(error));
goto detach;
}
}
sc->sc_iface_no = id->bInterfaceNumber;
- error = usb2_transfer_setup(uaa->device, &iface_index,
+ error = usbd_transfer_setup(uaa->device, &iface_index,
sc->sc_xfer, ulpt_config, ULPT_N_TRANSFER,
sc, &sc->sc_mtx);
if (error) {
- DPRINTF("error=%s\n", usb2_errstr(error));
+ DPRINTF("error=%s\n", usbd_errstr(error));
goto detach;
}
device_printf(sc->sc_dev, "using bi-directional mode\n");
@@ -566,7 +566,7 @@ found:
* UHCI and less often with OHCI. *sigh*
*/
{
- struct usb_config_descriptor *cd = usb2_get_config_descriptor(dev);
+ struct usb_config_descriptor *cd = usbd_get_config_descriptor(dev);
struct usb_device_request req;
int len, alen;
@@ -575,7 +575,7 @@ found:
USETW(req.wValue, cd->bConfigurationValue);
USETW2(req.wIndex, id->bInterfaceNumber, id->bAlternateSetting);
USETW(req.wLength, sizeof devinfo - 1);
- error = usb2_do_request_flags(dev, &req, devinfo, USB_SHORT_XFER_OK,
+ error = usbd_do_request_flags(dev, &req, devinfo, USB_SHORT_XFER_OK,
&alen, USB_DEFAULT_TIMEOUT);
if (error) {
device_printf(sc->sc_dev, "cannot get device id\n");
@@ -595,14 +595,14 @@ found:
}
#endif
- error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
+ error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
&ulpt_fifo_methods, &sc->sc_fifo,
unit, 0 - 1, uaa->info.bIfaceIndex,
UID_ROOT, GID_OPERATOR, 0644);
if (error) {
goto detach;
}
- error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
+ error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
&unlpt_fifo_methods, &sc->sc_fifo_noreset,
unit, 0 - 1, uaa->info.bIfaceIndex,
UID_ROOT, GID_OPERATOR, 0644);
@@ -628,15 +628,15 @@ ulpt_detach(device_t dev)
DPRINTF("sc=%p\n", sc);
- usb2_fifo_detach(&sc->sc_fifo);
- usb2_fifo_detach(&sc->sc_fifo_noreset);
+ usb_fifo_detach(&sc->sc_fifo);
+ usb_fifo_detach(&sc->sc_fifo_noreset);
mtx_lock(&sc->sc_mtx);
- usb2_callout_stop(&sc->sc_watchdog);
+ usb_callout_stop(&sc->sc_watchdog);
mtx_unlock(&sc->sc_mtx);
- usb2_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER);
- usb2_callout_drain(&sc->sc_watchdog);
+ usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER);
+ usb_callout_drain(&sc->sc_watchdog);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -696,9 +696,9 @@ ulpt_watchdog(void *arg)
mtx_assert(&sc->sc_mtx, MA_OWNED);
- usb2_transfer_start(sc->sc_xfer[ULPT_INTR_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[ULPT_INTR_DT_RD]);
- usb2_callout_reset(&sc->sc_watchdog,
+ usb_callout_reset(&sc->sc_watchdog,
hz, &ulpt_watchdog, sc);
}
diff --git a/sys/dev/usb/serial/umct.c b/sys/dev/usb/serial/umct.c
index eff8ec2..879b090 100644
--- a/sys/dev/usb/serial/umct.c
+++ b/sys/dev/usb/serial/umct.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_error.h>
#include <dev/usb/usb_cdc.h>
-#define USB_DEBUG_VAR usb2_debug
+#define USB_DEBUG_VAR usb_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
@@ -164,16 +164,16 @@ static const struct usb_config umct_config[UMCT_N_TRANSFER] = {
};
static const struct ucom_callback umct_callback = {
- .usb2_com_cfg_get_status = &umct_cfg_get_status,
- .usb2_com_cfg_set_dtr = &umct_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &umct_cfg_set_rts,
- .usb2_com_cfg_set_break = &umct_cfg_set_break,
- .usb2_com_cfg_param = &umct_cfg_param,
- .usb2_com_pre_param = &umct_pre_param,
- .usb2_com_start_read = &umct_start_read,
- .usb2_com_stop_read = &umct_stop_read,
- .usb2_com_start_write = &umct_start_write,
- .usb2_com_stop_write = &umct_stop_write,
+ .ucom_cfg_get_status = &umct_cfg_get_status,
+ .ucom_cfg_set_dtr = &umct_cfg_set_dtr,
+ .ucom_cfg_set_rts = &umct_cfg_set_rts,
+ .ucom_cfg_set_break = &umct_cfg_set_break,
+ .ucom_cfg_param = &umct_cfg_param,
+ .ucom_pre_param = &umct_pre_param,
+ .ucom_start_read = &umct_start_read,
+ .ucom_stop_read = &umct_stop_read,
+ .ucom_start_write = &umct_start_write,
+ .ucom_stop_write = &umct_stop_write,
};
static const struct usb_device_id umct_devs[] = {
@@ -217,7 +217,7 @@ umct_probe(device_t dev)
if (uaa->info.bIfaceIndex != UMCT_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(umct_devs, sizeof(umct_devs), uaa));
+ return (usbd_lookup_id_by_uaa(umct_devs, sizeof(umct_devs), uaa));
}
static int
@@ -232,7 +232,7 @@ umct_attach(device_t dev)
sc->sc_udev = uaa->device;
sc->sc_unit = device_get_unit(dev);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "umct", NULL, MTX_DEF);
snprintf(sc->sc_name, sizeof(sc->sc_name),
@@ -241,7 +241,7 @@ umct_attach(device_t dev)
sc->sc_iface_no = uaa->info.bIfaceNum;
iface_index = UMCT_IFACE_INDEX;
- error = usb2_transfer_setup(uaa->device, &iface_index,
+ error = usbd_transfer_setup(uaa->device, &iface_index,
sc->sc_xfer, umct_config, UMCT_N_TRANSFER, sc, &sc->sc_mtx);
if (error) {
@@ -274,7 +274,7 @@ umct_attach(device_t dev)
sc->sc_obufsize = 16;
}
}
- 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,
&umct_callback, &sc->sc_mtx);
if (error) {
goto detach;
@@ -291,8 +291,8 @@ umct_detach(device_t dev)
{
struct umct_softc *sc = device_get_softc(dev);
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_xfer, UMCT_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UMCT_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -316,11 +316,11 @@ umct_cfg_do_request(struct umct_softc *sc, uint8_t request,
USETW(req.wLength, len);
USETDW(temp, value);
- err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, temp, 0, 1000);
if (err) {
DPRINTFN(0, "device request failed, err=%s "
- "(ignored)\n", usb2_errstr(err));
+ "(ignored)\n", usbd_errstr(err));
}
return;
}
@@ -337,17 +337,17 @@ umct_intr_callback(struct usb_xfer *xfer)
DPRINTF("too short message\n");
goto tr_setup;
}
- usb2_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
+ usbd_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
sc->sc_msr = buf[0];
sc->sc_lsr = buf[1];
- 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 */
@@ -491,10 +491,10 @@ umct_start_read(struct ucom_softc *ucom)
struct umct_softc *sc = ucom->sc_parent;
/* start interrupt endpoint */
- usb2_transfer_start(sc->sc_xfer[UMCT_INTR_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UMCT_INTR_DT_RD]);
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[UMCT_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UMCT_BULK_DT_RD]);
}
static void
@@ -503,10 +503,10 @@ umct_stop_read(struct ucom_softc *ucom)
struct umct_softc *sc = ucom->sc_parent;
/* stop interrupt endpoint */
- usb2_transfer_stop(sc->sc_xfer[UMCT_INTR_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UMCT_INTR_DT_RD]);
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[UMCT_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UMCT_BULK_DT_RD]);
}
static void
@@ -514,7 +514,7 @@ umct_start_write(struct ucom_softc *ucom)
{
struct umct_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UMCT_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UMCT_BULK_DT_WR]);
}
static void
@@ -522,7 +522,7 @@ umct_stop_write(struct ucom_softc *ucom)
{
struct umct_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UMCT_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UMCT_BULK_DT_WR]);
}
static void
@@ -535,11 +535,11 @@ umct_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,
sc->sc_obufsize, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -560,13 +560,13 @@ umct_read_callback(struct usb_xfer *xfer)
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
- usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers,
+ 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 */
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index 55a9d29..13cdeea 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -216,17 +216,17 @@ static const struct usb_config umodem_config[UMODEM_N_TRANSFER] = {
};
static const struct ucom_callback umodem_callback = {
- .usb2_com_cfg_get_status = &umodem_cfg_get_status,
- .usb2_com_cfg_set_dtr = &umodem_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &umodem_cfg_set_rts,
- .usb2_com_cfg_set_break = &umodem_cfg_set_break,
- .usb2_com_cfg_param = &umodem_cfg_param,
- .usb2_com_pre_param = &umodem_pre_param,
- .usb2_com_ioctl = &umodem_ioctl,
- .usb2_com_start_read = &umodem_start_read,
- .usb2_com_stop_read = &umodem_stop_read,
- .usb2_com_start_write = &umodem_start_write,
- .usb2_com_stop_write = &umodem_stop_write,
+ .ucom_cfg_get_status = &umodem_cfg_get_status,
+ .ucom_cfg_set_dtr = &umodem_cfg_set_dtr,
+ .ucom_cfg_set_rts = &umodem_cfg_set_rts,
+ .ucom_cfg_set_break = &umodem_cfg_set_break,
+ .ucom_cfg_param = &umodem_cfg_param,
+ .ucom_pre_param = &umodem_pre_param,
+ .ucom_ioctl = &umodem_ioctl,
+ .ucom_start_read = &umodem_start_read,
+ .ucom_stop_read = &umodem_stop_read,
+ .ucom_start_write = &umodem_start_write,
+ .ucom_stop_write = &umodem_stop_write,
};
static device_method_t umodem_methods[] = {
@@ -260,7 +260,7 @@ umodem_probe(device_t dev)
if (uaa->usb_mode != USB_MODE_HOST) {
return (ENXIO);
}
- error = usb2_lookup_id_by_uaa(umodem_devs, sizeof(umodem_devs), uaa);
+ error = usbd_lookup_id_by_uaa(umodem_devs, sizeof(umodem_devs), uaa);
return (error);
}
@@ -274,7 +274,7 @@ umodem_attach(device_t dev)
uint8_t i;
int error;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "umodem", NULL, MTX_DEF);
sc->sc_ctrl_iface_no = uaa->info.bIfaceNum;
@@ -315,15 +315,15 @@ umodem_attach(device_t dev)
struct usb_interface *iface;
struct usb_interface_descriptor *id;
- iface = usb2_get_iface(uaa->device, i);
+ iface = usbd_get_iface(uaa->device, i);
if (iface) {
- id = usb2_get_interface_descriptor(iface);
+ id = usbd_get_interface_descriptor(iface);
if (id && (id->bInterfaceNumber == sc->sc_data_iface_no)) {
sc->sc_iface_index[0] = i;
- usb2_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
+ usbd_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
break;
}
} else {
@@ -343,7 +343,7 @@ umodem_attach(device_t dev)
}
sc->sc_cm_over_data = 1;
}
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
sc->sc_iface_index, sc->sc_xfer,
umodem_config, UMODEM_N_TRANSFER,
sc, &sc->sc_mtx);
@@ -353,11 +353,11 @@ umodem_attach(device_t dev)
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UMODEM_BULK_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UMODEM_BULK_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UMODEM_BULK_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UMODEM_BULK_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,
&umodem_callback, &sc->sc_mtx);
if (error) {
goto detach;
@@ -375,10 +375,10 @@ umodem_start_read(struct ucom_softc *ucom)
struct umodem_softc *sc = ucom->sc_parent;
/* start interrupt endpoint, if any */
- usb2_transfer_start(sc->sc_xfer[UMODEM_INTR_RD]);
+ usbd_transfer_start(sc->sc_xfer[UMODEM_INTR_RD]);
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[UMODEM_BULK_RD]);
+ usbd_transfer_start(sc->sc_xfer[UMODEM_BULK_RD]);
}
static void
@@ -387,10 +387,10 @@ umodem_stop_read(struct ucom_softc *ucom)
struct umodem_softc *sc = ucom->sc_parent;
/* stop interrupt endpoint, if any */
- usb2_transfer_stop(sc->sc_xfer[UMODEM_INTR_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UMODEM_INTR_RD]);
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[UMODEM_BULK_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UMODEM_BULK_RD]);
}
static void
@@ -398,7 +398,7 @@ umodem_start_write(struct ucom_softc *ucom)
{
struct umodem_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UMODEM_BULK_WR]);
+ usbd_transfer_start(sc->sc_xfer[UMODEM_BULK_WR]);
}
static void
@@ -406,7 +406,7 @@ umodem_stop_write(struct ucom_softc *ucom)
{
struct umodem_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UMODEM_BULK_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UMODEM_BULK_WR]);
}
static void
@@ -493,7 +493,7 @@ umodem_cfg_param(struct ucom_softc *ucom, struct termios *t)
req.wIndex[1] = 0;
USETW(req.wLength, sizeof(ls));
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, &ls, 0, 1000);
}
@@ -546,7 +546,7 @@ umodem_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -570,7 +570,7 @@ umodem_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -594,7 +594,7 @@ umodem_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
}
@@ -618,7 +618,7 @@ umodem_intr_callback(struct usb_xfer *xfer)
DPRINTF("truncating message\n");
xfer->actlen = sizeof(pkt);
}
- usb2_copy_out(xfer->frbuffers, 0, &pkt, xfer->actlen);
+ usbd_copy_out(xfer->frbuffers, 0, &pkt, xfer->actlen);
xfer->actlen -= 8;
@@ -660,7 +660,7 @@ umodem_intr_callback(struct usb_xfer *xfer)
if (pkt.data[0] & UCDC_N_SERIAL_DCD) {
sc->sc_msr |= SER_DCD;
}
- usb2_com_status_change(&sc->sc_ucom);
+ ucom_status_change(&sc->sc_ucom);
break;
default:
@@ -672,7 +672,7 @@ umodem_intr_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
tr_setup:
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
@@ -696,11 +696,11 @@ umodem_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,
UMODEM_BUF_SIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -724,13 +724,13 @@ umodem_read_callback(struct usb_xfer *xfer)
DPRINTF("actlen=%d\n", xfer->actlen);
- usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers, 0,
+ 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 */
@@ -768,7 +768,7 @@ umodem_set_comm_feature(struct usb_device *udev, uint8_t iface_no,
USETW(req.wLength, UCDC_ABSTRACT_STATE_LENGTH);
USETW(ast.wState, state);
- return (usb2_do_request(udev, NULL, &req, &ast));
+ return (usbd_do_request(udev, NULL, &req, &ast));
}
static int
@@ -778,8 +778,8 @@ umodem_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, UMODEM_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UMODEM_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
diff --git a/sys/dev/usb/serial/umoscom.c b/sys/dev/usb/serial/umoscom.c
index 22a497d..7fd52c3 100644
--- a/sys/dev/usb/serial/umoscom.c
+++ b/sys/dev/usb/serial/umoscom.c
@@ -230,20 +230,20 @@ static const struct usb_config umoscom_config_data[UMOSCOM_N_TRANSFER] = {
static const struct ucom_callback umoscom_callback = {
/* configuration callbacks */
- .usb2_com_cfg_get_status = &umoscom_cfg_get_status,
- .usb2_com_cfg_set_dtr = &umoscom_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &umoscom_cfg_set_rts,
- .usb2_com_cfg_set_break = &umoscom_cfg_set_break,
- .usb2_com_cfg_param = &umoscom_cfg_param,
- .usb2_com_cfg_open = &umoscom_cfg_open,
- .usb2_com_cfg_close = &umoscom_cfg_close,
+ .ucom_cfg_get_status = &umoscom_cfg_get_status,
+ .ucom_cfg_set_dtr = &umoscom_cfg_set_dtr,
+ .ucom_cfg_set_rts = &umoscom_cfg_set_rts,
+ .ucom_cfg_set_break = &umoscom_cfg_set_break,
+ .ucom_cfg_param = &umoscom_cfg_param,
+ .ucom_cfg_open = &umoscom_cfg_open,
+ .ucom_cfg_close = &umoscom_cfg_close,
/* other callbacks */
- .usb2_com_pre_param = &umoscom_pre_param,
- .usb2_com_start_read = &umoscom_start_read,
- .usb2_com_stop_read = &umoscom_stop_read,
- .usb2_com_start_write = &umoscom_start_write,
- .usb2_com_stop_write = &umoscom_stop_write,
+ .ucom_pre_param = &umoscom_pre_param,
+ .ucom_start_read = &umoscom_start_read,
+ .ucom_stop_read = &umoscom_stop_read,
+ .ucom_start_write = &umoscom_start_write,
+ .ucom_stop_write = &umoscom_stop_write,
};
static device_method_t umoscom_methods[] = {
@@ -283,7 +283,7 @@ umoscom_probe(device_t dev)
if (uaa->info.bIfaceIndex != UMOSCOM_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(umoscom_devs, sizeof(umoscom_devs), uaa));
+ return (usbd_lookup_id_by_uaa(umoscom_devs, sizeof(umoscom_devs), uaa));
}
static int
@@ -304,7 +304,7 @@ umoscom_attach(device_t dev)
mtx_init(&sc->sc_mtx, "umoscom", NULL, MTX_DEF);
iface_index = UMOSCOM_IFACE_INDEX;
- error = usb2_transfer_setup(uaa->device, &iface_index,
+ error = usbd_transfer_setup(uaa->device, &iface_index,
sc->sc_xfer, umoscom_config_data,
UMOSCOM_N_TRANSFER, sc, &sc->sc_mtx);
@@ -313,11 +313,11 @@ umoscom_attach(device_t dev)
}
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UMOSCOM_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UMOSCOM_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UMOSCOM_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UMOSCOM_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,
&umoscom_callback, &sc->sc_mtx);
if (error) {
goto detach;
@@ -325,7 +325,7 @@ umoscom_attach(device_t dev)
return (0);
detach:
- device_printf(dev, "attach error: %s\n", usb2_errstr(error));
+ device_printf(dev, "attach error: %s\n", usbd_errstr(error));
umoscom_detach(dev);
return (ENXIO);
}
@@ -335,8 +335,8 @@ umoscom_detach(device_t dev)
{
struct umoscom_softc *sc = device_get_softc(dev);
- usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
- usb2_transfer_unsetup(sc->sc_xfer, UMOSCOM_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UMOSCOM_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -517,7 +517,7 @@ umoscom_cfg_write(struct umoscom_softc *sc, uint16_t reg, uint16_t val)
USETW(req.wIndex, reg);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -533,7 +533,7 @@ umoscom_cfg_read(struct umoscom_softc *sc, uint16_t reg)
USETW(req.wIndex, reg);
USETW(req.wLength, 1);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, &val, 0, 1000);
DPRINTF("reg=0x%04x, val=0x%02x\n", reg, val);
@@ -548,10 +548,10 @@ umoscom_start_read(struct ucom_softc *ucom)
#if 0
/* start interrupt endpoint */
- usb2_transfer_start(sc->sc_xfer[UMOSCOM_INTR_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UMOSCOM_INTR_DT_RD]);
#endif
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[UMOSCOM_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UMOSCOM_BULK_DT_RD]);
}
static void
@@ -560,10 +560,10 @@ umoscom_stop_read(struct ucom_softc *ucom)
struct umoscom_softc *sc = ucom->sc_parent;
/* stop interrupt transfer */
- usb2_transfer_stop(sc->sc_xfer[UMOSCOM_INTR_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UMOSCOM_INTR_DT_RD]);
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[UMOSCOM_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UMOSCOM_BULK_DT_RD]);
}
static void
@@ -571,7 +571,7 @@ umoscom_start_write(struct ucom_softc *ucom)
{
struct umoscom_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UMOSCOM_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UMOSCOM_BULK_DT_WR]);
}
static void
@@ -579,7 +579,7 @@ umoscom_stop_write(struct ucom_softc *ucom)
{
struct umoscom_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UMOSCOM_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UMOSCOM_BULK_DT_WR]);
}
static void
@@ -594,11 +594,11 @@ umoscom_write_callback(struct usb_xfer *xfer)
tr_setup:
DPRINTF("\n");
- if (usb2_com_get_data(&sc->sc_ucom, xfer->frbuffers, 0,
+ if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers, 0,
UMOSCOM_BUFSIZE, &actlen)) {
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -621,14 +621,14 @@ umoscom_read_callback(struct usb_xfer *xfer)
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
DPRINTF("got %d bytes\n", xfer->actlen);
- 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:
DPRINTF("\n");
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
@@ -653,12 +653,12 @@ umoscom_intr_callback(struct usb_xfer *xfer)
DPRINTF("too short message\n");
goto tr_setup;
}
- 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 */
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c
index 23d18c0..0604b42 100644
--- a/sys/dev/usb/serial/uplcom.c
+++ b/sys/dev/usb/serial/uplcom.c
@@ -215,16 +215,16 @@ static const struct usb_config uplcom_config_data[UPLCOM_N_TRANSFER] = {
};
static struct ucom_callback uplcom_callback = {
- .usb2_com_cfg_get_status = &uplcom_cfg_get_status,
- .usb2_com_cfg_set_dtr = &uplcom_cfg_set_dtr,
- .usb2_com_cfg_set_rts = &uplcom_cfg_set_rts,
- .usb2_com_cfg_set_break = &uplcom_cfg_set_break,
- .usb2_com_cfg_param = &uplcom_cfg_param,
- .usb2_com_pre_param = &uplcom_pre_param,
- .usb2_com_start_read = &uplcom_start_read,
- .usb2_com_stop_read = &uplcom_stop_read,
- .usb2_com_start_write = &uplcom_start_write,
- .usb2_com_stop_write = &uplcom_stop_write,
+ .ucom_cfg_get_status = &uplcom_cfg_get_status,
+ .ucom_cfg_set_dtr = &uplcom_cfg_set_dtr,
+ .ucom_cfg_set_rts = &uplcom_cfg_set_rts,
+ .ucom_cfg_set_break = &uplcom_cfg_set_break,
+ .ucom_cfg_param = &uplcom_cfg_param,
+ .ucom_pre_param = &uplcom_pre_param,
+ .ucom_start_read = &uplcom_start_read,
+ .ucom_stop_read = &uplcom_stop_read,
+ .ucom_start_write = &uplcom_start_write,
+ .ucom_stop_write = &uplcom_stop_write,
};
#define USB_UPL(v,p,rl,rh,t) \
@@ -315,7 +315,7 @@ uplcom_probe(device_t dev)
if (uaa->info.bIfaceIndex != UPLCOM_IFACE_INDEX) {
return (ENXIO);
}
- return (usb2_lookup_id_by_uaa(uplcom_devs, sizeof(uplcom_devs), uaa));
+ return (usbd_lookup_id_by_uaa(uplcom_devs, sizeof(uplcom_devs), uaa));
}
static int
@@ -329,7 +329,7 @@ uplcom_attach(device_t dev)
DPRINTFN(11, "\n");
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uplcom", NULL, MTX_DEF);
DPRINTF("sc = %p\n", sc);
@@ -357,43 +357,43 @@ uplcom_attach(device_t dev)
sc->sc_ctrl_iface_no = uaa->info.bIfaceNum;
sc->sc_iface_index[1] = UPLCOM_IFACE_INDEX;
- iface = usb2_get_iface(uaa->device, UPLCOM_SECOND_IFACE_INDEX);
+ iface = usbd_get_iface(uaa->device, UPLCOM_SECOND_IFACE_INDEX);
if (iface) {
- id = usb2_get_interface_descriptor(iface);
+ id = usbd_get_interface_descriptor(iface);
if (id == NULL) {
device_printf(dev, "no interface descriptor (2)!\n");
goto detach;
}
sc->sc_data_iface_no = id->bInterfaceNumber;
sc->sc_iface_index[0] = UPLCOM_SECOND_IFACE_INDEX;
- usb2_set_parent_iface(uaa->device,
+ usbd_set_parent_iface(uaa->device,
UPLCOM_SECOND_IFACE_INDEX, uaa->info.bIfaceIndex);
} else {
sc->sc_data_iface_no = sc->sc_ctrl_iface_no;
sc->sc_iface_index[0] = UPLCOM_IFACE_INDEX;
}
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
sc->sc_iface_index, sc->sc_xfer, uplcom_config_data,
UPLCOM_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;
}
error = uplcom_reset(sc, uaa->device);
if (error) {
device_printf(dev, "reset failed, error=%s\n",
- usb2_errstr(error));
+ usbd_errstr(error));
goto detach;
}
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usb2_transfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
- usb2_transfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_RD]);
+ usbd_transfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[UPLCOM_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,
&uplcom_callback, &sc->sc_mtx);
if (error) {
goto detach;
@@ -422,8 +422,8 @@ uplcom_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, UPLCOM_N_TRANSFER);
+ ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+ usbd_transfer_unsetup(sc->sc_xfer, UPLCOM_N_TRANSFER);
mtx_destroy(&sc->sc_mtx);
return (0);
@@ -441,7 +441,7 @@ uplcom_reset(struct uplcom_softc *sc, struct usb_device *udev)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- return (usb2_do_request(udev, NULL, &req, NULL));
+ return (usbd_do_request(udev, NULL, &req, NULL));
}
struct pl2303x_init {
@@ -485,9 +485,9 @@ uplcom_pl2303x_init(struct usb_device *udev)
USETW(req.wIndex, pl2303x[i].index);
USETW(req.wLength, pl2303x[i].length);
- err = usb2_do_request(udev, NULL, &req, buf);
+ err = usbd_do_request(udev, NULL, &req, buf);
if (err) {
- DPRINTF("error=%s\n", usb2_errstr(err));
+ DPRINTF("error=%s\n", usbd_errstr(err));
return (EIO);
}
}
@@ -514,7 +514,7 @@ uplcom_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -538,7 +538,7 @@ uplcom_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -560,7 +560,7 @@ uplcom_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
@@ -655,7 +655,7 @@ uplcom_cfg_param(struct ucom_softc *ucom, struct termios *t)
req.wIndex[1] = 0;
USETW(req.wLength, UCDC_LINE_STATE_LENGTH);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, &ls, 0, 1000);
if (t->c_cflag & CRTSCTS) {
@@ -671,7 +671,7 @@ uplcom_cfg_param(struct ucom_softc *ucom, struct termios *t)
USETW(req.wIndex, UPLCOM_SET_CRTSCTS);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
} else {
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -679,7 +679,7 @@ uplcom_cfg_param(struct ucom_softc *ucom, struct termios *t)
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, 0);
- usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
+ ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom,
&req, NULL, 0, 1000);
}
}
@@ -690,10 +690,10 @@ uplcom_start_read(struct ucom_softc *ucom)
struct uplcom_softc *sc = ucom->sc_parent;
/* start interrupt endpoint */
- usb2_transfer_start(sc->sc_xfer[UPLCOM_INTR_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UPLCOM_INTR_DT_RD]);
/* start read endpoint */
- usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UPLCOM_BULK_DT_RD]);
}
static void
@@ -702,10 +702,10 @@ uplcom_stop_read(struct ucom_softc *ucom)
struct uplcom_softc *sc = ucom->sc_parent;
/* stop interrupt endpoint */
- usb2_transfer_stop(sc->sc_xfer[UPLCOM_INTR_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UPLCOM_INTR_DT_RD]);
/* stop read endpoint */
- usb2_transfer_stop(sc->sc_xfer[UPLCOM_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UPLCOM_BULK_DT_RD]);
}
static void
@@ -713,7 +713,7 @@ uplcom_start_write(struct ucom_softc *ucom)
{
struct uplcom_softc *sc = ucom->sc_parent;
- usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
}
static void
@@ -721,7 +721,7 @@ uplcom_stop_write(struct ucom_softc *ucom)
{
struct uplcom_softc *sc = ucom->sc_parent;
- usb2_transfer_stop(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
}
static void
@@ -748,7 +748,7 @@ uplcom_intr_callback(struct usb_xfer *xfer)
if (xfer->actlen >= 9) {
- usb2_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
+ usbd_copy_out(xfer->frbuffers, 0, buf, sizeof(buf));
DPRINTF("status = 0x%02x\n", buf[8]);
@@ -764,12 +764,12 @@ uplcom_intr_callback(struct usb_xfer *xfer)
if (buf[8] & RSAQ_STATUS_DCD) {
sc->sc_msr |= SER_DCD;
}
- 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 */
@@ -792,13 +792,13 @@ uplcom_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,
UPLCOM_BULK_BUF_SIZE, &actlen)) {
DPRINTF("actlen = %d\n", actlen);
xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -819,12 +819,12 @@ uplcom_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 */
diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c
index 6bb0f6d..d6c4c1a 100644
--- a/sys/dev/usb/serial/usb_serial.c
+++ b/sys/dev/usb/serial/usb_serial.c
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_cdc.h>
#include <dev/usb/usb_ioctl.h>
-#define USB_DEBUG_VAR usb2_com_debug
+#define USB_DEBUG_VAR ucom_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
@@ -85,49 +85,49 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/serial/usb_serial.h>
#if USB_DEBUG
-static int usb2_com_debug = 0;
+static int ucom_debug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom");
SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW,
- &usb2_com_debug, 0, "ucom debug level");
+ &ucom_debug, 0, "ucom debug level");
#endif
-static usb_proc_callback_t usb2_com_cfg_start_transfers;
-static usb_proc_callback_t usb2_com_cfg_open;
-static usb_proc_callback_t usb2_com_cfg_close;
-static usb_proc_callback_t usb2_com_cfg_line_state;
-static usb_proc_callback_t usb2_com_cfg_status_change;
-static usb_proc_callback_t usb2_com_cfg_param;
-
-static uint8_t usb2_com_units_alloc(uint32_t, uint32_t *);
-static void usb2_com_units_free(uint32_t, uint32_t);
-static int usb2_com_attach_tty(struct ucom_softc *, uint32_t);
-static void usb2_com_detach_tty(struct ucom_softc *);
-static void usb2_com_queue_command(struct ucom_softc *,
+static usb_proc_callback_t ucom_cfg_start_transfers;
+static usb_proc_callback_t ucom_cfg_open;
+static usb_proc_callback_t ucom_cfg_close;
+static usb_proc_callback_t ucom_cfg_line_state;
+static usb_proc_callback_t ucom_cfg_status_change;
+static usb_proc_callback_t ucom_cfg_param;
+
+static uint8_t ucom_units_alloc(uint32_t, uint32_t *);
+static void ucom_units_free(uint32_t, uint32_t);
+static int ucom_attach_tty(struct ucom_softc *, uint32_t);
+static void ucom_detach_tty(struct ucom_softc *);
+static void ucom_queue_command(struct ucom_softc *,
usb_proc_callback_t *, struct termios *pt,
struct usb_proc_msg *t0, struct usb_proc_msg *t1);
-static void usb2_com_shutdown(struct ucom_softc *);
-static void usb2_com_break(struct ucom_softc *, uint8_t);
-static void usb2_com_dtr(struct ucom_softc *, uint8_t);
-static void usb2_com_rts(struct ucom_softc *, uint8_t);
-
-static tsw_open_t usb2_com_open;
-static tsw_close_t usb2_com_close;
-static tsw_ioctl_t usb2_com_ioctl;
-static tsw_modem_t usb2_com_modem;
-static tsw_param_t usb2_com_param;
-static tsw_outwakeup_t usb2_com_outwakeup;
-static tsw_free_t usb2_com_free;
-
-static struct ttydevsw usb2_com_class = {
+static void ucom_shutdown(struct ucom_softc *);
+static void ucom_break(struct ucom_softc *, uint8_t);
+static void ucom_dtr(struct ucom_softc *, uint8_t);
+static void ucom_rts(struct ucom_softc *, uint8_t);
+
+static tsw_open_t ucom_open;
+static tsw_close_t ucom_close;
+static tsw_ioctl_t ucom_ioctl;
+static tsw_modem_t ucom_modem;
+static tsw_param_t ucom_param;
+static tsw_outwakeup_t ucom_outwakeup;
+static tsw_free_t ucom_free;
+
+static struct ttydevsw ucom_class = {
.tsw_flags = TF_INITLOCK | TF_CALLOUT,
- .tsw_open = usb2_com_open,
- .tsw_close = usb2_com_close,
- .tsw_outwakeup = usb2_com_outwakeup,
- .tsw_ioctl = usb2_com_ioctl,
- .tsw_param = usb2_com_param,
- .tsw_modem = usb2_com_modem,
- .tsw_free = usb2_com_free,
+ .tsw_open = ucom_open,
+ .tsw_close = ucom_close,
+ .tsw_outwakeup = ucom_outwakeup,
+ .tsw_ioctl = ucom_ioctl,
+ .tsw_param = ucom_param,
+ .tsw_modem = ucom_modem,
+ .tsw_free = ucom_free,
};
MODULE_DEPEND(ucom, usb, 1, 1, 1);
@@ -136,10 +136,10 @@ MODULE_VERSION(ucom, 1);
#define UCOM_UNIT_MAX 0x1000 /* exclusive */
#define UCOM_SUB_UNIT_MAX 0x100 /* exclusive */
-static uint8_t usb2_com_bitmap[(UCOM_UNIT_MAX + 7) / 8];
+static uint8_t ucom_bitmap[(UCOM_UNIT_MAX + 7) / 8];
static uint8_t
-usb2_com_units_alloc(uint32_t sub_units, uint32_t *p_root_unit)
+ucom_units_alloc(uint32_t sub_units, uint32_t *p_root_unit)
{
uint32_t n;
uint32_t o;
@@ -157,7 +157,7 @@ usb2_com_units_alloc(uint32_t sub_units, uint32_t *p_root_unit)
x = n + o;
- if (usb2_com_bitmap[x / 8] & (1 << (x % 8))) {
+ if (ucom_bitmap[x / 8] & (1 << (x % 8))) {
goto skip;
}
}
@@ -168,7 +168,7 @@ usb2_com_units_alloc(uint32_t sub_units, uint32_t *p_root_unit)
x = n + o;
- usb2_com_bitmap[x / 8] |= (1 << (x % 8));
+ ucom_bitmap[x / 8] |= (1 << (x % 8));
}
error = 0;
@@ -190,7 +190,7 @@ skip: ;
}
static void
-usb2_com_units_free(uint32_t root_unit, uint32_t sub_units)
+ucom_units_free(uint32_t root_unit, uint32_t sub_units)
{
uint32_t x;
@@ -198,7 +198,7 @@ usb2_com_units_free(uint32_t root_unit, uint32_t sub_units)
while (sub_units--) {
x = root_unit + sub_units;
- usb2_com_bitmap[x / 8] &= ~(1 << (x % 8));
+ ucom_bitmap[x / 8] &= ~(1 << (x % 8));
}
mtx_unlock(&Giant);
@@ -215,7 +215,7 @@ usb2_com_units_free(uint32_t root_unit, uint32_t sub_units)
* before calling into the ucom-layer!
*/
int
-usb2_com_attach(struct ucom_super_softc *ssc, struct ucom_softc *sc,
+ucom_attach(struct ucom_super_softc *ssc, struct ucom_softc *sc,
uint32_t sub_units, void *parent,
const struct ucom_callback *callback, struct mtx *mtx)
{
@@ -231,13 +231,13 @@ usb2_com_attach(struct ucom_super_softc *ssc, struct ucom_softc *sc,
}
/* XXX unit management does not really belong here */
- if (usb2_com_units_alloc(sub_units, &root_unit)) {
+ if (ucom_units_alloc(sub_units, &root_unit)) {
return (ENOMEM);
}
- error = usb2_proc_create(&ssc->sc_tq, mtx, "ucom", USB_PRI_MED);
+ error = usb_proc_create(&ssc->sc_tq, mtx, "ucom", USB_PRI_MED);
if (error) {
- usb2_com_units_free(root_unit, sub_units);
+ ucom_units_free(root_unit, sub_units);
return (error);
}
@@ -249,10 +249,10 @@ usb2_com_attach(struct ucom_super_softc *ssc, struct ucom_softc *sc,
sc->sc_parent = parent;
sc->sc_callback = callback;
- error = usb2_com_attach_tty(sc, sub_units);
+ error = ucom_attach_tty(sc, sub_units);
if (error) {
- usb2_com_detach(ssc, sc - n, n);
- usb2_com_units_free(root_unit + n, sub_units - n);
+ ucom_detach(ssc, sc - n, n);
+ ucom_units_free(root_unit + n, sub_units - n);
return (error);
}
sc->sc_flag |= UCOM_FLAG_ATTACHED;
@@ -265,35 +265,35 @@ usb2_com_attach(struct ucom_super_softc *ssc, struct ucom_softc *sc,
* the structure pointed to by "ssc" and "sc" is zero.
*/
void
-usb2_com_detach(struct ucom_super_softc *ssc, struct ucom_softc *sc,
+ucom_detach(struct ucom_super_softc *ssc, struct ucom_softc *sc,
uint32_t sub_units)
{
uint32_t n;
- usb2_proc_drain(&ssc->sc_tq);
+ usb_proc_drain(&ssc->sc_tq);
for (n = 0; n != sub_units; n++, sc++) {
if (sc->sc_flag & UCOM_FLAG_ATTACHED) {
- usb2_com_detach_tty(sc);
+ ucom_detach_tty(sc);
- usb2_com_units_free(sc->sc_unit, 1);
+ ucom_units_free(sc->sc_unit, 1);
/* avoid duplicate detach: */
sc->sc_flag &= ~UCOM_FLAG_ATTACHED;
}
}
- usb2_proc_free(&ssc->sc_tq);
+ usb_proc_free(&ssc->sc_tq);
}
static int
-usb2_com_attach_tty(struct ucom_softc *sc, uint32_t sub_units)
+ucom_attach_tty(struct ucom_softc *sc, uint32_t sub_units)
{
struct tty *tp;
int error = 0;
char buf[32]; /* temporary TTY device name buffer */
- tp = tty_alloc_mutex(&usb2_com_class, sc, sc->sc_mtx);
+ tp = tty_alloc_mutex(&ucom_class, sc, sc->sc_mtx);
if (tp == NULL) {
error = ENOMEM;
goto done;
@@ -303,8 +303,8 @@ usb2_com_attach_tty(struct ucom_softc *sc, uint32_t sub_units)
buf[0] = 0; /* set some default value */
/* Check if the client has a custom TTY name */
- if (sc->sc_callback->usb2_com_tty_name) {
- sc->sc_callback->usb2_com_tty_name(sc, buf,
+ if (sc->sc_callback->ucom_tty_name) {
+ sc->sc_callback->ucom_tty_name(sc, buf,
sizeof(buf), sc->sc_local_unit);
}
if (buf[0] == 0) {
@@ -328,14 +328,14 @@ usb2_com_attach_tty(struct ucom_softc *sc, uint32_t sub_units)
sc->sc_tty = tp;
DPRINTF("ttycreate: %s\n", buf);
- cv_init(&sc->sc_cv, "usb2_com");
+ cv_init(&sc->sc_cv, "ucom");
done:
return (error);
}
static void
-usb2_com_detach_tty(struct ucom_softc *sc)
+ucom_detach_tty(struct ucom_softc *sc)
{
struct tty *tp = sc->sc_tty;
@@ -351,7 +351,7 @@ usb2_com_detach_tty(struct ucom_softc *sc)
if (tp) {
tty_lock(tp);
- usb2_com_close(tp); /* close, if any */
+ ucom_close(tp); /* close, if any */
tty_rel_gone(tp);
@@ -362,11 +362,11 @@ usb2_com_detach_tty(struct ucom_softc *sc)
/*
* make sure that read and write transfers are stopped
*/
- if (sc->sc_callback->usb2_com_stop_read) {
- (sc->sc_callback->usb2_com_stop_read) (sc);
+ if (sc->sc_callback->ucom_stop_read) {
+ (sc->sc_callback->ucom_stop_read) (sc);
}
- if (sc->sc_callback->usb2_com_stop_write) {
- (sc->sc_callback->usb2_com_stop_write) (sc);
+ if (sc->sc_callback->ucom_stop_write) {
+ (sc->sc_callback->ucom_stop_write) (sc);
}
mtx_unlock(sc->sc_mtx);
}
@@ -374,7 +374,7 @@ usb2_com_detach_tty(struct ucom_softc *sc)
}
static void
-usb2_com_queue_command(struct ucom_softc *sc,
+ucom_queue_command(struct ucom_softc *sc,
usb_proc_callback_t *fn, struct termios *pt,
struct usb_proc_msg *t0, struct usb_proc_msg *t1)
{
@@ -383,7 +383,7 @@ usb2_com_queue_command(struct ucom_softc *sc,
mtx_assert(sc->sc_mtx, MA_OWNED);
- if (usb2_proc_is_gone(&ssc->sc_tq)) {
+ if (usb_proc_is_gone(&ssc->sc_tq)) {
DPRINTF("proc is gone\n");
return; /* nothing to do */
}
@@ -393,7 +393,7 @@ usb2_com_queue_command(struct ucom_softc *sc,
* structure after that the message got queued.
*/
task = (struct ucom_param_task *)
- usb2_proc_msignal(&ssc->sc_tq, t0, t1);
+ usb_proc_msignal(&ssc->sc_tq, t0, t1);
/* Setup callback and softc pointers */
task->hdr.pm_callback = fn;
@@ -409,19 +409,19 @@ usb2_com_queue_command(struct ucom_softc *sc,
/*
* Closing the device should be synchronous.
*/
- if (fn == usb2_com_cfg_close)
- usb2_proc_mwait(&ssc->sc_tq, t0, t1);
+ if (fn == ucom_cfg_close)
+ usb_proc_mwait(&ssc->sc_tq, t0, t1);
/*
* In case of multiple configure requests,
* keep track of the last one!
*/
- if (fn == usb2_com_cfg_start_transfers)
+ if (fn == ucom_cfg_start_transfers)
sc->sc_last_start_xfer = &task->hdr;
}
static void
-usb2_com_shutdown(struct ucom_softc *sc)
+ucom_shutdown(struct ucom_softc *sc)
{
struct tty *tp = sc->sc_tty;
@@ -433,7 +433,7 @@ usb2_com_shutdown(struct ucom_softc *sc)
* Hang up if necessary:
*/
if (tp->t_termios.c_cflag & HUPCL) {
- usb2_com_modem(tp, 0, SER_DTR);
+ ucom_modem(tp, 0, SER_DTR);
}
}
@@ -443,15 +443,15 @@ usb2_com_shutdown(struct ucom_softc *sc)
* else: taskqueue is draining or gone
*/
uint8_t
-usb2_com_cfg_is_gone(struct ucom_softc *sc)
+ucom_cfg_is_gone(struct ucom_softc *sc)
{
struct ucom_super_softc *ssc = sc->sc_super;
- return (usb2_proc_is_gone(&ssc->sc_tq));
+ return (usb_proc_is_gone(&ssc->sc_tq));
}
static void
-usb2_com_cfg_start_transfers(struct usb_proc_msg *_task)
+ucom_cfg_start_transfers(struct usb_proc_msg *_task)
{
struct ucom_cfg_task *task =
(struct ucom_cfg_task *)_task;
@@ -468,16 +468,16 @@ usb2_com_cfg_start_transfers(struct usb_proc_msg *_task)
if (_task == sc->sc_last_start_xfer)
sc->sc_flag |= UCOM_FLAG_GP_DATA;
- if (sc->sc_callback->usb2_com_start_read) {
- (sc->sc_callback->usb2_com_start_read) (sc);
+ if (sc->sc_callback->ucom_start_read) {
+ (sc->sc_callback->ucom_start_read) (sc);
}
- if (sc->sc_callback->usb2_com_start_write) {
- (sc->sc_callback->usb2_com_start_write) (sc);
+ if (sc->sc_callback->ucom_start_write) {
+ (sc->sc_callback->ucom_start_write) (sc);
}
}
static void
-usb2_com_start_transfers(struct ucom_softc *sc)
+ucom_start_transfers(struct ucom_softc *sc)
{
if (!(sc->sc_flag & UCOM_FLAG_HL_READY)) {
return;
@@ -486,16 +486,16 @@ usb2_com_start_transfers(struct ucom_softc *sc)
* Make sure that data transfers are started in both
* directions:
*/
- if (sc->sc_callback->usb2_com_start_read) {
- (sc->sc_callback->usb2_com_start_read) (sc);
+ if (sc->sc_callback->ucom_start_read) {
+ (sc->sc_callback->ucom_start_read) (sc);
}
- if (sc->sc_callback->usb2_com_start_write) {
- (sc->sc_callback->usb2_com_start_write) (sc);
+ if (sc->sc_callback->ucom_start_write) {
+ (sc->sc_callback->ucom_start_write) (sc);
}
}
static void
-usb2_com_cfg_open(struct usb_proc_msg *_task)
+ucom_cfg_open(struct usb_proc_msg *_task)
{
struct ucom_cfg_task *task =
(struct ucom_cfg_task *)_task;
@@ -511,17 +511,17 @@ usb2_com_cfg_open(struct usb_proc_msg *_task)
sc->sc_flag |= UCOM_FLAG_LL_READY;
- if (sc->sc_callback->usb2_com_cfg_open) {
- (sc->sc_callback->usb2_com_cfg_open) (sc);
+ if (sc->sc_callback->ucom_cfg_open) {
+ (sc->sc_callback->ucom_cfg_open) (sc);
/* wait a little */
- usb2_pause_mtx(sc->sc_mtx, hz / 10);
+ usb_pause_mtx(sc->sc_mtx, hz / 10);
}
}
}
static int
-usb2_com_open(struct tty *tp)
+ucom_open(struct tty *tp)
{
struct ucom_softc *sc = tty_softc(tp);
int error;
@@ -537,12 +537,12 @@ usb2_com_open(struct tty *tp)
}
DPRINTF("tp = %p\n", tp);
- if (sc->sc_callback->usb2_com_pre_open) {
+ if (sc->sc_callback->ucom_pre_open) {
/*
* give the lower layer a chance to disallow TTY open, for
* example if the device is not present:
*/
- error = (sc->sc_callback->usb2_com_pre_open) (sc);
+ error = (sc->sc_callback->ucom_pre_open) (sc);
if (error) {
return (error);
}
@@ -561,26 +561,26 @@ usb2_com_open(struct tty *tp)
sc->sc_pls_set = 0;
sc->sc_pls_clr = 0;
- usb2_com_queue_command(sc, usb2_com_cfg_open, NULL,
+ ucom_queue_command(sc, ucom_cfg_open, NULL,
&sc->sc_open_task[0].hdr,
&sc->sc_open_task[1].hdr);
/* Queue transfer enable command last */
- usb2_com_queue_command(sc, usb2_com_cfg_start_transfers, NULL,
+ ucom_queue_command(sc, ucom_cfg_start_transfers, NULL,
&sc->sc_start_task[0].hdr,
&sc->sc_start_task[1].hdr);
- usb2_com_modem(tp, SER_DTR | SER_RTS, 0);
+ ucom_modem(tp, SER_DTR | SER_RTS, 0);
- usb2_com_break(sc, 0);
+ ucom_break(sc, 0);
- usb2_com_status_change(sc);
+ ucom_status_change(sc);
return (0);
}
static void
-usb2_com_cfg_close(struct usb_proc_msg *_task)
+ucom_cfg_close(struct usb_proc_msg *_task)
{
struct ucom_cfg_task *task =
(struct ucom_cfg_task *)_task;
@@ -590,15 +590,15 @@ usb2_com_cfg_close(struct usb_proc_msg *_task)
if (sc->sc_flag & UCOM_FLAG_LL_READY) {
sc->sc_flag &= ~UCOM_FLAG_LL_READY;
- if (sc->sc_callback->usb2_com_cfg_close)
- (sc->sc_callback->usb2_com_cfg_close) (sc);
+ if (sc->sc_callback->ucom_cfg_close)
+ (sc->sc_callback->ucom_cfg_close) (sc);
} else {
/* already closed */
}
}
static void
-usb2_com_close(struct tty *tp)
+ucom_close(struct tty *tp)
{
struct ucom_softc *sc = tty_softc(tp);
@@ -610,21 +610,21 @@ usb2_com_close(struct tty *tp)
DPRINTF("tp=%p already closed\n", tp);
return;
}
- usb2_com_shutdown(sc);
+ ucom_shutdown(sc);
- usb2_com_queue_command(sc, usb2_com_cfg_close, NULL,
+ ucom_queue_command(sc, ucom_cfg_close, NULL,
&sc->sc_close_task[0].hdr,
&sc->sc_close_task[1].hdr);
sc->sc_flag &= ~(UCOM_FLAG_HL_READY | UCOM_FLAG_RTS_IFLOW);
- if (sc->sc_callback->usb2_com_stop_read) {
- (sc->sc_callback->usb2_com_stop_read) (sc);
+ if (sc->sc_callback->ucom_stop_read) {
+ (sc->sc_callback->ucom_stop_read) (sc);
}
}
static int
-usb2_com_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
+ucom_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
{
struct ucom_softc *sc = tty_softc(tp);
int error;
@@ -638,16 +638,16 @@ usb2_com_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
switch (cmd) {
case TIOCSBRK:
- usb2_com_break(sc, 1);
+ ucom_break(sc, 1);
error = 0;
break;
case TIOCCBRK:
- usb2_com_break(sc, 0);
+ ucom_break(sc, 0);
error = 0;
break;
default:
- if (sc->sc_callback->usb2_com_ioctl) {
- error = (sc->sc_callback->usb2_com_ioctl)
+ if (sc->sc_callback->ucom_ioctl) {
+ error = (sc->sc_callback->ucom_ioctl)
(sc, cmd, data, 0, td);
} else {
error = ENOIOCTL;
@@ -658,7 +658,7 @@ usb2_com_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
}
static int
-usb2_com_modem(struct tty *tp, int sigon, int sigoff)
+ucom_modem(struct tty *tp, int sigon, int sigoff)
{
struct ucom_softc *sc = tty_softc(tp);
uint8_t onoff;
@@ -703,16 +703,16 @@ usb2_com_modem(struct tty *tp, int sigon, int sigoff)
sc->sc_mcr &= ~SER_RTS;
}
onoff = (sc->sc_mcr & SER_DTR) ? 1 : 0;
- usb2_com_dtr(sc, onoff);
+ ucom_dtr(sc, onoff);
onoff = (sc->sc_mcr & SER_RTS) ? 1 : 0;
- usb2_com_rts(sc, onoff);
+ ucom_rts(sc, onoff);
return (0);
}
static void
-usb2_com_cfg_line_state(struct usb_proc_msg *_task)
+ucom_cfg_line_state(struct usb_proc_msg *_task)
{
struct ucom_cfg_task *task =
(struct ucom_cfg_task *)_task;
@@ -729,11 +729,11 @@ usb2_com_cfg_line_state(struct usb_proc_msg *_task)
mask = 0;
/* compute callback mask */
- if (sc->sc_callback->usb2_com_cfg_set_dtr)
+ if (sc->sc_callback->ucom_cfg_set_dtr)
mask |= UCOM_LS_DTR;
- if (sc->sc_callback->usb2_com_cfg_set_rts)
+ if (sc->sc_callback->ucom_cfg_set_rts)
mask |= UCOM_LS_RTS;
- if (sc->sc_callback->usb2_com_cfg_set_break)
+ if (sc->sc_callback->ucom_cfg_set_break)
mask |= UCOM_LS_BREAK;
/* compute the bits we are to program */
@@ -749,29 +749,29 @@ usb2_com_cfg_line_state(struct usb_proc_msg *_task)
/* ensure that we don't loose any levels */
if (notch_bits & UCOM_LS_DTR)
- sc->sc_callback->usb2_com_cfg_set_dtr(sc,
+ sc->sc_callback->ucom_cfg_set_dtr(sc,
(prev_value & UCOM_LS_DTR) ? 1 : 0);
if (notch_bits & UCOM_LS_RTS)
- sc->sc_callback->usb2_com_cfg_set_rts(sc,
+ sc->sc_callback->ucom_cfg_set_rts(sc,
(prev_value & UCOM_LS_RTS) ? 1 : 0);
if (notch_bits & UCOM_LS_BREAK)
- sc->sc_callback->usb2_com_cfg_set_break(sc,
+ sc->sc_callback->ucom_cfg_set_break(sc,
(prev_value & UCOM_LS_BREAK) ? 1 : 0);
/* set last value */
if (any_bits & UCOM_LS_DTR)
- sc->sc_callback->usb2_com_cfg_set_dtr(sc,
+ sc->sc_callback->ucom_cfg_set_dtr(sc,
(last_value & UCOM_LS_DTR) ? 1 : 0);
if (any_bits & UCOM_LS_RTS)
- sc->sc_callback->usb2_com_cfg_set_rts(sc,
+ sc->sc_callback->ucom_cfg_set_rts(sc,
(last_value & UCOM_LS_RTS) ? 1 : 0);
if (any_bits & UCOM_LS_BREAK)
- sc->sc_callback->usb2_com_cfg_set_break(sc,
+ sc->sc_callback->ucom_cfg_set_break(sc,
(last_value & UCOM_LS_BREAK) ? 1 : 0);
}
static void
-usb2_com_line_state(struct ucom_softc *sc,
+ucom_line_state(struct ucom_softc *sc,
uint8_t set_bits, uint8_t clear_bits)
{
mtx_assert(sc->sc_mtx, MA_OWNED);
@@ -789,46 +789,46 @@ usb2_com_line_state(struct ucom_softc *sc,
sc->sc_pls_clr |= clear_bits;
/* defer driver programming */
- usb2_com_queue_command(sc, usb2_com_cfg_line_state, NULL,
+ ucom_queue_command(sc, ucom_cfg_line_state, NULL,
&sc->sc_line_state_task[0].hdr,
&sc->sc_line_state_task[1].hdr);
}
static void
-usb2_com_break(struct ucom_softc *sc, uint8_t onoff)
+ucom_break(struct ucom_softc *sc, uint8_t onoff)
{
DPRINTF("onoff = %d\n", onoff);
if (onoff)
- usb2_com_line_state(sc, UCOM_LS_BREAK, 0);
+ ucom_line_state(sc, UCOM_LS_BREAK, 0);
else
- usb2_com_line_state(sc, 0, UCOM_LS_BREAK);
+ ucom_line_state(sc, 0, UCOM_LS_BREAK);
}
static void
-usb2_com_dtr(struct ucom_softc *sc, uint8_t onoff)
+ucom_dtr(struct ucom_softc *sc, uint8_t onoff)
{
DPRINTF("onoff = %d\n", onoff);
if (onoff)
- usb2_com_line_state(sc, UCOM_LS_DTR, 0);
+ ucom_line_state(sc, UCOM_LS_DTR, 0);
else
- usb2_com_line_state(sc, 0, UCOM_LS_DTR);
+ ucom_line_state(sc, 0, UCOM_LS_DTR);
}
static void
-usb2_com_rts(struct ucom_softc *sc, uint8_t onoff)
+ucom_rts(struct ucom_softc *sc, uint8_t onoff)
{
DPRINTF("onoff = %d\n", onoff);
if (onoff)
- usb2_com_line_state(sc, UCOM_LS_RTS, 0);
+ ucom_line_state(sc, UCOM_LS_RTS, 0);
else
- usb2_com_line_state(sc, 0, UCOM_LS_RTS);
+ ucom_line_state(sc, 0, UCOM_LS_RTS);
}
static void
-usb2_com_cfg_status_change(struct usb_proc_msg *_task)
+ucom_cfg_status_change(struct usb_proc_msg *_task)
{
struct ucom_cfg_task *task =
(struct ucom_cfg_task *)_task;
@@ -845,7 +845,7 @@ usb2_com_cfg_status_change(struct usb_proc_msg *_task)
if (!(sc->sc_flag & UCOM_FLAG_LL_READY)) {
return;
}
- if (sc->sc_callback->usb2_com_cfg_get_status == NULL) {
+ if (sc->sc_callback->ucom_cfg_get_status == NULL) {
return;
}
/* get status */
@@ -853,7 +853,7 @@ usb2_com_cfg_status_change(struct usb_proc_msg *_task)
new_msr = 0;
new_lsr = 0;
- (sc->sc_callback->usb2_com_cfg_get_status) (sc, &new_lsr, &new_msr);
+ (sc->sc_callback->ucom_cfg_get_status) (sc, &new_lsr, &new_msr);
if (!(sc->sc_flag & UCOM_FLAG_HL_READY)) {
/* TTY device closed */
@@ -875,7 +875,7 @@ usb2_com_cfg_status_change(struct usb_proc_msg *_task)
}
void
-usb2_com_status_change(struct ucom_softc *sc)
+ucom_status_change(struct ucom_softc *sc)
{
mtx_assert(sc->sc_mtx, MA_OWNED);
@@ -884,13 +884,13 @@ usb2_com_status_change(struct ucom_softc *sc)
}
DPRINTF("\n");
- usb2_com_queue_command(sc, usb2_com_cfg_status_change, NULL,
+ ucom_queue_command(sc, ucom_cfg_status_change, NULL,
&sc->sc_status_task[0].hdr,
&sc->sc_status_task[1].hdr);
}
static void
-usb2_com_cfg_param(struct usb_proc_msg *_task)
+ucom_cfg_param(struct usb_proc_msg *_task)
{
struct ucom_param_task *task =
(struct ucom_param_task *)_task;
@@ -899,18 +899,18 @@ usb2_com_cfg_param(struct usb_proc_msg *_task)
if (!(sc->sc_flag & UCOM_FLAG_LL_READY)) {
return;
}
- if (sc->sc_callback->usb2_com_cfg_param == NULL) {
+ if (sc->sc_callback->ucom_cfg_param == NULL) {
return;
}
- (sc->sc_callback->usb2_com_cfg_param) (sc, &task->termios_copy);
+ (sc->sc_callback->ucom_cfg_param) (sc, &task->termios_copy);
/* wait a little */
- usb2_pause_mtx(sc->sc_mtx, hz / 10);
+ usb_pause_mtx(sc->sc_mtx, hz / 10);
}
static int
-usb2_com_param(struct tty *tp, struct termios *t)
+ucom_param(struct tty *tp, struct termios *t)
{
struct ucom_softc *sc = tty_softc(tp);
uint8_t opened;
@@ -925,7 +925,7 @@ usb2_com_param(struct tty *tp, struct termios *t)
/* XXX the TTY layer should call "open()" first! */
- error = usb2_com_open(tp);
+ error = ucom_open(tp);
if (error) {
goto done;
}
@@ -946,9 +946,9 @@ usb2_com_param(struct tty *tp, struct termios *t)
}
t->c_ispeed = t->c_ospeed;
- if (sc->sc_callback->usb2_com_pre_param) {
+ if (sc->sc_callback->ucom_pre_param) {
/* Let the lower layer verify the parameters */
- error = (sc->sc_callback->usb2_com_pre_param) (sc, t);
+ error = (sc->sc_callback->ucom_pre_param) (sc, t);
if (error) {
DPRINTF("callback error = %d\n", error);
goto done;
@@ -959,12 +959,12 @@ usb2_com_param(struct tty *tp, struct termios *t)
sc->sc_flag &= ~UCOM_FLAG_GP_DATA;
/* Queue baud rate programming command first */
- usb2_com_queue_command(sc, usb2_com_cfg_param, t,
+ ucom_queue_command(sc, ucom_cfg_param, t,
&sc->sc_param_task[0].hdr,
&sc->sc_param_task[1].hdr);
/* Queue transfer enable command last */
- usb2_com_queue_command(sc, usb2_com_cfg_start_transfers, NULL,
+ ucom_queue_command(sc, ucom_cfg_start_transfers, NULL,
&sc->sc_start_task[0].hdr,
&sc->sc_start_task[1].hdr);
@@ -972,19 +972,19 @@ usb2_com_param(struct tty *tp, struct termios *t)
sc->sc_flag |= UCOM_FLAG_RTS_IFLOW;
} else if (sc->sc_flag & UCOM_FLAG_RTS_IFLOW) {
sc->sc_flag &= ~UCOM_FLAG_RTS_IFLOW;
- usb2_com_modem(tp, SER_RTS, 0);
+ ucom_modem(tp, SER_RTS, 0);
}
done:
if (error) {
if (opened) {
- usb2_com_close(tp);
+ ucom_close(tp);
}
}
return (error);
}
static void
-usb2_com_outwakeup(struct tty *tp)
+ucom_outwakeup(struct tty *tp)
{
struct ucom_softc *sc = tty_softc(tp);
@@ -996,18 +996,18 @@ usb2_com_outwakeup(struct tty *tp)
/* The higher layer is not ready */
return;
}
- usb2_com_start_transfers(sc);
+ ucom_start_transfers(sc);
}
/*------------------------------------------------------------------------*
- * usb2_com_get_data
+ * ucom_get_data
*
* Return values:
* 0: No data is available.
* Else: Data is available.
*------------------------------------------------------------------------*/
uint8_t
-usb2_com_get_data(struct ucom_softc *sc, struct usb_page_cache *pc,
+ucom_get_data(struct ucom_softc *sc, struct usb_page_cache *pc,
uint32_t offset, uint32_t len, uint32_t *actlen)
{
struct usb_page_search res;
@@ -1026,7 +1026,7 @@ usb2_com_get_data(struct ucom_softc *sc, struct usb_page_cache *pc,
while (len != 0) {
- usb2_get_page(pc, offset, &res);
+ usbd_get_page(pc, offset, &res);
if (res.length > len) {
res.length = len;
@@ -1054,7 +1054,7 @@ usb2_com_get_data(struct ucom_softc *sc, struct usb_page_cache *pc,
}
void
-usb2_com_put_data(struct ucom_softc *sc, struct usb_page_cache *pc,
+ucom_put_data(struct ucom_softc *sc, struct usb_page_cache *pc,
uint32_t offset, uint32_t len)
{
struct usb_page_search res;
@@ -1074,7 +1074,7 @@ usb2_com_put_data(struct ucom_softc *sc, struct usb_page_cache *pc,
while (len > 0) {
- usb2_get_page(pc, offset, &res);
+ usbd_get_page(pc, offset, &res);
if (res.length > len) {
res.length = len;
@@ -1111,7 +1111,7 @@ usb2_com_put_data(struct ucom_softc *sc, struct usb_page_cache *pc,
}
static void
-usb2_com_free(void *xsc)
+ucom_free(void *xsc)
{
struct ucom_softc *sc = xsc;
diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h
index 6f896ce..66a65da 100644
--- a/sys/dev/usb/serial/usb_serial.h
+++ b/sys/dev/usb/serial/usb_serial.h
@@ -85,26 +85,26 @@ struct usb_device_request;
struct thread;
/*
- * NOTE: There is no guarantee that "usb2_com_cfg_close()" will
- * be called after "usb2_com_cfg_open()" if the device is detached
+ * NOTE: There is no guarantee that "ucom_cfg_close()" will
+ * be called after "ucom_cfg_open()" if the device is detached
* while it is open!
*/
struct ucom_callback {
- void (*usb2_com_cfg_get_status) (struct ucom_softc *, uint8_t *plsr, uint8_t *pmsr);
- void (*usb2_com_cfg_set_dtr) (struct ucom_softc *, uint8_t);
- void (*usb2_com_cfg_set_rts) (struct ucom_softc *, uint8_t);
- void (*usb2_com_cfg_set_break) (struct ucom_softc *, uint8_t);
- void (*usb2_com_cfg_param) (struct ucom_softc *, struct termios *);
- void (*usb2_com_cfg_open) (struct ucom_softc *);
- void (*usb2_com_cfg_close) (struct ucom_softc *);
- int (*usb2_com_pre_open) (struct ucom_softc *);
- int (*usb2_com_pre_param) (struct ucom_softc *, struct termios *);
- int (*usb2_com_ioctl) (struct ucom_softc *, uint32_t, caddr_t, int, struct thread *);
- void (*usb2_com_start_read) (struct ucom_softc *);
- void (*usb2_com_stop_read) (struct ucom_softc *);
- void (*usb2_com_start_write) (struct ucom_softc *);
- void (*usb2_com_stop_write) (struct ucom_softc *);
- void (*usb2_com_tty_name) (struct ucom_softc *, char *pbuf, uint16_t buflen, uint16_t local_subunit);
+ void (*ucom_cfg_get_status) (struct ucom_softc *, uint8_t *plsr, uint8_t *pmsr);
+ void (*ucom_cfg_set_dtr) (struct ucom_softc *, uint8_t);
+ void (*ucom_cfg_set_rts) (struct ucom_softc *, uint8_t);
+ void (*ucom_cfg_set_break) (struct ucom_softc *, uint8_t);
+ void (*ucom_cfg_param) (struct ucom_softc *, struct termios *);
+ void (*ucom_cfg_open) (struct ucom_softc *);
+ void (*ucom_cfg_close) (struct ucom_softc *);
+ int (*ucom_pre_open) (struct ucom_softc *);
+ int (*ucom_pre_param) (struct ucom_softc *, struct termios *);
+ int (*ucom_ioctl) (struct ucom_softc *, uint32_t, caddr_t, int, struct thread *);
+ void (*ucom_start_read) (struct ucom_softc *);
+ void (*ucom_stop_read) (struct ucom_softc *);
+ void (*ucom_start_write) (struct ucom_softc *);
+ void (*ucom_stop_write) (struct ucom_softc *);
+ void (*ucom_tty_name) (struct ucom_softc *, char *pbuf, uint16_t buflen, uint16_t local_subunit);
};
/* Line status register */
@@ -182,18 +182,18 @@ struct ucom_softc {
#define UCOM_LS_BREAK 0x04
};
-#define usb2_com_cfg_do_request(udev,com,req,ptr,flags,timo) \
- usb2_do_request_proc(udev,&(com)->sc_super->sc_tq,req,ptr,flags,NULL,timo)
+#define ucom_cfg_do_request(udev,com,req,ptr,flags,timo) \
+ usbd_do_request_proc(udev,&(com)->sc_super->sc_tq,req,ptr,flags,NULL,timo)
-int usb2_com_attach(struct ucom_super_softc *,
+int ucom_attach(struct ucom_super_softc *,
struct ucom_softc *, uint32_t, void *,
const struct ucom_callback *callback, struct mtx *);
-void usb2_com_detach(struct ucom_super_softc *,
+void ucom_detach(struct ucom_super_softc *,
struct ucom_softc *, uint32_t);
-void usb2_com_status_change(struct ucom_softc *);
-uint8_t usb2_com_get_data(struct ucom_softc *, struct usb_page_cache *,
+void ucom_status_change(struct ucom_softc *);
+uint8_t ucom_get_data(struct ucom_softc *, struct usb_page_cache *,
uint32_t, uint32_t, uint32_t *);
-void usb2_com_put_data(struct ucom_softc *, struct usb_page_cache *,
+void ucom_put_data(struct ucom_softc *, struct usb_page_cache *,
uint32_t, uint32_t);
-uint8_t usb2_com_cfg_is_gone(struct ucom_softc *);
+uint8_t ucom_cfg_is_gone(struct ucom_softc *);
#endif /* _USB2_SERIAL_H_ */
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]);
}
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 */
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));
}
OpenPOWER on IntegriCloud