diff options
Diffstat (limited to 'sys/dev/usb/net/if_udav.c')
-rw-r--r-- | sys/dev/usb/net/if_udav.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c index 008f408..be9af15 100644 --- a/sys/dev/usb/net/if_udav.c +++ b/sys/dev/usb/net/if_udav.c @@ -197,7 +197,7 @@ static const struct usb_device_id udav_devs[] = { static void udav_attach_post(struct usb_ether *ue) { - struct udav_softc *sc = usb2_ether_getsc(ue); + struct udav_softc *sc = uether_getsc(ue); /* reset the adapter */ udav_reset(sc); @@ -218,7 +218,7 @@ udav_probe(device_t dev) if (uaa->info.bIfaceIndex != UDAV_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(udav_devs, sizeof(udav_devs), uaa)); + return (usbd_lookup_id_by_uaa(udav_devs, sizeof(udav_devs), uaa)); } static int @@ -232,12 +232,12 @@ udav_attach(device_t dev) sc->sc_flags = USB_GET_DRIVER_INFO(uaa); - device_set_usb2_desc(dev); + device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF); iface_index = UDAV_IFACE_INDEX; - error = usb2_transfer_setup(uaa->device, &iface_index, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, udav_config, UDAV_N_TRANSFER, sc, &sc->sc_mtx); if (error) { device_printf(dev, "allocating USB transfers failed!\n"); @@ -250,7 +250,7 @@ udav_attach(device_t dev) ue->ue_mtx = &sc->sc_mtx; ue->ue_methods = &udav_ue_methods; - error = usb2_ether_ifattach(ue); + error = uether_ifattach(ue); if (error) { device_printf(dev, "could not attach interface\n"); goto detach; @@ -269,8 +269,8 @@ udav_detach(device_t dev) struct udav_softc *sc = device_get_softc(dev); struct usb_ether *ue = &sc->sc_ue; - usb2_transfer_unsetup(sc->sc_xfer, UDAV_N_TRANSFER); - usb2_ether_ifdetach(ue); + usbd_transfer_unsetup(sc->sc_xfer, UDAV_N_TRANSFER); + uether_ifdetach(ue); mtx_destroy(&sc->sc_mtx); return (0); @@ -291,7 +291,7 @@ udav_mem_read(struct udav_softc *sc, uint16_t offset, void *buf, USETW(req.wIndex, offset); 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 @@ -308,7 +308,7 @@ udav_mem_write(struct udav_softc *sc, uint16_t offset, void *buf, USETW(req.wIndex, offset); 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 @@ -323,7 +323,7 @@ udav_mem_write1(struct udav_softc *sc, uint16_t offset, USETW(req.wIndex, offset); USETW(req.wLength, 0x0000); - return (usb2_ether_do_request(&sc->sc_ue, &req, NULL, 1000)); + return (uether_do_request(&sc->sc_ue, &req, NULL, 1000)); } #endif @@ -340,7 +340,7 @@ udav_csr_read(struct udav_softc *sc, uint16_t offset, void *buf, int len) USETW(req.wIndex, offset); 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 @@ -357,7 +357,7 @@ udav_csr_write(struct udav_softc *sc, uint16_t offset, void *buf, int len) USETW(req.wIndex, offset); 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 uint8_t @@ -383,14 +383,14 @@ udav_csr_write1(struct udav_softc *sc, uint16_t offset, USETW(req.wIndex, offset); USETW(req.wLength, 0x0000); - return (usb2_ether_do_request(&sc->sc_ue, &req, NULL, 1000)); + return (uether_do_request(&sc->sc_ue, &req, NULL, 1000)); } static void udav_init(struct usb_ether *ue) { struct udav_softc *sc = ue->ue_sc; - struct ifnet *ifp = usb2_ether_getifp(&sc->sc_ue); + struct ifnet *ifp = uether_getifp(&sc->sc_ue); UDAV_LOCK_ASSERT(sc, MA_OWNED); @@ -420,7 +420,7 @@ udav_init(struct usb_ether *ue) UDAV_SETBIT(sc, UDAV_GPCR, UDAV_GPCR_GEP_CNTL0); UDAV_CLRBIT(sc, UDAV_GPR, UDAV_GPR_GEPIO0); - usb2_transfer_set_stall(sc->sc_xfer[UDAV_BULK_DT_WR]); + usbd_transfer_set_stall(sc->sc_xfer[UDAV_BULK_DT_WR]); ifp->if_drv_flags |= IFF_DRV_RUNNING; udav_start(ue); @@ -450,11 +450,11 @@ udav_reset(struct udav_softc *sc) for (i = 0; i < UDAV_TX_TIMEOUT; i++) { if (!(udav_csr_read1(sc, UDAV_NCR) & UDAV_NCR_RST)) break; - if (usb2_ether_pause(&sc->sc_ue, hz / 100)) + if (uether_pause(&sc->sc_ue, hz / 100)) break; } - usb2_ether_pause(&sc->sc_ue, hz / 100); + uether_pause(&sc->sc_ue, hz / 100); } #define UDAV_BITS 6 @@ -462,7 +462,7 @@ static void udav_setmulti(struct usb_ether *ue) { struct udav_softc *sc = ue->ue_sc; - struct ifnet *ifp = usb2_ether_getifp(&sc->sc_ue); + struct ifnet *ifp = uether_getifp(&sc->sc_ue); struct ifmultiaddr *ifma; uint8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; int h = 0; @@ -502,7 +502,7 @@ static void udav_setpromisc(struct usb_ether *ue) { struct udav_softc *sc = ue->ue_sc; - struct ifnet *ifp = usb2_ether_getifp(&sc->sc_ue); + struct ifnet *ifp = uether_getifp(&sc->sc_ue); uint8_t rxmode; rxmode = udav_csr_read1(sc, UDAV_RCR); @@ -525,16 +525,16 @@ udav_start(struct usb_ether *ue) /* * start the USB transfers, if not already started: */ - usb2_transfer_start(sc->sc_xfer[UDAV_INTR_DT_RD]); - usb2_transfer_start(sc->sc_xfer[UDAV_BULK_DT_RD]); - usb2_transfer_start(sc->sc_xfer[UDAV_BULK_DT_WR]); + usbd_transfer_start(sc->sc_xfer[UDAV_INTR_DT_RD]); + usbd_transfer_start(sc->sc_xfer[UDAV_BULK_DT_RD]); + usbd_transfer_start(sc->sc_xfer[UDAV_BULK_DT_WR]); } static void udav_bulk_write_callback(struct usb_xfer *xfer) { struct udav_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; int extra_len; int temp_len; @@ -577,13 +577,13 @@ tr_setup: temp_len += 2; - 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); if (extra_len) { - usb2_bzero(xfer->frbuffers, temp_len - extra_len, + usbd_frame_zero(xfer->frbuffers, temp_len - extra_len, extra_len); } /* @@ -595,12 +595,12 @@ tr_setup: m_freem(m); xfer->frlengths[0] = temp_len; - 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++; @@ -618,7 +618,7 @@ udav_bulk_read_callback(struct usb_xfer *xfer) { struct udav_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); struct udav_rxpkt stat; int len; @@ -629,7 +629,7 @@ udav_bulk_read_callback(struct usb_xfer *xfer) ifp->if_ierrors++; goto tr_setup; } - usb2_copy_out(xfer->frbuffers, 0, &stat, sizeof(stat)); + usbd_copy_out(xfer->frbuffers, 0, &stat, sizeof(stat)); xfer->actlen -= sizeof(stat); len = min(xfer->actlen, le16toh(stat.pktlen)); len -= ETHER_CRC_LEN; @@ -642,18 +642,18 @@ udav_bulk_read_callback(struct usb_xfer *xfer) ifp->if_ierrors++; goto tr_setup; } - usb2_ether_rxbuf(ue, xfer->frbuffers, sizeof(stat), len); + uether_rxbuf(ue, xfer->frbuffers, sizeof(stat), 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 */ @@ -672,7 +672,7 @@ udav_intr_callback(struct usb_xfer *xfer) case USB_ST_SETUP: tr_setup: xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: /* Error */ @@ -689,7 +689,7 @@ static void udav_stop(struct usb_ether *ue) { struct udav_softc *sc = ue->ue_sc; - struct ifnet *ifp = usb2_ether_getifp(&sc->sc_ue); + struct ifnet *ifp = uether_getifp(&sc->sc_ue); UDAV_LOCK_ASSERT(sc, MA_OWNED); @@ -699,9 +699,9 @@ udav_stop(struct usb_ether *ue) /* * stop all the transfers, if not already stopped: */ - usb2_transfer_stop(sc->sc_xfer[UDAV_BULK_DT_WR]); - usb2_transfer_stop(sc->sc_xfer[UDAV_BULK_DT_RD]); - usb2_transfer_stop(sc->sc_xfer[UDAV_INTR_DT_RD]); + usbd_transfer_stop(sc->sc_xfer[UDAV_BULK_DT_WR]); + usbd_transfer_stop(sc->sc_xfer[UDAV_BULK_DT_RD]); + usbd_transfer_stop(sc->sc_xfer[UDAV_INTR_DT_RD]); udav_reset(sc); } |