X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fdma.c;h=9a6cc0caa22e2280ec86af7d408a48943f2d0235;hb=b94cc57fa4ee29cb70415b699a1efc5f66eb41c7;hp=c33608cc4814e251fa7a1bcf3b22a14fb0df6dd6;hpb=8bd3397985e442761ce6956b3ba2e126a2577c42;p=carl9170fw.git

diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c
index c33608c..9a6cc0c 100644
--- a/carlfw/src/dma.c
+++ b/carlfw/src/dma.c
@@ -19,15 +19,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "carl9170.h"
 #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)
@@ -57,6 +56,11 @@ static void fill_descriptor(struct dma_desc *d, uint16_t size, uint8_t *data)
 	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.
@@ -74,27 +78,19 @@ void dma_init_descriptors(void)
 
 	/* 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.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 */
-
-	BUILD_BUG_ON(AR9170_TERMINATOR_NUMBER != j);
+		init_queue(&fw.wlan.cab_queue[j], &dma_mem.terminator[i++]);
+
+	BUG_ON(AR9170_TERMINATOR_NUMBER != i);
 
 	DBG("Blocks:%d [tx:%d, rx:%d] Terminators:%d/%d\n",
 	    AR9170_BLOCK_NUMBER, AR9170_TX_BLOCK_NUMBER,