diff options
Diffstat (limited to 'sys/dev/usb/net')
| -rw-r--r-- | sys/dev/usb/net/if_aue.c | 116 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_axe.c | 104 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_cdce.c | 129 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_cue.c | 83 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_kue.c | 87 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_rue.c | 100 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_udav.c | 97 | ||||
| -rw-r--r-- | sys/dev/usb/net/usb_ethernet.c | 29 |
8 files changed, 450 insertions, 295 deletions
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c index 46ec901..550186d 100644 --- a/sys/dev/usb/net/if_aue.c +++ b/sys/dev/usb/net/if_aue.c @@ -68,20 +68,34 @@ __FBSDID("$FreeBSD$"); * transfers are done using usbd_transfer() and friends. */ -#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 "usbdevs.h" #define USB_DEBUG_VAR aue_debug - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_lookup.h> -#include <dev/usb/usb_process.h> #include <dev/usb/usb_debug.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> #include <dev/usb/net/usb_ethernet.h> #include <dev/usb/net/if_auereg.h> @@ -711,19 +725,24 @@ aue_detach(device_t dev) } static void -aue_intr_callback(struct usb_xfer *xfer) +aue_intr_callback(struct usb_xfer *xfer, usb_error_t error) { - struct aue_softc *sc = xfer->priv_sc; + struct aue_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); struct aue_intrpkt pkt; + struct usb_page_cache *pc; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && - xfer->actlen >= sizeof(pkt)) { + actlen >= sizeof(pkt)) { - usbd_copy_out(xfer->frbuffers, 0, &pkt, sizeof(pkt)); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, &pkt, sizeof(pkt)); if (pkt.aue_txstat0) ifp->if_oerrors++; @@ -734,14 +753,14 @@ aue_intr_callback(struct usb_xfer *xfer) /* FALLTHROUGH */ 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; @@ -749,31 +768,36 @@ tr_setup: } static void -aue_bulk_read_callback(struct usb_xfer *xfer) +aue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct aue_softc *sc = xfer->priv_sc; + struct aue_softc *sc = usbd_xfer_softc(xfer); struct usb_ether *ue = &sc->sc_ue; struct ifnet *ifp = uether_getifp(ue); struct aue_rxpkt stat; + struct usb_page_cache *pc; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); + pc = usbd_xfer_get_frame(xfer, 0); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - DPRINTFN(11, "received %d bytes\n", xfer->actlen); + DPRINTFN(11, "received %d bytes\n", actlen); if (sc->sc_flags & AUE_FLAG_VER_2) { - if (xfer->actlen == 0) { + if (actlen == 0) { ifp->if_ierrors++; goto tr_setup; } } else { - if (xfer->actlen <= (sizeof(stat) + ETHER_CRC_LEN)) { + if (actlen <= sizeof(stat) + ETHER_CRC_LEN) { ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers, - xfer->actlen - sizeof(stat), &stat, sizeof(stat)); + usbd_copy_out(pc, actlen - sizeof(stat), &stat, + sizeof(stat)); /* * turn off all the non-error bits in the rx status @@ -785,25 +809,25 @@ aue_bulk_read_callback(struct usb_xfer *xfer) goto tr_setup; } /* No errors; receive the packet. */ - xfer->actlen -= (sizeof(stat) + ETHER_CRC_LEN); + actlen -= (sizeof(stat) + ETHER_CRC_LEN); } - uether_rxbuf(ue, xfer->frbuffers, 0, xfer->actlen); + uether_rxbuf(ue, pc, 0, actlen); /* FALLTHROUGH */ 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); uether_rxflush(ue); return; default: /* Error */ DPRINTF("bulk read error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(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; @@ -811,16 +835,21 @@ tr_setup: } static void -aue_bulk_write_callback(struct usb_xfer *xfer) +aue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct aue_softc *sc = xfer->priv_sc; + struct aue_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); + struct usb_page_cache *pc; struct mbuf *m; uint8_t buf[2]; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); + pc = usbd_xfer_get_frame(xfer, 0); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - DPRINTFN(11, "transfer of %d bytes complete\n", xfer->actlen); + DPRINTFN(11, "transfer of %d bytes complete\n", actlen); ifp->if_opackets++; /* FALLTHROUGH */ @@ -840,14 +869,13 @@ tr_setup: m->m_pkthdr.len = MCLBYTES; if (sc->sc_flags & AUE_FLAG_VER_2) { - xfer->frlengths[0] = m->m_pkthdr.len; + usbd_xfer_set_frame_len(xfer, 0, m->m_pkthdr.len); - usbd_m_copy_in(xfer->frbuffers, 0, - m, 0, m->m_pkthdr.len); + usbd_m_copy_in(pc, 0, m, 0, m->m_pkthdr.len); } else { - xfer->frlengths[0] = (m->m_pkthdr.len + 2); + usbd_xfer_set_frame_len(xfer, 0, (m->m_pkthdr.len + 2)); /* * The ADMtek documentation says that the @@ -860,10 +888,8 @@ tr_setup: buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(xfer->frbuffers, 0, buf, 2); - - usbd_m_copy_in(xfer->frbuffers, 2, - m, 0, m->m_pkthdr.len); + usbd_copy_in(pc, 0, buf, 2); + usbd_m_copy_in(pc, 2, m, 0, m->m_pkthdr.len); } /* @@ -879,13 +905,13 @@ tr_setup: default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); ifp->if_oerrors++; - 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; @@ -951,7 +977,7 @@ aue_init(struct usb_ether *ue) AUE_SETBIT(sc, AUE_CTL0, AUE_CTL0_TX_ENB); AUE_SETBIT(sc, AUE_CTL2, AUE_CTL2_EP3_CLR); - usbd_transfer_set_stall(sc->sc_xfer[AUE_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[AUE_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; aue_start(ue); diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c index 83caec0..3c72b38 100644 --- a/sys/dev/usb/net/if_axe.c +++ b/sys/dev/usb/net/if_axe.c @@ -76,20 +76,34 @@ __FBSDID("$FreeBSD$"); * http://www.asix.com.tw/FrootAttach/datasheet/AX88772_datasheet_Rev10.pdf */ -#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 "usbdevs.h" #define USB_DEBUG_VAR axe_debug - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_lookup.h> -#include <dev/usb/usb_process.h> #include <dev/usb/usb_debug.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> #include <dev/usb/net/usb_ethernet.h> #include <dev/usb/net/if_axereg.h> @@ -731,20 +745,20 @@ axe_detach(device_t dev) } static void -axe_intr_callback(struct usb_xfer *xfer) +axe_intr_callback(struct usb_xfer *xfer, usb_error_t error) { switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: 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; @@ -756,56 +770,61 @@ tr_setup: #endif static void -axe_bulk_read_callback(struct usb_xfer *xfer) +axe_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct axe_softc *sc = xfer->priv_sc; + struct axe_softc *sc = usbd_xfer_softc(xfer); struct usb_ether *ue = &sc->sc_ue; struct ifnet *ifp = uether_getifp(ue); struct axe_sframe_hdr hdr; - int error, pos, len, adjust; + struct usb_page_cache *pc; + int err, pos, len, adjust; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: pos = 0; + pc = usbd_xfer_get_frame(xfer, 0); while (1) { if (sc->sc_flags & (AXE_FLAG_772 | AXE_FLAG_178)) { - if (xfer->actlen < sizeof(hdr)) { + if (actlen < sizeof(hdr)) { /* too little data */ break; } - usbd_copy_out(xfer->frbuffers, pos, &hdr, sizeof(hdr)); + usbd_copy_out(pc, pos, &hdr, sizeof(hdr)); if ((hdr.len ^ hdr.ilen) != 0xFFFF) { /* we lost sync */ break; } - xfer->actlen -= sizeof(hdr); + actlen -= sizeof(hdr); pos += sizeof(hdr); len = le16toh(hdr.len); - if (len > xfer->actlen) { + if (len > actlen) { /* invalid length */ break; } adjust = (len & 1); } else { - len = xfer->actlen; + len = actlen; adjust = 0; } - error = uether_rxbuf(ue, xfer->frbuffers, pos, len); - if (error) + err = uether_rxbuf(ue, pc, pos, len); + if (err) break; pos += len; - xfer->actlen -= len; + actlen -= len; - if (xfer->actlen <= adjust) { + if (actlen <= adjust) { /* we are finished */ goto tr_setup; } pos += adjust; - xfer->actlen -= adjust; + actlen -= adjust; } /* count an error */ @@ -814,18 +833,17 @@ axe_bulk_read_callback(struct usb_xfer *xfer) /* FALLTHROUGH */ 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); uether_rxflush(ue); return; default: /* Error */ - DPRINTF("bulk read error, %s\n", - usbd_errstr(xfer->error)); + DPRINTF("bulk read error, %s\n", usbd_errstr(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; @@ -838,11 +856,12 @@ tr_setup: #endif static void -axe_bulk_write_callback(struct usb_xfer *xfer) +axe_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct axe_softc *sc = xfer->priv_sc; + struct axe_softc *sc = usbd_xfer_softc(xfer); struct axe_sframe_hdr hdr; struct ifnet *ifp = uether_getifp(&sc->sc_ue); + struct usb_page_cache *pc; struct mbuf *m; int pos; @@ -860,6 +879,7 @@ tr_setup: return; } pos = 0; + pc = usbd_xfer_get_frame(xfer, 0); while (1) { @@ -878,7 +898,7 @@ tr_setup: hdr.len = htole16(m->m_pkthdr.len); hdr.ilen = ~hdr.len; - usbd_copy_in(xfer->frbuffers, pos, &hdr, sizeof(hdr)); + usbd_copy_in(pc, pos, &hdr, sizeof(hdr)); pos += sizeof(hdr); @@ -890,9 +910,7 @@ tr_setup: * USB_FORCE_SHORT_XFER flag instead. */ } - usbd_m_copy_in(xfer->frbuffers, pos, - m, 0, m->m_pkthdr.len); - + usbd_m_copy_in(pc, pos, m, 0, m->m_pkthdr.len); pos += m->m_pkthdr.len; /* @@ -914,19 +932,19 @@ tr_setup: } } - xfer->frlengths[0] = pos; + usbd_xfer_set_frame_len(xfer, 0, pos); usbd_transfer_submit(xfer); return; default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); ifp->if_oerrors++; - 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; @@ -1010,7 +1028,7 @@ axe_init(struct usb_ether *ue) /* Load the multicast filter. */ axe_setmulti(ue); - usbd_transfer_set_stall(sc->sc_xfer[AXE_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[AXE_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; axe_start(ue); diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index 624760b..532776e 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -43,23 +43,36 @@ #include <sys/cdefs.h> __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/usb_cdc.h> +#include "usbdevs.h" #define USB_DEBUG_VAR cdce_debug - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_lookup.h> -#include <dev/usb/usb_process.h> #include <dev/usb/usb_debug.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_util.h> -#include <dev/usb/usb_parse.h> -#include <dev/usb/usb_device.h> +#include <dev/usb/usb_process.h> +#include "usb_if.h" #include <dev/usb/net/usb_ethernet.h> #include <dev/usb/net/if_cdcereg.h> @@ -426,22 +439,24 @@ cdce_free_queue(struct mbuf **ppm, uint8_t n) } static void -cdce_bulk_write_callback(struct usb_xfer *xfer) +cdce_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct cdce_softc *sc = xfer->priv_sc; + struct cdce_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); struct mbuf *m; struct mbuf *mt; uint32_t crc; uint8_t x; + int actlen, aframes; + + usbd_xfer_status(xfer, &actlen, NULL, &aframes, NULL); DPRINTFN(1, "\n"); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - DPRINTFN(11, "transfer complete: " - "%u bytes in %u frames\n", xfer->actlen, - xfer->aframes); + DPRINTFN(11, "transfer complete: %u bytes in %u frames\n", + actlen, aframes); ifp->if_opackets++; @@ -486,8 +501,7 @@ tr_setup: m->m_pkthdr.len = MCLBYTES; } sc->sc_tx_buf[x] = m; - xfer->frlengths[x] = m->m_len; - usbd_set_frame_data(xfer, m->m_data, x); + usbd_xfer_set_frame_data(xfer, x, m->m_data, m->m_len); /* * If there's a BPF listener, bounce a copy of @@ -496,14 +510,15 @@ tr_setup: BPF_MTAP(ifp, m); } if (x != 0) { - xfer->nframes = x; + usbd_xfer_set_frames(xfer, x); + usbd_transfer_submit(xfer); } break; default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); /* free all previous TX buffers */ cdce_free_queue(sc->sc_tx_buf, CDCE_FRAMES_MAX); @@ -511,9 +526,9 @@ tr_setup: /* count output errors */ ifp->if_oerrors++; - 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; } break; @@ -554,7 +569,7 @@ cdce_init(struct usb_ether *ue) usbd_transfer_start(sc->sc_xfer[CDCE_INTR_TX]); /* stall data write direction, which depends on USB mode */ - usbd_transfer_set_stall(sc->sc_xfer[CDCE_BULK_TX]); + usbd_xfer_set_stall(sc->sc_xfer[CDCE_BULK_TX]); /* start data transfers */ cdce_start(ue); @@ -608,34 +623,36 @@ cdce_resume(device_t dev) } static void -cdce_bulk_read_callback(struct usb_xfer *xfer) +cdce_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct cdce_softc *sc = xfer->priv_sc; + struct cdce_softc *sc = usbd_xfer_softc(xfer); struct mbuf *m; uint8_t x; + int actlen, aframes, len; + + usbd_xfer_status(xfer, &actlen, NULL, &aframes, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - DPRINTF("received %u bytes in %u frames\n", - xfer->actlen, xfer->aframes); + DPRINTF("received %u bytes in %u frames\n", actlen, aframes); - for (x = 0; x != xfer->aframes; x++) { + for (x = 0; x != aframes; x++) { m = sc->sc_rx_buf[x]; sc->sc_rx_buf[x] = NULL; + len = usbd_xfer_get_frame_len(xfer, x); /* Strip off CRC added by Zaurus, if any */ - if ((sc->sc_flags & CDCE_FLAG_ZAURUS) && - (xfer->frlengths[x] >= 14)) - xfer->frlengths[x] -= 4; + if ((sc->sc_flags & CDCE_FLAG_ZAURUS) && len >= 14) + len -= 4; - if (xfer->frlengths[x] < sizeof(struct ether_header)) { + if (len < sizeof(struct ether_header)) { m_freem(m); continue; } /* queue up mbuf */ - uether_rxmbuf(&sc->sc_ue, m, xfer->frlengths[x]); + uether_rxmbuf(&sc->sc_ue, m, len); } /* FALLTHROUGH */ @@ -654,11 +671,10 @@ cdce_bulk_read_callback(struct usb_xfer *xfer) m = sc->sc_rx_buf[x]; } - usbd_set_frame_data(xfer, m->m_data, x); - xfer->frlengths[x] = m->m_len; + usbd_xfer_set_frame_data(xfer, x, m->m_data, m->m_len); } /* set number of frames and start hardware */ - xfer->nframes = x; + usbd_xfer_set_frames(xfer, x); usbd_transfer_submit(xfer); /* flush any received frames */ uether_rxflush(&sc->sc_ue); @@ -666,13 +682,13 @@ cdce_bulk_read_callback(struct usb_xfer *xfer) default: /* Error */ DPRINTF("error = %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); - if (xfer->error != USB_ERR_CANCELLED) { + if (error != USB_ERR_CANCELLED) { tr_stall: /* try to clear stall first */ - xfer->flags.stall_pipe = 1; - xfer->nframes = 0; + usbd_xfer_set_stall(xfer); + usbd_xfer_set_frames(xfer, 0); usbd_transfer_submit(xfer); break; } @@ -684,28 +700,30 @@ tr_stall: } static void -cdce_intr_read_callback(struct usb_xfer *xfer) +cdce_intr_read_callback(struct usb_xfer *xfer, usb_error_t error) { - ; /* style fix */ + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); + switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - DPRINTF("Received %d bytes\n", - xfer->actlen); + DPRINTF("Received %d bytes\n", actlen); /* TODO: decode some indications */ /* FALLTHROUGH */ 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); break; default: /* Error */ - if (xfer->error != USB_ERR_CANCELLED) { + if (error != USB_ERR_CANCELLED) { /* start clear stall */ - xfer->flags.stall_pipe = 1; + usbd_xfer_set_stall(xfer); goto tr_setup; } break; @@ -713,27 +731,30 @@ tr_setup: } static void -cdce_intr_write_callback(struct usb_xfer *xfer) +cdce_intr_write_callback(struct usb_xfer *xfer, usb_error_t error) { - ; /* style fix */ + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); + switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - DPRINTF("Transferred %d bytes\n", xfer->actlen); + DPRINTF("Transferred %d bytes\n", actlen); /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: #if 0 - xfer->frlengths[0] = XXX; + usbd_xfer_set_frame_len(xfer, 0, XXX); usbd_transfer_submit(xfer); #endif break; default: /* Error */ - if (xfer->error != USB_ERR_CANCELLED) { + if (error != USB_ERR_CANCELLED) { /* start clear stall */ - xfer->flags.stall_pipe = 1; + usbd_xfer_set_stall(xfer); goto tr_setup; } break; diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c index 648722f..4bb0da2 100644 --- a/sys/dev/usb/net/if_cue.c +++ b/sys/dev/usb/net/if_cue.c @@ -51,20 +51,34 @@ __FBSDID("$FreeBSD$"); * transaction, which helps performance a great deal. */ -#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 "usbdevs.h" #define USB_DEBUG_VAR cue_debug - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_lookup.h> -#include <dev/usb/usb_process.h> #include <dev/usb/usb_debug.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> #include <dev/usb/net/usb_ethernet.h> #include <dev/usb/net/if_cuereg.h> @@ -426,42 +440,47 @@ cue_detach(device_t dev) } static void -cue_bulk_read_callback(struct usb_xfer *xfer) +cue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct cue_softc *sc = xfer->priv_sc; + struct cue_softc *sc = usbd_xfer_softc(xfer); struct usb_ether *ue = &sc->sc_ue; struct ifnet *ifp = uether_getifp(ue); + struct usb_page_cache *pc; uint8_t buf[2]; int len; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->actlen <= (2 + sizeof(struct ether_header))) { + if (actlen <= (2 + sizeof(struct ether_header))) { ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers, 0, buf, 2); - xfer->actlen -= 2; + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, buf, 2); + actlen -= 2; len = buf[0] | (buf[1] << 8); - len = min(xfer->actlen, len); + len = min(actlen, len); - uether_rxbuf(ue, xfer->frbuffers, 2, len); + uether_rxbuf(ue, pc, 2, len); /* FALLTHROUGH */ 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); uether_rxflush(ue); return; default: /* Error */ DPRINTF("bulk read error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(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; @@ -470,10 +489,11 @@ tr_setup: } static void -cue_bulk_write_callback(struct usb_xfer *xfer) +cue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct cue_softc *sc = xfer->priv_sc; + struct cue_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); + struct usb_page_cache *pc; struct mbuf *m; uint8_t buf[2]; @@ -491,17 +511,16 @@ tr_setup: return; if (m->m_pkthdr.len > MCLBYTES) m->m_pkthdr.len = MCLBYTES; - xfer->frlengths[0] = (m->m_pkthdr.len + 2); + usbd_xfer_set_frame_len(xfer, 0, (m->m_pkthdr.len + 2)); /* the first two bytes are the frame length */ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(xfer->frbuffers, 0, buf, 2); - - usbd_m_copy_in(xfer->frbuffers, 2, - m, 0, m->m_pkthdr.len); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_in(pc, 0, buf, 2); + usbd_m_copy_in(pc, 2, m, 0, m->m_pkthdr.len); /* * If there's a BPF listener, bounce a copy of this frame @@ -517,13 +536,13 @@ tr_setup: default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); ifp->if_oerrors++; - 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; @@ -598,7 +617,7 @@ cue_init(struct usb_ether *ue) /* Program the LED operation. */ cue_csr_write_1(sc, CUE_LEDCTL, CUE_LEDCTL_FOLLOW_LINK); - usbd_transfer_set_stall(sc->sc_xfer[CUE_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[CUE_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; cue_start(ue); diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c index 555b493..85a43a2 100644 --- a/sys/dev/usb/net/if_kue.c +++ b/sys/dev/usb/net/if_kue.c @@ -65,20 +65,34 @@ __FBSDID("$FreeBSD$"); * the development of this 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/usbdi.h> +#include <dev/usb/usbdi_util.h> +#include "usbdevs.h" #define USB_DEBUG_VAR kue_debug - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_lookup.h> -#include <dev/usb/usb_process.h> #include <dev/usb/usb_debug.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> #include <dev/usb/net/usb_ethernet.h> #include <dev/usb/net/if_kuereg.h> @@ -514,42 +528,47 @@ kue_detach(device_t dev) * the higher level protocols. */ static void -kue_bulk_read_callback(struct usb_xfer *xfer) +kue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct kue_softc *sc = xfer->priv_sc; + struct kue_softc *sc = usbd_xfer_softc(xfer); struct usb_ether *ue = &sc->sc_ue; struct ifnet *ifp = uether_getifp(ue); + struct usb_page_cache *pc; uint8_t buf[2]; int len; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->actlen <= (2 + sizeof(struct ether_header))) { + if (actlen <= (2 + sizeof(struct ether_header))) { ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers, 0, buf, 2); - xfer->actlen -= 2; + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, buf, 2); + actlen -= 2; len = buf[0] | (buf[1] << 8); - len = min(xfer->actlen, len); + len = min(actlen, len); - uether_rxbuf(ue, xfer->frbuffers, 2, len); + uether_rxbuf(ue, pc, 2, len); /* FALLTHROUGH */ 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); uether_rxflush(ue); return; default: /* Error */ DPRINTF("bulk read error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(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; @@ -558,10 +577,11 @@ tr_setup: } static void -kue_bulk_write_callback(struct usb_xfer *xfer) +kue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct kue_softc *sc = xfer->priv_sc; + struct kue_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); + struct usb_page_cache *pc; struct mbuf *m; int total_len; int temp_len; @@ -589,15 +609,12 @@ tr_setup: buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(xfer->frbuffers, 0, buf, 2); - - usbd_m_copy_in(xfer->frbuffers, 2, - m, 0, m->m_pkthdr.len); - - usbd_frame_zero(xfer->frbuffers, temp_len, - total_len - temp_len); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_in(pc, 0, buf, 2); + usbd_m_copy_in(pc, 2, m, 0, m->m_pkthdr.len); - xfer->frlengths[0] = total_len; + usbd_frame_zero(pc, temp_len, total_len - temp_len); + usbd_xfer_set_frame_len(xfer, 0, total_len); /* * if there's a BPF listener, bounce a copy @@ -613,13 +630,13 @@ tr_setup: default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); ifp->if_oerrors++; - 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; @@ -664,7 +681,7 @@ kue_init(struct usb_ether *ue) /* load the multicast filter */ kue_setpromisc(ue); - usbd_transfer_set_stall(sc->sc_xfer[KUE_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[KUE_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; kue_start(ue); diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c index 36960d1..b942e50 100644 --- a/sys/dev/usb/net/if_rue.c +++ b/sys/dev/usb/net/if_rue.c @@ -65,20 +65,34 @@ __FBSDID("$FreeBSD$"); * ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/. */ -#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 "usbdevs.h" #define USB_DEBUG_VAR rue_debug - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_lookup.h> -#include <dev/usb/usb_process.h> #include <dev/usb/usb_debug.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> #include <dev/usb/net/usb_ethernet.h> #include <dev/usb/net/if_ruereg.h> @@ -613,19 +627,24 @@ rue_detach(device_t dev) } static void -rue_intr_callback(struct usb_xfer *xfer) +rue_intr_callback(struct usb_xfer *xfer, usb_error_t error) { - struct rue_softc *sc = xfer->priv_sc; + struct rue_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); struct rue_intrpkt pkt; + struct usb_page_cache *pc; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) && - (xfer->actlen >= sizeof(pkt))) { + actlen >= sizeof(pkt)) { - usbd_copy_out(xfer->frbuffers, 0, &pkt, sizeof(pkt)); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, &pkt, sizeof(pkt)); ifp->if_ierrors += pkt.rue_rxlost_cnt; ifp->if_ierrors += pkt.rue_crcerr_cnt; @@ -634,14 +653,14 @@ rue_intr_callback(struct usb_xfer *xfer) /* FALLTHROUGH */ 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; @@ -649,23 +668,27 @@ tr_setup: } static void -rue_bulk_read_callback(struct usb_xfer *xfer) +rue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct rue_softc *sc = xfer->priv_sc; + struct rue_softc *sc = usbd_xfer_softc(xfer); struct usb_ether *ue = &sc->sc_ue; struct ifnet *ifp = uether_getifp(ue); + struct usb_page_cache *pc; uint16_t status; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->actlen < 4) { + if (actlen < 4) { ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers, xfer->actlen - 4, - &status, sizeof(status)); - xfer->actlen -= 4; + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, actlen - 4, &status, sizeof(status)); + actlen -= 4; /* check recieve packet was valid or not */ status = le16toh(status); @@ -673,22 +696,22 @@ rue_bulk_read_callback(struct usb_xfer *xfer) ifp->if_ierrors++; goto tr_setup; } - uether_rxbuf(ue, xfer->frbuffers, 0, xfer->actlen); + uether_rxbuf(ue, pc, 0, actlen); /* FALLTHROUGH */ 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); uether_rxflush(ue); return; default: /* Error */ DPRINTF("bulk read error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(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; @@ -696,10 +719,11 @@ tr_setup: } static void -rue_bulk_write_callback(struct usb_xfer *xfer) +rue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct rue_softc *sc = xfer->priv_sc; + struct rue_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); + struct usb_page_cache *pc; struct mbuf *m; int temp_len; @@ -725,8 +749,8 @@ tr_setup: m->m_pkthdr.len = MCLBYTES; temp_len = m->m_pkthdr.len; - usbd_m_copy_in(xfer->frbuffers, 0, - m, 0, m->m_pkthdr.len); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_m_copy_in(pc, 0, m, 0, m->m_pkthdr.len); /* * This is an undocumented behavior. @@ -734,11 +758,11 @@ tr_setup: * RUE_MIN_FRAMELEN (60) byte packet. */ if (temp_len < RUE_MIN_FRAMELEN) { - usbd_frame_zero(xfer->frbuffers, temp_len, + usbd_frame_zero(pc, temp_len, RUE_MIN_FRAMELEN - temp_len); temp_len = RUE_MIN_FRAMELEN; } - xfer->frlengths[0] = temp_len; + usbd_xfer_set_frame_len(xfer, 0, temp_len); /* * if there's a BPF listener, bounce a copy @@ -754,13 +778,13 @@ tr_setup: default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); ifp->if_oerrors++; - 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; @@ -829,7 +853,7 @@ rue_init(struct usb_ether *ue) /* Enable RX and TX */ rue_csr_write_1(sc, RUE_CR, (RUE_CR_TE | RUE_CR_RE | RUE_CR_EP3CLREN)); - usbd_transfer_set_stall(sc->sc_xfer[RUE_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[RUE_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; rue_start(ue); diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c index be9af15..926b0a3 100644 --- a/sys/dev/usb/net/if_udav.c +++ b/sys/dev/usb/net/if_udav.c @@ -46,20 +46,34 @@ #include <sys/cdefs.h> __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 "usbdevs.h" #define USB_DEBUG_VAR udav_debug - -#include <dev/usb/usb_core.h> -#include <dev/usb/usb_lookup.h> -#include <dev/usb/usb_process.h> #include <dev/usb/usb_debug.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> #include <dev/usb/net/usb_ethernet.h> #include <dev/usb/net/if_udavreg.h> @@ -420,7 +434,7 @@ udav_init(struct usb_ether *ue) UDAV_SETBIT(sc, UDAV_GPCR, UDAV_GPCR_GEP_CNTL0); UDAV_CLRBIT(sc, UDAV_GPR, UDAV_GPR_GEPIO0); - usbd_transfer_set_stall(sc->sc_xfer[UDAV_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[UDAV_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; udav_start(ue); @@ -531,10 +545,11 @@ udav_start(struct usb_ether *ue) } static void -udav_bulk_write_callback(struct usb_xfer *xfer) +udav_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error) { - struct udav_softc *sc = xfer->priv_sc; + struct udav_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); + struct usb_page_cache *pc; struct mbuf *m; int extra_len; int temp_len; @@ -577,15 +592,12 @@ tr_setup: temp_len += 2; - usbd_copy_in(xfer->frbuffers, 0, buf, 2); - - usbd_m_copy_in(xfer->frbuffers, 2, - m, 0, m->m_pkthdr.len); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_in(pc, 0, buf, 2); + usbd_m_copy_in(pc, 2, m, 0, m->m_pkthdr.len); - if (extra_len) { - usbd_frame_zero(xfer->frbuffers, temp_len - extra_len, - extra_len); - } + if (extra_len) + usbd_frame_zero(pc, temp_len - extra_len, extra_len); /* * if there's a BPF listener, bounce a copy * of this frame to him: @@ -594,19 +606,19 @@ tr_setup: m_freem(m); - xfer->frlengths[0] = temp_len; + usbd_xfer_set_frame_len(xfer, 0, temp_len); usbd_transfer_submit(xfer); return; default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(error)); ifp->if_oerrors++; - 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; @@ -614,24 +626,29 @@ tr_setup: } static void -udav_bulk_read_callback(struct usb_xfer *xfer) +udav_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) { - struct udav_softc *sc = xfer->priv_sc; + struct udav_softc *sc = usbd_xfer_softc(xfer); struct usb_ether *ue = &sc->sc_ue; struct ifnet *ifp = uether_getifp(ue); + struct usb_page_cache *pc; struct udav_rxpkt stat; int len; + int actlen; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (xfer->actlen < sizeof(stat) + ETHER_CRC_LEN) { + if (actlen < sizeof(stat) + ETHER_CRC_LEN) { ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers, 0, &stat, sizeof(stat)); - xfer->actlen -= sizeof(stat); - len = min(xfer->actlen, le16toh(stat.pktlen)); + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, &stat, sizeof(stat)); + actlen -= sizeof(stat); + len = min(actlen, le16toh(stat.pktlen)); len -= ETHER_CRC_LEN; if (stat.rxstat & UDAV_RSR_LCS) { @@ -642,22 +659,22 @@ udav_bulk_read_callback(struct usb_xfer *xfer) ifp->if_ierrors++; goto tr_setup; } - uether_rxbuf(ue, xfer->frbuffers, sizeof(stat), len); + uether_rxbuf(ue, pc, sizeof(stat), len); /* FALLTHROUGH */ 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); uether_rxflush(ue); return; default: /* Error */ DPRINTF("bulk read error, %s\n", - usbd_errstr(xfer->error)); + usbd_errstr(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; @@ -665,20 +682,20 @@ tr_setup: } static void -udav_intr_callback(struct usb_xfer *xfer) +udav_intr_callback(struct usb_xfer *xfer, usb_error_t error) { switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: 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; diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 3c42be6..6cf4460 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -24,17 +24,30 @@ * SUCH DAMAGE. */ -#include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_error.h> -#include <dev/usb/usb_endian.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/usbdi.h> -#include <dev/usb/usb_core.h> #include <dev/usb/usb_process.h> -#include <dev/usb/usb_busdma.h> -#include <dev/usb/usb_request.h> -#include <dev/usb/usb_util.h> - #include <dev/usb/net/usb_ethernet.h> SYSCTL_NODE(_net, OID_AUTO, ue, CTLFLAG_RD, 0, "USB Ethernet parameters"); |
