X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_owl.c;h=5a06c599f7f2046ad32c383b6bdc35ecb7c4be70;hb=c3639cf95a219f4ebbea6b813a137c945f16c22b;hp=7c83da11769ba58d01954d559ab2e267aaaabb3d;hpb=e58fbe2efce3a9ae307c41765e5dd39882dff0f4;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 7c83da1..5a06c59 100755
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -47,7 +47,6 @@
 #include <adf_net.h>
 #include <adf_net_wcmd.h>
 
-#include "if_ethersubr.h"
 #include "if_llc.h"
 
 #ifdef USE_HEADERLEN_RESV
@@ -58,7 +57,6 @@
 #include "if_athrate.h"
 #include "if_athvar.h"
 #include "ah_desc.h"
-#include "if_ath_pci.h"
 
 #define ath_tgt_free_skb  adf_nbuf_free
 
@@ -265,6 +263,7 @@ static void ath_filltxdesc(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 {
 	struct ath_tx_desc *ds = bf->bf_desc;
+	struct ath_hal *ah = sc->sc_ah;
 
 	switch (bf->bf_protmode) {
     	case IEEE80211_PROT_RTSCTS:
@@ -277,7 +276,7 @@ static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 		break;
 	}
 
-	ath_hal_set11n_txdesc(sc->sc_ah, ds
+	ah->ah_set11nTxDesc(ah, ds
 			      , bf->bf_pktlen
 			      , bf->bf_atype
 			      , 60
@@ -444,7 +443,7 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
     rtsctsrate = rt->info[cix].rateCode |
 	    (bf->bf_shpream ? rt->info[cix].shortPreamble : 0);
 
-    ath_hal_set11n_ratescenario(ah, ds, 1,
+    ah->ah_set11nRateScenario(ah, ds, 1,
 				rtsctsrate, ctsduration,
 				series, 4,
 				flags);
@@ -618,9 +617,10 @@ void ath_tx_status_send(struct ath_softc_tgt *sc)
 
 static void owltgt_tx_process_cabq(struct ath_softc_tgt *sc, struct ath_txq *txq)
 {
-	ath_hal_intrset(sc->sc_ah, sc->sc_imask & ~HAL_INT_SWBA);
+	struct ath_hal *ah = sc->sc_ah;
+	ah->ah_setInterrupts(ah, sc->sc_imask & ~HAL_INT_SWBA);
 	owltgt_tx_processq(sc, txq, OWL_TXQ_ACTIVE);
-	ath_hal_intrset(sc->sc_ah, sc->sc_imask);
+	ah->ah_setInterrupts(ah, sc->sc_imask);
 }
 
 void owl_tgt_tx_tasklet(TQUEUE_ARG data)
@@ -890,17 +890,17 @@ static void ath_tgt_txq_add_ucast(struct ath_softc_tgt *sc, struct ath_tx_buf *b
 	ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
 
 	if (txq->axq_link == NULL) {
-		ath_hal_puttxbuf(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+		ah->ah_setTxDP(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
 	} else {
 		*txq->axq_link = ATH_BUF_GET_DESC_PHY_ADDR(bf);
 
 		txe_val = OS_REG_READ(ah, 0x840);
 		if (!(txe_val & (1<< txq->axq_qnum)))
-			ath_hal_puttxbuf(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+			ah->ah_setTxDP(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
 	}
 
 	txq->axq_link = &bf->bf_lastds->ds_link;
-	ath_hal_txstart(ah, txq->axq_qnum);
+	ah->ah_startTxDma(ah, txq->axq_qnum);
 }
 
 static a_int32_t ath_tgt_txbuf_setup(struct ath_softc_tgt *sc,
@@ -1231,7 +1231,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 		series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
 		series[i].RateFlags = 0;
 	}
-	ath_hal_set11n_ratescenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
+	ah->ah_set11nRateScenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
 	ath_tgt_txqaddbuf(sc, txq, bf, bf->bf_lastds);
 
 	return;
@@ -1250,13 +1250,13 @@ ath_tgt_txqaddbuf(struct ath_softc_tgt *sc,
 	ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
 
 	if (txq->axq_link == NULL) {
-		ath_hal_puttxbuf(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+		ah->ah_setTxDP(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
 	} else {
 		*txq->axq_link = ATH_BUF_GET_DESC_PHY_ADDR(bf);
 	}
 
 	txq->axq_link = &lastds->ds_link;
-	ath_hal_txstart(ah, txq->axq_qnum);
+	ah->ah_startTxDma(ah, txq->axq_qnum);
 }
 
 void ath_tgt_handle_normal(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
@@ -1379,6 +1379,7 @@ ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
 	ath_tx_bufhead bf_q;
 	struct ath_txq *txq = TID_TO_ACTXQ(tid->tidno);
 	struct ath_tx_desc *ds = NULL;
+	struct ath_hal *ah = sc->sc_ah;
 	int i;
 
 
@@ -1423,7 +1424,7 @@ ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
 
 		bf->bf_isaggr  = 1;
 		ath_buf_set_rate(sc, bf);
-		ath_hal_set11n_aggr_first(sc->sc_ah, bf->bf_desc, bf->bf_al,
+		ah->ah_set11nAggrFirst(ah, bf->bf_desc, bf->bf_al,
 					  bf->bf_ndelim);
 		bf->bf_lastds = bf_last->bf_lastds;
 
@@ -2081,6 +2082,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
 	struct ieee80211_frame_bar *bar;
 	u_int8_t min_rate;
 	struct ath_tx_desc *ds, *ds0;
+	struct ath_hal *ah = sc->sc_ah;
 	HAL_11N_RATE_SERIES series[4];
 	int i = 0;
 	adf_nbuf_queue_t skbhead;
@@ -2089,7 +2091,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
 
 	__stats(sc, tx_bars);
 
-	memset(&series, 0, sizeof(series));
+	adf_os_mem_set(&series, 0, sizeof(series));
 
 	ath_aggr_pause_tid(sc, tid);
 
@@ -2152,6 +2154,6 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
 		series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
 	}
 
-	ath_hal_set11n_ratescenario(sc->sc_ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
+	ah->ah_set11nRateScenario(ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
 	ath_tgt_txq_add_ucast(sc, bf);
 }