X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=2f63ae0b5d0b46d049ac8dfbe9b6d68120df7dd6;hb=d7eb06db9a6f2a82ae3aacc8e01faacc53b370d9;hp=92b74a0a12a37316d930fccb3ecef19746940cbd;hpb=ab43d8cf291c5a517841ac0ae445c9bc6d74cf5c;p=carl9170fw.git

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index 92b74a0..2f63ae0 100644
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -31,6 +31,7 @@
 #include "wl.h"
 #include "rf.h"
 #include "usb.h"
+#include "radar.h"
 
 #define AR9170_WATCH_DOG_TIMER		   0x100
 
@@ -54,10 +55,10 @@ void clock_set(enum cpu_clock_t clock_, bool on)
 	 * So watch out, if you need _stable_ timer interrupts.
 	 */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
-        if (fw.phy.frequency < 3000000)
+	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 */
@@ -134,10 +135,6 @@ static void timer0_isr(void)
 	gpio_timer();
 #endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
 
-#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
-	tally_update();
-#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
-
 #ifdef CONFIG_CARL9170FW_DEBUG_LED_HEARTBEAT
 	set(AR9170_GPIO_REG_PORT_DATA, get(AR9170_GPIO_REG_PORT_DATA) ^ 1);
 #endif /* CONFIG_CARL9170FW_DEBUG_LED_HEARTBEAT */
@@ -168,6 +165,53 @@ static void handle_timer(void)
 #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 */
@@ -186,7 +230,9 @@ static void __noreturn main_loop(void)
 
 		handle_timer();
 
-		fw.counter++;
+		tally_update();
+
+		radar_pattern_generator();
 	}
 }
 
@@ -200,7 +246,7 @@ static void __noreturn main_loop(void)
  * we put _start() there with the linker script carl9170.lds.
  */
 
-void __section(boot) start(void)
+void __section(boot) __noreturn __visible start(void)
 {
 	clock_set(AHB_40MHZ_OSC, true);