summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/serial/umodem.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/serial/umodem.c')
-rw-r--r--sys/dev/usb/serial/umodem.c108
1 files changed, 67 insertions, 41 deletions
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index e409d07..fc658c5 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -80,23 +80,38 @@ __FBSDID("$FreeBSD$");
*
*/
-#include "usbdevs.h"
+#include <sys/stdint.h>
+#include <sys/stddef.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/sysctl.h>
+#include <sys/sx.h>
+#include <sys/unistd.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/priv.h>
+
#include <dev/usb/usb.h>
-#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_error.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbhid.h>
#include <dev/usb/usb_cdc.h>
+#include "usbdevs.h"
+
#include <dev/usb/usb_ioctl.h>
#define USB_DEBUG_VAR umodem_debug
-
-#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
#include <dev/usb/usb_process.h>
-#include <dev/usb/usb_request.h>
-#include <dev/usb/usb_lookup.h>
-#include <dev/usb/usb_util.h>
-#include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_device.h>
#include <dev/usb/serial/usb_serial.h>
@@ -353,8 +368,8 @@ umodem_attach(device_t dev)
/* clear stall at first run */
mtx_lock(&sc->sc_mtx);
- usbd_transfer_set_stall(sc->sc_xfer[UMODEM_BULK_WR]);
- usbd_transfer_set_stall(sc->sc_xfer[UMODEM_BULK_RD]);
+ usbd_xfer_set_stall(sc->sc_xfer[UMODEM_BULK_WR]);
+ usbd_xfer_set_stall(sc->sc_xfer[UMODEM_BULK_RD]);
mtx_unlock(&sc->sc_mtx);
error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc,
@@ -600,31 +615,36 @@ umodem_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
}
static void
-umodem_intr_callback(struct usb_xfer *xfer)
+umodem_intr_callback(struct usb_xfer *xfer, usb_error_t error)
{
struct usb_cdc_notification pkt;
- struct umodem_softc *sc = xfer->priv_sc;
+ struct umodem_softc *sc = usbd_xfer_softc(xfer);
+ struct usb_page_cache *pc;
uint16_t wLen;
+ int actlen;
+
+ usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
- if (xfer->actlen < 8) {
+ if (actlen < 8) {
DPRINTF("received short packet, "
- "%d bytes\n", xfer->actlen);
+ "%d bytes\n", actlen);
goto tr_setup;
}
- if (xfer->actlen > sizeof(pkt)) {
+ if (actlen > sizeof(pkt)) {
DPRINTF("truncating message\n");
- xfer->actlen = sizeof(pkt);
+ actlen = sizeof(pkt);
}
- usbd_copy_out(xfer->frbuffers, 0, &pkt, xfer->actlen);
+ pc = usbd_xfer_get_frame(xfer, 0);
+ usbd_copy_out(pc, 0, &pkt, actlen);
- xfer->actlen -= 8;
+ actlen -= 8;
wLen = UGETW(pkt.wLength);
- if (xfer->actlen > wLen) {
- xfer->actlen = wLen;
+ if (actlen > wLen) {
+ actlen = wLen;
}
if (pkt.bmRequestType != UCDC_NOTIFICATION) {
DPRINTF("unknown message type, "
@@ -638,9 +658,9 @@ umodem_intr_callback(struct usb_xfer *xfer)
* Set the serial state in ucom driver based on
* the bits from the notify message
*/
- if (xfer->actlen < 2) {
+ if (actlen < 2) {
DPRINTF("invalid notification "
- "length, %d bytes!\n", xfer->actlen);
+ "length, %d bytes!\n", actlen);
break;
}
DPRINTF("notify bytes = %02x%02x\n",
@@ -671,14 +691,14 @@ umodem_intr_callback(struct usb_xfer *xfer)
case USB_ST_SETUP:
tr_setup:
- xfer->frlengths[0] = xfer->max_data_length;
+ usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
usbd_transfer_submit(xfer);
return;
default: /* Error */
- if (xfer->error != USB_ERR_CANCELLED) {
+ if (error != USB_ERR_CANCELLED) {
/* try to clear stall first */
- xfer->flags.stall_pipe = 1;
+ usbd_xfer_set_stall(xfer);
goto tr_setup;
}
return;
@@ -687,27 +707,29 @@ tr_setup:
}
static void
-umodem_write_callback(struct usb_xfer *xfer)
+umodem_write_callback(struct usb_xfer *xfer, usb_error_t error)
{
- struct umodem_softc *sc = xfer->priv_sc;
+ struct umodem_softc *sc = usbd_xfer_softc(xfer);
+ struct usb_page_cache *pc;
uint32_t actlen;
switch (USB_GET_STATE(xfer)) {
case USB_ST_SETUP:
case USB_ST_TRANSFERRED:
tr_setup:
- if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers, 0,
+ pc = usbd_xfer_get_frame(xfer, 0);
+ if (ucom_get_data(&sc->sc_ucom, pc, 0,
UMODEM_BUF_SIZE, &actlen)) {
- xfer->frlengths[0] = actlen;
+ usbd_xfer_set_frame_len(xfer, 0, actlen);
usbd_transfer_submit(xfer);
}
return;
default: /* Error */
- if (xfer->error != USB_ERR_CANCELLED) {
+ if (error != USB_ERR_CANCELLED) {
/* try to clear stall first */
- xfer->flags.stall_pipe = 1;
+ usbd_xfer_set_stall(xfer);
goto tr_setup;
}
return;
@@ -715,28 +737,32 @@ tr_setup:
}
static void
-umodem_read_callback(struct usb_xfer *xfer)
+umodem_read_callback(struct usb_xfer *xfer, usb_error_t error)
{
- struct umodem_softc *sc = xfer->priv_sc;
+ struct umodem_softc *sc = usbd_xfer_softc(xfer);
+ struct usb_page_cache *pc;
+ int actlen;
+
+ usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
- DPRINTF("actlen=%d\n", xfer->actlen);
+ DPRINTF("actlen=%d\n", actlen);
- ucom_put_data(&sc->sc_ucom, xfer->frbuffers, 0,
- xfer->actlen);
+ pc = usbd_xfer_get_frame(xfer, 0);
+ ucom_put_data(&sc->sc_ucom, pc, 0, actlen);
case USB_ST_SETUP:
tr_setup:
- xfer->frlengths[0] = xfer->max_data_length;
+ usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
usbd_transfer_submit(xfer);
return;
default: /* Error */
- if (xfer->error != USB_ERR_CANCELLED) {
+ if (error != USB_ERR_CANCELLED) {
/* try to clear stall first */
- xfer->flags.stall_pipe = 1;
+ usbd_xfer_set_stall(xfer);
goto tr_setup;
}
return;
OpenPOWER on IntegriCloud