diff options
| author | Martynas Venckus <martynas@cvs.openbsd.org> | 2009-06-04 19:27:28 +0000 |
|---|---|---|
| committer | Martynas Venckus <martynas@cvs.openbsd.org> | 2009-06-04 19:27:28 +0000 |
| commit | 1e73139d3fab33e0fcdb98148bfa49965f5d3d6d (patch) | |
| tree | 26451c76261866e15e0db55fc8b9707aecc2960d /sys/dev/usb/if_urtwreg.h | |
| parent | ab96caf7168244601cc8b71aab51cd29035b8ac5 (diff) | |
instead of having some 'generic' data str. with "NB: don't use it
for tx" for some fields, and functions trying to do everything;
split it into rx_data & tx_data. this way it's less error-prone.
i've actually fixed a bug doing this.
"please start comitting this stuff" jsg@
Diffstat (limited to 'sys/dev/usb/if_urtwreg.h')
| -rw-r--r-- | sys/dev/usb/if_urtwreg.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sys/dev/usb/if_urtwreg.h b/sys/dev/usb/if_urtwreg.h index b0acb9f4cbe..9b6f5ead4da 100644 --- a/sys/dev/usb/if_urtwreg.h +++ b/sys/dev/usb/if_urtwreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwreg.h,v 1.2 2008/12/03 10:44:17 jsg Exp $ */ +/* $OpenBSD: if_urtwreg.h,v 1.3 2009/06/04 19:27:27 martynas Exp $ */ /*- * Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.org> * @@ -211,12 +211,18 @@ #define URTW_MAX_CHANNELS 15 -struct urtw_data { +struct urtw_tx_data { + struct urtw_softc *sc; + usbd_xfer_handle xfer; + uint8_t *buf; + struct ieee80211_node *ni; +}; + +struct urtw_rx_data { struct urtw_softc *sc; usbd_xfer_handle xfer; uint8_t *buf; struct mbuf *m; - struct ieee80211_node *ni; /* NB: tx only */ }; /* XXX not correct.. */ @@ -303,8 +309,8 @@ struct urtw_softc { #define URTW_PRIORITY_LOW 0 #define URTW_PRIORITY_NORMAL 1 #define URTW_DATA_TIMEOUT 10000 /* 10 sec */ - struct urtw_data sc_rxdata[URTW_RX_DATA_LIST_COUNT]; - struct urtw_data sc_txdata[URTW_TX_DATA_LIST_COUNT]; + struct urtw_rx_data sc_rxdata[URTW_RX_DATA_LIST_COUNT]; + struct urtw_tx_data sc_txdata[URTW_TX_DATA_LIST_COUNT]; uint32_t sc_tx_low_queued; uint32_t sc_tx_normal_queued; uint32_t sc_txidx; |