use ah_setInterrupts 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 f228a1440f33540153f4ef5a691b32057dd4fc15..9d0f8d48e2662c794a0813cea63dfda9f8fc6b4b 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -271,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;
 }
@@ -472,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;
 }
@@ -522,7 +522,7 @@ static void ath_tgt_rx_tasklet(TQUEUE_ARG data)
        } while(1);
 
        sc->sc_imask |= HAL_INT_RX;
-       ath_hal_intrset(ah, sc->sc_imask);
+       ah->ah_setInterrupts(ah, sc->sc_imask);
 }
 
 /*******************/
@@ -1021,15 +1021,15 @@ 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;
 
        if (status & HAL_INT_FATAL) {
-               ath_hal_intrset(ah, 0);
+               ah->ah_setInterrupts(ah, 0);
                ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_fataltq);
        } else {
                if (status & HAL_INT_SWBA) {
@@ -1061,7 +1061,7 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
                        ath_uapsd_processtriggers(sc);
 
                        sc->sc_imask &= ~HAL_INT_RX;
-                       ath_hal_intrset(ah, sc->sc_imask);
+                       ah->ah_setInterrupts(ah, sc->sc_imask);
 
                        ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_rxtq);
                }
@@ -1127,7 +1127,7 @@ static void ath_enable_intr_tgt(void *Context, A_UINT16 Command,
                sc->sc_imask |= HAL_INT_BMISS;
        }
 
-       ath_hal_intrset(ah, sc->sc_imask);
+       ah->ah_setInterrupts(ah, sc->sc_imask);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo,NULL, 0);
 }
 
@@ -1147,7 +1147,7 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
                sc->sc_imask |= HAL_INT_CST;
 
        adf_os_setup_intr(sc->sc_dev, ath_intr);
-       ath_hal_intrset(ah, sc->sc_imask);
+       ah->ah_setInterrupts(ah, sc->sc_imask);
 
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
@@ -1516,7 +1516,7 @@ static void ath_disable_intr_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_intrset(ah, 0);
+       ah->ah_setInterrupts(ah, 0);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo,NULL, 0);
 }
 
@@ -1617,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);
+       ah->ah_stopPcuReceive(ah);
        ah->ah_setRxFilter(ah, 0);
-       ath_hal_stopdmarecv(ah);
+       ah->ah_stopDmaReceive(ah);
 
        sc->sc_rxlink = NULL;
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
@@ -1931,7 +1931,7 @@ a_int32_t ath_tgt_attach(a_uint32_t devid, struct ath_softc_tgt *sc, adf_os_devi
 
        ath_tgt_txq_setup(sc);
        sc->sc_imask =0;
-       ath_hal_intrset(ah,0);
+       ah->ah_setInterrupts(ah, 0);
 
        return 0;
 bad: