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_updateTxTrigLevel 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 30165d4d2524503ea6492c6966455d932c78ab10..91376c5848689939fe59f2fb51580b25e2b5910c 100755
(executable)
--- a/
target_firmware/wlan/if_ath.c
+++ b/
target_firmware/wlan/if_ath.c
@@
-50,13
+50,12
@@
#include <adf_os_irq.h>
#include <if_ath_pci.h>
#include <adf_os_irq.h>
#include <if_ath_pci.h>
-#include "if_ethersubr.h"
#include "if_llc.h"
#include "ieee80211_var.h"
#include "if_llc.h"
#include "ieee80211_var.h"
-#include "ieee80211_proto.h"
#include "if_athrate.h"
#include "if_athvar.h"
#include "ah_desc.h"
#include "if_athrate.h"
#include "if_athvar.h"
#include "ah_desc.h"
+#include "ah.h"
static a_int32_t ath_numrxbufs = -1;
static a_int32_t ath_numrxdescs = -1;
static a_int32_t ath_numrxbufs = -1;
static a_int32_t ath_numrxdescs = -1;
@@
-121,10
+120,10
@@
static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode)
switch (mode) {
case IEEE80211_MODE_11NA:
switch (mode) {
case IEEE80211_MODE_11NA:
- sc->sc_rates[mode] = a
th_hal_getratet
able(ah, HAL_MODE_11NA);
+ sc->sc_rates[mode] = a
h->ah_getRateT
able(ah, HAL_MODE_11NA);
break;
case IEEE80211_MODE_11NG:
break;
case IEEE80211_MODE_11NG:
- sc->sc_rates[mode] = a
th_hal_getratet
able(ah, HAL_MODE_11NG);
+ sc->sc_rates[mode] = a
h->ah_getRateT
able(ah, HAL_MODE_11NG);
break;
default:
return 0;
break;
default:
return 0;
@@
-539,7
+538,7
@@
static void ath_beacon_setup(struct ath_softc_tgt *sc,
{
adf_nbuf_t skb = bf->bf_skb;
struct ath_hal *ah = sc->sc_ah;
{
adf_nbuf_t skb = bf->bf_skb;
struct ath_hal *ah = sc->sc_ah;
- struct ath_desc *ds;
+ struct ath_
tx_
desc *ds;
a_int32_t flags;
const HAL_RATE_TABLE *rt;
a_uint8_t rix, rate;
a_int32_t flags;
const HAL_RATE_TABLE *rt;
a_uint8_t rix, rate;
@@
-933,7
+932,7
@@
static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
a_uint32_t i;
struct ath_descdma *dd = &sc->sc_rxdma;
a_uint32_t i;
struct ath_descdma *dd = &sc->sc_rxdma;
- struct ath_rx_desc *ds = dd->dd_desc;
+ struct ath_rx_desc *ds =
(struct ath_rx_desc *)
dd->dd_desc;
struct ath_rx_desc *ds_prev = NULL;
asf_tailq_init(&sc->sc_rxdesc);
struct ath_rx_desc *ds_prev = NULL;
asf_tailq_init(&sc->sc_rxdesc);
@@
-1068,7
+1067,7
@@
adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
if (status & HAL_INT_TXURN) {
sc->sc_int_stats.ast_txurn++;
if (status & HAL_INT_TXURN) {
sc->sc_int_stats.ast_txurn++;
- a
th_hal_updatetxtrigl
evel(ah, AH_TRUE);
+ a
h->ah_updateTxTrigL
evel(ah, AH_TRUE);
}
ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_txtq);
}
ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_txtq);
@@
-1136,7
+1135,6
@@
static void ath_init_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_uint32_t stbcsupport;
sc->sc_imask = HAL_INT_RX | HAL_INT_TX
| HAL_INT_RXEOL | HAL_INT_RXORN
sc->sc_imask = HAL_INT_RX | HAL_INT_TX
| HAL_INT_RXEOL | HAL_INT_RXORN
@@
-1147,13
+1145,6
@@
static void ath_init_tgt(void *Context, A_UINT16 Command,
if (ath_hal_htsupported(ah))
sc->sc_imask |= HAL_INT_CST;
if (ath_hal_htsupported(ah))
sc->sc_imask |= HAL_INT_CST;
-#ifdef MAGPIE_MERLIN
- if (ath_hal_txstbcsupport(ah, &stbcsupport))
- sc->sc_txstbcsupport = stbcsupport;
-
- if (ath_hal_rxstbcsupport(ah, &stbcsupport))
- sc->sc_rxstbcsupport = stbcsupport;
-#endif
adf_os_setup_intr(sc->sc_dev, ath_intr);
ath_hal_intrset(ah, sc->sc_imask);
adf_os_setup_intr(sc->sc_dev, ath_intr);
ath_hal_intrset(ah, sc->sc_imask);
@@
-1532,7
+1523,7
@@
static void ath_flushrecv_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_buf *bf;
+ struct ath_
rx_
buf *bf;
asf_tailq_foreach(bf, &sc->sc_rxbuf, bf_list)
if (bf->bf_skb != NULL) {
asf_tailq_foreach(bf, &sc->sc_rxbuf, bf_list)
if (bf->bf_skb != NULL) {
@@
-1653,7
+1644,7
@@
static void ath_detach_tgt(void *Context, A_UINT16 Command, A_UINT16 SeqNo,
struct ath_hal *ah = sc->sc_ah;
ath_desc_free(sc);
struct ath_hal *ah = sc->sc_ah;
ath_desc_free(sc);
- a
th_hal
_detach(ah);
+ a
h->ah
_detach(ah);
wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
adf_os_mem_free(sc);
}
wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
adf_os_mem_free(sc);
}
@@
-1883,8
+1874,7
@@
static void tgt_hif_htc_wmi_init(struct ath_softc_tgt *sc)
HTC_Ready(sc->tgt_htc_handle);
}
HTC_Ready(sc->tgt_htc_handle);
}
-a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
- struct ath_softc_tgt *sc, adf_os_device_t osdev)
+a_int32_t ath_tgt_attach(a_uint32_t devid, struct ath_softc_tgt *sc, adf_os_device_t osdev)
{
struct ath_hal *ah;
HAL_STATUS status;
{
struct ath_hal *ah;
HAL_STATUS status;
@@
-1906,7
+1896,7
@@
a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
ATH_INIT_TQUEUE(sc->sc_dev, &sc->sc_fataltq, ath_fatal_tasklet, sc);
flags |= AH_USE_EEPROM;
ATH_INIT_TQUEUE(sc->sc_dev, &sc->sc_fataltq, ath_fatal_tasklet, sc);
flags |= AH_USE_EEPROM;
- ah = _ath_hal_attach_tgt(devid,
sc,sc->sc_dev,mem_start
, flags, &status);
+ ah = _ath_hal_attach_tgt(devid,
sc, sc->sc_dev
, flags, &status);
if (ah == NULL) {
error = ENXIO;
goto bad;
if (ah == NULL) {
error = ENXIO;
goto bad;
@@
-1946,7
+1936,7
@@
bad:
bad2:
ath_desc_free(sc);
if (ah)
bad2:
ath_desc_free(sc);
if (ah)
- a
th_hal
_detach(ah);
+ a
h->ah
_detach(ah);
}
static void tgt_hif_htc_wmi_shutdown(struct ath_softc_tgt *sc)
}
static void tgt_hif_htc_wmi_shutdown(struct ath_softc_tgt *sc)