carl9170 firmware: reorganize pattern generator

[carl9170fw.git] / carlfw / src / main.c

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index e36dfad2df0013ad7d22567b63754bf5065db7f3..fc44d50af2fddcddf5be8d1d7e74c902838bd761 100644 (file)
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -31,6 +31,7 @@
 #include "wl.h"
 #include "rf.h"
 #include "usb.h"
+#include "pattern_generator.h"
 
 #define AR9170_WATCH_DOG_TIMER            0x100
 
@@ -84,10 +85,13 @@ static void handle_fw(void)
 
 static void tally_update(void)
 {
-       unsigned int boff, time, delta;
+       unsigned int time;
 
        time = get_clock_counter();
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
        if (fw.phy.state == CARL9170_PHY_ON) {
+               unsigned int boff, delta;
+
                delta = (time - fw.tally_clock);
 
                fw.tally.active += delta;
@@ -98,7 +102,7 @@ static void tally_update(void)
                if (boff & AR9170_MAC_BACKOFF_CCA)
                        fw.tally.cca += delta;
        }
-
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
        fw.tally_clock = time;
        fw.counter++;
 }
@@ -122,6 +126,8 @@ static void __noreturn main_loop(void)
                handle_timer();
 
                tally_update();
+
+               radar_pattern_generator();
        }
 }