X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=b61189bb2bf0530867cb7e661d23dc2c5ed6c893;hb=1b87ea4a51988adea4d112ada0cb749c8059353c;hp=2ae4f630e3d10e717c21b318d64d3b157cd0c183;hpb=93192408781150af7e10a1d0970b9497940579dc;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 2ae4f63..b61189b 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -45,9 +45,8 @@ struct carl9170_bar_ctx {
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 enum carl9170_cab_trigger {
 	CARL9170_CAB_TRIGGER_EMPTY	= 0,
-	CARL9170_CAB_TRIGGER_READY	= BIT(0),
-	CARL9170_CAB_TRIGGER_ARMED	= BIT(1),
-	CARL9170_CAB_TRIGGER_DEFER	= BIT(2),
+	CARL9170_CAB_TRIGGER_ARMED	= BIT(0),
+	CARL9170_CAB_TRIGGER_DEFER	= BIT(1),
 };
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
@@ -71,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 */
@@ -98,9 +97,20 @@ 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 */