X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fdma.c;h=c33608cc4814e251fa7a1bcf3b22a14fb0df6dd6;hb=b74f4944e8b7d8409915fc647b041f56dd98d95f;hp=7ca0c9aec0222eb2799e8f1fc3e998309097cee9;hpb=cdced53c2ede33a9fe9004db4d93cfc984ad4243;p=carl9170fw.git

diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c
index 7ca0c9a..c33608c 100644
--- a/carlfw/src/dma.c
+++ b/carlfw/src/dma.c
@@ -81,7 +81,7 @@ void dma_init_descriptors(void)
 	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++];
 	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 ? */
@@ -120,14 +120,8 @@ void dma_init_descriptors(void)
 		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->status = AR9170_OWN_BITS_SW;
-	fw.usb.int_desc->ctrl = (AR9170_CTRL_LS_BIT | AR9170_CTRL_FS_BIT);
 	fw.usb.int_desc->dataSize = AR9170_BLOCK_SIZE;
-	fw.usb.int_desc->totalLen = 0;
-	fw.usb.int_desc->lastAddr = fw.usb.int_desc;
 	fw.usb.int_desc->dataAddr = (void *) &dma_mem.reserved.rsp;
-	fw.usb.int_desc->nextAddr = (void *) 0;
 
 	memset(DESC_PAYLOAD(fw.usb.int_desc), 0xff,
 	       AR9170_INT_MAGIC_HEADER_SIZE);
@@ -137,19 +131,8 @@ void dma_init_descriptors(void)
 	/* rsp is now available for use */
 	fw.usb.int_desc_available = 1;
 
-	fw.wlan.ba_desc->status = AR9170_OWN_BITS_SW;
-	fw.wlan.ba_desc->ctrl = (AR9170_CTRL_LS_BIT | AR9170_CTRL_FS_BIT);
-	fw.wlan.ba_desc->dataSize = fw.wlan.ba_desc->totalLen =
-		sizeof(struct carl9170_tx_superdesc) +
-		sizeof(struct ar9170_tx_hwdesc) +
-		sizeof(struct ieee80211_ba) + FCS_LEN;
-	fw.wlan.ba_desc->lastAddr = fw.wlan.ba_desc;
-	fw.wlan.ba_desc->nextAddr = fw.wlan.ba_desc;
-	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;
 }
 
 /*