X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=ff074e3982ee3451c16ec73492e809e8c73b34ad;hb=7cb1a2fccddb29f3479d92ab6532aa8dd728fb78;hp=0e0b1dd144b27c4254b0f8fbd0d53278e296c849;hpb=592643728e9b7c37c918afee05df8142c6d7303e;p=carl9170fw.git

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 0e0b1dd..ff074e3 100644
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -307,9 +307,9 @@ static void __wlan_tx(struct dma_desc *desc)
 # endif
 #else /* CONFIG_CARL9170FW_LOOPBACK */
 
-# if ((defined CONFIG_CARL9170FW_DEBUG) && (defined CONFIG_CARL9170FW_PSM))
+# ifdef CONFIG_CARL9170FW_DEBUG
 	BUG_ON(fw.phy.psm.state != CARL9170_PSM_WAKE);
-# endif /* CONFIG_CARL9170FW_DEBUG && CONFIG_CARL9170FW_PSM */
+# endif /* CONFIG_CARL9170FW_DEBUG */
 
 	/* insert desc into the right queue */
 	dma_put(&fw.wlan.tx_queue[super->s.queue], desc);
@@ -466,7 +466,7 @@ static void handle_tx_completion(void)
 	unsigned int map = 0;
 	int i;
 
-	for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
+	for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
 		__while_desc_bits(desc, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW) {
 			if (!wlan_tx_status(&fw.wlan.tx_queue[i], desc)) {
 				/* termination requested. */
@@ -985,14 +985,10 @@ static void handle_pretbtt(void)
 	fw.wlan.cab_flush_time = get_clock_counter();
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
-#ifdef CONFIG_CARL9170FW_PSM
 	rf_psm();
 
 	send_cmd_to_host(4, CARL9170_RSP_PRETBTT, 0x00,
 			 (uint8_t *) &fw.phy.psm.state);
-#else
-	send_cmd_to_host(0, CARL9170_RSP_PRETBTT, 0x00, NULL);
-#endif /* CONFIG_CARL9170FW_PSM */
 }
 
 static void handle_atim(void)
@@ -1102,9 +1098,9 @@ void handle_wlan(void)
 static void wlan_check_hang(void)
 {
 	struct dma_desc *desc;
-	unsigned int i;
+	int i;
 
-	for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
+	for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
 		if (queue_empty(&fw.wlan.tx_queue[i])) {
 			/* Nothing to do here... move along */
 			continue;
@@ -1179,13 +1175,15 @@ static void wlan_mac_reset(void)
 	uint32_t ack_power;
 	uint32_t rts_cts_tpc;
 	uint32_t rts_cts_rate;
-	unsigned int i;
+	int i;
 
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 	uint32_t rx_BB;
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 
+#ifdef CONFIG_CARL9170FW_NOISY_MAC_RESET
 	INFO("MAC RESET");
+#endif /* CONFIG_CARL9170FW_NOISY_MAC_RESET */
 
 	/* Save aggregation parameters */
 	agg_wait_counter = get(AR9170_MAC_REG_AMPDU_FACTOR);
@@ -1255,7 +1253,7 @@ static void wlan_mac_reset(void)
 
 	val = AR9170_DMA_TRIGGER_RXQ;
 	/* Reinitialize all WLAN TX DMA queues. */
-	for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
+	for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
 		struct dma_desc *iter;
 
 		__for_each_desc_bits(iter, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW);