use ah_stopPcuReceive directly

[open-ath9k-htc-firmware.git] / target_firmware / wlan / if_ath.c

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 95ee8696fd6792d514b9f9b842e8626bb2aff424..b44d299cb263f82c9b8e3ff579c6f3e47cf90d1c 100755 (executable)
--- 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;
 }
@@ -623,9 +624,9 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
        adf_nbuf_dmamap_info(bf->bf_dmamap,&bf->bf_dmamap_info);
 
        ath_beacon_setup(sc, bf, &sc->sc_vap[vap_index]);
-       ath_hal_stoptxdma(ah, sc->sc_bhalq);
+       ah->ah_stopTxDma(ah, sc->sc_bhalq);
        ah->ah_setTxDP(ah, sc->sc_bhalq, ATH_BUF_GET_DESC_PHY_ADDR(bf));
-       ath_hal_txstart(ah, sc->sc_bhalq);
+       ah->ah_startTxDma(ah, sc->sc_bhalq);
 }
 
 /******/
@@ -636,7 +637,7 @@ static void ath_tx_stopdma(struct ath_softc_tgt *sc, struct ath_txq *txq)
 {
        struct ath_hal *ah = sc->sc_ah;
 
-       (void) ath_hal_stoptxdma(ah, txq->axq_qnum);
+       ah->ah_stopTxDma(ah, txq->axq_qnum);
 }
 
 static void owltgt_txq_drain(struct ath_softc_tgt *sc, struct ath_txq *txq)
@@ -659,7 +660,7 @@ static void ath_draintxq(struct ath_softc_tgt *sc, HAL_BOOL drain_softq)
        ath_tx_status_clear(sc);
        sc->sc_tx_draining = 1;
 
-       (void) ath_hal_stoptxdma(ah, sc->sc_bhalq);
+       ah->ah_stopTxDma(ah, sc->sc_bhalq);
 
        for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
                if (ATH_TXQ_SETUP(sc, i))
@@ -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 ) {
@@ -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.beaconPendingCount = ath_hal_numtxpending(ah, sc->sc_bhalq);
-                       sc->sc_swba_tsf = ath_hal_gettsf64(ah);
+                       swbaEvt.tsf = ah->ah_getTsf64(ah);
+                       swbaEvt.beaconPendingCount = ah->ah_numTxPending(ah, sc->sc_bhalq);
+                       sc->sc_swba_tsf = ah->ah_getTsf64(ah);
 
                        wmi_event(sc->tgt_wmi_handle,
                                  WMI_SWBA_EVENTID,
@@ -1564,8 +1565,9 @@ static void ath_aborttx_dma_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_hal *ah = sc->sc_ah;
 
-       ath_hal_aborttxdma(sc->sc_ah);
+       ah->ah_abortTxDma(sc->sc_ah);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
 
@@ -1595,7 +1597,7 @@ static void ath_stop_tx_dma_tgt(void *Context, A_UINT16 Command,
                q = *(a_uint32_t *)data;
 
        q = adf_os_ntohl(q);
-       ath_hal_stoptxdma(ah, q);
+       ah->ah_stopTxDma(ah, q);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
 
@@ -1615,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);