X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=97c570577835071c2ece4fe598c4d7a68157e3d5;hb=c1d4716037319ad03fa29cbe56d7cb8c3af67472;hp=c85a4f31c529ce737e7da8fdefe284ae5196b65e;hpb=1dbab55a460484fd655c44c99fc192b9e3702485;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index c85a4f3..97c5705 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -70,7 +70,6 @@ enum carl9170_mac_reset_state {
 
 struct firmware_context_struct {
 	/* timer / clocks */
-	unsigned int bogoclock;			/* supposed to be CPU clock in KHz */
 	unsigned int counter;			/* main() cycles */
 
 	/* misc */
@@ -97,16 +96,18 @@ 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 rx_filter;
 		unsigned int rx_total;
 		unsigned int rx_overruns;
 		unsigned int mac_reset;
+		unsigned int soft_int;
 
 #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 */
@@ -157,9 +158,6 @@ struct firmware_context_struct {
 		uint8_t put_buffer[CARL9170_MAX_CMD_PAYLOAD_LEN];
 #endif /* CONFIG_CARL9170FW_DEBUG_USB */
 
-#ifdef CONFIG_CARL9170FW_USB_WATCHDOG
-		struct carl9170_watchdog_cmd watchdog;
-#endif /* CONFIG CARL9170FW_USB_WATCHDOG */
 	} usb;
 
 	struct {