summaryrefslogtreecommitdiff
path: root/sys/dev/usb2/wlan
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb2/wlan')
-rw-r--r--sys/dev/usb2/wlan/if_rum2.c38
-rw-r--r--sys/dev/usb2/wlan/if_rumvar.h10
-rw-r--r--sys/dev/usb2/wlan/if_ural2.c38
-rw-r--r--sys/dev/usb2/wlan/if_uralvar.h10
-rw-r--r--sys/dev/usb2/wlan/if_zyd2.c66
-rw-r--r--sys/dev/usb2/wlan/if_zydreg.h24
6 files changed, 99 insertions, 87 deletions
diff --git a/sys/dev/usb2/wlan/if_rum2.c b/sys/dev/usb2/wlan/if_rum2.c
index d0adba33764b..991d32890e40 100644
--- a/sys/dev/usb2/wlan/if_rum2.c
+++ b/sys/dev/usb2/wlan/if_rum2.c
@@ -375,7 +375,7 @@ static const struct rfprog rum_rf5225[] = {
};
static const struct usb2_config rum_config[RUM_N_TRANSFER] = {
- [0] = {
+ [RUM_BULK_DT_WR] = {
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
@@ -385,7 +385,7 @@ static const struct usb2_config rum_config[RUM_N_TRANSFER] = {
.mh.timeout = 5000, /* ms */
},
- [1] = {
+ [RUM_BULK_DT_RD] = {
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
@@ -394,7 +394,7 @@ static const struct usb2_config rum_config[RUM_N_TRANSFER] = {
.mh.callback = &rum_bulk_read_callback,
},
- [2] = {
+ [RUM_BULK_CS_WR] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -404,7 +404,7 @@ static const struct usb2_config rum_config[RUM_N_TRANSFER] = {
.mh.interval = 50, /* 50ms */
},
- [3] = {
+ [RUM_BULK_CS_RD] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -897,7 +897,7 @@ rum_end_of_commands(struct rum_softc *sc)
sc->sc_flags &= ~RUM_FLAG_WAIT_COMMAND;
/* start write transfer, if not started */
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_DT_WR]);
}
static void
@@ -1075,7 +1075,7 @@ rum_bulk_read_callback(struct usb2_xfer *xfer)
tr_setup:
if (sc->sc_flags & RUM_FLAG_READ_STALL) {
- usb2_transfer_start(sc->sc_xfer[3]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_CS_RD]);
} else {
xfer->frlengths[0] = xfer->max_data_length;
usb2_start_hardware(xfer);
@@ -1110,7 +1110,7 @@ tr_setup:
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= RUM_FLAG_READ_STALL;
- usb2_transfer_start(sc->sc_xfer[3]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_CS_RD]);
}
return;
@@ -1121,7 +1121,7 @@ static void
rum_bulk_read_clear_stall_callback(struct usb2_xfer *xfer)
{
struct rum_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[1];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[RUM_BULK_DT_RD];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -1302,7 +1302,7 @@ rum_setup_desc_and_tx(struct rum_softc *sc, struct mbuf *m, uint32_t flags,
/* start write transfer, if not started */
_IF_ENQUEUE(&sc->sc_tx_queue, mm);
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_DT_WR]);
}
static void
@@ -1322,7 +1322,7 @@ rum_bulk_write_callback(struct usb2_xfer *xfer)
case USB_ST_SETUP:
if (sc->sc_flags & RUM_FLAG_WRITE_STALL) {
- usb2_transfer_start(sc->sc_xfer[2]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_CS_WR]);
break;
}
if (sc->sc_flags & RUM_FLAG_WAIT_COMMAND) {
@@ -1380,7 +1380,7 @@ rum_bulk_write_callback(struct usb2_xfer *xfer)
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= RUM_FLAG_WRITE_STALL;
- usb2_transfer_start(sc->sc_xfer[2]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_CS_WR]);
}
ifp->if_oerrors++;
break;
@@ -1391,7 +1391,7 @@ static void
rum_bulk_write_clear_stall_callback(struct usb2_xfer *xfer)
{
struct rum_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[0];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[RUM_BULK_DT_WR];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -1473,7 +1473,7 @@ rum_start_cb(struct ifnet *ifp)
mtx_lock(&sc->sc_mtx);
/* start write transfer, if not started */
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_DT_WR]);
mtx_unlock(&sc->sc_mtx);
}
@@ -2234,8 +2234,8 @@ rum_cfg_init(struct rum_softc *sc,
/*
* start the USB transfers, if not already started:
*/
- usb2_transfer_start(sc->sc_xfer[1]);
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_DT_RD]);
+ usb2_transfer_start(sc->sc_xfer[RUM_BULK_DT_WR]);
/*
* start IEEE802.11 layer
@@ -2293,10 +2293,10 @@ rum_cfg_pre_stop(struct rum_softc *sc,
/*
* stop all the transfers, if not already stopped:
*/
- usb2_transfer_stop(sc->sc_xfer[0]);
- usb2_transfer_stop(sc->sc_xfer[1]);
- usb2_transfer_stop(sc->sc_xfer[2]);
- usb2_transfer_stop(sc->sc_xfer[3]);
+ usb2_transfer_stop(sc->sc_xfer[RUM_BULK_DT_WR]);
+ usb2_transfer_stop(sc->sc_xfer[RUM_BULK_DT_RD]);
+ usb2_transfer_stop(sc->sc_xfer[RUM_BULK_CS_WR]);
+ usb2_transfer_stop(sc->sc_xfer[RUM_BULK_CS_RD]);
/* clean up transmission */
rum_tx_clean_queue(sc);
diff --git a/sys/dev/usb2/wlan/if_rumvar.h b/sys/dev/usb2/wlan/if_rumvar.h
index 8551a4115162..ffa19f12023d 100644
--- a/sys/dev/usb2/wlan/if_rumvar.h
+++ b/sys/dev/usb2/wlan/if_rumvar.h
@@ -17,8 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RUM_N_TRANSFER 4
-
struct rum_node {
struct ieee80211_node ni;
struct ieee80211_amrr_node amn;
@@ -113,6 +111,14 @@ struct rum_ifq {
uint16_t ifq_len;
};
+enum {
+ RUM_BULK_DT_WR,
+ RUM_BULK_DT_RD,
+ RUM_BULK_CS_WR,
+ RUM_BULK_CS_RD,
+ RUM_N_TRANSFER = 4,
+};
+
struct rum_softc {
void *sc_evilhack; /* XXX this pointer must be first */
diff --git a/sys/dev/usb2/wlan/if_ural2.c b/sys/dev/usb2/wlan/if_ural2.c
index 30963cb20b18..9ac3521dab8a 100644
--- a/sys/dev/usb2/wlan/if_ural2.c
+++ b/sys/dev/usb2/wlan/if_ural2.c
@@ -367,7 +367,7 @@ static const struct ural_rf5222 ural_rf5222[] = {
};
static const struct usb2_config ural_config[URAL_N_TRANSFER] = {
- [0] = {
+ [URAL_BULK_DT_WR] = {
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
@@ -377,7 +377,7 @@ static const struct usb2_config ural_config[URAL_N_TRANSFER] = {
.mh.timeout = 5000, /* ms */
},
- [1] = {
+ [URAL_BULK_DT_RD] = {
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
@@ -386,7 +386,7 @@ static const struct usb2_config ural_config[URAL_N_TRANSFER] = {
.mh.callback = &ural_bulk_read_callback,
},
- [2] = {
+ [URAL_BULK_CS_WR] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -396,7 +396,7 @@ static const struct usb2_config ural_config[URAL_N_TRANSFER] = {
.mh.interval = 50, /* 50ms */
},
- [3] = {
+ [URAL_BULK_CS_RD] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -881,7 +881,7 @@ ural_end_of_commands(struct ural_softc *sc)
sc->sc_flags &= ~URAL_FLAG_WAIT_COMMAND;
/* start write transfer, if not started */
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_DT_WR]);
}
static void
@@ -1077,7 +1077,7 @@ ural_bulk_read_callback(struct usb2_xfer *xfer)
tr_setup:
if (sc->sc_flags & URAL_FLAG_READ_STALL) {
- usb2_transfer_start(sc->sc_xfer[3]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_CS_RD]);
} else {
xfer->frlengths[0] = xfer->max_data_length;
usb2_start_hardware(xfer);
@@ -1115,7 +1115,7 @@ tr_setup:
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= URAL_FLAG_READ_STALL;
- usb2_transfer_start(sc->sc_xfer[3]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_CS_RD]);
}
return;
@@ -1126,7 +1126,7 @@ static void
ural_bulk_read_clear_stall_callback(struct usb2_xfer *xfer)
{
struct ural_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[1];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[URAL_BULK_DT_RD];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -1293,7 +1293,7 @@ ural_setup_desc_and_tx(struct ural_softc *sc, struct mbuf *m,
/* start write transfer, if not started */
_IF_ENQUEUE(&sc->sc_tx_queue, mm);
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_DT_WR]);
}
static void
@@ -1313,7 +1313,7 @@ ural_bulk_write_callback(struct usb2_xfer *xfer)
case USB_ST_SETUP:
if (sc->sc_flags & URAL_FLAG_WRITE_STALL) {
- usb2_transfer_start(sc->sc_xfer[2]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_CS_WR]);
break;
}
if (sc->sc_flags & URAL_FLAG_WAIT_COMMAND) {
@@ -1371,7 +1371,7 @@ ural_bulk_write_callback(struct usb2_xfer *xfer)
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= URAL_FLAG_WRITE_STALL;
- usb2_transfer_start(sc->sc_xfer[2]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_CS_WR]);
}
ifp->if_oerrors++;
break;
@@ -1382,7 +1382,7 @@ static void
ural_bulk_write_clear_stall_callback(struct usb2_xfer *xfer)
{
struct ural_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[0];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[URAL_BULK_DT_WR];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -1468,7 +1468,7 @@ ural_start_cb(struct ifnet *ifp)
mtx_lock(&sc->sc_mtx);
/* start write transfer, if not started */
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_DT_WR]);
mtx_unlock(&sc->sc_mtx);
}
@@ -2160,8 +2160,8 @@ ural_cfg_init(struct ural_softc *sc,
/*
* start the USB transfers, if not already started:
*/
- usb2_transfer_start(sc->sc_xfer[1]);
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_DT_RD]);
+ usb2_transfer_start(sc->sc_xfer[URAL_BULK_DT_WR]);
/*
* start IEEE802.11 layer
@@ -2219,10 +2219,10 @@ ural_cfg_pre_stop(struct ural_softc *sc,
/*
* stop all the transfers, if not already stopped:
*/
- usb2_transfer_stop(sc->sc_xfer[0]);
- usb2_transfer_stop(sc->sc_xfer[1]);
- usb2_transfer_stop(sc->sc_xfer[2]);
- usb2_transfer_stop(sc->sc_xfer[3]);
+ usb2_transfer_stop(sc->sc_xfer[URAL_BULK_DT_WR]);
+ usb2_transfer_stop(sc->sc_xfer[URAL_BULK_DT_RD]);
+ usb2_transfer_stop(sc->sc_xfer[URAL_BULK_CS_WR]);
+ usb2_transfer_stop(sc->sc_xfer[URAL_BULK_CS_RD]);
/* clean up transmission */
ural_tx_clean_queue(sc);
diff --git a/sys/dev/usb2/wlan/if_uralvar.h b/sys/dev/usb2/wlan/if_uralvar.h
index c91643c804c1..aa107caf1bb9 100644
--- a/sys/dev/usb2/wlan/if_uralvar.h
+++ b/sys/dev/usb2/wlan/if_uralvar.h
@@ -17,8 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define URAL_N_TRANSFER 4
-
struct ural_node {
struct ieee80211_node ni;
struct ieee80211_amrr_node amn;
@@ -113,6 +111,14 @@ struct ural_ifq {
uint16_t ifq_len;
};
+enum {
+ URAL_BULK_DT_WR,
+ URAL_BULK_DT_RD,
+ URAL_BULK_CS_WR,
+ URAL_BULK_CS_RD,
+ URAL_N_TRANSFER = 4,
+};
+
struct ural_softc {
void *sc_evilhack; /* XXX this pointer must be first */
diff --git a/sys/dev/usb2/wlan/if_zyd2.c b/sys/dev/usb2/wlan/if_zyd2.c
index 2e800937dc3c..f18bee8127bc 100644
--- a/sys/dev/usb2/wlan/if_zyd2.c
+++ b/sys/dev/usb2/wlan/if_zyd2.c
@@ -216,7 +216,7 @@ static const struct usb2_device_id zyd_devs[] = {
};
static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
- [ZYD_TR_BULK_DT_WR] = {
+ [ZYD_BULK_DT_WR] = {
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
@@ -227,7 +227,7 @@ static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
.mh.timeout = 10000, /* 10 seconds */
},
- [ZYD_TR_BULK_DT_RD] = {
+ [ZYD_BULK_DT_RD] = {
.type = UE_BULK,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
@@ -237,7 +237,7 @@ static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
.ep_index = 0,
},
- [ZYD_TR_BULK_CS_WR] = {
+ [ZYD_BULK_CS_WR] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -248,7 +248,7 @@ static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
.mh.interval = 50, /* 50ms */
},
- [ZYD_TR_BULK_CS_RD] = {
+ [ZYD_BULK_CS_RD] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -259,7 +259,7 @@ static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
.mh.interval = 50, /* 50ms */
},
- [ZYD_TR_INTR_DT_WR] = {
+ [ZYD_INTR_DT_WR] = {
.type = UE_BULK_INTR,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
@@ -270,7 +270,7 @@ static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
.ep_index = 1,
},
- [ZYD_TR_INTR_DT_RD] = {
+ [ZYD_INTR_DT_RD] = {
.type = UE_BULK_INTR,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_IN,
@@ -280,7 +280,7 @@ static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
.ep_index = 1,
},
- [ZYD_TR_INTR_CS_WR] = {
+ [ZYD_INTR_CS_WR] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -291,7 +291,7 @@ static const struct usb2_config zyd_config[ZYD_N_TRANSFER] = {
.mh.interval = 50, /* 50ms */
},
- [ZYD_TR_INTR_CS_RD] = {
+ [ZYD_INTR_CS_RD] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
@@ -373,7 +373,7 @@ static void
zyd_intr_read_clear_stall_callback(struct usb2_xfer *xfer)
{
struct zyd_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_TR_INTR_DT_RD];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_INTR_DT_RD];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -420,7 +420,7 @@ zyd_intr_read_callback(struct usb2_xfer *xfer)
case USB_ST_SETUP:
tr_setup:
if (sc->sc_flags & ZYD_FLAG_INTR_READ_STALL) {
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_CS_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_CS_RD]);
break;
}
xfer->frlengths[0] = xfer->max_data_length;
@@ -434,7 +434,7 @@ tr_setup:
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= ZYD_FLAG_INTR_READ_STALL;
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_CS_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_CS_RD]);
}
break;
}
@@ -529,7 +529,7 @@ repeat:
/* wait for data */
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_DT_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_DT_RD]);
if (usb2_cv_timedwait(&sc->sc_intr_cv,
&sc->sc_mtx, hz / 2)) {
@@ -571,7 +571,7 @@ skip0:
* We have fetched the data from the shared buffer and it is
* safe to restart the interrupt transfer!
*/
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_DT_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_DT_RD]);
done:
return;
}
@@ -580,7 +580,7 @@ static void
zyd_intr_write_clear_stall_callback(struct usb2_xfer *xfer)
{
struct zyd_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_TR_INTR_DT_WR];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_INTR_DT_WR];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -602,7 +602,7 @@ zyd_intr_write_callback(struct usb2_xfer *xfer)
case USB_ST_SETUP:
if (sc->sc_flags & ZYD_FLAG_INTR_WRITE_STALL) {
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_CS_WR]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_CS_WR]);
goto wakeup;
}
if (sc->sc_intr_owakeup) {
@@ -621,7 +621,7 @@ zyd_intr_write_callback(struct usb2_xfer *xfer)
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= ZYD_FLAG_INTR_WRITE_STALL;
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_CS_WR]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_CS_WR]);
}
goto wakeup;
}
@@ -657,7 +657,7 @@ zyd_cfg_usb2_intr_write(struct zyd_softc *sc, const void *data,
sc->sc_intr_obuf.code = htole16(code);
bcopy(data, sc->sc_intr_obuf.data, size);
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_DT_WR]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_DT_WR]);
while (sc->sc_intr_owakeup) {
if (usb2_cv_timedwait(&sc->sc_intr_cv,
@@ -774,7 +774,7 @@ static void
zyd_bulk_read_clear_stall_callback(struct usb2_xfer *xfer)
{
struct zyd_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_TR_BULK_DT_RD];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_BULK_DT_RD];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -923,7 +923,7 @@ tr_setup:
DPRINTF("setup\n");
if (sc->sc_flags & ZYD_FLAG_BULK_READ_STALL) {
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_BULK_CS_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_CS_RD]);
} else {
xfer->frlengths[0] = xfer->max_data_length;
usb2_start_hardware(xfer);
@@ -973,7 +973,7 @@ tr_setup:
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= ZYD_FLAG_BULK_READ_STALL;
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_BULK_CS_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_CS_RD]);
}
break;
}
@@ -2145,7 +2145,7 @@ zyd_cfg_first_time_setup(struct zyd_softc *sc,
if (bootverbose) {
ieee80211_announce(ic);
}
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_INTR_DT_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_INTR_DT_RD]);
done:
return;
}
@@ -2542,8 +2542,8 @@ zyd_cfg_init(struct zyd_softc *sc,
/*
* start the USB transfers, if not already started:
*/
- usb2_transfer_start(sc->sc_xfer[1]);
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_DT_RD]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_DT_WR]);
/*
* start IEEE802.11 layer
@@ -2576,10 +2576,10 @@ zyd_cfg_pre_stop(struct zyd_softc *sc,
/*
* stop all the transfers, if not already stopped:
*/
- usb2_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_DT_WR]);
- usb2_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_DT_RD]);
- usb2_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_CS_WR]);
- usb2_transfer_stop(sc->sc_xfer[ZYD_TR_BULK_CS_RD]);
+ usb2_transfer_stop(sc->sc_xfer[ZYD_BULK_DT_WR]);
+ usb2_transfer_stop(sc->sc_xfer[ZYD_BULK_DT_RD]);
+ usb2_transfer_stop(sc->sc_xfer[ZYD_BULK_CS_WR]);
+ usb2_transfer_stop(sc->sc_xfer[ZYD_BULK_CS_RD]);
/* clean up transmission */
zyd_tx_clean_queue(sc);
@@ -2669,7 +2669,7 @@ zyd_start_cb(struct ifnet *ifp)
struct zyd_softc *sc = ifp->if_softc;
mtx_lock(&sc->sc_mtx);
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_BULK_DT_WR]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_DT_WR]);
mtx_unlock(&sc->sc_mtx);
}
@@ -2677,7 +2677,7 @@ static void
zyd_bulk_write_clear_stall_callback(struct usb2_xfer *xfer)
{
struct zyd_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_TR_BULK_DT_WR];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[ZYD_BULK_DT_WR];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -2781,7 +2781,7 @@ zyd_setup_desc_and_tx(struct zyd_softc *sc, struct mbuf *m,
/* start write transfer, if not started */
_IF_ENQUEUE(&sc->sc_tx_queue, mm);
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_DT_WR]);
}
static void
@@ -2802,7 +2802,7 @@ zyd_bulk_write_callback(struct usb2_xfer *xfer)
case USB_ST_SETUP:
if (sc->sc_flags & ZYD_FLAG_BULK_WRITE_STALL) {
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_BULK_CS_WR]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_CS_WR]);
DPRINTFN(11, "write stalled\n");
break;
}
@@ -2848,7 +2848,7 @@ zyd_bulk_write_callback(struct usb2_xfer *xfer)
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= ZYD_FLAG_BULK_WRITE_STALL;
- usb2_transfer_start(sc->sc_xfer[ZYD_TR_BULK_CS_WR]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_CS_WR]);
}
ifp->if_oerrors++;
break;
@@ -3020,7 +3020,7 @@ zyd_end_of_commands(struct zyd_softc *sc)
sc->sc_flags &= ~ZYD_FLAG_WAIT_COMMAND;
/* start write transfer, if not started */
- usb2_transfer_start(sc->sc_xfer[0]);
+ usb2_transfer_start(sc->sc_xfer[ZYD_BULK_DT_WR]);
}
static void
diff --git a/sys/dev/usb2/wlan/if_zydreg.h b/sys/dev/usb2/wlan/if_zydreg.h
index de145f7b03f3..635440faa680 100644
--- a/sys/dev/usb2/wlan/if_zydreg.h
+++ b/sys/dev/usb2/wlan/if_zydreg.h
@@ -1210,18 +1210,6 @@ struct zyd_rf {
uint8_t width;
};
-enum {
- ZYD_TR_BULK_DT_WR,
- ZYD_TR_BULK_DT_RD,
- ZYD_TR_BULK_CS_WR,
- ZYD_TR_BULK_CS_RD,
- ZYD_TR_INTR_DT_WR,
- ZYD_TR_INTR_DT_RD,
- ZYD_TR_INTR_CS_WR,
- ZYD_TR_INTR_CS_RD,
- ZYD_N_TRANSFER,
-};
-
struct zyd_ifq {
struct mbuf *ifq_head;
struct mbuf *ifq_tail;
@@ -1284,6 +1272,18 @@ struct zyd_config_copy {
uint8_t if_broadcastaddr[IEEE80211_ADDR_LEN];
};
+enum {
+ ZYD_BULK_DT_WR,
+ ZYD_BULK_DT_RD,
+ ZYD_BULK_CS_WR,
+ ZYD_BULK_CS_RD,
+ ZYD_INTR_DT_WR,
+ ZYD_INTR_DT_RD,
+ ZYD_INTR_CS_WR,
+ ZYD_INTR_CS_RD,
+ ZYD_N_TRANSFER = 8,
+};
+
struct zyd_softc {
void *sc_evilhack; /* XXX this pointer must be first */
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 07:43:21 +0000