#include "wl.h"
#include "printf.h"
-struct ar9170_dma_memory dma_mem __section(sram);
+struct ar9170_dma_memory dma_mem __in_section(sram);
static void copy_dma_desc(struct dma_desc *dst,
struct dma_desc *src)
d->nextAddr = NULL;
}
+static void init_queue(struct dma_queue *q, struct dma_desc *d)
+{
+ q->head = q->terminator = d;
+}
+
/*
* - Init up_queue, down_queue, tx_queue[5], rx_queue.
* - Setup descriptors and data buffer address.
/* Assign terminators to DMA queues */
i = 0;
- fw.pta.up_queue.head = fw.pta.up_queue.terminator = &dma_mem.terminator[i++];
- fw.pta.down_queue.head = fw.pta.down_queue.terminator = &dma_mem.terminator[i++];
+ init_queue(&fw.pta.up_queue, &dma_mem.terminator[i++]);
+ init_queue(&fw.pta.down_queue, &dma_mem.terminator[i++]);
for (j = 0; j < __AR9170_NUM_TX_QUEUES; j++)
- fw.wlan.tx_queue[j].head = fw.wlan.tx_queue[j].terminator = &dma_mem.terminator[i++];
- fw.wlan.tx_retry.head = fw.wlan.tx_retry.terminator = &dma_mem.terminator[i++];
- fw.wlan.rx_queue.head = fw.wlan.rx_queue.terminator = &dma_mem.terminator[i++];
+ init_queue(&fw.wlan.tx_queue[j], &dma_mem.terminator[i++]);
+ init_queue(&fw.wlan.tx_retry, &dma_mem.terminator[i++]);
+ init_queue(&fw.wlan.rx_queue, &dma_mem.terminator[i++]);
fw.usb.int_desc = &dma_mem.terminator[i++];
- fw.wlan.ba_desc = &dma_mem.terminator[i++];
+ fw.wlan.fw_desc = &dma_mem.terminator[i++];
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
- /* 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 */
+ init_queue(&fw.wlan.cab_queue[j], &dma_mem.terminator[i++]);
- BUILD_BUG_ON(AR9170_TERMINATOR_NUMBER != j);
+ BUG_ON(AR9170_TERMINATOR_NUMBER != i);
DBG("Blocks:%d [tx:%d, rx:%d] Terminators:%d/%d\n",
AR9170_BLOCK_NUMBER, AR9170_TX_BLOCK_NUMBER,
set_wlan_txq_dma_addr(i, (uint32_t) fw.wlan.tx_queue[i].head);
set(AR9170_MAC_REG_DMA_RXQ_ADDR, (uint32_t) fw.wlan.rx_queue.head);
-
fw.usb.int_desc->dataSize = AR9170_BLOCK_SIZE;
fw.usb.int_desc->dataAddr = (void *) &dma_mem.reserved.rsp;
/* rsp is now available for use */
fw.usb.int_desc_available = 1;
- fw.wlan.ba_desc->dataAddr = (void *) &dma_mem.reserved.ba;
- memset(DESC_PAYLOAD(fw.wlan.ba_desc), 0, 128);
- fw.wlan.ba_desc_available = 1;
+ memset(DESC_PAYLOAD(fw.wlan.fw_desc), 0, 128);
+ fw.wlan.fw_desc_available = 1;
}
/*