projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
[carl9170fw.git]
/
carlfw
/
include
/
wl.h
diff --git
a/carlfw/include/wl.h
b/carlfw/include/wl.h
index ff04536d4af7fd6291ef030be386678cc1f6c4e3..9064dcb2c6af35e28691f1f147e27a86be293aec 100644
(file)
--- a/
carlfw/include/wl.h
+++ b/
carlfw/include/wl.h
@@
-42,32
+42,25
@@
static inline __inline void set_wlan_txq_dma_curr_addr(const unsigned int q, con
set(AR9170_MAC_REG_DMA_TXQ_CURR_ADDR + (q << 3), v);
}
set(AR9170_MAC_REG_DMA_TXQ_CURR_ADDR + (q << 3), v);
}
-static inline __inline struct dma_desc *get_wlan_txq_dma_addr(const unsigned int q)
+static inline __inline
volatile
struct dma_desc *get_wlan_txq_dma_addr(const unsigned int q)
{
return getp(AR9170_MAC_REG_DMA_TXQ_ADDR + (q << 3));
}
{
return getp(AR9170_MAC_REG_DMA_TXQ_ADDR + (q << 3));
}
-static inline __inline struct dma_desc *get_wlan_txq_addr(const unsigned int q)
+static inline __inline
volatile
struct dma_desc *get_wlan_txq_addr(const unsigned int q)
{
return getp(AR9170_MAC_REG_DMA_TXQ_CURR_ADDR + (q << 3));
}
{
return getp(AR9170_MAC_REG_DMA_TXQ_CURR_ADDR + (q << 3));
}
-static inline __inline vo
id _wlan_trigger(const uint32_t queue_bit
)
+static inline __inline vo
latile struct dma_desc *get_wlan_txq_last_addr(const unsigned int q
)
{
{
-
set(AR9170_MAC_REG_DMA_TRIGGER, queue_bit
);
+
return getp(AR9170_MAC_REG_DMA_TXQ_LAST_ADDR + (q << 2)
);
}
}
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
static inline __inline void wlan_trigger(const uint32_t queue_bit)
{
static inline __inline void wlan_trigger(const uint32_t queue_bit)
{
- fw.wlan.tx_trigger |= queue_bit;
-}
-#else
-static inline __inline void wlan_trigger(const uint32_t queue_bit)
-{
- _wlan_trigger(queue_bit);
+ set(AR9170_MAC_REG_DMA_TRIGGER, queue_bit);
}
}
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
static inline __inline uint8_t ar9170_get_rx_macstatus_status(struct dma_desc *desc)
{
static inline __inline uint8_t ar9170_get_rx_macstatus_status(struct dma_desc *desc)
{
@@
-222,6
+215,11
@@
static inline __inline struct carl9170_tx_superframe *get_super(struct dma_desc
f);
}
f);
}
+static inline __inline struct carl9170_tx_superframe *__get_super(struct dma_desc *desc)
+{
+ return DESC_PAYLOAD(desc);
+}
+
static inline __inline void hide_super(struct dma_desc *desc)
{
desc->dataAddr = (uint8_t *)
static inline __inline void hide_super(struct dma_desc *desc)
{
desc->dataAddr = (uint8_t *)
@@
-265,14
+263,10
@@
void wlan_modify_beacon(const unsigned int vif,
const unsigned int bcn_addr,
const unsigned int bcn_len);
const unsigned int bcn_addr,
const unsigned int bcn_len);
-static inline void wlan_prepare_wol(void)
-{
- /* set filter policy to: discard everything */
- fw.wlan.rx_filter = CARL9170_RX_FILTER_EVERYTHING;
+void wlan_tx_complete(struct carl9170_tx_superframe *super,
+ bool txs);
- /* reenable rx dma */
- wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
-}
+void wlan_prepare_wol(void);
static inline void __check_wlantx(void)
{
static inline void __check_wlantx(void)
{