use ah_fillTxDesc 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 5c2cff8604d9fdd20f9d00b39a90ecbfe3af1746..59b6c94024c96f42dcfe3e7065c50b36c4f0499b 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -266,7 +266,7 @@ static a_int32_t ath_rxdesc_init(struct ath_softc_tgt *sc, struct ath_rx_desc *d
        ds->ds_link = 0;
        adf_nbuf_peek_header(ds->ds_nbuf, &anbdata, &anblen);
 
-       ath_hal_setuprxdesc(ah, ds,
+       ah->ah_setupRxDesc(ah, ds,
                            adf_nbuf_tailroom(ds->ds_nbuf),
                            0);
 
@@ -386,7 +386,7 @@ static void ath_uapsd_processtriggers(struct ath_softc_tgt *sc)
                        continue;
                }
 
-               retval = ath_hal_rxprocdescfast(ah, ds, ds->ds_daddr,
+               retval = ah->ah_procRxDescFast(ah, ds, ds->ds_daddr,
                                                PA2DESC(sc, ds->ds_link), &bf->bf_rx_status);
                if (HAL_EINPROGRESS == retval) {
                        break;
@@ -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);
 }
 
 /*******************/
@@ -555,7 +555,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        rt  = sc->sc_currates;
        rate = rt->info[rix].rateCode;
 
-       ath_hal_setuptxdesc(ah, ds
+       ah->ah_setupTxDesc(ah, ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , sizeof(struct ieee80211_frame)
                            , HAL_PKT_TYPE_BEACON
@@ -570,7 +570,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
                            , 0
                            , ATH_COMP_PROC_NO_COMP_NO_CCS);
 
-       ath_hal_filltxdesc(ah, ds
+       ah->ah_fillTxDesc(ah, ds
                           , asf_roundup(adf_nbuf_len(skb), 4)
                           , AH_TRUE
                           , AH_TRUE
@@ -580,7 +580,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        series[0].Rate = rate;
        series[0].ChSel = sc->sc_ic.ic_tx_chainmask;
        series[0].RateFlags = 0;
-       ath_hal_set11n_ratescenario(ah, ds, 0, 0, 0, series, 4, 0);
+       ah->ah_set11nRateScenario(ah, ds, 0, 0, 0, series, 4, 0);
 }
 
 static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
@@ -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,7 +1617,7 @@ 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);
        ah->ah_stopDmaReceive(ah);
 
@@ -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: