X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=b24d905f5eba04f1de8b51ac3cf3f0f3048e5393;hb=1739e9d7c5d581c15d1ae331d83352f8998a6a83;hp=c35f5ad104a9cf4feaf6716c2419783f83e7d9af;hpb=8dc065b3012754fb34dcb04b7ce295cca4be0627;p=carl9170fw.git

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index c35f5ad..b24d905 100644
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -31,54 +31,10 @@
 #include "wl.h"
 #include "rf.h"
 #include "usb.h"
-#include "radar.h"
+#include "pattern_generator.h"
 
 #define AR9170_WATCH_DOG_TIMER		   0x100
 
-static void timer_init(const unsigned int timer, const unsigned int interval)
-{
-	/* Set timer to periodic mode */
-	orl(AR9170_TIMER_REG_CONTROL, BIT(timer));
-
-	/* Set time interval */
-	set(AR9170_TIMER_REG_TIMER0 + (timer << 2), interval - 1);
-
-	/* Clear timer interrupt flag */
-	orl(AR9170_TIMER_REG_INTERRUPT, BIT(timer));
-}
-
-void clock_set(enum cpu_clock_t clock_, bool on)
-{
-	/*
-	 * Word of Warning!
-	 * This setting does more than just mess with the CPU Clock.
-	 * So watch out, if you need _stable_ timer interrupts.
-	 */
-#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, 0x5163);
-#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
-
-	fw.ticks_per_usec = GET_VAL(AR9170_PWR_PLL_ADDAC_DIV,
-		get(AR9170_PWR_REG_PLL_ADDAC));
-
-	set(AR9170_PWR_REG_CLOCK_SEL, (uint32_t) ((on ? 0x70 : 0x600) | clock_));
-
-	switch (clock_) {
-	case AHB_20_22MHZ:
-		fw.ticks_per_usec >>= 1;
-	case AHB_40MHZ_OSC:
-	case AHB_40_44MHZ:
-		fw.ticks_per_usec >>= 1;
-	case AHB_80_88MHZ:
-		break;
-	}
-}
-
 static void init(void)
 {
 	led_init();
@@ -127,50 +83,15 @@ static void handle_fw(void)
 		reboot();
 }
 
-static void timer0_isr(void)
-{
-	wlan_timer();
-
-#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
-	gpio_timer();
-#endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
-
-#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 */
-}
-
-static void handle_timer(void)
-{
-	uint32_t intr;
-
-	intr = get(AR9170_TIMER_REG_INTERRUPT);
-
-	/* ACK timer interrupt */
-	set(AR9170_TIMER_REG_INTERRUPT, intr);
-
-#define HANDLER(intr, flag, func)			\
-	do {						\
-		if ((intr & flag) != 0) {		\
-			intr &= ~flag;			\
-			func();				\
-		}					\
-	} while (0)
-
-	HANDLER(intr, BIT(0), timer0_isr);
-
-	if (intr)
-		DBG("Unhandled Timer Event %x", (unsigned int) intr);
-
-#undef HANDLER
-}
-
 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;
@@ -181,37 +102,11 @@ 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++;
 }
 
-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 */
@@ -232,7 +127,7 @@ static void __noreturn main_loop(void)
 
 		tally_update();
 
-		radar_pattern_generator();
+		pattern_generator();
 	}
 }
 
@@ -246,7 +141,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);