diff options
Diffstat (limited to 'sys/dev/usb/serial/uplcom.c')
| -rw-r--r-- | sys/dev/usb/serial/uplcom.c | 88 |
1 files changed, 57 insertions, 31 deletions
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c index 0604b42fb9e1..399792f1ef15 100644 --- a/sys/dev/usb/serial/uplcom.c +++ b/sys/dev/usb/serial/uplcom.c @@ -84,21 +84,35 @@ __FBSDID("$FreeBSD$"); * documented in the datasheet. */ -#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/usb_cdc.h> +#include "usbdevs.h" #define USB_DEBUG_VAR uplcom_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/serial/usb_serial.h> @@ -389,8 +403,8 @@ uplcom_attach(device_t dev) } /* clear stall at first run */ mtx_lock(&sc->sc_mtx); - usbd_transfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_WR]); - usbd_transfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_RD]); + usbd_xfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_RD]); mtx_unlock(&sc->sc_mtx); error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, @@ -736,19 +750,24 @@ uplcom_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr) } static void -uplcom_intr_callback(struct usb_xfer *xfer) +uplcom_intr_callback(struct usb_xfer *xfer, usb_error_t error) { - struct uplcom_softc *sc = xfer->priv_sc; + struct uplcom_softc *sc = usbd_xfer_softc(xfer); + struct usb_page_cache *pc; uint8_t buf[9]; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - DPRINTF("actlen = %u\n", xfer->actlen); + DPRINTF("actlen = %u\n", actlen); - if (xfer->actlen >= 9) { + if (actlen >= 9) { - usbd_copy_out(xfer->frbuffers, 0, buf, sizeof(buf)); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, buf, sizeof(buf)); DPRINTF("status = 0x%02x\n", buf[8]); @@ -768,14 +787,14 @@ uplcom_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; @@ -783,29 +802,31 @@ tr_setup: } static void -uplcom_write_callback(struct usb_xfer *xfer) +uplcom_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct uplcom_softc *sc = xfer->priv_sc; + struct uplcom_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, UPLCOM_BULK_BUF_SIZE, &actlen)) { DPRINTF("actlen = %d\n", 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; @@ -813,24 +834,29 @@ tr_setup: } static void -uplcom_read_callback(struct usb_xfer *xfer) +uplcom_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct uplcom_softc *sc = xfer->priv_sc; + struct uplcom_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: - 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; |