X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_ath.c;h=95ee8696fd6792d514b9f9b842e8626bb2aff424;hb=f55b884f589e94eddfa08539d0ee1234876415a5;hp=30165d4d2524503ea6492c6966455d932c78ab10;hpb=64675d5a78bd4f578469e4348594f166aa570478;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 30165d4..95ee869 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -50,13 +50,12 @@
 #include <adf_os_irq.h>
 
 #include <if_ath_pci.h>
-#include "if_ethersubr.h"
 #include "if_llc.h"
 #include "ieee80211_var.h"
-#include "ieee80211_proto.h"
 #include "if_athrate.h"
 #include "if_athvar.h"
 #include "ah_desc.h"
+#include "ah.h"
 
 static a_int32_t ath_numrxbufs = -1;
 static a_int32_t ath_numrxdescs = -1;
@@ -121,10 +120,10 @@ static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode)
 
 	switch (mode) {
 	case IEEE80211_MODE_11NA:
-		sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NA);
+		sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NA);
 		break;
 	case IEEE80211_MODE_11NG:
-		sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NG);
+		sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NG);
 		break;
 	default:
 		return 0;
@@ -539,7 +538,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
 {
 	adf_nbuf_t skb = bf->bf_skb;
 	struct ath_hal *ah = sc->sc_ah;
-	struct ath_desc *ds;
+	struct ath_tx_desc *ds;
 	a_int32_t flags;
 	const HAL_RATE_TABLE *rt;
 	a_uint8_t rix, rate;
@@ -625,7 +624,7 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
 
 	ath_beacon_setup(sc, bf, &sc->sc_vap[vap_index]);
 	ath_hal_stoptxdma(ah, sc->sc_bhalq);
-	ath_hal_puttxbuf(ah, sc->sc_bhalq, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+	ah->ah_setTxDP(ah, sc->sc_bhalq, ATH_BUF_GET_DESC_PHY_ADDR(bf));
 	ath_hal_txstart(ah, sc->sc_bhalq);
 }
 
@@ -933,7 +932,7 @@ static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
 
 	a_uint32_t i;
 	struct ath_descdma *dd = &sc->sc_rxdma;
-	struct ath_rx_desc *ds = dd->dd_desc;
+	struct ath_rx_desc *ds = (struct ath_rx_desc *)dd->dd_desc;
 	struct ath_rx_desc *ds_prev = NULL;
 
 	asf_tailq_init(&sc->sc_rxdesc);
@@ -1068,7 +1067,7 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
 
 		if (status & HAL_INT_TXURN) {
 			sc->sc_int_stats.ast_txurn++;
-			ath_hal_updatetxtriglevel(ah, AH_TRUE);
+			ah->ah_updateTxTrigLevel(ah, AH_TRUE);
 		}
 
 		ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_txtq);
@@ -1136,7 +1135,6 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
-	a_uint32_t stbcsupport;
 
 	sc->sc_imask = HAL_INT_RX | HAL_INT_TX
 		| HAL_INT_RXEOL | HAL_INT_RXORN
@@ -1147,13 +1145,6 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 	if (ath_hal_htsupported(ah))
 		sc->sc_imask |= HAL_INT_CST;
 
-#ifdef MAGPIE_MERLIN
-	if (ath_hal_txstbcsupport(ah, &stbcsupport))
-		sc->sc_txstbcsupport = stbcsupport;
-
-	if (ath_hal_rxstbcsupport(ah, &stbcsupport))
-		sc->sc_rxstbcsupport = stbcsupport;
-#endif
 	adf_os_setup_intr(sc->sc_dev, ath_intr);
 	ath_hal_intrset(ah, sc->sc_imask);
 
@@ -1532,7 +1523,7 @@ static void ath_flushrecv_tgt(void *Context, A_UINT16 Command,
 			      A_UINT16 SeqNo, A_UINT8 *data, a_int32_t datalen)
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
-	struct ath_buf *bf;
+	struct ath_rx_buf *bf;
 
 	asf_tailq_foreach(bf, &sc->sc_rxbuf, bf_list)
 		if (bf->bf_skb != NULL) {
@@ -1653,7 +1644,7 @@ static void ath_detach_tgt(void *Context, A_UINT16 Command, A_UINT16 SeqNo,
 	struct ath_hal *ah = sc->sc_ah;
 
 	ath_desc_free(sc);
-	ath_hal_detach(ah);
+	ah->ah_detach(ah);
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 	adf_os_mem_free(sc);
 }
@@ -1883,8 +1874,7 @@ static void tgt_hif_htc_wmi_init(struct ath_softc_tgt *sc)
 	HTC_Ready(sc->tgt_htc_handle);
 }
 
-a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
-			 struct ath_softc_tgt *sc, adf_os_device_t osdev)
+a_int32_t ath_tgt_attach(a_uint32_t devid, struct ath_softc_tgt *sc, adf_os_device_t osdev)
 {
 	struct ath_hal *ah;
 	HAL_STATUS status;
@@ -1906,7 +1896,7 @@ a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
 	ATH_INIT_TQUEUE(sc->sc_dev, &sc->sc_fataltq, ath_fatal_tasklet, sc);
 
 	flags |= AH_USE_EEPROM;
-	ah = _ath_hal_attach_tgt(devid,sc,sc->sc_dev,mem_start, flags, &status);
+	ah = _ath_hal_attach_tgt(devid, sc, sc->sc_dev, flags, &status);
 	if (ah == NULL) {
 		error = ENXIO;
 		goto bad;
@@ -1946,7 +1936,7 @@ bad:
 bad2:
 	ath_desc_free(sc);
 	if (ah)
-		ath_hal_detach(ah);
+		ah->ah_detach(ah);
 }
 
 static void tgt_hif_htc_wmi_shutdown(struct ath_softc_tgt *sc)