summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/input
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/input')
-rw-r--r--sys/dev/usb/input/uhid.c74
-rw-r--r--sys/dev/usb/input/ukbd.c50
-rw-r--r--sys/dev/usb/input/ums.c50
3 files changed, 87 insertions, 87 deletions
diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
index ae5a63c..9390a69 100644
--- a/sys/dev/usb/input/uhid.c
+++ b/sys/dev/usb/input/uhid.c
@@ -159,7 +159,7 @@ uhid_intr_callback(struct usb_xfer *xfer)
DPRINTF("transferred!\n");
if (xfer->actlen >= sc->sc_isize) {
- usb2_fifo_put_data(
+ usb_fifo_put_data(
sc->sc_fifo.fp[USB_FIFO_RX],
xfer->frbuffers,
0, sc->sc_isize, 1);
@@ -171,10 +171,10 @@ uhid_intr_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
re_submit:
- if (usb2_fifo_put_bytes_max(
+ if (usb_fifo_put_bytes_max(
sc->sc_fifo.fp[USB_FIFO_RX]) != 0) {
xfer->frlengths[0] = sc->sc_isize;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
@@ -227,14 +227,14 @@ uhid_write_callback(struct usb_xfer *xfer)
/* try to extract the ID byte */
if (sc->sc_oid) {
- if (usb2_fifo_get_data(
+ if (usb_fifo_get_data(
sc->sc_fifo.fp[USB_FIFO_TX],
xfer->frbuffers,
0, 1, &actlen, 0)) {
if (actlen != 1) {
goto tr_error;
}
- usb2_copy_out(xfer->frbuffers, 0, &id, 1);
+ usbd_copy_out(xfer->frbuffers, 0, &id, 1);
} else {
return;
@@ -246,7 +246,7 @@ uhid_write_callback(struct usb_xfer *xfer)
id = 0;
}
- if (usb2_fifo_get_data(
+ if (usb_fifo_get_data(
sc->sc_fifo.fp[USB_FIFO_TX],
xfer->frbuffers + 1,
0, UHID_BSIZE, &actlen, 1)) {
@@ -257,19 +257,19 @@ uhid_write_callback(struct usb_xfer *xfer)
(&req, sc->sc_iface_no,
UHID_OUTPUT_REPORT, id, 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] = size;
xfer->nframes = xfer->frlengths[1] ? 2 : 1;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
default:
tr_error:
/* bomb out */
- usb2_fifo_get_data_error(sc->sc_fifo.fp[USB_FIFO_TX]);
+ usb_fifo_get_data_error(sc->sc_fifo.fp[USB_FIFO_TX]);
return;
}
}
@@ -282,30 +282,30 @@ uhid_read_callback(struct usb_xfer *xfer)
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
- usb2_fifo_put_data(sc->sc_fifo.fp[USB_FIFO_RX], xfer->frbuffers,
+ usb_fifo_put_data(sc->sc_fifo.fp[USB_FIFO_RX], xfer->frbuffers,
sizeof(req), sc->sc_isize, 1);
return;
case USB_ST_SETUP:
- if (usb2_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) > 0) {
+ if (usb_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) > 0) {
uhid_fill_get_report
(&req, sc->sc_iface_no, UHID_INPUT_REPORT,
sc->sc_iid, sc->sc_isize);
- 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] = sc->sc_isize;
xfer->nframes = xfer->frlengths[1] ? 2 : 1;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
default: /* Error */
/* bomb out */
- usb2_fifo_put_data_error(sc->sc_fifo.fp[USB_FIFO_RX]);
+ usb_fifo_put_data_error(sc->sc_fifo.fp[USB_FIFO_RX]);
return;
}
}
@@ -346,9 +346,9 @@ uhid_start_read(struct usb_fifo *fifo)
struct uhid_softc *sc = fifo->priv_sc0;
if (sc->sc_flags & UHID_FLAG_IMMED) {
- usb2_transfer_start(sc->sc_xfer[UHID_CTRL_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UHID_CTRL_DT_RD]);
} else {
- usb2_transfer_start(sc->sc_xfer[UHID_INTR_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[UHID_INTR_DT_RD]);
}
}
@@ -357,8 +357,8 @@ uhid_stop_read(struct usb_fifo *fifo)
{
struct uhid_softc *sc = fifo->priv_sc0;
- usb2_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_RD]);
- usb2_transfer_stop(sc->sc_xfer[UHID_INTR_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[UHID_INTR_DT_RD]);
}
static void
@@ -366,7 +366,7 @@ uhid_start_write(struct usb_fifo *fifo)
{
struct uhid_softc *sc = fifo->priv_sc0;
- usb2_transfer_start(sc->sc_xfer[UHID_CTRL_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[UHID_CTRL_DT_WR]);
}
static void
@@ -374,7 +374,7 @@ uhid_stop_write(struct usb_fifo *fifo)
{
struct uhid_softc *sc = fifo->priv_sc0;
- usb2_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[UHID_CTRL_DT_WR]);
}
static int
@@ -393,7 +393,7 @@ uhid_get_report(struct uhid_softc *sc, uint8_t type,
}
free_data = 1;
}
- err = usb2_req_get_report(sc->sc_udev, NULL, kern_data,
+ err = usbd_req_get_report(sc->sc_udev, NULL, kern_data,
len, sc->sc_iface_index, type, id);
if (err) {
err = ENXIO;
@@ -433,7 +433,7 @@ uhid_set_report(struct uhid_softc *sc, uint8_t type,
goto done;
}
}
- err = usb2_req_set_report(sc->sc_udev, NULL, kern_data,
+ err = usbd_req_set_report(sc->sc_udev, NULL, kern_data,
len, sc->sc_iface_index, type, id);
if (err) {
err = ENXIO;
@@ -459,13 +459,13 @@ uhid_open(struct usb_fifo *fifo, int fflags)
/* reset flags */
sc->sc_flags &= ~UHID_FLAG_IMMED;
- if (usb2_fifo_alloc_buffer(fifo,
+ if (usb_fifo_alloc_buffer(fifo,
sc->sc_isize + 1, UHID_FRAME_NUM)) {
return (ENOMEM);
}
}
if (fflags & FWRITE) {
- if (usb2_fifo_alloc_buffer(fifo,
+ if (usb_fifo_alloc_buffer(fifo,
sc->sc_osize + 1, UHID_FRAME_NUM)) {
return (ENOMEM);
}
@@ -477,7 +477,7 @@ static void
uhid_close(struct usb_fifo *fifo, int fflags)
{
if (fflags & (FREAD | FWRITE)) {
- usb2_fifo_free_buffer(fifo);
+ usb_fifo_free_buffer(fifo);
}
}
@@ -616,7 +616,7 @@ uhid_probe(device_t dev)
return (ENXIO);
}
}
- if (usb2_test_quirk(uaa, UQ_HID_IGNORE)) {
+ if (usb_test_quirk(uaa, UQ_HID_IGNORE)) {
return (ENXIO);
}
return (0);
@@ -632,7 +632,7 @@ uhid_attach(device_t dev)
DPRINTFN(10, "sc=%p\n", sc);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uhid lock", NULL, MTX_DEF | MTX_RECURSE);
@@ -641,12 +641,12 @@ uhid_attach(device_t dev)
sc->sc_iface_no = uaa->info.bIfaceNum;
sc->sc_iface_index = uaa->info.bIfaceIndex;
- error = usb2_transfer_setup(uaa->device,
+ error = usbd_transfer_setup(uaa->device,
&uaa->info.bIfaceIndex, sc->sc_xfer, uhid_config,
UHID_N_TRANSFER, sc, &sc->sc_mtx);
if (error) {
- DPRINTF("error=%s\n", usb2_errstr(error));
+ DPRINTF("error=%s\n", usbd_errstr(error));
goto detach;
}
if (uaa->info.idVendor == USB_VENDOR_WACOM) {
@@ -668,13 +668,13 @@ uhid_attach(device_t dev)
* feature report ID 2 before it'll start
* returning digitizer data.
*/
- error = usb2_req_set_report(uaa->device, NULL,
+ error = usbd_req_set_report(uaa->device, NULL,
reportbuf, sizeof(reportbuf),
uaa->info.bIfaceIndex, UHID_FEATURE_REPORT, 2);
if (error) {
DPRINTF("set report failed, error=%s (ignored)\n",
- usb2_errstr(error));
+ usbd_errstr(error));
}
sc->sc_repdesc_size = sizeof(uhid_graphire3_4x5_report_descr);
sc->sc_repdesc_ptr = USB_ADD_BYTES(uhid_graphire3_4x5_report_descr, 0);
@@ -691,7 +691,7 @@ uhid_attach(device_t dev)
}
if (sc->sc_repdesc_ptr == NULL) {
- error = usb2_req_get_hid_desc(uaa->device, NULL,
+ error = usbd_req_get_hid_desc(uaa->device, NULL,
&sc->sc_repdesc_ptr, &sc->sc_repdesc_size,
M_USBDEV, uaa->info.bIfaceIndex);
@@ -700,12 +700,12 @@ uhid_attach(device_t dev)
goto detach;
}
}
- error = usb2_req_set_idle(uaa->device, NULL,
+ error = usbd_req_set_idle(uaa->device, NULL,
uaa->info.bIfaceIndex, 0, 0);
if (error) {
DPRINTF("set idle failed, error=%s (ignored)\n",
- usb2_errstr(error));
+ usbd_errstr(error));
}
sc->sc_isize = hid_report_size
(sc->sc_repdesc_ptr, sc->sc_repdesc_size, hid_input, &sc->sc_iid);
@@ -735,7 +735,7 @@ uhid_attach(device_t dev)
sc->sc_fsize = UHID_BSIZE;
}
- error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
+ error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
&uhid_fifo_methods, &sc->sc_fifo,
unit, 0 - 1, uaa->info.bIfaceIndex,
UID_ROOT, GID_OPERATOR, 0644);
@@ -754,9 +754,9 @@ uhid_detach(device_t dev)
{
struct uhid_softc *sc = device_get_softc(dev);
- usb2_fifo_detach(&sc->sc_fifo);
+ usb_fifo_detach(&sc->sc_fifo);
- usb2_transfer_unsetup(sc->sc_xfer, UHID_N_TRANSFER);
+ usbd_transfer_unsetup(sc->sc_xfer, UHID_N_TRANSFER);
if (sc->sc_repdesc_ptr) {
if (!(sc->sc_flags & UHID_FLAG_STATIC_DESC)) {
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index 52b2176..52062fc 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -297,14 +297,14 @@ ukbd_get_key(struct ukbd_softc *sc, uint8_t wait)
if (sc->sc_inputs == 0) {
/* start transfer, if not already started */
- usb2_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
+ usbd_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
}
if (sc->sc_flags & UKBD_FLAG_POLLING) {
DPRINTFN(2, "polling\n");
while (sc->sc_inputs == 0) {
- usb2_do_poll(sc->sc_xfer, UKBD_N_TRANSFER);
+ usbd_do_poll(sc->sc_xfer, UKBD_N_TRANSFER);
DELAY(1000); /* delay 1 ms */
@@ -454,7 +454,7 @@ ukbd_timeout(void *arg)
}
ukbd_interrupt(sc);
- usb2_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc);
+ usb_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc);
}
static uint8_t
@@ -501,7 +501,7 @@ ukbd_intr_callback(struct usb_xfer *xfer)
if (sc->sc_kbd_id != 0) {
/* check and remove HID ID byte */
- usb2_copy_out(xfer->frbuffers, 0, &id, 1);
+ usbd_copy_out(xfer->frbuffers, 0, &id, 1);
if (id != sc->sc_kbd_id) {
DPRINTF("wrong HID ID\n");
goto tr_setup;
@@ -518,7 +518,7 @@ ukbd_intr_callback(struct usb_xfer *xfer)
if (len) {
memset(&sc->sc_ndata, 0, sizeof(sc->sc_ndata));
- usb2_copy_out(xfer->frbuffers, offset,
+ usbd_copy_out(xfer->frbuffers, offset,
&sc->sc_ndata, len);
if ((sc->sc_flags & UKBD_FLAG_APPLE_EJECT) &&
@@ -568,14 +568,14 @@ ukbd_intr_callback(struct usb_xfer *xfer)
tr_setup:
if (sc->sc_inputs < UKBD_IN_BUF_FULL) {
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
} else {
DPRINTF("input queue is full!\n");
}
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) {
/* try to clear stall first */
@@ -617,18 +617,18 @@ ukbd_set_leds_callback(struct usb_xfer *xfer)
buf[1] = 0;
}
- usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
- usb2_copy_in(xfer->frbuffers + 1, 0, buf, sizeof(buf));
+ usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
+ usbd_copy_in(xfer->frbuffers + 1, 0, buf, sizeof(buf));
xfer->frlengths[0] = sizeof(req);
xfer->frlengths[1] = req.wLength[0];
xfer->nframes = 2;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
return;
default: /* Error */
- DPRINTFN(0, "error=%s\n", usb2_errstr(xfer->error));
+ DPRINTFN(0, "error=%s\n", usbd_errstr(xfer->error));
return;
}
}
@@ -677,13 +677,13 @@ ukbd_probe(device_t dev)
if ((uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) &&
(uaa->info.bInterfaceProtocol == UPROTO_BOOT_KEYBOARD)) {
- if (usb2_test_quirk(uaa, UQ_KBD_IGNORE))
+ if (usb_test_quirk(uaa, UQ_KBD_IGNORE))
return (ENXIO);
else
return (0);
}
- error = usb2_req_get_hid_desc(uaa->device, NULL,
+ error = usbd_req_get_hid_desc(uaa->device, NULL,
&d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex);
if (error)
@@ -691,7 +691,7 @@ ukbd_probe(device_t dev)
if (hid_is_collection(d_ptr, d_len,
HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_KEYBOARD))) {
- if (usb2_test_quirk(uaa, UQ_KBD_IGNORE))
+ if (usb_test_quirk(uaa, UQ_KBD_IGNORE))
error = ENXIO;
else
error = 0;
@@ -721,7 +721,7 @@ ukbd_attach(device_t dev)
kbd->kb_data = (void *)sc;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
sc->sc_udev = uaa->device;
sc->sc_iface = uaa->iface;
@@ -729,14 +729,14 @@ ukbd_attach(device_t dev)
sc->sc_iface_no = uaa->info.bIfaceNum;
sc->sc_mode = K_XLATE;
- usb2_callout_init_mtx(&sc->sc_callout, &Giant, 0);
+ usb_callout_init_mtx(&sc->sc_callout, &Giant, 0);
- err = usb2_transfer_setup(uaa->device,
+ err = usbd_transfer_setup(uaa->device,
&uaa->info.bIfaceIndex, sc->sc_xfer, ukbd_config,
UKBD_N_TRANSFER, sc, &Giant);
if (err) {
- DPRINTF("error=%s\n", usb2_errstr(err));
+ DPRINTF("error=%s\n", usbd_errstr(err));
goto detach;
}
/* setup default keyboard maps */
@@ -761,7 +761,7 @@ ukbd_attach(device_t dev)
KBD_PROBE_DONE(kbd);
/* figure out if there is an ID byte in the data */
- err = usb2_req_get_hid_desc(uaa->device, NULL, &hid_ptr,
+ err = usbd_req_get_hid_desc(uaa->device, NULL, &hid_ptr,
&hid_len, M_TEMP, uaa->info.bIfaceIndex);
if (err == 0) {
uint8_t temp_id;
@@ -801,7 +801,7 @@ ukbd_attach(device_t dev)
}
/* ignore if SETIDLE fails, hence it is not crucial */
- err = usb2_req_set_idle(sc->sc_udev, &Giant, sc->sc_iface_index, 0, 0);
+ err = usbd_req_set_idle(sc->sc_udev, &Giant, sc->sc_iface_index, 0, 0);
ukbd_ioctl(kbd, KDSETLED, (caddr_t)&sc->sc_state);
@@ -830,7 +830,7 @@ ukbd_attach(device_t dev)
/* start the keyboard */
- usb2_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
+ usbd_transfer_start(sc->sc_xfer[UKBD_INTR_DT]);
/* start the timer */
@@ -858,7 +858,7 @@ ukbd_detach(device_t dev)
}
sc->sc_flags |= UKBD_FLAG_GONE;
- usb2_callout_stop(&sc->sc_callout);
+ usb_callout_stop(&sc->sc_callout);
ukbd_disable(&sc->sc_kbd);
@@ -882,9 +882,9 @@ ukbd_detach(device_t dev)
}
sc->sc_kbd.kb_flags = 0;
- usb2_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER);
+ usbd_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER);
- usb2_callout_drain(&sc->sc_callout);
+ usb_callout_drain(&sc->sc_callout);
DPRINTF("%s: disconnected\n",
device_get_nameunit(dev));
@@ -1492,7 +1492,7 @@ ukbd_set_leds(struct ukbd_softc *sc, uint8_t leds)
/* start transfer, if not already started */
- usb2_transfer_start(sc->sc_xfer[UKBD_CTRL_LED]);
+ usbd_transfer_start(sc->sc_xfer[UKBD_CTRL_LED]);
}
static int
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index cf8ef5f..4eff1f2 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -197,7 +197,7 @@ ums_intr_callback(struct usb_xfer *xfer)
if (len == 0)
goto tr_setup;
- usb2_copy_out(xfer->frbuffers, 0, buf, len);
+ usbd_copy_out(xfer->frbuffers, 0, buf, len);
DPRINTFN(6, "data = %02x %02x %02x %02x "
"%02x %02x %02x %02x\n",
@@ -287,11 +287,11 @@ ums_intr_callback(struct usb_xfer *xfer)
(dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) &&
(dw == 0) && (buttons == 0)) {
- usb2_callout_reset(&sc->sc_callout, hz / 20,
+ usb_callout_reset(&sc->sc_callout, hz / 20,
&ums_put_queue_timeout, sc);
} else {
- usb2_callout_stop(&sc->sc_callout);
+ usb_callout_stop(&sc->sc_callout);
ums_put_queue(sc, dx, dy, dz, dt, buttons);
}
@@ -299,10 +299,10 @@ ums_intr_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
tr_setup:
/* check if we can put more data into the FIFO */
- if (usb2_fifo_put_bytes_max(
+ if (usb_fifo_put_bytes_max(
sc->sc_fifo.fp[USB_FIFO_RX]) != 0) {
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
}
break;
@@ -348,7 +348,7 @@ ums_probe(device_t dev)
(uaa->info.bInterfaceProtocol == UIPROTO_MOUSE))
return (0);
- error = usb2_req_get_hid_desc(uaa->device, NULL,
+ error = usbd_req_get_hid_desc(uaa->device, NULL,
&d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex);
if (error)
@@ -476,11 +476,11 @@ ums_attach(device_t dev)
DPRINTFN(11, "sc=%p\n", sc);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "ums lock", NULL, MTX_DEF | MTX_RECURSE);
- usb2_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0);
+ usb_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0);
/*
* Force the report (non-boot) protocol.
@@ -488,18 +488,18 @@ ums_attach(device_t dev)
* Mice without boot protocol support may choose not to implement
* Set_Protocol at all; Ignore any error.
*/
- err = usb2_req_set_protocol(uaa->device, NULL,
+ err = usbd_req_set_protocol(uaa->device, NULL,
uaa->info.bIfaceIndex, 1);
- err = usb2_transfer_setup(uaa->device,
+ err = usbd_transfer_setup(uaa->device,
&uaa->info.bIfaceIndex, sc->sc_xfer, ums_config,
UMS_N_TRANSFER, sc, &sc->sc_mtx);
if (err) {
- DPRINTF("error=%s\n", usb2_errstr(err));
+ DPRINTF("error=%s\n", usbd_errstr(err));
goto detach;
}
- err = usb2_req_get_hid_desc(uaa->device, NULL, &d_ptr,
+ err = usbd_req_get_hid_desc(uaa->device, NULL, &d_ptr,
&d_len, M_TEMP, uaa->info.bIfaceIndex);
if (err) {
@@ -515,7 +515,7 @@ ums_attach(device_t dev)
* all of its other button positions are all off. It also reports that
* it has two addional buttons and a tilt wheel.
*/
- if (usb2_test_quirk(uaa, UQ_MS_BAD_CLASS)) {
+ if (usb_test_quirk(uaa, UQ_MS_BAD_CLASS)) {
info = &sc->sc_info[0];
info->sc_flags = (UMS_FLAG_X_AXIS |
UMS_FLAG_Y_AXIS |
@@ -542,7 +542,7 @@ ums_attach(device_t dev)
}
}
- if (usb2_test_quirk(uaa, UQ_MS_REVZ)) {
+ if (usb_test_quirk(uaa, UQ_MS_REVZ)) {
info = &sc->sc_info[0];
/* Some wheels need the Z axis reversed. */
info->sc_flags |= UMS_FLAG_REVZ;
@@ -599,7 +599,7 @@ ums_attach(device_t dev)
sc->sc_mode.syncmask[0] = MOUSE_MSC_SYNCMASK;
sc->sc_mode.syncmask[1] = MOUSE_MSC_SYNC;
- err = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
+ err = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx,
&ums_fifo_methods, &sc->sc_fifo,
device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex,
UID_ROOT, GID_OPERATOR, 0644);
@@ -623,11 +623,11 @@ ums_detach(device_t self)
DPRINTF("sc=%p\n", sc);
- usb2_fifo_detach(&sc->sc_fifo);
+ usb_fifo_detach(&sc->sc_fifo);
- usb2_transfer_unsetup(sc->sc_xfer, UMS_N_TRANSFER);
+ usbd_transfer_unsetup(sc->sc_xfer, UMS_N_TRANSFER);
- usb2_callout_drain(&sc->sc_callout);
+ usb_callout_drain(&sc->sc_callout);
mtx_destroy(&sc->sc_mtx);
@@ -639,7 +639,7 @@ ums_start_read(struct usb_fifo *fifo)
{
struct ums_softc *sc = fifo->priv_sc0;
- usb2_transfer_start(sc->sc_xfer[UMS_INTR_DT]);
+ usbd_transfer_start(sc->sc_xfer[UMS_INTR_DT]);
}
static void
@@ -647,8 +647,8 @@ ums_stop_read(struct usb_fifo *fifo)
{
struct ums_softc *sc = fifo->priv_sc0;
- usb2_transfer_stop(sc->sc_xfer[UMS_INTR_DT]);
- usb2_callout_stop(&sc->sc_callout);
+ usbd_transfer_stop(sc->sc_xfer[UMS_INTR_DT]);
+ usb_callout_stop(&sc->sc_callout);
}
@@ -694,7 +694,7 @@ ums_put_queue(struct ums_softc *sc, int32_t dx, int32_t dy,
buf[6] = dz - (dz >> 1);
buf[7] = (((~buttons) >> 3) & MOUSE_SYS_EXTBUTTONS);
}
- usb2_fifo_put_data_linear(sc->sc_fifo.fp[USB_FIFO_RX], buf,
+ usb_fifo_put_data_linear(sc->sc_fifo.fp[USB_FIFO_RX], buf,
sc->sc_mode.packetsize, 1);
} else {
@@ -706,7 +706,7 @@ static void
ums_reset_buf(struct ums_softc *sc)
{
/* reset read queue */
- usb2_fifo_reset(sc->sc_fifo.fp[USB_FIFO_RX]);
+ usb_fifo_reset(sc->sc_fifo.fp[USB_FIFO_RX]);
}
static int
@@ -728,7 +728,7 @@ ums_open(struct usb_fifo *fifo, int fflags)
sc->sc_status.dz = 0;
/* sc->sc_status.dt = 0; */
- if (usb2_fifo_alloc_buffer(fifo,
+ if (usb_fifo_alloc_buffer(fifo,
UMS_BUF_SIZE, UMS_IFQ_MAXLEN)) {
return (ENOMEM);
}
@@ -740,7 +740,7 @@ static void
ums_close(struct usb_fifo *fifo, int fflags)
{
if (fflags & FREAD) {
- usb2_fifo_free_buffer(fifo);
+ usb_fifo_free_buffer(fifo);
}
}
OpenPOWER on IntegriCloud