carl9170 firmware: reorganize pattern generator

[carl9170fw.git] / carlfw / include / carl9170.h

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index df41f8461bf4e1acbfb1fadf7c63a2234de74e58..26a0975819b824f2229ed2028e8e67a7f62153dc 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -33,7 +33,6 @@
 #include "dma.h"
 #include "usb.h"
 #include "cmd.h"
-#include "radar.h"
 
 struct carl9170_bar_ctx {
        uint8_t ta[6];
@@ -42,13 +41,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 +115,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 +139,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 {