summaryrefslogtreecommitdiffstats
path: root/sys/dev/ath/if_athvar.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ath/if_athvar.h')
-rw-r--r--sys/dev/ath/if_athvar.h321
1 files changed, 238 insertions, 83 deletions
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index 0d35989..ffc05f2 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -47,73 +47,150 @@
#include <contrib/dev/ath/ah.h>
#include <net80211/ieee80211_radiotap.h>
#include <dev/ath/if_athioctl.h>
+#include <dev/ath/if_athrate.h>
#define ATH_TIMEOUT 1000
#define ATH_RXBUF 40 /* number of RX buffers */
#define ATH_TXBUF 60 /* number of TX buffers */
#define ATH_TXDESC 8 /* number of descriptors per buffer */
+#define ATH_TXMAXTRY 11 /* max number of transmit attempts */
+#define ATH_TXINTR_PERIOD 5 /* max number of batched tx descriptors */
-struct ath_recv_hist {
- int arh_ticks; /* sample time by system clock */
- u_int8_t arh_rssi; /* rssi */
- u_int8_t arh_antenna; /* antenna */
-};
-#define ATH_RHIST_SIZE 16 /* number of samples */
-#define ATH_RHIST_NOTIME (~0)
-
-/* driver-specific node */
+/* driver-specific node state */
struct ath_node {
struct ieee80211_node an_node; /* base class */
- u_int an_tx_ok; /* tx ok pkt */
- u_int an_tx_err; /* tx !ok pkt */
- u_int an_tx_retr; /* tx retry count */
- int an_tx_upper; /* tx upper rate req cnt */
- u_int an_tx_antenna; /* antenna for last good frame */
- u_int an_rx_antenna; /* antenna for last rcvd frame */
- struct ath_recv_hist an_rx_hist[ATH_RHIST_SIZE];
- u_int an_rx_hist_next;/* index of next ``free entry'' */
+ u_int8_t an_tx_mgtrate; /* h/w rate for management/ctl frames */
+ u_int8_t an_tx_mgtratesp;/* short preamble h/w rate for " " */
+ u_int32_t an_avgrssi; /* average rssi over all rx frames */
+ HAL_NODE_STATS an_halstats; /* rssi statistics used by hal */
+ /* variable-length rate control state follows */
};
-#define ATH_NODE(_n) ((struct ath_node *)(_n))
+#define ATH_NODE(ni) ((struct ath_node *)(ni))
+#define ATH_NODE_CONST(ni) ((const struct ath_node *)(ni))
+
+#define ATH_RSSI_LPF_LEN 10
+#define ATH_RSSI_DUMMY_MARKER 0x127
+#define ATH_EP_MUL(x, mul) ((x) * (mul))
+#define ATH_RSSI_IN(x) (ATH_EP_MUL((x), HAL_RSSI_EP_MULTIPLIER))
+#define ATH_LPF_RSSI(x, y, len) \
+ ((x != ATH_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
+#define ATH_RSSI_LPF(x, y) do { \
+ if ((y) >= -20) \
+ x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \
+} while (0)
struct ath_buf {
- TAILQ_ENTRY(ath_buf) bf_list;
+ STAILQ_ENTRY(ath_buf) bf_list;
int bf_nseg;
- bus_dmamap_t bf_dmamap; /* DMA map of the buffer */
struct ath_desc *bf_desc; /* virtual addr of desc */
bus_addr_t bf_daddr; /* physical addr of desc */
+ bus_dmamap_t bf_dmamap; /* DMA map for mbuf chain */
struct mbuf *bf_m; /* mbuf for buf */
struct ieee80211_node *bf_node; /* pointer to the node */
bus_size_t bf_mapsize;
#define ATH_MAX_SCATTER 64
bus_dma_segment_t bf_segs[ATH_MAX_SCATTER];
};
+typedef STAILQ_HEAD(, ath_buf) ath_bufhead;
+
+/*
+ * DMA state for tx/rx descriptors.
+ */
+struct ath_descdma {
+ const char* dd_name;
+ struct ath_desc *dd_desc; /* descriptors */
+ bus_addr_t dd_desc_paddr; /* physical addr of dd_desc */
+ bus_addr_t dd_desc_len; /* size of dd_desc */
+ bus_dma_segment_t dd_dseg;
+ bus_dma_tag_t dd_dmat; /* bus DMA tag */
+ bus_dmamap_t dd_dmamap; /* DMA map for descriptors */
+ struct ath_buf *dd_bufptr; /* associated buffers */
+};
+
+/*
+ * Data transmit queue state. One of these exists for each
+ * hardware transmit queue. Packets sent to us from above
+ * are assigned to queues based on their priority. Not all
+ * devices support a complete set of hardware transmit queues.
+ * For those devices the array sc_ac2q will map multiple
+ * priorities to fewer hardware queues (typically all to one
+ * hardware queue).
+ */
+struct ath_txq {
+ u_int axq_qnum; /* hardware q number */
+ u_int axq_depth; /* queue depth (stat only) */
+ u_int axq_intrcnt; /* interrupt count */
+ u_int32_t *axq_link; /* link ptr in last TX desc */
+ STAILQ_HEAD(, ath_buf) axq_q; /* transmit queue */
+ struct mtx axq_lock; /* lock on q and link */
+};
+
+#define ATH_TXQ_LOCK_INIT(_sc, _tq) \
+ mtx_init(&(_tq)->axq_lock, \
+ device_get_nameunit((_sc)->sc_dev), "xmit q", MTX_DEF)
+#define ATH_TXQ_LOCK_DESTROY(_tq) mtx_destroy(&(_tq)->axq_lock)
+#define ATH_TXQ_LOCK(_tq) mtx_lock(&(_tq)->axq_lock)
+#define ATH_TXQ_UNLOCK(_tq) mtx_unlock(&(_tq)->axq_lock)
+#define ATH_TXQ_LOCK_ASSERT(_tq) mtx_assert(&(_tq)->axq_lock, MA_OWNED)
+
+#define ATH_TXQ_INSERT_TAIL(_tq, _elm, _field) do { \
+ STAILQ_INSERT_TAIL(&(_tq)->axq_q, (_elm), _field); \
+ (_tq)->axq_depth++; \
+} while (0)
+#define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \
+ STAILQ_REMOVE_HEAD(&(_tq)->axq_q, _field); \
+ (_tq)->axq_depth--; \
+} while (0)
struct ath_softc {
+ struct arpcom sc_arp; /* interface common */
+ struct ath_stats sc_stats; /* interface statistics */
struct ieee80211com sc_ic; /* IEEE 802.11 common */
+ int sc_regdomain;
+ int sc_countrycode;
+ int sc_debug;
+ void (*sc_recv_mgmt)(struct ieee80211com *,
+ struct mbuf *,
+ struct ieee80211_node *,
+ int, int, u_int32_t);
int (*sc_newstate)(struct ieee80211com *,
enum ieee80211_state, int);
- void (*sc_node_free)(struct ieee80211com *,
- struct ieee80211_node *);
- void (*sc_node_copy)(struct ieee80211com *,
- struct ieee80211_node *,
- const struct ieee80211_node *);
+ void (*sc_node_free)(struct ieee80211_node *);
device_t sc_dev;
bus_space_tag_t sc_st; /* bus space tag */
bus_space_handle_t sc_sh; /* bus space handle */
bus_dma_tag_t sc_dmat; /* bus DMA tag */
struct mtx sc_mtx; /* master lock (recursive) */
struct ath_hal *sc_ah; /* Atheros HAL */
+ struct ath_ratectrl *sc_rc; /* tx rate control support */
+ void (*sc_setdefantenna)(struct ath_softc *, u_int);
unsigned int sc_invalid : 1,/* disable hardware accesses */
- sc_doani : 1,/* dynamic noise immunity */
- sc_probing : 1;/* probing AP on beacon miss */
+ sc_mrretry : 1, /* multi-rate retry support */
+ sc_softled : 1, /* enable LED gpio status */
+ sc_splitmic: 1, /* split TKIP MIC keys */
+ sc_needmib : 1, /* enable MIB stats intr */
+ sc_hasdiversity : 1,/* rx diversity available */
+ sc_diversity : 1,/* enable rx diversity */
+ sc_hasveol : 1, /* tx VEOL support */
+ sc_hastpc : 1; /* per-packet TPC support */
/* rate tables */
const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX];
const HAL_RATE_TABLE *sc_currates; /* current rate table */
enum ieee80211_phymode sc_curmode; /* current phy mode */
+ u_int16_t sc_curtxpow; /* current tx power limit */
+ HAL_CHANNEL sc_curchan; /* current h/w channel */
u_int8_t sc_rixmap[256]; /* IEEE to h/w rate table ix */
u_int8_t sc_hwmap[32]; /* h/w rate ix to IEEE table */
+ u_int8_t sc_protrix; /* protection rate index */
+ u_int sc_txantenna; /* tx antenna (fixed or auto) */
HAL_INT sc_imask; /* interrupt mask copy */
+ u_int sc_keymax; /* size of key cache */
+ u_int8_t sc_keymap[16]; /* bit map of key cache use */
+
+ u_int32_t sc_beacons; /* beacon count for LED mgmt */
+ u_int16_t sc_ledstate; /* LED on/off state */
+ u_int16_t sc_ledpin; /* GPIO pin for driving LED */
struct bpf_if *sc_drvbpf;
union {
@@ -127,37 +204,45 @@ struct ath_softc {
} u_rx_rt;
int sc_rx_th_len;
- struct ath_desc *sc_desc; /* TX/RX descriptors */
- bus_dma_segment_t sc_dseg;
- bus_dmamap_t sc_ddmamap; /* DMA map for descriptors */
- bus_addr_t sc_desc_paddr; /* physical addr of sc_desc */
- bus_addr_t sc_desc_len; /* size of sc_desc */
-
struct task sc_fataltask; /* fatal int processing */
- struct task sc_rxorntask; /* rxorn int processing */
- TAILQ_HEAD(, ath_buf) sc_rxbuf; /* receive buffer */
+ struct ath_descdma sc_rxdma; /* RX descriptos */
+ ath_bufhead sc_rxbuf; /* receive buffer */
u_int32_t *sc_rxlink; /* link ptr in last RX desc */
struct task sc_rxtask; /* rx int processing */
+ struct task sc_rxorntask; /* rxorn int processing */
+ u_int8_t sc_defant; /* current default antenna */
+ u_int8_t sc_rxotherant; /* rx's on non-default antenna*/
- u_int sc_txhalq; /* HAL q for outgoing frames */
- u_int32_t *sc_txlink; /* link ptr in last TX desc */
- int sc_tx_timer; /* transmit timeout */
- TAILQ_HEAD(, ath_buf) sc_txbuf; /* transmit buffer */
+ struct ath_descdma sc_txdma; /* TX descriptors */
+ ath_bufhead sc_txbuf; /* transmit buffer */
struct mtx sc_txbuflock; /* txbuf lock */
- TAILQ_HEAD(, ath_buf) sc_txq; /* transmitting queue */
- struct mtx sc_txqlock; /* lock on txq and txlink */
+ int sc_tx_timer; /* transmit timeout */
+ u_int sc_txqsetup; /* h/w queues setup */
+ u_int sc_txintrperiod;/* tx interrupt batching */
+ struct ath_txq sc_txq[HAL_NUM_TX_QUEUES];
+ struct ath_txq *sc_ac2q[5]; /* WME AC -> h/w q map */
struct task sc_txtask; /* tx int processing */
+ struct ath_descdma sc_bdma; /* beacon descriptors */
+ ath_bufhead sc_bbuf; /* beacon buffers */
u_int sc_bhalq; /* HAL q for outgoing beacons */
- struct ath_buf *sc_bcbuf; /* beacon buffer */
- struct ath_buf *sc_bufptr; /* allocated buffer ptr */
+ u_int sc_bmisscount; /* missed beacon transmits */
+ u_int32_t sc_ant_tx[8]; /* recent tx frames/antenna */
+ struct ath_txq *sc_cabq; /* tx q for cab frames */
+ struct ieee80211_beacon_offsets sc_boff;/* dynamic update state */
struct task sc_bmisstask; /* bmiss int processing */
+ struct task sc_bstucktask; /* stuck beacon processing */
+ enum {
+ OK, /* no change needed */
+ UPDATE, /* update pending */
+ COMMIT /* beacon sent, commit change */
+ } sc_updateslot; /* slot time update fsm */
struct callout sc_cal_ch; /* callout handle for cals */
struct callout sc_scan_ch; /* callout handle for scan */
- struct ath_stats sc_stats; /* interface statistics */
};
+#define sc_if sc_arp.ac_if
#define sc_tx_th u_tx_rt.th
#define sc_rx_th u_rx_rt.th
@@ -169,6 +254,8 @@ struct ath_softc {
#define ATH_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
#define ATH_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
+#define ATH_TXQ_SETUP(sc, i) ((sc)->sc_txqsetup & (1<<i))
+
#define ATH_TXBUF_LOCK_INIT(_sc) \
mtx_init(&(_sc)->sc_txbuflock, \
device_get_nameunit((_sc)->sc_dev), "xmit buf q", MTX_DEF)
@@ -178,14 +265,6 @@ struct ath_softc {
#define ATH_TXBUF_LOCK_ASSERT(_sc) \
mtx_assert(&(_sc)->sc_txbuflock, MA_OWNED)
-#define ATH_TXQ_LOCK_INIT(_sc) \
- mtx_init(&(_sc)->sc_txqlock, \
- device_get_nameunit((_sc)->sc_dev), "xmit q", MTX_DEF)
-#define ATH_TXQ_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_txqlock)
-#define ATH_TXQ_LOCK(_sc) mtx_lock(&(_sc)->sc_txqlock)
-#define ATH_TXQ_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_txqlock)
-#define ATH_TXQ_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_txqlock, MA_OWNED)
-
int ath_attach(u_int16_t, struct ath_softc *);
int ath_detach(struct ath_softc *);
void ath_resume(struct ath_softc *);
@@ -196,17 +275,16 @@ void ath_intr(void *);
/*
* HAL definitions to comply with local coding convention.
*/
+#define ath_hal_detach(_ah) \
+ ((*(_ah)->ah_detach)((_ah)))
#define ath_hal_reset(_ah, _opmode, _chan, _outdoor, _pstatus) \
((*(_ah)->ah_reset)((_ah), (_opmode), (_chan), (_outdoor), (_pstatus)))
#define ath_hal_getratetable(_ah, _mode) \
((*(_ah)->ah_getRateTable)((_ah), (_mode)))
-#define ath_hal_getregdomain(_ah) \
- ((*(_ah)->ah_getRegDomain)((_ah)))
-#define ath_hal_getcountrycode(_ah) (_ah)->ah_countryCode
#define ath_hal_getmac(_ah, _mac) \
((*(_ah)->ah_getMacAddress)((_ah), (_mac)))
-#define ath_hal_detach(_ah) \
- ((*(_ah)->ah_detach)((_ah)))
+#define ath_hal_setmac(_ah, _mac) \
+ ((*(_ah)->ah_setMacAddress)((_ah), (_mac)))
#define ath_hal_intrset(_ah, _mask) \
((*(_ah)->ah_setInterrupts)((_ah), (_mask)))
#define ath_hal_intrget(_ah) \
@@ -219,10 +297,12 @@ void ath_intr(void *);
((*(_ah)->ah_updateTxTrigLevel)((_ah), (_inc)))
#define ath_hal_setpower(_ah, _mode, _sleepduration) \
((*(_ah)->ah_setPowerMode)((_ah), (_mode), AH_TRUE, (_sleepduration)))
+#define ath_hal_keycachesize(_ah) \
+ ((*(_ah)->ah_getKeyCacheSize)((_ah)))
#define ath_hal_keyreset(_ah, _ix) \
((*(_ah)->ah_resetKeyCacheEntry)((_ah), (_ix)))
-#define ath_hal_keyset(_ah, _ix, _pk) \
- ((*(_ah)->ah_setKeyCacheEntry)((_ah), (_ix), (_pk), NULL, AH_FALSE))
+#define ath_hal_keyset(_ah, _ix, _pk, _mac) \
+ ((*(_ah)->ah_setKeyCacheEntry)((_ah), (_ix), (_pk), (_mac), AH_FALSE))
#define ath_hal_keyisvalid(_ah, _ix) \
(((*(_ah)->ah_isKeyCacheEntryValid)((_ah), (_ix))))
#define ath_hal_keysetmac(_ah, _ix, _mac) \
@@ -249,6 +329,8 @@ void ath_intr(void *);
((*(_ah)->ah_setTxDP)((_ah), (_q), (_bufaddr)))
#define ath_hal_gettxbuf(_ah, _q) \
((*(_ah)->ah_getTxDP)((_ah), (_q)))
+#define ath_hal_numtxpending(_ah, _q) \
+ ((*(_ah)->ah_numTxPending)((_ah), (_q)))
#define ath_hal_getrxbuf(_ah) \
((*(_ah)->ah_getRxDP)((_ah)))
#define ath_hal_txstart(_ah, _q) \
@@ -259,17 +341,18 @@ void ath_intr(void *);
((*(_ah)->ah_perCalibration)((_ah), (_chan)))
#define ath_hal_setledstate(_ah, _state) \
((*(_ah)->ah_setLedState)((_ah), (_state)))
-#define ath_hal_beaconinit(_ah, _opmode, _nextb, _bperiod) \
- ((*(_ah)->ah_beaconInit)((_ah), (_opmode), (_nextb), (_bperiod)))
+#define ath_hal_beaconinit(_ah, _nextb, _bperiod) \
+ ((*(_ah)->ah_beaconInit)((_ah), (_nextb), (_bperiod)))
#define ath_hal_beaconreset(_ah) \
((*(_ah)->ah_resetStationBeaconTimers)((_ah)))
-#define ath_hal_beacontimers(_ah, _bs, _tsf, _dc, _cc) \
- ((*(_ah)->ah_setStationBeaconTimers)((_ah), (_bs), (_tsf), \
- (_dc), (_cc)))
+#define ath_hal_beacontimers(_ah, _bs) \
+ ((*(_ah)->ah_setStationBeaconTimers)((_ah), (_bs)))
#define ath_hal_setassocid(_ah, _bss, _associd) \
- ((*(_ah)->ah_writeAssocid)((_ah), (_bss), (_associd), 0))
-#define ath_hal_setopmode(_ah, _opmode) \
- ((*(_ah)->ah_setPCUConfig)((_ah), (_opmode)))
+ ((*(_ah)->ah_writeAssocid)((_ah), (_bss), (_associd)))
+#define ath_hal_phydisable(_ah) \
+ ((*(_ah)->ah_phyDisable)((_ah)))
+#define ath_hal_setopmode(_ah) \
+ ((*(_ah)->ah_setPCUConfig)((_ah)))
#define ath_hal_stoptxdma(_ah, _qnum) \
((*(_ah)->ah_stopTxDma)((_ah), (_qnum)))
#define ath_hal_stoppcurecv(_ah) \
@@ -278,27 +361,90 @@ void ath_intr(void *);
((*(_ah)->ah_startPcuReceive)((_ah)))
#define ath_hal_stopdmarecv(_ah) \
((*(_ah)->ah_stopDmaReceive)((_ah)))
-#define ath_hal_dumpstate(_ah) \
- ((*(_ah)->ah_dumpState)((_ah)))
-#define ath_hal_getdiagstate(_ah, _id, _data, _size) \
- ((*(_ah)->ah_getDiagState)((_ah), (_id), (_data), (_size)))
+#define ath_hal_getdiagstate(_ah, _id, _indata, _insize, _outdata, _outsize) \
+ ((*(_ah)->ah_getDiagState)((_ah), (_id), \
+ (_indata), (_insize), (_outdata), (_outsize)))
#define ath_hal_setuptxqueue(_ah, _type, _irq) \
((*(_ah)->ah_setupTxQueue)((_ah), (_type), (_irq)))
#define ath_hal_resettxqueue(_ah, _q) \
((*(_ah)->ah_resetTxQueue)((_ah), (_q)))
#define ath_hal_releasetxqueue(_ah, _q) \
((*(_ah)->ah_releaseTxQueue)((_ah), (_q)))
-#define ath_hal_hasveol(_ah) \
- ((*(_ah)->ah_hasVEOL)((_ah)))
+#define ath_hal_gettxqueueprops(_ah, _q, _qi) \
+ ((*(_ah)->ah_getTxQueueProps)((_ah), (_q), (_qi)))
+#define ath_hal_settxqueueprops(_ah, _q, _qi) \
+ ((*(_ah)->ah_setTxQueueProps)((_ah), (_q), (_qi)))
#define ath_hal_getrfgain(_ah) \
((*(_ah)->ah_getRfGain)((_ah)))
-#define ath_hal_rxmonitor(_ah) \
- ((*(_ah)->ah_rxMonitor)((_ah)))
+#define ath_hal_getdefantenna(_ah) \
+ ((*(_ah)->ah_getDefAntenna)((_ah)))
+#define ath_hal_setdefantenna(_ah, _ant) \
+ ((*(_ah)->ah_setDefAntenna)((_ah), (_ant)))
+#define ath_hal_rxmonitor(_ah, _arg) \
+ ((*(_ah)->ah_rxMonitor)((_ah), (_arg)))
+#define ath_hal_mibevent(_ah, _stats) \
+ ((*(_ah)->ah_procMibEvent)((_ah), (_stats)))
+#define ath_hal_setslottime(_ah, _us) \
+ ((*(_ah)->ah_setSlotTime)((_ah), (_us)))
+#define ath_hal_getslottime(_ah) \
+ ((*(_ah)->ah_getSlotTime)((_ah)))
+#define ath_hal_setacktimeout(_ah, _us) \
+ ((*(_ah)->ah_setAckTimeout)((_ah), (_us)))
+#define ath_hal_getacktimeout(_ah) \
+ ((*(_ah)->ah_getAckTimeout)((_ah)))
+#define ath_hal_setctstimeout(_ah, _us) \
+ ((*(_ah)->ah_setCTSTimeout)((_ah), (_us)))
+#define ath_hal_getctstimeout(_ah) \
+ ((*(_ah)->ah_getCTSTimeout)((_ah)))
+#define ath_hal_getcapability(_ah, _cap, _param, _result) \
+ ((*(_ah)->ah_getCapability)((_ah), (_cap), (_param), (_result)))
+#define ath_hal_setcapability(_ah, _cap, _param, _v, _status) \
+ ((*(_ah)->ah_setCapability)((_ah), (_cap), (_param), (_v), (_status)))
+#define ath_hal_ciphersupported(_ah, _cipher) \
+ (ath_hal_getcapability(_ah, HAL_CAP_CIPHER, _cipher, NULL) == HAL_OK)
+#define ath_hal_getregdomain(_ah, _prd) \
+ ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd))
+#define ath_hal_getcountrycode(_ah, _pcc) \
+ (*(_pcc) = (_ah)->ah_countryCode)
+#define ath_hal_tkipsplit(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_TKIP_SPLIT, 0, NULL) == HAL_OK)
+#define ath_hal_hwphycounters(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_PHYCOUNTERS, 0, NULL) == HAL_OK)
+#define ath_hal_hasdiversity(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_DIVERSITY, 0, NULL) == HAL_OK)
+#define ath_hal_getdiversity(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_DIVERSITY, 1, NULL) == HAL_OK)
+#define ath_hal_setdiversity(_ah, _v) \
+ ath_hal_setcapability(_ah, HAL_CAP_DIVERSITY, 1, _v, NULL)
+#define ath_hal_getdiag(_ah, _pv) \
+ (ath_hal_getcapability(_ah, HAL_CAP_DIAG, 0, _pv) == HAL_OK)
+#define ath_hal_setdiag(_ah, _v) \
+ ath_hal_setcapability(_ah, HAL_CAP_DIAG, 0, _v, NULL)
+#define ath_hal_getnumtxqueues(_ah, _pv) \
+ (ath_hal_getcapability(_ah, HAL_CAP_NUM_TXQUEUES, 0, _pv) == HAL_OK)
+#define ath_hal_hasveol(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_VEOL, 0, NULL) == HAL_OK)
+#define ath_hal_hastxpowlimit(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_TXPOW, 0, NULL) == HAL_OK)
+#define ath_hal_settxpowlimit(_ah, _pow) \
+ ((*(_ah)->ah_setTxPowerLimit)((_ah), (_pow)))
+#define ath_hal_gettxpowlimit(_ah, _ppow) \
+ (ath_hal_getcapability(_ah, HAL_CAP_TXPOW, 1, _ppow) == HAL_OK)
+#define ath_hal_getmaxtxpow(_ah, _ppow) \
+ (ath_hal_getcapability(_ah, HAL_CAP_TXPOW, 2, _ppow) == HAL_OK)
+#define ath_hal_gettpscale(_ah, _scale) \
+ (ath_hal_getcapability(_ah, HAL_CAP_TXPOW, 3, _scale) == HAL_OK)
+#define ath_hal_settpscale(_ah, _v) \
+ ath_hal_setcapability(_ah, HAL_CAP_TXPOW, 3, _v, NULL)
+#define ath_hal_hastpc(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_TPC, 0, NULL) == HAL_OK)
+#define ath_hal_gettpc(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_TPC, 1, NULL) == HAL_OK)
+#define ath_hal_settpc(_ah, _v) \
+ ath_hal_setcapability(_ah, HAL_CAP_TPC, 1, _v, NULL)
+#define ath_hal_hasbursting(_ah) \
+ (ath_hal_getcapability(_ah, HAL_CAP_BURST, 0, NULL) == HAL_OK)
-#define ath_hal_setupbeacondesc(_ah, _ds, _opmode, _flen, _hlen, \
- _rate, _antmode) \
- ((*(_ah)->ah_setupBeaconDesc)((_ah), (_ds), (_opmode), \
- (_flen), (_hlen), (_rate), (_antmode)))
#define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \
((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))
#define ath_hal_rxprocdesc(_ah, _ds, _dspa, _dsnext) \
@@ -309,13 +455,22 @@ void ath_intr(void *);
((*(_ah)->ah_setupTxDesc)((_ah), (_ds), (_plen), (_hlen), (_atype), \
(_txpow), (_txr0), (_txtr0), (_keyix), (_ant), \
(_flags), (_rtsrate), (_rtsdura)))
-#define ath_hal_setupxtxdesc(_ah, _ds, _short, \
+#define ath_hal_setupxtxdesc(_ah, _ds, \
_txr1, _txtr1, _txr2, _txtr2, _txr3, _txtr3) \
- ((*(_ah)->ah_setupXTxDesc)((_ah), (_ds), (_short), \
+ ((*(_ah)->ah_setupXTxDesc)((_ah), (_ds), \
(_txr1), (_txtr1), (_txr2), (_txtr2), (_txr3), (_txtr3)))
-#define ath_hal_filltxdesc(_ah, _ds, _l, _first, _last) \
- ((*(_ah)->ah_fillTxDesc)((_ah), (_ds), (_l), (_first), (_last)))
+#define ath_hal_filltxdesc(_ah, _ds, _l, _first, _last, _ds0) \
+ ((*(_ah)->ah_fillTxDesc)((_ah), (_ds), (_l), (_first), (_last), (_ds0)))
#define ath_hal_txprocdesc(_ah, _ds) \
((*(_ah)->ah_procTxDesc)((_ah), (_ds)))
+#define ath_hal_updateCTSForBursting(_ah, _ds, _prevds, _prevdsWithCTS, \
+ _gatingds, _txOpLimit, _ctsDuration) \
+ ((*(_ah)->ah_updateCTSForBursting)((_ah), (_ds), (_prevds), \
+ (_prevdsWithCTS), (_gatingds), (_txOpLimit), (_ctsDuration)))
+
+#define ath_hal_gpioCfgOutput(_ah, _gpio) \
+ ((*(_ah)->ah_gpioCfgOutput)((_ah), (_gpio)))
+#define ath_hal_gpioset(_ah, _gpio, _b) \
+ ((*(_ah)->ah_gpioSet)((_ah), (_gpio), (_b)))
#endif /* _DEV_ATH_ATHVAR_H */
OpenPOWER on IntegriCloud