X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=carlfw%2Finclude%2Fcarl9170.h;h=ed5120df22ba1b88a0e07358e0d740ee2694cd48;hb=f2a29506f1066b49129ae11d546a344f33ae37fc;hp=df41f8461bf4e1acbfb1fadf7c63a2234de74e58;hpb=58c26fc2140754c7af1e723b7840246edf5744d9;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index df41f84..ed5120d 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -42,13 +42,11 @@ struct carl9170_bar_ctx {
 	__le16 control;
 };
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 enum carl9170_cab_trigger {
 	CARL9170_CAB_TRIGGER_EMPTY	= 0,
 	CARL9170_CAB_TRIGGER_ARMED	= BIT(0),
 	CARL9170_CAB_TRIGGER_DEFER	= BIT(1),
 };
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 enum carl9170_ep0_action {
 	CARL9170_EP0_NO_ACTION		= 0,
@@ -118,13 +116,11 @@ struct firmware_context_struct {
 		/* tx sequence control counters */
 		unsigned int sequence[CARL9170_INTF_NUM];
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 		/* CAB */
 		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 */
 		unsigned int tx_status_pending,
@@ -144,9 +140,13 @@ struct firmware_context_struct {
 			     ba_head_idx,
 			     queued_ba;
 
+		unsigned int queued_bar;
+
+#ifdef CONFIG_CARL9170FW_RADAR
 		unsigned int soft_radar,
 			     radar_last,
 			     pattern_index;
+#endif /* CONFIG_CARL9170FW_RADAR */
 	} wlan;
 
 	struct {