X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_athvar.h;h=945a9558c8f40b269e8d50bcd694621bf0cdfe56;hb=d9c8efbdfb3e47436720dd31bf0a9d9d9c972e4b;hp=8a53b32322cf34c495d2608691bcc70772d9f82e;hpb=bd385aac9d518fae6f9f3410e78fe6b03e9fa9c7;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index 8a53b32..945a955 100755
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -146,8 +146,10 @@ struct ath_txq;
 #define ath_free_rx_skb(_sc,_skb)                   BUF_Pool_free_buf(_sc->pool_handle, POOL_ID_WLAN_RX_BUF, _skb)
 #define ath_free_tx_skb(_htc_handle, endpt, _skb)   HTC_ReturnBuffers(_htc_handle, endpt, _skb);
 
-typedef void (*ath_txq_add_fn_t)(struct ath_softc_tgt *sc, struct ath_buf *bf);
-typedef void (*ath_tx_comp_fn_t)(struct ath_softc_tgt *sc, struct ath_buf *bf);
+struct ath_tx_buf;
+
+typedef void (*ath_txq_add_fn_t)(struct ath_softc_tgt *sc, struct ath_tx_buf *bf);
+typedef void (*ath_tx_comp_fn_t)(struct ath_softc_tgt *sc, struct ath_tx_buf *bf);
 
 struct ath_buf_state {
 	ath_tx_comp_fn_t        bfs_comp;           /* completion function          */
@@ -276,7 +278,7 @@ typedef struct ath_atx_tid {
 	a_int32_t          baw_tail;
 	a_uint32_t         tx_buf_bitmap[ATH_TID_MAX_BUFS/TX_BUF_BITMAP_SIZE];
 	asf_tailq_entry(ath_atx_tid) tid_qelem;
-	asf_tailq_head(ath_tid_rbq,ath_buf) buf_q;
+	asf_tailq_head(ath_tid_rbq,ath_tx_buf) buf_q;
 	a_int8_t           paused;
 	a_int8_t           sched;
 	a_uint8_t          flag;
@@ -303,9 +305,9 @@ struct ath_descdma {
 struct ath_txq {
 	a_uint32_t           axq_qnum;
 	a_uint32_t           *axq_link;
-	asf_tailq_head(,ath_buf) axq_q;
+	asf_tailq_head(,ath_tx_buf) axq_q;
 	a_uint32_t           axq_depth;
-	struct  ath_buf     *axq_linkbuf;
+	struct  ath_tx_buf     *axq_linkbuf;
 	asf_tailq_head(,ath_atx_tid) axq_tidq;
 };
 
@@ -319,7 +321,7 @@ struct wmi_rc_rate_mask_cmd {
 struct ath_vap_target {
 	struct ieee80211vap_target      av_vap;
 	struct ath_txq                  av_mcastq;
-	struct ath_buf                  *av_bcbuf;
+	struct ath_tx_buf		*av_bcbuf;
 	a_uint32_t                      av_rate_mask[2];  /* 0 - 2G, 1 - 5G */
 	a_uint8_t                       av_minrateidx[2]; /* 0 - 2G, 1 - 5G */
 	a_int8_t                        av_valid;
@@ -364,8 +366,6 @@ struct ath_softc_tgt
 	struct ath_ratectrl    *sc_rc;
 
 	a_uint32_t            sc_invalid : 1,
-		sc_txstbcsupport       : 1,
-		sc_rxstbcsupport       : 2,
 		sc_tx_draining         : 1,
 		sc_enable_coex         : 1;
 
@@ -418,7 +418,7 @@ struct ath_softc_tgt
 	struct ath_vap_target      sc_vap[TARGET_VAP_MAX];
 	struct ieee80211com_target sc_ic;
 
-	ath_bufhead         sc_bbuf;
+	ath_tx_bufhead         sc_bbuf;
 	a_uint64_t          sc_swba_tsf;
 
 	WMI_TXSTATUS_EVENT  tx_status[2];
@@ -489,16 +489,12 @@ typedef enum {
 
 a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *avp);
 
-#define ath_hal_getratetable(_ah, _mode) \
-    ((*(_ah)->ah_getRateTable)((_ah), (_mode)))
 #define ath_hal_intrset(_ah, _mask) \
     ((*(_ah)->ah_setInterrupts)((_ah), (_mask)))
 #define ath_hal_intrpend(_ah) \
     ((*(_ah)->ah_isInterruptPending)((_ah)))
 #define ath_hal_getisr(_ah, _pmask) \
     ((*(_ah)->ah_getPendingInterrupts)((_ah), (_pmask)))
-#define ath_hal_updatetxtriglevel(_ah, _inc) \
-    ((*(_ah)->ah_updateTxTrigLevel)((_ah), (_inc)))
 #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \
     ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))
 #define ath_hal_rxprocdescfast(_ah, _ds, _dspa, _dsnext, _rx_stats) \
@@ -545,14 +541,8 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     ((*(_ah)->ah_stopPcuReceive)((_ah)))
 #define ath_hal_htsupported(_ah) \
     (ath_hal_getcapability(_ah, HAL_CAP_HT, 0, NULL) == HAL_OK)
-#define ath_hal_rxstbcsupport(_ah, _rxstbc) \
-    (ath_hal_getcapability(_ah, HAL_CAP_RX_STBC, 0, _rxstbc) == HAL_OK)
-#define ath_hal_txstbcsupport(_ah, _txstbc) \
-    (ath_hal_getcapability(_ah, HAL_CAP_TX_STBC, 0, _txstbc) == HAL_OK)
 #define ath_hal_getrtsaggrlimit(_ah, _pv) \
     (ath_hal_getcapability(_ah, HAL_CAP_RTS_AGGR_LIMIT, 0, _pv) == HAL_OK)
-#define ath_hal_puttxbuf(_ah, _q, _bufaddr) \
-    ((*(_ah)->ah_setTxDP)((_ah), (_q), (_bufaddr)))
  #define ath_hal_txstart(_ah, _q) \
     ((*(_ah)->ah_startTxDma)((_ah), (_q)))
 #define ath_hal_setrxfilter(_ah, _filter) \
@@ -561,15 +551,11 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     ((*(_ah)->ah_getTsf64)((_ah)))
 #define ath_hal_intrset(_ah, _mask) \
     ((*(_ah)->ah_setInterrupts)((_ah), (_mask)))
-#define ath_hal_getcapability(_ah, _cap, _param, _result) \
-    ((*(_ah)->ah_getCapability)((_ah), (_cap), (_param), (_result)))
 #define ath_hal_set11n_aggr_first(_ah, _ds, _aggrlen, _numdelims) \
     ((*(_ah)->ah_set11nAggrFirst)(_ah, _ds, _aggrlen, _numdelims))
 #define ath_hal_set11n_aggr_middle(_ah, _ds, _numdelims) \
     ((*(_ah)->ah_set11nAggrMiddle)(_ah, _ds, _numdelims))
 #define ath_hal_set11n_aggr_last(_ah, _ds) \
     ((*(_ah)->ah_set11nAggrLast)(_ah, _ds))
-#define ath_hal_numtxpending(_ah, _q) \
-    ((*(_ah)->ah_numTxPending)((_ah), (_q)))
 
 #endif /* _DEV_ATH_ATHVAR_H */