projects
/
open-ath9k-htc-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use ah_isInterruptPending 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 af6684ae918c25d347cdf803119fa0d6198be337..c61832e7d170c2c85ecda090b8382ff42270ecf1 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)
{
*/
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;
u_int64_t tsf;
u_int32_t tsf_low;
u_int64_t tsf64;
- tsf = a
th_hal_gettsf64(sc->sc_
ah);
+ tsf = a
h->ah_getTsf64(
ah);
tsf_low = tsf & 0xffffffff;
tsf64 = (tsf & ~0xffffffffULL) | rstamp;
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) {
0);
if (sc->sc_rxlink == NULL) {
- a
th_hal_putrxbuf
(ah, ds->ds_daddr);
+ a
h->ah_setRxDP
(ah, ds->ds_daddr);
}
else {
*sc->sc_rxlink = ds->ds_daddr;
}
sc->sc_rxlink = &ds->ds_link;
}
else {
*sc->sc_rxlink = ds->ds_daddr;
}
sc->sc_rxlink = &ds->ds_link;
- a
th_hal_rxena
(ah);
+ a
h->ah_enableReceive
(ah);
return 0;
}
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)))
((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc + \
((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
- tsf = a
th_hal_gett
sf64(ah);
+ tsf = a
h->ah_getT
sf64(ah);
bf = asf_tailq_first(&sc->sc_rxbuf);
ds = asf_tailq_first(&sc->sc_rxdesc);
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);
}
ds = asf_tailq_first(&sc->sc_rxdesc);
- a
th_hal_putrxbuf
(ah, ds->ds_daddr);
+ a
h->ah_setRxDP
(ah, ds->ds_daddr);
return 0;
}
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]);
adf_nbuf_dmamap_info(bf->bf_dmamap,&bf->bf_dmamap_info);
ath_beacon_setup(sc, bf, &sc->sc_vap[vap_index]);
- a
th_hal_stoptxd
ma(ah, sc->sc_bhalq);
+ a
h->ah_stopTxD
ma(ah, sc->sc_bhalq);
ah->ah_setTxDP(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));
- a
th_hal_txstart
(ah, sc->sc_bhalq);
+ a
h->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;
{
struct ath_hal *ah = sc->sc_ah;
-
(void) ath_hal_stoptxd
ma(ah, txq->axq_qnum);
+
ah->ah_stopTxD
ma(ah, txq->axq_qnum);
}
static void owltgt_txq_drain(struct ath_softc_tgt *sc, struct ath_txq *txq)
}
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;
ath_tx_status_clear(sc);
sc->sc_tx_draining = 1;
-
(void) ath_hal_stoptxd
ma(ah, sc->sc_bhalq);
+
ah->ah_stopTxD
ma(ah, sc->sc_bhalq);
for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
if (ATH_TXQ_SETUP(sc, i))
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
a_uint32_t tmp;
#ifdef ATH_ENABLE_CABQ
- tsf = a
th_hal_gett
sf64(ah);
+ tsf = a
h->ah_getT
sf64(ah);
tmp = tsf - sc->sc_swba_tsf;
if ( tmp > ATH_CABQ_HANDLING_THRESHOLD ) {
tmp = tsf - sc->sc_swba_tsf;
if ( tmp > ATH_CABQ_HANDLING_THRESHOLD ) {
@@
-1020,7
+1021,7
@@
adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
if (sc->sc_invalid)
return ADF_OS_IRQ_NONE;
if (sc->sc_invalid)
return ADF_OS_IRQ_NONE;
- if (!a
th_hal_intrpend
(ah))
+ if (!a
h->ah_isInterruptPending
(ah))
return ADF_OS_IRQ_NONE;
ath_hal_getisr(ah, &status);
return ADF_OS_IRQ_NONE;
ath_hal_getisr(ah, &status);
@@
-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);
WMI_SWBA_EVENT swbaEvt;
struct ath_txq *txq = ATH_TXQ(sc, 8);
- swbaEvt.tsf = a
th_hal_gett
sf64(ah);
+ swbaEvt.tsf = a
h->ah_getT
sf64(ah);
swbaEvt.beaconPendingCount = ah->ah_numTxPending(ah, sc->sc_bhalq);
swbaEvt.beaconPendingCount = ah->ah_numTxPending(ah, sc->sc_bhalq);
- sc->sc_swba_tsf = a
th_hal_gett
sf64(ah);
+ sc->sc_swba_tsf = a
h->ah_getT
sf64(ah);
wmi_event(sc->tgt_wmi_handle,
WMI_SWBA_EVENTID,
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;
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;
- a
th_hal_aborttxd
ma(sc->sc_ah);
+ a
h->ah_abortTxD
ma(sc->sc_ah);
wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
}
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);
q = *(a_uint32_t *)data;
q = adf_os_ntohl(q);
- a
th_hal_stoptxd
ma(ah, q);
+ a
h->ah_stopTxD
ma(ah, q);
wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
}
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;
struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
struct ath_hal *ah = sc->sc_ah;
- a
th_hal_stoppcurecv
(ah);
- a
th_hal_setrxf
ilter(ah, 0);
- a
th_hal_stopdmarecv
(ah);
+ a
h->ah_stopPcuReceive
(ah);
+ a
h->ah_setRxF
ilter(ah, 0);
+ a
h->ah_stopDmaReceive
(ah);
sc->sc_rxlink = NULL;
wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
sc->sc_rxlink = NULL;
wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);