Merge branch 'master' into radar

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

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index 2c8ea9a30540acf7cf2744e9599943e4ad4caa37..c35f5ad104a9cf4feaf6716c2419783f83e7d9af 100644 (file)
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -29,7 +29,9 @@
 #include "printf.h"
 #include "gpio.h"
 #include "wl.h"
+#include "rf.h"
 #include "usb.h"
+#include "radar.h"
 
 #define AR9170_WATCH_DOG_TIMER            0x100
 
@@ -52,10 +54,14 @@ void clock_set(enum cpu_clock_t clock_, bool on)
         * This setting does more than just mess with the CPU Clock.
         * So watch out, if you need _stable_ timer interrupts.
         */
-        if (fw.phy.frequency < 3000000)
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
+       if (fw.phy.frequency < 3000000)
                set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);
-        else
-                set(AR9170_PWR_REG_PLL_ADDAC, 0x5143);
+       else
+               set(AR9170_PWR_REG_PLL_ADDAC, 0x5143);
+#else
+       set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 
        fw.ticks_per_usec = GET_VAL(AR9170_PWR_PLL_ADDAC_DIV,
                get(AR9170_PWR_REG_PLL_ADDAC));
@@ -71,8 +77,6 @@ void clock_set(enum cpu_clock_t clock_, bool on)
        case AHB_80_88MHZ:
                break;
        }
-
-       timer_init(1, (fw.ticks_per_usec * 25) >> 1);
 }
 
 static void init(void)
@@ -136,10 +140,6 @@ static void timer0_isr(void)
 #endif /* CONFIG_CARL9170FW_DEBUG_LED_HEARTBEAT */
 }
 
-static void timer1_isr(void)
-{
-}
-
 static void handle_timer(void)
 {
        uint32_t intr;
@@ -159,14 +159,59 @@ static void handle_timer(void)
 
        HANDLER(intr, BIT(0), timer0_isr);
 
-       HANDLER(intr, BIT(1), timer1_isr);
-
        if (intr)
                DBG("Unhandled Timer Event %x", (unsigned int) intr);
 
 #undef HANDLER
 }
 
+static void tally_update(void)
+{
+       unsigned int boff, time, delta;
+
+       time = get_clock_counter();
+       if (fw.phy.state == CARL9170_PHY_ON) {
+               delta = (time - fw.tally_clock);
+
+               fw.tally.active += delta;
+
+               boff = get(AR9170_MAC_REG_BACKOFF_STATUS);
+               if (boff & AR9170_MAC_BACKOFF_TX_PE)
+                       fw.tally.tx_time += delta;
+               if (boff & AR9170_MAC_BACKOFF_CCA)
+                       fw.tally.cca += delta;
+       }
+
+       fw.tally_clock = time;
+       fw.counter++;
+}
+
+static void radar_pattern_generator(void)
+{
+       if (fw.phy.state == CARL9170_PHY_ON) {
+               if (fw.wlan.soft_radar == NO_RADAR ||
+                   fw.wlan.soft_radar >= __CARL9170FW_NUM_RADARS)
+                       return;
+
+               const struct radar_info *radar = &radars[fw.wlan.soft_radar];
+               if (radar->pulses >= fw.wlan.pattern_index) {
+                       fw.wlan.pattern_index = 0;
+               }
+
+               if (radar->pulses > fw.wlan.pattern_index) {
+                       const struct radar_info_pattern *pattern = &radar->pattern[fw.wlan.pattern_index];
+                       if (is_after_usecs(fw.wlan.radar_last, pattern->pulse_interval)) {
+                               fw.wlan.radar_last = get_clock_counter();
+                               //set(PATTERN, pattern->pulse_pattern);
+                               //set(MODE, pattern->pulse_mode);
+                               udelay(pattern->pulse_width);
+                               //set(MODE, ~pattern->pulse_mode);
+                               fw.wlan.pattern_index++;
+                       }
+               }
+       }
+}
+
 static void __noreturn main_loop(void)
 {
        /* main loop */
@@ -185,7 +230,9 @@ static void __noreturn main_loop(void)
 
                handle_timer();
 
-               fw.counter++;
+               tally_update();
+
+               radar_pattern_generator();
        }
 }