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
nuke ath_hal_*xstbcsupport
[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 90813fb67efdfd15f135aa289c9c5c0d3aa7bea3..4c9e98b16a63d84ac3bfacaff4ff17ca0fe95738 100755
(executable)
--- a/
target_firmware/wlan/if_ath.c
+++ b/
target_firmware/wlan/if_ath.c
@@
-539,7
+539,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;
@@
-879,8
+879,8
@@
static void ath_descdma_cleanup(struct ath_softc_tgt *sc,
struct ath_descdma *dd,
ath_bufhead *head, a_int32_t dir)
{
struct ath_descdma *dd,
ath_bufhead *head, a_int32_t dir)
{
- struct ath_
tx_
buf *bf;
- struct ieee80211_node *ni;
+ struct ath_buf *bf;
+ struct ieee80211_node
_target
*ni;
asf_tailq_foreach(bf, head, bf_list) {
if (adf_nbuf_queue_len(&bf->bf_skbhead) != 0) {
asf_tailq_foreach(bf, head, bf_list) {
if (adf_nbuf_queue_len(&bf->bf_skbhead) != 0) {
@@
-924,7
+924,7
@@
static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
if (ath_numrxdescs == -1)
ath_numrxdescs = ATH_RXDESC;
if (ath_numrxdescs == -1)
ath_numrxdescs = ATH_RXDESC;
- error = ath_descdma_setup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+ error = ath_descdma_setup(sc, &sc->sc_rxdma,
(ath_bufhead *)
&sc->sc_rxbuf,
"rx", ath_numrxdescs, 1,
sizeof(struct ath_rx_buf),
sizeof(struct ath_rx_desc));
"rx", ath_numrxdescs, 1,
sizeof(struct ath_rx_buf),
sizeof(struct ath_rx_desc));
@@
-933,7
+933,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);
@@
-961,24
+961,24
@@
static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
asf_tailq_insert_tail(&sc->sc_rxdesc, ds, ds_list);
}
asf_tailq_insert_tail(&sc->sc_rxdesc, ds, ds_list);
}
- error = ath_descdma_setup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+ error = ath_descdma_setup(sc, &sc->sc_txdma,
(ath_bufhead *)
&sc->sc_txbuf,
"tx", ATH_TXBUF + 1, ATH_TXDESC,
sizeof(struct ath_tx_buf),
sizeof(struct ath_tx_desc));
if (error != 0) {
"tx", ATH_TXBUF + 1, ATH_TXDESC,
sizeof(struct ath_tx_buf),
sizeof(struct ath_tx_desc));
if (error != 0) {
- ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+ ath_descdma_cleanup(sc, &sc->sc_rxdma,
(ath_bufhead *)
&sc->sc_rxbuf,
ADF_OS_DMA_FROM_DEVICE);
return error;
}
ADF_OS_DMA_FROM_DEVICE);
return error;
}
- error = ath_descdma_setup(sc, &sc->sc_bdma, &sc->sc_bbuf,
+ error = ath_descdma_setup(sc, &sc->sc_bdma,
(ath_bufhead *)
&sc->sc_bbuf,
"beacon", ATH_BCBUF, 1,
sizeof(struct ath_tx_buf),
sizeof(struct ath_tx_desc));
if (error != 0) {
"beacon", ATH_BCBUF, 1,
sizeof(struct ath_tx_buf),
sizeof(struct ath_tx_desc));
if (error != 0) {
- ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+ ath_descdma_cleanup(sc, &sc->sc_txdma,
(ath_bufhead *)
&sc->sc_txbuf,
ADF_OS_DMA_TO_DEVICE);
ADF_OS_DMA_TO_DEVICE);
- ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+ ath_descdma_cleanup(sc, &sc->sc_rxdma,
(ath_bufhead *)
&sc->sc_rxbuf,
ADF_OS_DMA_FROM_DEVICE);
return error;
}
ADF_OS_DMA_FROM_DEVICE);
return error;
}
@@
-1001,10
+1001,10
@@
static void ath_desc_free(struct ath_softc_tgt *sc)
sc->sc_txbuf_held = NULL;
if (sc->sc_txdma.dd_desc_len != 0)
sc->sc_txbuf_held = NULL;
if (sc->sc_txdma.dd_desc_len != 0)
- ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+ ath_descdma_cleanup(sc, &sc->sc_txdma,
(ath_bufhead *)
&sc->sc_txbuf,
ADF_OS_DMA_TO_DEVICE);
if (sc->sc_rxdma.dd_desc_len != 0)
ADF_OS_DMA_TO_DEVICE);
if (sc->sc_rxdma.dd_desc_len != 0)
- ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+ ath_descdma_cleanup(sc, &sc->sc_rxdma,
(ath_bufhead *)
&sc->sc_rxbuf,
ADF_OS_DMA_FROM_DEVICE);
}
ADF_OS_DMA_FROM_DEVICE);
}
@@
-1136,7
+1136,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
+1146,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
+1524,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) {
@@
-1883,8
+1875,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
+1897,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;