diff options
Diffstat (limited to 'sys/dev/usb/net/if_cue.c')
-rw-r--r-- | sys/dev/usb/net/if_cue.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c index cf37520..648722f 100644 --- a/sys/dev/usb/net/if_cue.c +++ b/sys/dev/usb/net/if_cue.c @@ -186,7 +186,7 @@ cue_csr_read_1(struct cue_softc *sc, uint16_t reg) USETW(req.wIndex, reg); USETW(req.wLength, 1); - if (usb2_ether_do_request(&sc->sc_ue, &req, &val, 1000)) { + if (uether_do_request(&sc->sc_ue, &req, &val, 1000)) { /* ignore any errors */ } return (val); @@ -204,7 +204,7 @@ cue_csr_read_2(struct cue_softc *sc, uint8_t reg) USETW(req.wIndex, reg); USETW(req.wLength, 2); - (void)usb2_ether_do_request(&sc->sc_ue, &req, &val, 1000); + (void)uether_do_request(&sc->sc_ue, &req, &val, 1000); return (le16toh(val)); } @@ -219,7 +219,7 @@ cue_csr_write_1(struct cue_softc *sc, uint16_t reg, uint16_t val) USETW(req.wIndex, reg); USETW(req.wLength, 0); - return (usb2_ether_do_request(&sc->sc_ue, &req, NULL, 1000)); + return (uether_do_request(&sc->sc_ue, &req, NULL, 1000)); } static int @@ -236,7 +236,7 @@ cue_mem(struct cue_softc *sc, uint8_t cmd, uint16_t addr, void *buf, int len) USETW(req.wIndex, addr); USETW(req.wLength, len); - return (usb2_ether_do_request(&sc->sc_ue, &req, buf, 1000)); + return (uether_do_request(&sc->sc_ue, &req, buf, 1000)); } static int @@ -250,7 +250,7 @@ cue_getmac(struct cue_softc *sc, void *buf) USETW(req.wIndex, 0); USETW(req.wLength, ETHER_ADDR_LEN); - return (usb2_ether_do_request(&sc->sc_ue, &req, buf, 1000)); + return (uether_do_request(&sc->sc_ue, &req, buf, 1000)); } #define CUE_BITS 9 @@ -269,8 +269,8 @@ cue_mchash(const uint8_t *addr) static void cue_setpromisc(struct usb_ether *ue) { - struct cue_softc *sc = usb2_ether_getsc(ue); - struct ifnet *ifp = usb2_ether_getifp(ue); + struct cue_softc *sc = uether_getsc(ue); + struct ifnet *ifp = uether_getifp(ue); CUE_LOCK_ASSERT(sc, MA_OWNED); @@ -287,8 +287,8 @@ cue_setpromisc(struct usb_ether *ue) static void cue_setmulti(struct usb_ether *ue) { - struct cue_softc *sc = usb2_ether_getsc(ue); - struct ifnet *ifp = usb2_ether_getifp(ue); + struct cue_softc *sc = uether_getsc(ue); + struct ifnet *ifp = uether_getifp(ue); struct ifmultiaddr *ifma; uint32_t h = 0, i; uint8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -337,20 +337,20 @@ cue_reset(struct cue_softc *sc) USETW(req.wIndex, 0); USETW(req.wLength, 0); - if (usb2_ether_do_request(&sc->sc_ue, &req, NULL, 1000)) { + if (uether_do_request(&sc->sc_ue, &req, NULL, 1000)) { /* ignore any errors */ } /* * wait a little while for the chip to get its brains in order: */ - usb2_ether_pause(&sc->sc_ue, hz / 100); + uether_pause(&sc->sc_ue, hz / 100); } static void cue_attach_post(struct usb_ether *ue) { - struct cue_softc *sc = usb2_ether_getsc(ue); + struct cue_softc *sc = uether_getsc(ue); cue_getmac(sc, ue->ue_eaddr); } @@ -367,7 +367,7 @@ cue_probe(device_t dev) if (uaa->info.bIfaceIndex != CUE_IFACE_IDX) return (ENXIO); - return (usb2_lookup_id_by_uaa(cue_devs, sizeof(cue_devs), uaa)); + return (usbd_lookup_id_by_uaa(cue_devs, sizeof(cue_devs), uaa)); } /* @@ -383,11 +383,11 @@ cue_attach(device_t dev) uint8_t iface_index; int error; - device_set_usb2_desc(dev); + device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF); iface_index = CUE_IFACE_IDX; - error = usb2_transfer_setup(uaa->device, &iface_index, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, cue_config, CUE_N_TRANSFER, sc, &sc->sc_mtx); if (error) { device_printf(dev, "allocating USB transfers failed!\n"); @@ -400,7 +400,7 @@ cue_attach(device_t dev) ue->ue_mtx = &sc->sc_mtx; ue->ue_methods = &cue_ue_methods; - error = usb2_ether_ifattach(ue); + error = uether_ifattach(ue); if (error) { device_printf(dev, "could not attach interface\n"); goto detach; @@ -418,8 +418,8 @@ cue_detach(device_t dev) struct cue_softc *sc = device_get_softc(dev); struct usb_ether *ue = &sc->sc_ue; - usb2_transfer_unsetup(sc->sc_xfer, CUE_N_TRANSFER); - usb2_ether_ifdetach(ue); + usbd_transfer_unsetup(sc->sc_xfer, CUE_N_TRANSFER); + uether_ifdetach(ue); mtx_destroy(&sc->sc_mtx); return (0); @@ -430,7 +430,7 @@ cue_bulk_read_callback(struct usb_xfer *xfer) { struct cue_softc *sc = xfer->priv_sc; struct usb_ether *ue = &sc->sc_ue; - struct ifnet *ifp = usb2_ether_getifp(ue); + struct ifnet *ifp = uether_getifp(ue); uint8_t buf[2]; int len; @@ -441,23 +441,23 @@ cue_bulk_read_callback(struct usb_xfer *xfer) ifp->if_ierrors++; goto tr_setup; } - usb2_copy_out(xfer->frbuffers, 0, buf, 2); + usbd_copy_out(xfer->frbuffers, 0, buf, 2); xfer->actlen -= 2; len = buf[0] | (buf[1] << 8); len = min(xfer->actlen, len); - usb2_ether_rxbuf(ue, xfer->frbuffers, 2, len); + uether_rxbuf(ue, xfer->frbuffers, 2, len); /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); - usb2_ether_rxflush(ue); + usbd_transfer_submit(xfer); + uether_rxflush(ue); return; default: /* Error */ DPRINTF("bulk read error, %s\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); if (xfer->error != USB_ERR_CANCELLED) { /* try to clear stall first */ @@ -473,7 +473,7 @@ static void cue_bulk_write_callback(struct usb_xfer *xfer) { struct cue_softc *sc = xfer->priv_sc; - struct ifnet *ifp = usb2_ether_getifp(&sc->sc_ue); + struct ifnet *ifp = uether_getifp(&sc->sc_ue); struct mbuf *m; uint8_t buf[2]; @@ -498,9 +498,9 @@ tr_setup: buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usb2_copy_in(xfer->frbuffers, 0, buf, 2); + usbd_copy_in(xfer->frbuffers, 0, buf, 2); - usb2_m_copy_in(xfer->frbuffers, 2, + usbd_m_copy_in(xfer->frbuffers, 2, m, 0, m->m_pkthdr.len); /* @@ -511,13 +511,13 @@ tr_setup: m_freem(m); - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); ifp->if_oerrors++; @@ -533,8 +533,8 @@ tr_setup: static void cue_tick(struct usb_ether *ue) { - struct cue_softc *sc = usb2_ether_getsc(ue); - struct ifnet *ifp = usb2_ether_getifp(ue); + struct cue_softc *sc = uether_getsc(ue); + struct ifnet *ifp = uether_getifp(ue); CUE_LOCK_ASSERT(sc, MA_OWNED); @@ -549,20 +549,20 @@ cue_tick(struct usb_ether *ue) static void cue_start(struct usb_ether *ue) { - struct cue_softc *sc = usb2_ether_getsc(ue); + struct cue_softc *sc = uether_getsc(ue); /* * start the USB transfers, if not already started: */ - usb2_transfer_start(sc->sc_xfer[CUE_BULK_DT_RD]); - usb2_transfer_start(sc->sc_xfer[CUE_BULK_DT_WR]); + usbd_transfer_start(sc->sc_xfer[CUE_BULK_DT_RD]); + usbd_transfer_start(sc->sc_xfer[CUE_BULK_DT_WR]); } static void cue_init(struct usb_ether *ue) { - struct cue_softc *sc = usb2_ether_getsc(ue); - struct ifnet *ifp = usb2_ether_getifp(ue); + struct cue_softc *sc = uether_getsc(ue); + struct ifnet *ifp = uether_getifp(ue); int i; CUE_LOCK_ASSERT(sc, MA_OWNED); @@ -598,7 +598,7 @@ cue_init(struct usb_ether *ue) /* Program the LED operation. */ cue_csr_write_1(sc, CUE_LEDCTL, CUE_LEDCTL_FOLLOW_LINK); - usb2_transfer_set_stall(sc->sc_xfer[CUE_BULK_DT_WR]); + usbd_transfer_set_stall(sc->sc_xfer[CUE_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; cue_start(ue); @@ -611,8 +611,8 @@ cue_init(struct usb_ether *ue) static void cue_stop(struct usb_ether *ue) { - struct cue_softc *sc = usb2_ether_getsc(ue); - struct ifnet *ifp = usb2_ether_getifp(ue); + struct cue_softc *sc = uether_getsc(ue); + struct ifnet *ifp = uether_getifp(ue); CUE_LOCK_ASSERT(sc, MA_OWNED); @@ -621,8 +621,8 @@ cue_stop(struct usb_ether *ue) /* * stop all the transfers, if not already stopped: */ - usb2_transfer_stop(sc->sc_xfer[CUE_BULK_DT_WR]); - usb2_transfer_stop(sc->sc_xfer[CUE_BULK_DT_RD]); + usbd_transfer_stop(sc->sc_xfer[CUE_BULK_DT_WR]); + usbd_transfer_stop(sc->sc_xfer[CUE_BULK_DT_RD]); cue_csr_write_1(sc, CUE_ETHCTL, 0); cue_reset(sc); |