diff options
Diffstat (limited to 'sys/dev/usb/wlan')
| -rw-r--r-- | sys/dev/usb/wlan/if_rum.c | 64 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_uath.c | 40 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_upgt.c | 32 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_ural.c | 70 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_urtw.c | 136 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_zyd.c | 66 |
6 files changed, 204 insertions, 204 deletions
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index fe86ac7..799abeb 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -418,7 +418,7 @@ rum_match(device_t self) if (uaa->info.bIfaceIndex != RT2573_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(rum_devs, sizeof(rum_devs), uaa)); + return (usbd_lookup_id_by_uaa(rum_devs, sizeof(rum_devs), uaa)); } static int @@ -432,7 +432,7 @@ rum_attach(device_t self) uint32_t tmp; int error, ntries; - device_set_usb2_desc(self); + device_set_usb_desc(self); sc->sc_udev = uaa->device; sc->sc_dev = self; @@ -440,11 +440,11 @@ rum_attach(device_t self) MTX_NETWORK_LOCK, MTX_DEF); iface_index = RT2573_IFACE_INDEX; - error = usb2_transfer_setup(uaa->device, &iface_index, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, rum_config, RUM_N_TRANSFER, sc, &sc->sc_mtx); if (error) { device_printf(self, "could not allocate USB transfers, " - "err=%s\n", usb2_errstr(error)); + "err=%s\n", usbd_errstr(error)); goto detach; } @@ -547,7 +547,7 @@ rum_detach(device_t self) struct ieee80211com *ic; /* stop all USB transfers */ - usb2_transfer_unsetup(sc->sc_xfer, RUM_N_TRANSFER); + usbd_transfer_unsetup(sc->sc_xfer, RUM_N_TRANSFER); /* free TX list, if any */ RUM_LOCK(sc); @@ -572,13 +572,13 @@ rum_do_request(struct rum_softc *sc, int ntries = 10; while (ntries--) { - err = usb2_do_request_flags(sc->sc_udev, &sc->sc_mtx, + err = usbd_do_request_flags(sc->sc_udev, &sc->sc_mtx, req, data, 0, NULL, 250 /* ms */); if (err == 0) break; DPRINTFN(1, "Control request failed, %s (retrying)\n", - usb2_errstr(err)); + usbd_errstr(err)); if (rum_pause(sc, hz / 100)) break; } @@ -610,7 +610,7 @@ rum_vap_create(struct ieee80211com *ic, rvp->newstate = vap->iv_newstate; vap->iv_newstate = rum_newstate; - usb2_callout_init_mtx(&rvp->amrr_ch, &sc->sc_mtx, 0); + usb_callout_init_mtx(&rvp->amrr_ch, &sc->sc_mtx, 0); TASK_INIT(&rvp->amrr_task, 0, rum_amrr_task, rvp); ieee80211_amrr_init(&rvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, @@ -629,7 +629,7 @@ rum_vap_delete(struct ieee80211vap *vap) struct rum_vap *rvp = RUM_VAP(vap); struct ieee80211com *ic = vap->iv_ic; - usb2_callout_drain(&rvp->amrr_ch); + usb_callout_drain(&rvp->amrr_ch); ieee80211_draintask(ic, &rvp->amrr_task); ieee80211_amrr_cleanup(&rvp->amrr); ieee80211_vap_detach(vap); @@ -718,7 +718,7 @@ rum_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) IEEE80211_UNLOCK(ic); RUM_LOCK(sc); - usb2_callout_stop(&rvp->amrr_ch); + usb_callout_stop(&rvp->amrr_ch); switch (nstate) { case IEEE80211_S_INIT: @@ -798,9 +798,9 @@ tr_setup: m->m_pkthdr.len); m->m_pkthdr.len = (MCLBYTES + RT2573_TX_DESC_SIZE); } - usb2_copy_in(xfer->frbuffers, 0, &data->desc, + usbd_copy_in(xfer->frbuffers, 0, &data->desc, RT2573_TX_DESC_SIZE); - usb2_m_copy_in(xfer->frbuffers, RT2573_TX_DESC_SIZE, m, + usbd_m_copy_in(xfer->frbuffers, RT2573_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); vap = data->ni->ni_vap; @@ -825,13 +825,13 @@ tr_setup: xfer->frlengths[0] = len; xfer->priv_fifo = data; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); } break; default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); ifp->if_oerrors++; data = xfer->priv_fifo; @@ -877,7 +877,7 @@ rum_bulk_read_callback(struct usb_xfer *xfer) } len -= RT2573_RX_DESC_SIZE; - usb2_copy_out(xfer->frbuffers, 0, &sc->sc_rx_desc, + usbd_copy_out(xfer->frbuffers, 0, &sc->sc_rx_desc, RT2573_RX_DESC_SIZE); rssi = rum_get_rssi(sc, sc->sc_rx_desc.rssi); @@ -899,7 +899,7 @@ rum_bulk_read_callback(struct usb_xfer *xfer) ifp->if_ierrors++; goto tr_setup; } - usb2_copy_out(xfer->frbuffers, RT2573_RX_DESC_SIZE, + usbd_copy_out(xfer->frbuffers, RT2573_RX_DESC_SIZE, mtod(m, uint8_t *), len); /* finalize mbuf */ @@ -922,7 +922,7 @@ rum_bulk_read_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); /* * At the end of a USB callback it is always safe to unlock @@ -1068,7 +1068,7 @@ rum_sendprot(struct rum_softc *sc, rum_setup_tx_desc(sc, &data->desc, flags, 0, mprot->m_pkthdr.len, protrate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[RUM_BULK_WR]); return 0; } @@ -1128,7 +1128,7 @@ rum_tx_mgt(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, tp->mgmtrate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[RUM_BULK_WR]); return (0); } @@ -1180,7 +1180,7 @@ rum_tx_raw(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni, m0->m_pkthdr.len, rate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[RUM_BULK_WR]); return 0; } @@ -1262,7 +1262,7 @@ rum_tx_data(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[RUM_BULK_WR]); return 0; } @@ -1351,7 +1351,7 @@ rum_eeprom_read(struct rum_softc *sc, uint16_t addr, void *buf, int len) error = rum_do_request(sc, &req, buf); if (error != 0) { device_printf(sc->sc_dev, "could not read EEPROM: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } } @@ -1381,7 +1381,7 @@ rum_read_multi(struct rum_softc *sc, uint16_t reg, void *buf, int len) if (error != 0) { device_printf(sc->sc_dev, "could not multi read MAC register: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } } @@ -1409,7 +1409,7 @@ rum_write_multi(struct rum_softc *sc, uint16_t reg, void *buf, size_t len) if (error != 0) { device_printf(sc->sc_dev, "could not multi write MAC register: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } return (error); } @@ -2011,8 +2011,8 @@ rum_init_locked(struct rum_softc *sc) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - usb2_transfer_set_stall(sc->sc_xfer[RUM_BULK_WR]); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_RD]); + usbd_transfer_set_stall(sc->sc_xfer[RUM_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[RUM_BULK_RD]); return; fail: rum_stop(sc); @@ -2049,8 +2049,8 @@ rum_stop(struct rum_softc *sc) /* * Drain the USB transfers, if not already drained: */ - usb2_transfer_drain(sc->sc_xfer[RUM_BULK_WR]); - usb2_transfer_drain(sc->sc_xfer[RUM_BULK_RD]); + usbd_transfer_drain(sc->sc_xfer[RUM_BULK_WR]); + usbd_transfer_drain(sc->sc_xfer[RUM_BULK_RD]); RUM_LOCK(sc); @@ -2092,7 +2092,7 @@ rum_load_microcode(struct rum_softc *sc, const uint8_t *ucode, size_t size) err = rum_do_request(sc, &req, NULL); if (err != 0) { device_printf(sc->sc_dev, "could not run firmware: %s\n", - usb2_errstr(err)); + usbd_errstr(err)); } /* give the chip some time to boot */ @@ -2189,7 +2189,7 @@ rum_amrr_start(struct rum_softc *sc, struct ieee80211_node *ni) ieee80211_amrr_node_init(&rvp->amrr, &RUM_NODE(ni)->amn, ni); - usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); + usb_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); } static void @@ -2227,7 +2227,7 @@ rum_amrr_task(void *arg, int pending) ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ - usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); + usb_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); RUM_UNLOCK(sc); } @@ -2339,7 +2339,7 @@ static int rum_pause(struct rum_softc *sc, int timeout) { - usb2_pause_mtx(&sc->sc_mtx, timeout); + usb_pause_mtx(&sc->sc_mtx, timeout); return (0); } diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 1c12a9c..29f2398 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -338,7 +338,7 @@ uath_match(device_t dev) if (uaa->info.bIfaceIndex != UATH_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(uath_devs, sizeof(uath_devs), uaa)); + return (usbd_lookup_id_by_uaa(uath_devs, sizeof(uath_devs), uaa)); } static int @@ -357,7 +357,7 @@ uath_attach(device_t dev) #ifdef UATH_DEBUG sc->sc_debug = uath_debug; #endif - device_set_usb2_desc(dev); + device_set_usb_desc(dev); /* * Only post-firmware devices here. @@ -378,11 +378,11 @@ uath_attach(device_t dev) goto fail; } - error = usb2_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, uath_usbconfig, UATH_N_XFERS, sc, &sc->sc_mtx); if (error) { device_printf(dev, "could not allocate USB transfers, " - "err=%s\n", usb2_errstr(error)); + "err=%s\n", usbd_errstr(error)); goto fail1; } @@ -497,7 +497,7 @@ uath_attach(device_t dev) fail4: if_free(ifp); fail3: UATH_UNLOCK(sc); -fail2: usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS); +fail2: usbd_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS); fail1: uath_free_cmd_list(sc, sc->sc_cmd, UATH_CMD_LIST_COUNT); fail: return (error); @@ -519,7 +519,7 @@ uath_detach(device_t dev) callout_drain(&sc->stat_ch); callout_drain(&sc->watchdog_ch); - usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS); + usbd_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS); ieee80211_ifdetach(ic); /* free buffers */ @@ -735,10 +735,10 @@ uath_cmdsend(struct uath_softc *sc, uint32_t code, const void *idata, int ilen, STAILQ_INSERT_TAIL(&sc->sc_cmd_pending, cmd, next); UATH_STAT_INC(sc, st_cmd_pending); - usb2_transfer_start(sc->sc_xfer[UATH_INTR_TX]); + usbd_transfer_start(sc->sc_xfer[UATH_INTR_TX]); if (cmd->flags & UATH_CMD_FLAG_READ) { - usb2_transfer_start(sc->sc_xfer[UATH_INTR_RX]); + usbd_transfer_start(sc->sc_xfer[UATH_INTR_RX]); /* wait at most two seconds for command reply */ error = mtx_sleep(cmd, &sc->sc_mtx, 0, "uathcmd", 2 * hz); @@ -1168,7 +1168,7 @@ uath_init_locked(void *arg) /* XXX? check */ uath_cmd_write(sc, WDCMSG_RESET_KEY_CACHE, NULL, 0, 0); - usb2_transfer_start(sc->sc_xfer[UATH_BULK_RX]); + usbd_transfer_start(sc->sc_xfer[UATH_BULK_RX]); /* enable Rx */ uath_set_rxfilter(sc, 0x0, UATH_FILTER_OP_INIT); uath_set_rxfilter(sc, @@ -1355,7 +1355,7 @@ uath_abort_xfers(struct uath_softc *sc) UATH_ASSERT_LOCKED(sc); /* abort any pending transfers */ for (i = 0; i < UATH_N_XFERS; i++) - usb2_transfer_stop(sc->sc_xfer[i]); + usbd_transfer_stop(sc->sc_xfer[i]); } static int @@ -1425,7 +1425,7 @@ uath_dataflush(struct uath_softc *sc) STAILQ_INSERT_TAIL(&sc->sc_tx_pending, data, next); UATH_STAT_INC(sc, st_tx_pending); sc->sc_tx_timer = 5; - usb2_transfer_start(sc->sc_xfer[UATH_BULK_TX]); + usbd_transfer_start(sc->sc_xfer[UATH_BULK_TX]); return (0); } @@ -1692,7 +1692,7 @@ uath_tx_start(struct uath_softc *sc, struct mbuf *m0, struct ieee80211_node *ni, STAILQ_INSERT_TAIL(&sc->sc_tx_pending, data, next); UATH_STAT_INC(sc, st_tx_pending); - usb2_transfer_start(sc->sc_xfer[UATH_BULK_TX]); + usbd_transfer_start(sc->sc_xfer[UATH_BULK_TX]); return (0); } @@ -2401,12 +2401,12 @@ uath_intr_rx_callback(struct usb_xfer *xfer) KASSERT(xfer->actlen >= sizeof(struct uath_cmd_hdr), ("short xfer error")); - usb2_copy_out(xfer->frbuffers, 0, cmd->buf, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, cmd->buf, xfer->actlen); uath_cmdeof(sc, cmd); case USB_ST_SETUP: setup: xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); break; default: if (xfer->error != USB_ERR_CANCELLED) { @@ -2456,9 +2456,9 @@ setup: else UATH_STAT_INC(sc, st_cmd_active); - usb2_set_frame_data(xfer, cmd->buf, 0); + usbd_set_frame_data(xfer, cmd->buf, 0); xfer->frlengths[0] = cmd->buflen; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); break; default: if (xfer->error != USB_ERR_CANCELLED) { @@ -2708,9 +2708,9 @@ setup: UATH_STAT_DEC(sc, st_rx_inactive); STAILQ_INSERT_TAIL(&sc->sc_rx_active, data, next); UATH_STAT_INC(sc, st_rx_active); - usb2_set_frame_data(xfer, data->buf, 0); + usbd_set_frame_data(xfer, data->buf, 0); xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); /* * To avoid LOR we should unlock our private mutex here to call @@ -2818,9 +2818,9 @@ setup: STAILQ_INSERT_TAIL(&sc->sc_tx_active, data, next); UATH_STAT_INC(sc, st_tx_active); - usb2_set_frame_data(xfer, data->buf, 0); + usbd_set_frame_data(xfer, data->buf, 0); xfer->frlengths[0] = data->buflen; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); UATH_UNLOCK(sc); uath_start(ifp); diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index c1e5b12..b7e697c 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -239,7 +239,7 @@ upgt_match(device_t dev) if (uaa->info.bIfaceIndex != UPGT_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(upgt_devs_2, sizeof(upgt_devs_2), uaa)); + return (usbd_lookup_id_by_uaa(upgt_devs_2, sizeof(upgt_devs_2), uaa)); } static int @@ -257,7 +257,7 @@ upgt_attach(device_t dev) #ifdef UPGT_DEBUG sc->sc_debug = upgt_debug; #endif - device_set_usb2_desc(dev); + device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, device_get_nameunit(sc->sc_dev), MTX_NETWORK_LOCK, MTX_DEF); @@ -272,11 +272,11 @@ upgt_attach(device_t dev) if (error) goto fail2; - error = usb2_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, upgt_config, UPGT_N_XFERS, sc, &sc->sc_mtx); if (error) { device_printf(dev, "could not allocate USB transfers, " - "err=%s\n", usb2_errstr(error)); + "err=%s\n", usbd_errstr(error)); goto fail3; } @@ -382,7 +382,7 @@ upgt_attach(device_t dev) return (0); fail5: if_free(ifp); -fail4: usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); +fail4: usbd_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); fail3: upgt_free_rx(sc); fail2: upgt_free_tx(sc); fail1: mtx_destroy(&sc->sc_mtx); @@ -641,7 +641,7 @@ upgt_init_locked(struct upgt_softc *sc) if (ifp->if_drv_flags & IFF_DRV_RUNNING) upgt_stop_locked(sc); - usb2_transfer_start(sc->sc_xfer[UPGT_BULK_RX]); + usbd_transfer_start(sc->sc_xfer[UPGT_BULK_RX]); (void)upgt_set_macfilter(sc, IEEE80211_S_SCAN); @@ -1319,7 +1319,7 @@ upgt_eeprom_read(struct upgt_softc *sc) int block, error, offset; UPGT_LOCK(sc); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); offset = 0; block = UPGT_EEPROM_BLOCK_SIZE; @@ -1679,7 +1679,7 @@ upgt_fw_load(struct upgt_softc *sc) upgt_bulk_tx(sc, data_cmd); /* waiting 'OK' response. */ - usb2_transfer_start(sc->sc_xfer[UPGT_BULK_RX]); + usbd_transfer_start(sc->sc_xfer[UPGT_BULK_RX]); error = mtx_sleep(sc, &sc->sc_mtx, 0, "upgtfw", 2 * hz); if (error != 0) { device_printf(sc->sc_dev, "firmware load failed!\n"); @@ -1911,7 +1911,7 @@ upgt_bulk_tx(struct upgt_softc *sc, struct upgt_data *data) STAILQ_INSERT_TAIL(&sc->sc_tx_pending, data, next); UPGT_STAT_INC(sc, st_tx_pending); - usb2_transfer_start(sc->sc_xfer[UPGT_BULK_TX]); + usbd_transfer_start(sc->sc_xfer[UPGT_BULK_TX]); } static int @@ -1930,7 +1930,7 @@ upgt_device_reset(struct upgt_softc *sc) bcopy(init_cmd, data->buf, sizeof(init_cmd)); data->buflen = sizeof(init_cmd); upgt_bulk_tx(sc, data); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); UPGT_UNLOCK(sc); DPRINTF(sc, UPGT_DEBUG_FW, "%s: device initialized\n", __func__); @@ -2000,7 +2000,7 @@ upgt_detach(device_t dev) callout_drain(&sc->sc_led_ch); callout_drain(&sc->sc_watchdog_ch); - usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); + usbd_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); ieee80211_ifdetach(ic); upgt_free_rx(sc); upgt_free_tx(sc); @@ -2045,7 +2045,7 @@ upgt_abort_xfers_locked(struct upgt_softc *sc) UPGT_ASSERT_LOCKED(sc); /* abort any pending transfers */ for (i = 0; i < UPGT_N_XFERS; i++) - usb2_transfer_stop(sc->sc_xfer[i]); + usbd_transfer_stop(sc->sc_xfer[i]); } static void @@ -2274,9 +2274,9 @@ setup: return; STAILQ_REMOVE_HEAD(&sc->sc_rx_inactive, next); STAILQ_INSERT_TAIL(&sc->sc_rx_active, data, next); - usb2_set_frame_data(xfer, data->buf, 0); + usbd_set_frame_data(xfer, data->buf, 0); xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); /* * To avoid LOR we should unlock our private mutex here to call @@ -2347,9 +2347,9 @@ setup: STAILQ_INSERT_TAIL(&sc->sc_tx_active, data, next); UPGT_STAT_INC(sc, st_tx_active); - usb2_set_frame_data(xfer, data->buf, 0); + usbd_set_frame_data(xfer, data->buf, 0); xfer->frlengths[0] = data->buflen; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); UPGT_UNLOCK(sc); upgt_start(ifp); UPGT_LOCK(sc); diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c index 83e279ce..f450e31 100644 --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -421,7 +421,7 @@ ural_match(device_t self) if (uaa->info.bIfaceIndex != RAL_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(ural_devs, sizeof(ural_devs), uaa)); + return (usbd_lookup_id_by_uaa(ural_devs, sizeof(ural_devs), uaa)); } static int @@ -434,7 +434,7 @@ ural_attach(device_t self) uint8_t iface_index, bands; int error; - device_set_usb2_desc(self); + device_set_usb_desc(self); sc->sc_udev = uaa->device; sc->sc_dev = self; @@ -442,12 +442,12 @@ ural_attach(device_t self) MTX_NETWORK_LOCK, MTX_DEF); iface_index = RAL_IFACE_INDEX; - error = usb2_transfer_setup(uaa->device, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, ural_config, URAL_N_TRANSFER, sc, &sc->sc_mtx); if (error) { device_printf(self, "could not allocate USB transfers, " - "err=%s\n", usb2_errstr(error)); + "err=%s\n", usbd_errstr(error)); goto detach; } @@ -538,7 +538,7 @@ ural_detach(device_t self) struct ieee80211com *ic; /* stop all USB transfers */ - usb2_transfer_unsetup(sc->sc_xfer, URAL_N_TRANSFER); + usbd_transfer_unsetup(sc->sc_xfer, URAL_N_TRANSFER); /* free TX list, if any */ RAL_LOCK(sc); @@ -563,13 +563,13 @@ ural_do_request(struct ural_softc *sc, int ntries = 10; while (ntries--) { - err = usb2_do_request_flags(sc->sc_udev, &sc->sc_mtx, + err = usbd_do_request_flags(sc->sc_udev, &sc->sc_mtx, req, data, 0, NULL, 250 /* ms */); if (err == 0) break; DPRINTFN(1, "Control request failed, %s (retrying)\n", - usb2_errstr(err)); + usbd_errstr(err)); if (ural_pause(sc, hz / 100)) break; } @@ -601,7 +601,7 @@ ural_vap_create(struct ieee80211com *ic, uvp->newstate = vap->iv_newstate; vap->iv_newstate = ural_newstate; - usb2_callout_init_mtx(&uvp->amrr_ch, &sc->sc_mtx, 0); + usb_callout_init_mtx(&uvp->amrr_ch, &sc->sc_mtx, 0); TASK_INIT(&uvp->amrr_task, 0, ural_amrr_task, uvp); ieee80211_amrr_init(&uvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, @@ -620,7 +620,7 @@ ural_vap_delete(struct ieee80211vap *vap) struct ural_vap *uvp = URAL_VAP(vap); struct ieee80211com *ic = vap->iv_ic; - usb2_callout_drain(&uvp->amrr_ch); + usb_callout_drain(&uvp->amrr_ch); ieee80211_draintask(ic, &uvp->amrr_task); ieee80211_amrr_cleanup(&uvp->amrr); ieee80211_vap_detach(vap); @@ -707,7 +707,7 @@ ural_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) IEEE80211_UNLOCK(ic); RAL_LOCK(sc); - usb2_callout_stop(&uvp->amrr_ch); + usb_callout_stop(&uvp->amrr_ch); switch (nstate) { case IEEE80211_S_INIT: @@ -811,9 +811,9 @@ tr_setup: m->m_pkthdr.len); m->m_pkthdr.len = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE); } - usb2_copy_in(xfer->frbuffers, 0, &data->desc, + usbd_copy_in(xfer->frbuffers, 0, &data->desc, RAL_TX_DESC_SIZE); - usb2_m_copy_in(xfer->frbuffers, RAL_TX_DESC_SIZE, m, 0, + usbd_m_copy_in(xfer->frbuffers, RAL_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); vap = data->ni->ni_vap; @@ -838,13 +838,13 @@ tr_setup: xfer->frlengths[0] = len; xfer->priv_fifo = data; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); } break; default: /* Error */ DPRINTFN(11, "transfer error, %s\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); ifp->if_oerrors++; data = xfer->priv_fifo; @@ -891,7 +891,7 @@ ural_bulk_read_callback(struct usb_xfer *xfer) len -= RAL_RX_DESC_SIZE; /* rx descriptor is located at the end */ - usb2_copy_out(xfer->frbuffers, len, &sc->sc_rx_desc, + usbd_copy_out(xfer->frbuffers, len, &sc->sc_rx_desc, RAL_RX_DESC_SIZE); rssi = URAL_RSSI(sc->sc_rx_desc.rssi); @@ -914,7 +914,7 @@ ural_bulk_read_callback(struct usb_xfer *xfer) ifp->if_ierrors++; goto tr_setup; } - usb2_copy_out(xfer->frbuffers, 0, mtod(m, uint8_t *), len); + usbd_copy_out(xfer->frbuffers, 0, mtod(m, uint8_t *), len); /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; @@ -939,7 +939,7 @@ ural_bulk_read_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); /* * At the end of a USB callback it is always safe to unlock @@ -1071,7 +1071,7 @@ ural_tx_bcn(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) m0->m_pkthdr.len, tp->mgmtrate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[URAL_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[URAL_BULK_WR]); return (0); } @@ -1132,7 +1132,7 @@ ural_tx_mgt(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) m0->m_pkthdr.len, tp->mgmtrate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[URAL_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[URAL_BULK_WR]); return 0; } @@ -1183,7 +1183,7 @@ ural_sendprot(struct ural_softc *sc, ural_setup_tx_desc(sc, &data->desc, flags, mprot->m_pkthdr.len, protrate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[URAL_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[URAL_BULK_WR]); return 0; } @@ -1236,7 +1236,7 @@ ural_tx_raw(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni, m0->m_pkthdr.len, rate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[URAL_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[URAL_BULK_WR]); return 0; } @@ -1316,7 +1316,7 @@ ural_tx_data(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) m0->m_pkthdr.len, rate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[URAL_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[URAL_BULK_WR]); return 0; } @@ -1403,7 +1403,7 @@ ural_set_testmode(struct ural_softc *sc) error = ural_do_request(sc, &req, NULL); if (error != 0) { device_printf(sc->sc_dev, "could not set test mode: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } } @@ -1422,7 +1422,7 @@ ural_eeprom_read(struct ural_softc *sc, uint16_t addr, void *buf, int len) error = ural_do_request(sc, &req, buf); if (error != 0) { device_printf(sc->sc_dev, "could not read EEPROM: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } } @@ -1442,7 +1442,7 @@ ural_read(struct ural_softc *sc, uint16_t reg) error = ural_do_request(sc, &req, &val); if (error != 0) { device_printf(sc->sc_dev, "could not read MAC register: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); return 0; } @@ -1464,7 +1464,7 @@ ural_read_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len) error = ural_do_request(sc, &req, buf); if (error != 0) { device_printf(sc->sc_dev, "could not read MAC register: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } } @@ -1483,7 +1483,7 @@ ural_write(struct ural_softc *sc, uint16_t reg, uint16_t val) error = ural_do_request(sc, &req, NULL); if (error != 0) { device_printf(sc->sc_dev, "could not write MAC register: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } } @@ -1502,7 +1502,7 @@ ural_write_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len) error = ural_do_request(sc, &req, buf); if (error != 0) { device_printf(sc->sc_dev, "could not write MAC register: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } } @@ -2120,8 +2120,8 @@ ural_init_locked(struct ural_softc *sc) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - usb2_transfer_set_stall(sc->sc_xfer[URAL_BULK_WR]); - usb2_transfer_start(sc->sc_xfer[URAL_BULK_RD]); + usbd_transfer_set_stall(sc->sc_xfer[URAL_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[URAL_BULK_RD]); return; fail: ural_stop(sc); @@ -2156,8 +2156,8 @@ ural_stop(struct ural_softc *sc) * Drain all the transfers, if not already drained: */ RAL_UNLOCK(sc); - usb2_transfer_drain(sc->sc_xfer[URAL_BULK_WR]); - usb2_transfer_drain(sc->sc_xfer[URAL_BULK_RD]); + usbd_transfer_drain(sc->sc_xfer[URAL_BULK_WR]); + usbd_transfer_drain(sc->sc_xfer[URAL_BULK_RD]); RAL_LOCK(sc); ural_unsetup_tx_list(sc); @@ -2234,7 +2234,7 @@ ural_amrr_start(struct ural_softc *sc, struct ieee80211_node *ni) ieee80211_amrr_node_init(&uvp->amrr, &URAL_NODE(ni)->amn, ni); - usb2_callout_reset(&uvp->amrr_ch, hz, ural_amrr_timeout, uvp); + usb_callout_reset(&uvp->amrr_ch, hz, ural_amrr_timeout, uvp); } static void @@ -2272,7 +2272,7 @@ ural_amrr_task(void *arg, int pending) ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ - usb2_callout_reset(&uvp->amrr_ch, hz, ural_amrr_timeout, uvp); + usb_callout_reset(&uvp->amrr_ch, hz, ural_amrr_timeout, uvp); RAL_UNLOCK(sc); } @@ -2280,6 +2280,6 @@ static int ural_pause(struct ural_softc *sc, int timeout) { - usb2_pause_mtx(&sc->sc_mtx, timeout); + usb_pause_mtx(&sc->sc_mtx, timeout); return (0); } diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index 883c1d9..30b14d3 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -730,7 +730,7 @@ urtw_match(device_t dev) if (uaa->info.bIfaceIndex != URTW_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(urtw_devs, sizeof(urtw_devs), uaa)); + return (usbd_lookup_id_by_uaa(urtw_devs, sizeof(urtw_devs), uaa)); } static int @@ -747,7 +747,7 @@ urtw_attach(device_t dev) uint32_t data; usb_error_t error; - device_set_usb2_desc(dev); + device_set_usb_desc(dev); sc->sc_dev = dev; sc->sc_udev = uaa->device; @@ -759,7 +759,7 @@ urtw_attach(device_t dev) mtx_init(&sc->sc_mtx, device_get_nameunit(sc->sc_dev), MTX_NETWORK_LOCK, MTX_DEF); - usb2_callout_init_mtx(&sc->sc_led_ch, &sc->sc_mtx, 0); + usb_callout_init_mtx(&sc->sc_led_ch, &sc->sc_mtx, 0); TASK_INIT(&sc->sc_led_task, 0, urtw_ledtask, sc); callout_init(&sc->sc_watchdog_ch, 0); @@ -771,11 +771,11 @@ urtw_attach(device_t dev) n_setup = URTW_8187L_N_XFERS; } - error = usb2_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, setup_start, n_setup, sc, &sc->sc_mtx); if (error) { device_printf(dev, "could not allocate USB transfers, " - "err=%s\n", usb2_errstr(error)); + "err=%s\n", usbd_errstr(error)); ret = ENXIO; goto fail0; } @@ -865,7 +865,7 @@ urtw_attach(device_t dev) return (0); fail: URTW_UNLOCK(sc); -fail1: usb2_transfer_unsetup(sc->sc_xfer, (sc->sc_flags & URTW_RTL8187B) ? +fail1: usbd_transfer_unsetup(sc->sc_xfer, (sc->sc_flags & URTW_RTL8187B) ? URTW_8187B_N_XFERS : URTW_8187L_N_XFERS); fail0: return (ret); @@ -884,10 +884,10 @@ urtw_detach(device_t dev) urtw_stop(ifp, 1); ieee80211_draintask(ic, &sc->sc_led_task); - usb2_callout_drain(&sc->sc_led_ch); + usb_callout_drain(&sc->sc_led_ch); callout_drain(&sc->sc_watchdog_ch); - usb2_transfer_unsetup(sc->sc_xfer, (sc->sc_flags & URTW_RTL8187B) ? + usbd_transfer_unsetup(sc->sc_xfer, (sc->sc_flags & URTW_RTL8187B) ? URTW_8187B_N_XFERS : URTW_8187L_N_XFERS); ieee80211_ifdetach(ic); @@ -1141,7 +1141,7 @@ urtw_adapter_start_b(struct urtw_softc *sc) urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, 0x0480); urtw_write16_m(sc, URTW_RF_PINS_SELECT, 0x2488); urtw_write16_m(sc, URTW_RF_PINS_ENABLE, 0x1fff); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); error = sc->sc_rf_init(sc); if (error != 0) @@ -1305,7 +1305,7 @@ urtw_8187b_cmd_reset(struct urtw_softc *sc) urtw_write8_m(sc, URTW_CMD, data8); for (i = 0; i < 20; i++) { - usb2_pause_mtx(&sc->sc_mtx, 2); + usb_pause_mtx(&sc->sc_mtx, 2); urtw_read8_m(sc, URTW_CMD, &data8); if (!(data8 & URTW_CMD_RST)) break; @@ -1320,7 +1320,7 @@ urtw_8187b_cmd_reset(struct urtw_softc *sc) goto fail; for (i = 0; i < 20; i++) { - usb2_pause_mtx(&sc->sc_mtx, 4); + usb_pause_mtx(&sc->sc_mtx, 4); urtw_read8_m(sc, URTW_EPROM_CMD, &data8); if (!(data8 & URTW_EPROM_CMD_CONFIG)) break; @@ -1358,15 +1358,15 @@ urtw_do_request(struct urtw_softc *sc, URTW_ASSERT_LOCKED(sc); while (ntries--) { - err = usb2_do_request_flags(sc->sc_udev, &sc->sc_mtx, + err = usbd_do_request_flags(sc->sc_udev, &sc->sc_mtx, req, data, 0, NULL, 250 /* ms */); if (err == 0) break; DPRINTF(sc, URTW_DEBUG_INIT, "Control request failed, %s (retrying)\n", - usb2_errstr(err)); - usb2_pause_mtx(&sc->sc_mtx, hz / 100); + usbd_errstr(err)); + usb_pause_mtx(&sc->sc_mtx, hz / 100); } return (err); } @@ -1431,9 +1431,9 @@ urtw_stop_locked(struct ifnet *ifp, int disable) fail: if (error) device_printf(sc->sc_dev, "failed to stop (%s)\n", - usb2_errstr(error)); + usbd_errstr(error)); - usb2_callout_stop(&sc->sc_led_ch); + usb_callout_stop(&sc->sc_led_ch); callout_stop(&sc->sc_watchdog_ch); urtw_abort_xfers(sc); @@ -1461,7 +1461,7 @@ urtw_abort_xfers(struct urtw_softc *sc) /* abort any pending transfers */ for (i = 0; i < max; i++) - usb2_transfer_stop(sc->sc_xfer[i]); + usbd_transfer_stop(sc->sc_xfer[i]); } static int @@ -1709,7 +1709,7 @@ urtw_set_channel(struct ieee80211com *ic) error = sc->sc_rf_set_chan(sc, ieee80211_chan2ieee(ic, ic->ic_curchan)); if (error != 0) goto fail; - usb2_pause_mtx(&sc->sc_mtx, 10); + usb_pause_mtx(&sc->sc_mtx, 10); urtw_write32_m(sc, URTW_TX_CONF, orig); urtw_write16_m(sc, URTW_ATIM_WND, 2); @@ -1862,7 +1862,7 @@ urtw_tx_start(struct urtw_softc *sc, struct ieee80211_node *ni, struct mbuf *m0, sc->sc_xfer[URTW_8187L_BULK_TX_NORMAL]; STAILQ_INSERT_TAIL(&sc->sc_tx_pending, data, next); - usb2_transfer_start(xfer); + usbd_transfer_start(xfer); error = urtw_led_ctl(sc, URTW_LED_CTL_TX); if (error != 0) @@ -1888,7 +1888,7 @@ urtw_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) IEEE80211_UNLOCK(ic); URTW_LOCK(sc); - usb2_callout_stop(&sc->sc_led_ch); + usb_callout_stop(&sc->sc_led_ch); callout_stop(&sc->sc_watchdog_ch); switch (nstate) { @@ -2528,20 +2528,20 @@ urtw_8225_rf_init(struct urtw_softc *sc) error = urtw_8185_rf_pins_enable(sc); if (error) goto fail; - usb2_pause_mtx(&sc->sc_mtx, 1000); + usb_pause_mtx(&sc->sc_mtx, 1000); for (i = 0; i < N(urtw_8225_rf_part1); i++) { urtw_8225_write(sc, urtw_8225_rf_part1[i].reg, urtw_8225_rf_part1[i].val); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); } - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1); - usb2_pause_mtx(&sc->sc_mtx, 200); + usb_pause_mtx(&sc->sc_mtx, 200); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2); - usb2_pause_mtx(&sc->sc_mtx, 200); + usb_pause_mtx(&sc->sc_mtx, 200); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC3); @@ -2557,15 +2557,15 @@ urtw_8225_rf_init(struct urtw_softc *sc) for (i = 0; i < 128; i++) { urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); urtw_8187_write_phy_ofdm(sc, 0xa, (uint8_t)i + 0x80); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); } for (i = 0; i < N(urtw_8225_rf_part2); i++) { urtw_8187_write_phy_ofdm(sc, urtw_8225_rf_part2[i].reg, urtw_8225_rf_part2[i].val); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); } error = urtw_8225_setgain(sc, 4); @@ -2575,7 +2575,7 @@ urtw_8225_rf_init(struct urtw_softc *sc) for (i = 0; i < N(urtw_8225_rf_part3); i++) { urtw_8187_write_phy_cck(sc, urtw_8225_rf_part3[i].reg, urtw_8225_rf_part3[i].val); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); } urtw_write8_m(sc, URTW_TESTR, 0x0d); @@ -2585,9 +2585,9 @@ urtw_8225_rf_init(struct urtw_softc *sc) goto fail; urtw_8187_write_phy_cck(sc, 0x10, 0x9b); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); urtw_8187_write_phy_ofdm(sc, 0x26, 0x90); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); /* TX ant A, 0x0 for B */ error = urtw_8185_tx_antenna(sc, 0x3); @@ -2617,7 +2617,7 @@ urtw_8185_tx_antenna(struct urtw_softc *sc, uint8_t ant) usb_error_t error; urtw_write8_m(sc, URTW_TX_ANTENNA, ant); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); fail: return (error); } @@ -2649,7 +2649,7 @@ urtw_8187_write_phy(struct urtw_softc *sc, uint8_t addr, uint32_t data) urtw_write8_m(sc, URTW_PHY_MAGIC3, ((phyw & 0x00ff0000) >> 16)); urtw_write8_m(sc, URTW_PHY_MAGIC2, ((phyw & 0x0000ff00) >> 8)); urtw_write8_m(sc, URTW_PHY_MAGIC1, ((phyw & 0x000000ff))); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); fail: return (error); } @@ -2689,7 +2689,7 @@ urtw_8225_usb_init(struct urtw_softc *sc) urtw_write16_m(sc, URTW_RF_PINS_SELECT, 0x80); urtw_write16_m(sc, URTW_RF_PINS_ENABLE, 0x80); - usb2_pause_mtx(&sc->sc_mtx, 500); + usb_pause_mtx(&sc->sc_mtx, 500); fail: return (error); } @@ -2722,7 +2722,7 @@ urtw_8225_write_c(struct urtw_softc *sc, uint8_t addr, uint16_t data) DELAY(10); urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, d80 | URTW_BB_HOST_BANG_EN); urtw_write16_m(sc, URTW_RF_PINS_SELECT, d84); - usb2_pause_mtx(&sc->sc_mtx, 2); + usb_pause_mtx(&sc->sc_mtx, 2); fail: return (error); } @@ -2776,7 +2776,7 @@ urtw_8225_rf_set_chan(struct urtw_softc *sc, int chan) if (error) goto fail; urtw_8225_write(sc, URTW_8225_ADDR_7_MAGIC, urtw_8225_channel[chan]); - usb2_pause_mtx(&sc->sc_mtx, 10); + usb_pause_mtx(&sc->sc_mtx, 10); urtw_write8_m(sc, URTW_SIFS, 0x22); @@ -2855,7 +2855,7 @@ urtw_8225_set_txpwrlvl(struct urtw_softc *sc, int chan) urtw_8187_write_phy_cck(sc, 0x44 + i, cck_pwltable[idx * 8 + i]); } - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); /* OFDM power setting */ ofdm_pwrlvl = (ofdm_pwrlvl > (ofdm_pwrlvl_max - ofdm_pwrlvl_min)) ? @@ -2876,7 +2876,7 @@ urtw_8225_set_txpwrlvl(struct urtw_softc *sc, int chan) urtw_8225_tx_gain_cck_ofdm[set] >> 1); urtw_8187_write_phy_ofdm(sc, 0x5, urtw_8225_txpwr_ofdm[idx]); urtw_8187_write_phy_ofdm(sc, 0x7, urtw_8225_txpwr_ofdm[idx]); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); fail: return (error); } @@ -2950,13 +2950,13 @@ urtw_8225v2_rf_init(struct urtw_softc *sc) if (error) goto fail; - usb2_pause_mtx(&sc->sc_mtx, 500); + usb_pause_mtx(&sc->sc_mtx, 500); for (i = 0; i < N(urtw_8225v2_rf_part1); i++) { urtw_8225_write(sc, urtw_8225v2_rf_part1[i].reg, urtw_8225v2_rf_part1[i].val); } - usb2_pause_mtx(&sc->sc_mtx, 50); + usb_pause_mtx(&sc->sc_mtx, 50); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1); @@ -2975,10 +2975,10 @@ urtw_8225v2_rf_init(struct urtw_softc *sc) URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC2); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32); if (error != 0) @@ -2988,17 +2988,17 @@ urtw_8225v2_rf_init(struct urtw_softc *sc) if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) { urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2); - usb2_pause_mtx(&sc->sc_mtx, 50); + usb_pause_mtx(&sc->sc_mtx, 50); error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32); if (error != 0) goto fail; if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) device_printf(sc->sc_dev, "RF calibration failed\n"); } - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC6); @@ -3054,7 +3054,7 @@ urtw_8225v2_rf_set_chan(struct urtw_softc *sc, int chan) goto fail; urtw_8225_write(sc, URTW_8225_ADDR_7_MAGIC, urtw_8225_channel[chan]); - usb2_pause_mtx(&sc->sc_mtx, 10); + usb_pause_mtx(&sc->sc_mtx, 10); urtw_write8_m(sc, URTW_SIFS, 0x22); @@ -3193,7 +3193,7 @@ urtw_8225v2_set_txpwrlvl(struct urtw_softc *sc, int chan) urtw_write8_m(sc, URTW_TX_GAIN_CCK, urtw_8225v2_tx_gain_cck_ofdm[cck_pwrlvl]); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); /* OFDM power setting */ ofdm_pwrlvl = (ofdm_pwrlvl > (ofdm_pwrlvl_max - ofdm_pwrlvl_min)) ? @@ -3213,7 +3213,7 @@ urtw_8225v2_set_txpwrlvl(struct urtw_softc *sc, int chan) urtw_write8_m(sc, URTW_TX_GAIN_OFDM, urtw_8225v2_tx_gain_cck_ofdm[ofdm_pwrlvl]); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); fail: return (error); } @@ -3227,13 +3227,13 @@ urtw_8225v2_setgain(struct urtw_softc *sc, int16_t gain) /* XXX for A? */ gainp = urtw_8225v2_gain_bg; urtw_8187_write_phy_ofdm(sc, 0x0d, gainp[gain * 3]); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); urtw_8187_write_phy_ofdm(sc, 0x1b, gainp[gain * 3 + 1]); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); urtw_8187_write_phy_ofdm(sc, 0x1d, gainp[gain * 3 + 2]); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); urtw_8187_write_phy_ofdm(sc, 0x21, 0x17); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); fail: return (error); } @@ -3249,7 +3249,7 @@ urtw_8225_isv2(struct urtw_softc *sc, int *ret) urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_MAGIC5); urtw_write16_m(sc, URTW_RF_PINS_SELECT, URTW_RF_PINS_MAGIC5); urtw_write16_m(sc, URTW_RF_PINS_ENABLE, URTW_RF_PINS_MAGIC5); - usb2_pause_mtx(&sc->sc_mtx, 500); + usb_pause_mtx(&sc->sc_mtx, 500); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1); @@ -3342,7 +3342,7 @@ urtw_8225v2b_rf_set_chan(struct urtw_softc *sc, int chan) goto fail; urtw_8225_write(sc, URTW_8225_ADDR_7_MAGIC, urtw_8225_channel[chan]); - usb2_pause_mtx(&sc->sc_mtx, 10); + usb_pause_mtx(&sc->sc_mtx, 10); urtw_write8_m(sc, URTW_SIFS, 0xa); if (ic->ic_flags & IEEE80211_F_SHSLOT) { @@ -3405,7 +3405,7 @@ urtw_8225v2b_set_txpwrlvl(struct urtw_softc *sc, int chan) urtw_write8_m(sc, URTW_TX_GAIN_CCK, urtw_8225v2_tx_gain_cck_ofdm[cck_pwrlvl] << 1); - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); /* OFDM power setting */ ofdm_pwrlvl = (ofdm_pwrlvl > 15) ? @@ -3437,7 +3437,7 @@ urtw_8225v2b_set_txpwrlvl(struct urtw_softc *sc, int chan) urtw_8187_write_phy_ofdm(sc, 0x89, 0x50); } } - usb2_pause_mtx(&sc->sc_mtx, 1); + usb_pause_mtx(&sc->sc_mtx, 1); fail: return (error); } @@ -3554,7 +3554,7 @@ urtw_reset(struct urtw_softc *sc) error = urtw_intr_disable(sc); if (error) goto fail; - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); error = urtw_write8e(sc, 0x18, 0x10); if (error != 0) @@ -3565,12 +3565,12 @@ urtw_reset(struct urtw_softc *sc) error = urtw_write8e(sc, 0x18, 0x00); if (error != 0) goto fail; - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); urtw_read8_m(sc, URTW_CMD, &data); data = (data & 0x2) | URTW_CMD_RST; urtw_write8_m(sc, URTW_CMD, data); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); urtw_read8_m(sc, URTW_CMD, &data); if (data & URTW_CMD_RST) { @@ -3581,7 +3581,7 @@ urtw_reset(struct urtw_softc *sc) error = urtw_set_mode(sc, URTW_EPROM_CMD_LOAD); if (error) goto fail; - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); error = urtw_8180_set_anaparam(sc, URTW_8225_ANAPARAM_ON); if (error) @@ -3654,11 +3654,11 @@ urtw_led_mode0(struct urtw_softc *sc, int mode) sc->sc_gpio_ledinprogress = 1; sc->sc_gpio_blinkstate = (sc->sc_gpio_ledon != 0) ? URTW_LED_OFF : URTW_LED_ON; - usb2_callout_reset(&sc->sc_led_ch, hz, urtw_led_ch, sc); + usb_callout_reset(&sc->sc_led_ch, hz, urtw_led_ch, sc); break; case URTW_LED_POWER_ON_BLINK: urtw_led_on(sc, URTW_LED_GPIO); - usb2_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, 100); urtw_led_off(sc, URTW_LED_GPIO); break; default: @@ -3803,7 +3803,7 @@ urtw_led_blink(struct urtw_softc *sc) switch (sc->sc_gpio_ledstate) { case URTW_LED_BLINK_NORMAL: - usb2_callout_reset(&sc->sc_led_ch, hz, urtw_led_ch, sc); + usb_callout_reset(&sc->sc_led_ch, hz, urtw_led_ch, sc); break; default: panic("unknown LED status 0x%x", sc->sc_gpio_ledstate); @@ -3818,7 +3818,7 @@ urtw_rx_enable(struct urtw_softc *sc) uint8_t data; usb_error_t error; - usb2_transfer_start((sc->sc_flags & URTW_RTL8187B) ? + usbd_transfer_start((sc->sc_flags & URTW_RTL8187B) ? sc->sc_xfer[URTW_8187B_BULK_RX] : sc->sc_xfer[URTW_8187L_BULK_RX]); error = urtw_rx_setconf(sc); @@ -4055,9 +4055,9 @@ setup: } STAILQ_REMOVE_HEAD(&sc->sc_rx_inactive, next); STAILQ_INSERT_TAIL(&sc->sc_rx_active, data, next); - usb2_set_frame_data(xfer, data->buf, 0); + usbd_set_frame_data(xfer, data->buf, 0); xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); /* * To avoid LOR we should unlock our private mutex here to call @@ -4155,9 +4155,9 @@ setup: STAILQ_REMOVE_HEAD(&sc->sc_tx_pending, next); STAILQ_INSERT_TAIL(&sc->sc_tx_active, data, next); - usb2_set_frame_data(xfer, data->buf, 0); + usbd_set_frame_data(xfer, data->buf, 0); xfer->frlengths[0] = data->buflen; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); URTW_UNLOCK(sc); urtw_start(ifp); diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index a0079eb7..8627d81 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -110,7 +110,7 @@ enum { #endif #define zyd_do_request(sc,req,data) \ - usb2_do_request_flags((sc)->sc_udev, &(sc)->sc_mtx, req, data, 0, NULL, 5000) + usbd_do_request_flags((sc)->sc_udev, &(sc)->sc_mtx, req, data, 0, NULL, 5000) static device_probe_t zyd_match; static device_attach_t zyd_attach; @@ -330,7 +330,7 @@ zyd_match(device_t dev) if (uaa->info.bIfaceIndex != ZYD_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(zyd_devs, sizeof(zyd_devs), uaa)); + return (usbd_lookup_id_by_uaa(zyd_devs, sizeof(zyd_devs), uaa)); } static int @@ -350,7 +350,7 @@ zyd_attach(device_t dev) return (EINVAL); } - device_set_usb2_desc(dev); + device_set_usb_desc(dev); sc->sc_dev = dev; sc->sc_udev = uaa->device; sc->sc_macrev = USB_GET_DRIVER_INFO(uaa); @@ -360,12 +360,12 @@ zyd_attach(device_t dev) STAILQ_INIT(&sc->sc_rqh); iface_index = ZYD_IFACE_INDEX; - error = usb2_transfer_setup(uaa->device, + error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, zyd_config, ZYD_N_TRANSFER, sc, &sc->sc_mtx); if (error) { device_printf(dev, "could not allocate USB transfers, " - "err=%s\n", usb2_errstr(error)); + "err=%s\n", usbd_errstr(error)); goto detach; } @@ -448,7 +448,7 @@ zyd_detach(device_t dev) struct ieee80211com *ic; /* stop all USB transfers */ - usb2_transfer_unsetup(sc->sc_xfer, ZYD_N_TRANSFER); + usbd_transfer_unsetup(sc->sc_xfer, ZYD_N_TRANSFER); /* free TX list, if any */ zyd_unsetup_tx_list(sc); @@ -644,7 +644,7 @@ zyd_intr_read_callback(struct usb_xfer *xfer) switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - usb2_copy_out(xfer->frbuffers, 0, cmd, sizeof(*cmd)); + usbd_copy_out(xfer->frbuffers, 0, cmd, sizeof(*cmd)); switch (le16toh(cmd->code)) { case ZYD_NOTIF_RETRYSTATUS: @@ -720,12 +720,12 @@ zyd_intr_read_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); break; default: /* Error */ DPRINTF(sc, ZYD_DEBUG_CMD, "error = %s\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); if (xfer->error != USB_ERR_CANCELLED) { /* try to clear stall first */ @@ -760,19 +760,19 @@ tr_setup: if (rqp->flags & ZYD_CMD_FLAG_SENT) continue; - usb2_copy_in(xfer->frbuffers, 0, rqp->cmd, rqp->ilen); + usbd_copy_in(xfer->frbuffers, 0, rqp->cmd, rqp->ilen); xfer->frlengths[0] = rqp->ilen; xfer->priv_fifo = rqp; rqp->flags |= ZYD_CMD_FLAG_SENT; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); break; } break; default: /* Error */ DPRINTF(sc, ZYD_DEBUG_ANY, "error = %s\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); if (xfer->error != USB_ERR_CANCELLED) { /* try to clear stall first */ @@ -806,8 +806,8 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, rq.olen = olen; rq.flags = flags; STAILQ_INSERT_TAIL(&sc->sc_rqh, &rq, rq); - usb2_transfer_start(sc->sc_xfer[ZYD_INTR_RD]); - usb2_transfer_start(sc->sc_xfer[ZYD_INTR_WR]); + usbd_transfer_start(sc->sc_xfer[ZYD_INTR_RD]); + usbd_transfer_start(sc->sc_xfer[ZYD_INTR_WR]); /* wait at most one second for command reply */ error = mtx_sleep(&rq, &sc->sc_mtx, 0 , "zydcmd", hz); @@ -1922,7 +1922,7 @@ zyd_get_macaddr(struct zyd_softc *sc) error = zyd_do_request(sc, &req, sc->sc_bssid); if (error != 0) { device_printf(sc->sc_dev, "could not read EEPROM: %s\n", - usb2_errstr(error)); + usbd_errstr(error)); } return (error); @@ -2179,8 +2179,8 @@ zyd_rx_data(struct usb_xfer *xfer, int offset, uint16_t len) ifp->if_ierrors++; return; } - usb2_copy_out(xfer->frbuffers, offset, &plcp, sizeof(plcp)); - usb2_copy_out(xfer->frbuffers, offset + len - sizeof(stat), + usbd_copy_out(xfer->frbuffers, offset, &plcp, sizeof(plcp)); + usbd_copy_out(xfer->frbuffers, offset + len - sizeof(stat), &stat, sizeof(stat)); if (stat.flags & ZYD_RX_ERROR) { @@ -2213,7 +2213,7 @@ zyd_rx_data(struct usb_xfer *xfer, int offset, uint16_t len) } m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = rlen; - usb2_copy_out(xfer->frbuffers, offset + sizeof(plcp), + usbd_copy_out(xfer->frbuffers, offset + sizeof(plcp), mtod(m, uint8_t *), rlen); if (ieee80211_radiotap_active(ic)) { @@ -2255,7 +2255,7 @@ zyd_bulk_read_callback(struct usb_xfer *xfer) sc->sc_rx_count = 0; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - usb2_copy_out(xfer->frbuffers, xfer->actlen - sizeof(desc), + usbd_copy_out(xfer->frbuffers, xfer->actlen - sizeof(desc), &desc, sizeof(desc)); offset = 0; @@ -2288,7 +2288,7 @@ zyd_bulk_read_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); /* * At the end of a USB callback it is always safe to unlock @@ -2315,7 +2315,7 @@ tr_setup: break; default: /* Error */ - DPRINTF(sc, ZYD_DEBUG_ANY, "frame error: %s\n", usb2_errstr(xfer->error)); + DPRINTF(sc, ZYD_DEBUG_ANY, "frame error: %s\n", usbd_errstr(xfer->error)); if (xfer->error != USB_ERR_CANCELLED) { /* try to clear stall first */ @@ -2397,9 +2397,9 @@ tr_setup: m->m_pkthdr.len); m->m_pkthdr.len = ZYD_MAX_TXBUFSZ; } - usb2_copy_in(xfer->frbuffers, 0, &data->desc, + usbd_copy_in(xfer->frbuffers, 0, &data->desc, ZYD_TX_DESC_SIZE); - usb2_m_copy_in(xfer->frbuffers, ZYD_TX_DESC_SIZE, m, 0, + usbd_m_copy_in(xfer->frbuffers, ZYD_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); vap = data->ni->ni_vap; @@ -2414,13 +2414,13 @@ tr_setup: xfer->frlengths[0] = ZYD_TX_DESC_SIZE + m->m_pkthdr.len; xfer->priv_fifo = data; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); } break; default: /* Error */ DPRINTF(sc, ZYD_DEBUG_ANY, "transfer error, %s\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); ifp->if_oerrors++; data = xfer->priv_fifo; @@ -2553,7 +2553,7 @@ zyd_tx_start(struct zyd_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) rate); STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[ZYD_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[ZYD_BULK_WR]); return (0); } @@ -2682,8 +2682,8 @@ zyd_init_locked(struct zyd_softc *sc) } /* reset device */ - cd = usb2_get_config_descriptor(sc->sc_udev); - error = usb2_req_set_config(sc->sc_udev, &sc->sc_mtx, + cd = usbd_get_config_descriptor(sc->sc_udev); + error = usbd_req_set_config(sc->sc_udev, &sc->sc_mtx, cd->bConfigurationValue); if (error) device_printf(sc->sc_dev, "reset failed, continuing\n"); @@ -2761,9 +2761,9 @@ zyd_init_locked(struct zyd_softc *sc) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - usb2_transfer_set_stall(sc->sc_xfer[ZYD_BULK_WR]); - usb2_transfer_start(sc->sc_xfer[ZYD_BULK_RD]); - usb2_transfer_start(sc->sc_xfer[ZYD_INTR_RD]); + usbd_transfer_set_stall(sc->sc_xfer[ZYD_BULK_WR]); + usbd_transfer_start(sc->sc_xfer[ZYD_BULK_RD]); + usbd_transfer_start(sc->sc_xfer[ZYD_INTR_RD]); return; @@ -2800,8 +2800,8 @@ zyd_stop(struct zyd_softc *sc) * Drain all the transfers, if not already drained: */ ZYD_UNLOCK(sc); - usb2_transfer_drain(sc->sc_xfer[ZYD_BULK_WR]); - usb2_transfer_drain(sc->sc_xfer[ZYD_BULK_RD]); + usbd_transfer_drain(sc->sc_xfer[ZYD_BULK_WR]); + usbd_transfer_drain(sc->sc_xfer[ZYD_BULK_RD]); ZYD_LOCK(sc); zyd_unsetup_tx_list(sc); |
