X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_ath.c;h=3907262818fb15ec9aadcd2dda59838ef848d57f;hb=c94791073f835301c4f2cf4f33066b8625379257;hp=46fde9026bd0d7df55af97c6870193ac3fde0751;hpb=a2d6199554c18f3466ec9cf589369ccf8e647deb;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 46fde90..3907262 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -96,11 +96,12 @@ static a_uint16_t adf_os_cpu_to_le16(a_uint16_t x)
  */
 static u_int64_t ath_extend_tsf(struct ath_softc_tgt *sc, u_int32_t rstamp)
 {
+	struct ath_hal *ah = sc->sc_ah;
 	u_int64_t tsf;
 	u_int32_t tsf_low;
 	u_int64_t tsf64;
 
-	tsf = ath_hal_gettsf64(sc->sc_ah);
+	tsf = ah->ah_getTsf64(ah);
 	tsf_low = tsf & 0xffffffff;
 	tsf64 = (tsf & ~0xffffffffULL) | rstamp;
 
@@ -270,13 +271,13 @@ static a_int32_t ath_rxdesc_init(struct ath_softc_tgt *sc, struct ath_rx_desc *d
 			    0);
 
 	if (sc->sc_rxlink == NULL) {
-		ath_hal_putrxbuf(ah, ds->ds_daddr);
+		ah->ah_setRxDP(ah, ds->ds_daddr);
 	}
 	else {
 		*sc->sc_rxlink = ds->ds_daddr;
 	}
 	sc->sc_rxlink = &ds->ds_link;
-	ath_hal_rxena(ah);
+	ah->ah_enableReceive(ah);
 
 	return 0;
 }
@@ -334,7 +335,7 @@ static void ath_uapsd_processtriggers(struct ath_softc_tgt *sc)
 	((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc +		\
 			     ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
 
-	tsf = ath_hal_gettsf64(ah);
+	tsf = ah->ah_getTsf64(ah);
 	bf = asf_tailq_first(&sc->sc_rxbuf);
 
 	ds = asf_tailq_first(&sc->sc_rxdesc);
@@ -471,7 +472,7 @@ static a_int32_t ath_startrecv(struct ath_softc_tgt *sc)
 	}
 
 	ds = asf_tailq_first(&sc->sc_rxdesc);
-	ath_hal_putrxbuf(ah, ds->ds_daddr);
+	ah->ah_setRxDP(ah, ds->ds_daddr);
 
 	return 0;
 }
@@ -784,7 +785,7 @@ static void tgt_HTCRecv_cabhandler(HTC_ENDPOINT_ID EndPt, adf_nbuf_t hdr_buf,
 	a_uint32_t tmp;
 
 #ifdef ATH_ENABLE_CABQ
-	tsf = ath_hal_gettsf64(ah);
+	tsf = ah->ah_getTsf64(ah);
 	tmp = tsf - sc->sc_swba_tsf;
 
 	if ( tmp > ATH_CABQ_HANDLING_THRESHOLD ) {
@@ -1020,10 +1021,10 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
 	if (sc->sc_invalid)
 		return ADF_OS_IRQ_NONE;
 
-	if (!ath_hal_intrpend(ah))
+	if (!ah->ah_isInterruptPending(ah))
 		return ADF_OS_IRQ_NONE;
 
-	ath_hal_getisr(ah, &status);
+	ah->ah_getPendingInterrupts(ah, &status);
 
 	status &= sc->sc_imask;
 
@@ -1035,9 +1036,9 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
 			WMI_SWBA_EVENT swbaEvt;
 			struct ath_txq *txq = ATH_TXQ(sc, 8);
 
-			swbaEvt.tsf = ath_hal_gettsf64(ah);
+			swbaEvt.tsf = ah->ah_getTsf64(ah);
 			swbaEvt.beaconPendingCount = ah->ah_numTxPending(ah, sc->sc_bhalq);
-			sc->sc_swba_tsf = ath_hal_gettsf64(ah);
+			sc->sc_swba_tsf = ah->ah_getTsf64(ah);
 
 			wmi_event(sc->tgt_wmi_handle,
 				  WMI_SWBA_EVENTID,
@@ -1616,9 +1617,9 @@ static void ath_stoprecv_tgt(void *Context, A_UINT16 Command,
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
 
-	ath_hal_stoppcurecv(ah);
-	ath_hal_setrxfilter(ah, 0);
-	ath_hal_stopdmarecv(ah);
+	ah->ah_stopPcuReceive(ah);
+	ah->ah_setRxFilter(ah, 0);
+	ah->ah_stopDmaReceive(ah);
 
 	sc->sc_rxlink = NULL;
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);