X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=b61189bb2bf0530867cb7e661d23dc2c5ed6c893;hb=007045ac7c9822009b704b856e2f92934cca2401;hp=220f2a1e07e51f41ea6494b05d230afc3a490196;hpb=95e0b3d5f76e191546422c4dbb7afd2ad679ff8d;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 220f2a1..b61189b 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -70,7 +70,7 @@ enum carl9170_mac_reset_state {
 
 struct firmware_context_struct {
 	/* timer / clocks */
-	unsigned int bogoclock;			/* supposed to be CPU clock in KHz */
+	unsigned int ticks_per_msec;
 	unsigned int counter;			/* main() cycles */
 
 	/* misc */
@@ -97,16 +97,27 @@ struct firmware_context_struct {
 		/* 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 mac_reset;
+		unsigned int soft_int;
+
+		/* rx filter */
+		unsigned int rx_filter;
+
+		/* rx statistics */
 		unsigned int rx_total;
 		unsigned int rx_overruns;
-		unsigned int mac_reset;
+
+#ifdef CONFIG_CARL9170FW_TX_AMPDU
+		/* tx aggregate scheduling */
+		struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
+#endif /* CONFIG_CARL9170FW_TX_AMPDU */
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 		/* CAB */
-		struct dma_queue cab_queue;
-		unsigned int cab_queue_len,
-			     cab_flush_time;
-		enum carl9170_cab_trigger cab_flush_trigger;
+		struct dma_queue cab_queue[CARL9170_INTF_NUM];
+		unsigned int cab_queue_len[CARL9170_INTF_NUM];
+		unsigned int cab_flush_time;
+		enum carl9170_cab_trigger cab_flush_trigger[CARL9170_INTF_NUM];
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 		/* tx status */