Merge branch 'master' into radar

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 6dfdf3e56df000087a3e7acdde93ebb49182be64..300d291a1c97d2a0e475813b7df3ca9e21aafe75 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -33,13 +33,13 @@
 #include "dma.h"
 #include "usb.h"
 #include "cmd.h"
+#include "radar.h"
 
 struct carl9170_bar_ctx {
        uint8_t ta[6];
        uint8_t ra[6];
        __le16 start_seq_num;
        __le16 control;
-       __le32 phy;
 };
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
@@ -143,6 +143,12 @@ struct firmware_context_struct {
                unsigned int ba_tail_idx,
                             ba_head_idx,
                             queued_ba;
+
+               unsigned int queued_bar;
+
+               unsigned int soft_radar,
+                            radar_last,
+                            pattern_index;
        } wlan;
 
        struct {