diff options
Diffstat (limited to 'sys/dev/usb/serial/uftdi.c')
| -rw-r--r-- | sys/dev/usb/serial/uftdi.c | 79 |
1 files changed, 49 insertions, 30 deletions
diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c index 700d68b..52a070b 100644 --- a/sys/dev/usb/serial/uftdi.c +++ b/sys/dev/usb/serial/uftdi.c @@ -48,21 +48,34 @@ __FBSDID("$FreeBSD$"); * FTDI FT8U100AX serial adapter driver */ -#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/usb_cdc.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include "usbdevs.h" #define USB_DEBUG_VAR uftdi_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> #include <dev/usb/serial/uftdi_reg.h> @@ -296,8 +309,8 @@ uftdi_attach(device_t dev) /* clear stall at first run */ mtx_lock(&sc->sc_mtx); - usbd_transfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_WR]); - usbd_transfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_RD]); + usbd_xfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[UFTDI_BULK_DT_RD]); mtx_unlock(&sc->sc_mtx); /* set a valid "lcr" value */ @@ -368,9 +381,10 @@ uftdi_cfg_open(struct ucom_softc *ucom) } static void -uftdi_write_callback(struct usb_xfer *xfer) +uftdi_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct uftdi_softc *sc = xfer->priv_sc; + struct uftdi_softc *sc = usbd_xfer_softc(xfer); + struct usb_page_cache *pc; uint32_t actlen; uint8_t buf[1]; @@ -378,24 +392,25 @@ uftdi_write_callback(struct usb_xfer *xfer) case USB_ST_SETUP: case USB_ST_TRANSFERRED: tr_setup: - if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers, + pc = usbd_xfer_get_frame(xfer, 0); + if (ucom_get_data(&sc->sc_ucom, pc, 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); - usbd_copy_in(xfer->frbuffers, 0, buf, 1); + usbd_copy_in(pc, 0, buf, 1); } - xfer->frlengths[0] = actlen + sc->sc_hdrlen; + usbd_xfer_set_frame_len(xfer, 0, actlen + sc->sc_hdrlen); 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; @@ -403,21 +418,26 @@ tr_setup: } static void -uftdi_read_callback(struct usb_xfer *xfer) +uftdi_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct uftdi_softc *sc = xfer->priv_sc; + struct uftdi_softc *sc = usbd_xfer_softc(xfer); + struct usb_page_cache *pc; uint8_t buf[2]; uint8_t ftdi_msr; uint8_t msr; uint8_t lsr; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->actlen < 2) { + if (actlen < 2) { goto tr_setup; } - usbd_copy_out(xfer->frbuffers, 0, buf, 2); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, buf, 2); ftdi_msr = FTDI_GET_MSR(buf); lsr = FTDI_GET_LSR(buf); @@ -443,22 +463,21 @@ uftdi_read_callback(struct usb_xfer *xfer) ucom_status_change(&sc->sc_ucom); } - xfer->actlen -= 2; + actlen -= 2; - if (xfer->actlen > 0) { - ucom_put_data(&sc->sc_ucom, xfer->frbuffers, 2, - xfer->actlen); + if (actlen > 0) { + ucom_put_data(&sc->sc_ucom, pc, 2, 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; |
