carl9170 firmware: Support multiple CAB queues

[carl9170fw.git] / carlfw / src / dma.c

diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c
index 3da9f8c328c1de3cbd66c478f764bfcc43fb38b9..6b40e05b846db7aac851daf309464df8ab0b0cfe 100644 (file)
--- a/carlfw/src/dma.c
+++ b/carlfw/src/dma.c
@@ -82,7 +82,14 @@ void dma_init_descriptors(void)
        fw.usb.int_desc = &dma_mem.terminator[i++];
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-       fw.wlan.cab_queue.head = fw.wlan.cab_queue.terminator = &dma_mem.terminator[i++];
+       /* GCC bug ? */
+# if (CARL9170_INTF_NUM != 2)
+       for (j = 0; j < CARL9170_INTF_NUM; j++)
+               fw.wlan.cab_queue[j].head = fw.wlan.cab_queue[j].terminator = &dma_mem.terminator[i++];
+#else
+       fw.wlan.cab_queue[0].head = fw.wlan.cab_queue[0].terminator = &dma_mem.terminator[i++];
+       fw.wlan.cab_queue[1].head = fw.wlan.cab_queue[1].terminator = &dma_mem.terminator[i++];
+#endif
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 #ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
@@ -96,6 +103,8 @@ void dma_init_descriptors(void)
                fw.wlan.tx_delay[j].head = fw.wlan.tx_delay[j].terminator = &dma_mem.terminator[i++];
 #endif /* CONFIG_CARL9170FW_DELAYED_TX */
 
+       BUILD_BUG_ON(AR9170_TERMINATOR_NUMBER != j);
+
        DBG("Blocks:%d [tx:%d, rx:%d] Terminators:%d/%d\n",
            AR9170_BLOCK_NUMBER, AR9170_TX_BLOCK_NUMBER,
            AR9170_RX_BLOCK_NUMBER, AR9170_TERMINATOR_NUMBER, i);
@@ -192,7 +201,7 @@ void dma_reclaim(struct dma_queue *q, struct dma_desc *desc)
        desc->status = AR9170_OWN_BITS_SW;
 
        /* 5. Copy TTD to last TD */
-       tdesc.status &= (~AR9170_OWN_BITS_MASK);
+       tdesc.status &= (~AR9170_OWN_BITS);
        copy_dma_desc((void *)q->terminator, (void *)&tdesc);
        q->terminator->status |= AR9170_OWN_BITS_HW;
 
@@ -212,9 +221,6 @@ void dma_put(struct dma_queue *q, struct dma_desc *desc)
 
        tmpDesc = desc;
 
-       /* force correct CTRL_BITS */
-       tmpDesc->ctrl = 0;
-       tmpDesc->ctrl |= AR9170_CTRL_FS_BIT;
        while (1) {
                /* update totalLen */
                tmpDesc->totalLen = desc->totalLen;
@@ -229,9 +235,7 @@ void dma_put(struct dma_queue *q, struct dma_desc *desc)
                        break;
 
                tmpDesc = tmpDesc->nextAddr;
-               tmpDesc->ctrl = 0;
        }
-       tmpDesc->ctrl |= AR9170_CTRL_LS_BIT;
 
        /* 2. Next address of Last TD to be added = first TD */
        desc->lastAddr->nextAddr = desc;
@@ -253,7 +257,7 @@ void dma_put(struct dma_queue *q, struct dma_desc *desc)
        desc->dataAddr = NULL;
 
        /* 5. Copy TTD to last TD */
-       tdesc.status &= (~AR9170_OWN_BITS_MASK);
+       tdesc.status &= (~AR9170_OWN_BITS);
        copy_dma_desc((void *)q->terminator, (void *)&tdesc);
        q->terminator->status |= AR9170_OWN_BITS_HW;