X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=85ea1d2425bd5895915aff9525cb407a61f01bac;hb=29c96874116d87d35be5f636d107679f4120ee77;hp=b57993d2d7e70abafc582aa86f64fee80564416e;hpb=6476369c2c6d4ba487408cb5daff8df0480d6b4a;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index b57993d..85ea1d2 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -3,7 +3,7 @@
  *
  * Firmware context definition
  *
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -93,17 +93,15 @@ struct firmware_context_struct {
 	struct {
 		/* Hardware DMA queues */
 		struct dma_queue tx_queue[__AR9170_NUM_TX_QUEUES];	/* wlan tx queue */
+		struct dma_queue tx_retry;
 		struct dma_queue rx_queue;				/* wlan rx queue */
 
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
-		struct dma_queue tx_delay[__AR9170_NUM_TX_QUEUES];
-		struct dma_queue tx_retry;
-		unsigned int tx_trigger;
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
+		/* tx aggregate scheduling */
+		struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
 
 		/* Hardware DMA queue unstuck/fix detection */
-		unsigned int last_tx_desc_num[__AR9170_NUM_TX_QUEUES];
-		struct dma_desc *last_tx_desc[__AR9170_NUM_TX_QUEUES];
+		unsigned int last_super_num[__AR9170_NUM_TX_QUEUES];
+		struct carl9170_tx_superframe *last_super[__AR9170_NUM_TX_QUEUES];
 		unsigned int mac_reset;
 		unsigned int soft_int;
 
@@ -114,10 +112,8 @@ struct firmware_context_struct {
 		unsigned int rx_total;
 		unsigned int rx_overruns;
 
-#ifdef CONFIG_CARL9170FW_TX_AMPDU
-		/* tx aggregate scheduling */
-		struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
-#endif /* CONFIG_CARL9170FW_TX_AMPDU */
+		/* tx sequence control counters */
+		unsigned int sequence[CARL9170_INTF_NUM];
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 		/* CAB */
@@ -186,9 +182,7 @@ struct firmware_context_struct {
 		unsigned int frequency;
 		unsigned int ht_settings;
 
-#ifdef CONFIG_CARL9170FW_PSM
 		struct carl9170_psm psm;
-#endif /* CONFIG_CARL9170FW_PSM */
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 	} phy;