summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/misc
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/misc')
-rw-r--r--sys/dev/usb/misc/udbp.c48
-rw-r--r--sys/dev/usb/misc/ufm.c12
2 files changed, 30 insertions, 30 deletions
diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c
index b17f587..e856296c 100644
--- a/sys/dev/usb/misc/udbp.c
+++ b/sys/dev/usb/misc/udbp.c
@@ -317,17 +317,17 @@ udbp_attach(device_t dev)
struct udbp_softc *sc = device_get_softc(dev);
int error;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
snprintf(sc->sc_name, sizeof(sc->sc_name),
"%s", device_get_nameunit(dev));
mtx_init(&sc->sc_mtx, "udbp lock", NULL, MTX_DEF | MTX_RECURSE);
- error = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex,
+ error = usbd_transfer_setup(uaa->device, &uaa->info.bIfaceIndex,
sc->sc_xfer, udbp_config, UDBP_T_MAX, sc, &sc->sc_mtx);
if (error) {
- DPRINTF("error=%s\n", usb2_errstr(error));
+ DPRINTF("error=%s\n", usbd_errstr(error));
goto detach;
}
NG_BT_MBUFQ_INIT(&sc->sc_xmitq, UDBP_Q_MAXLEN);
@@ -376,7 +376,7 @@ udbp_detach(device_t dev)
}
/* free USB transfers, if any */
- usb2_transfer_unsetup(sc->sc_xfer, UDBP_T_MAX);
+ usbd_transfer_unsetup(sc->sc_xfer, UDBP_T_MAX);
mtx_destroy(&sc->sc_mtx);
@@ -418,7 +418,7 @@ udbp_bulk_read_callback(struct usb_xfer *xfer)
}
m->m_pkthdr.len = m->m_len = xfer->actlen;
- usb2_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen);
+ usbd_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen);
sc->sc_bulk_in_buffer = m;
@@ -432,18 +432,18 @@ tr_setup:
return;
}
if (sc->sc_flags & UDBP_FLAG_READ_STALL) {
- usb2_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
return;
}
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= UDBP_FLAG_READ_STALL;
- usb2_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_RD_CS]);
}
return;
@@ -456,10 +456,10 @@ udbp_bulk_read_clear_stall_callback(struct usb_xfer *xfer)
struct udbp_softc *sc = xfer->priv_sc;
struct usb_xfer *xfer_other = sc->sc_xfer[UDBP_T_RD];
- if (usb2_clear_stall_callback(xfer, xfer_other)) {
+ if (usbd_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
sc->sc_flags &= ~UDBP_FLAG_READ_STALL;
- usb2_transfer_start(xfer_other);
+ usbd_transfer_start(xfer_other);
}
}
@@ -498,7 +498,7 @@ done:
}
/* start USB bulk-in transfer, if not already started */
- usb2_transfer_start(sc->sc_xfer[UDBP_T_RD]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_RD]);
mtx_unlock(&sc->sc_mtx);
}
@@ -516,7 +516,7 @@ udbp_bulk_write_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
if (sc->sc_flags & UDBP_FLAG_WRITE_STALL) {
- usb2_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
return;
}
/* get next mbuf, if any */
@@ -535,7 +535,7 @@ udbp_bulk_write_callback(struct usb_xfer *xfer)
MCLBYTES);
m->m_pkthdr.len = MCLBYTES;
}
- usb2_m_copy_in(xfer->frbuffers, 0, m, 0, m->m_pkthdr.len);
+ usbd_m_copy_in(xfer->frbuffers, 0, m, 0, m->m_pkthdr.len);
xfer->frlengths[0] = m->m_pkthdr.len;
@@ -544,14 +544,14 @@ udbp_bulk_write_callback(struct usb_xfer *xfer)
DPRINTF("packet out: %d bytes\n",
xfer->frlengths[0]);
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= UDBP_FLAG_WRITE_STALL;
- usb2_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_WR_CS]);
}
return;
@@ -564,10 +564,10 @@ udbp_bulk_write_clear_stall_callback(struct usb_xfer *xfer)
struct udbp_softc *sc = xfer->priv_sc;
struct usb_xfer *xfer_other = sc->sc_xfer[UDBP_T_WR];
- if (usb2_clear_stall_callback(xfer, xfer_other)) {
+ if (usbd_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
sc->sc_flags &= ~UDBP_FLAG_WRITE_STALL;
- usb2_transfer_start(xfer_other);
+ usbd_transfer_start(xfer_other);
}
}
@@ -725,7 +725,7 @@ ng_udbp_rcvdata(hook_p hook, item_p item)
/*
* start bulk-out transfer, if not already started:
*/
- usb2_transfer_start(sc->sc_xfer[UDBP_T_WR]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_WR]);
error = 0;
}
@@ -793,10 +793,10 @@ ng_udbp_connect(hook_p hook)
UDBP_FLAG_WRITE_STALL);
/* start bulk-in transfer */
- usb2_transfer_start(sc->sc_xfer[UDBP_T_RD]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_RD]);
/* start bulk-out transfer */
- usb2_transfer_start(sc->sc_xfer[UDBP_T_WR]);
+ usbd_transfer_start(sc->sc_xfer[UDBP_T_WR]);
mtx_unlock(&sc->sc_mtx);
@@ -823,12 +823,12 @@ ng_udbp_disconnect(hook_p hook)
} else {
/* stop bulk-in transfer */
- usb2_transfer_stop(sc->sc_xfer[UDBP_T_RD_CS]);
- usb2_transfer_stop(sc->sc_xfer[UDBP_T_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UDBP_T_RD_CS]);
+ usbd_transfer_stop(sc->sc_xfer[UDBP_T_RD]);
/* stop bulk-out transfer */
- usb2_transfer_stop(sc->sc_xfer[UDBP_T_WR_CS]);
- usb2_transfer_stop(sc->sc_xfer[UDBP_T_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UDBP_T_WR_CS]);
+ usbd_transfer_stop(sc->sc_xfer[UDBP_T_WR]);
/* cleanup queues */
NG_BT_MBUFQ_DRAIN(&sc->sc_xmitq);
diff --git a/sys/dev/usb/misc/ufm.c b/sys/dev/usb/misc/ufm.c
index 1a95702..d8e4a9e 100644
--- a/sys/dev/usb/misc/ufm.c
+++ b/sys/dev/usb/misc/ufm.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_error.h>
#include <dev/usb/ufm_ioctl.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>
@@ -137,9 +137,9 @@ ufm_attach(device_t dev)
mtx_init(&sc->sc_mtx, "ufm lock", NULL, MTX_DEF | MTX_RECURSE);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
- error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
+ error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
&ufm_fifo_methods, &sc->sc_fifo,
device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex,
UID_ROOT, GID_OPERATOR, 0644);
@@ -158,7 +158,7 @@ ufm_detach(device_t dev)
{
struct ufm_softc *sc = device_get_softc(dev);
- usb2_fifo_detach(&sc->sc_fifo);
+ usb_fifo_detach(&sc->sc_fifo);
mtx_destroy(&sc->sc_mtx);
@@ -189,7 +189,7 @@ ufm_do_req(struct ufm_softc *sc, uint8_t request,
USETW(req.wIndex, index);
USETW(req.wLength, 1);
- error = usb2_do_request(sc->sc_udev, NULL, &req, buf);
+ error = usbd_do_request(sc->sc_udev, NULL, &req, buf);
if (retbuf) {
*retbuf = buf[0];
@@ -284,7 +284,7 @@ ufm_get_stat(struct ufm_softc *sc, void *addr)
* Note, there's a 240ms settle time before the status
* will be valid, so sleep that amount.
*/
- usb2_pause_mtx(NULL, hz / 4);
+ usb_pause_mtx(NULL, hz / 4);
if (ufm_do_req(sc, UFM_CMD0,
0x00, 0x24, &ret)) {
OpenPOWER on IntegriCloud