carl9170 firmware: improve mac reset handling

[carl9170fw.git] / carlfw / include / dma.h

diff --git a/carlfw/include/dma.h b/carlfw/include/dma.h
index 9913f3a40359ce23ebf393730ab84b38b90b5ae0..e8d813bb1c77913d5e258e76dec8c7e1aa9615bc 100644 (file)
--- a/carlfw/include/dma.h
+++ b/carlfw/include/dma.h
@@ -58,7 +58,7 @@ struct dma_desc {
 #endif /* CONFIG_CARL9170FW_DELAYED_TX */
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-#define AR9170_TERMINATOR_NUMBER_CAB   1
+#define AR9170_TERMINATOR_NUMBER_CAB   CARL9170_INTF_NUM
 #else
 #define AR9170_TERMINATOR_NUMBER_CAB   0
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
@@ -147,7 +147,6 @@ struct carl9170_sram_reserved {
  * 0x18000
  */
 
-#define AR9170_SRAM_SIZE               0x18000
 #define CARL9170_SRAM_RESERVED         (sizeof(struct carl9170_sram_reserved))
 
 #define AR9170_FRAME_MEMORY_SIZE       (AR9170_SRAM_SIZE - CARL9170_SRAM_RESERVED)
@@ -227,6 +226,11 @@ void dma_queue_reclaim(struct dma_queue *dst, struct dma_queue *src);
 void queue_dump(void);
 void wlan_txq_hangfix(const unsigned int queue);
 
+static inline __inline bool is_terminator(struct dma_queue *q, struct dma_desc *desc)
+{
+       return q->terminator == desc;
+}
+
 static inline __inline bool queue_empty(struct dma_queue *q)
 {
        return q->head == q->terminator;