X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=b24d905f5eba04f1de8b51ac3cf3f0f3048e5393;hb=1739e9d7c5d581c15d1ae331d83352f8998a6a83;hp=50415fedbbb760e77ef29ec6fede2b9f1a907cb7;hpb=6ab15e7eeb60d71950cba1931dc5b03ff8163e5b;p=carl9170fw.git diff --git a/carlfw/src/main.c b/carlfw/src/main.c index 50415fe..b24d905 100644 --- a/carlfw/src/main.c +++ b/carlfw/src/main.c @@ -31,7 +31,7 @@ #include "wl.h" #include "rf.h" #include "usb.h" -#include "radar.h" +#include "pattern_generator.h" #define AR9170_WATCH_DOG_TIMER 0x100 @@ -107,38 +107,6 @@ static void tally_update(void) fw.counter++; } -#ifdef CONFIG_CARL9170FW_RADAR -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(0x1C3BC0, pattern->pulse_pattern); - set(0x1C3BBC, pattern->pulse_mode); - udelay(pattern->pulse_width); - set(0x1C3BBC, ~pattern->pulse_mode); - fw.wlan.pattern_index++; - } - } - } -} -#else -static void radar_pattern_generator(void) -{ -} -#endif /* CONFIG_CARL9170FW_RADAR */ - static void __noreturn main_loop(void) { /* main loop */ @@ -159,7 +127,7 @@ static void __noreturn main_loop(void) tally_update(); - radar_pattern_generator(); + pattern_generator(); } }