X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=97a4331c285d1a9e91b0eb0376f0ebc844437d6c;hb=d57b31e45dca1087cefd56876a0a8064efe4e29c;hp=574154bafd1faaba526feb007e3f3bbd3009d764;hpb=f47f2e5344e6a07531825af13337aee8fdd45c68;p=carl9170fw.git

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index 574154b..97a4331 100644
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -29,6 +29,7 @@
 #include "printf.h"
 #include "gpio.h"
 #include "wl.h"
+#include "rf.h"
 #include "usb.h"
 
 #define AR9170_WATCH_DOG_TIMER		   0x100
@@ -45,17 +46,38 @@ static void timer_init(const unsigned int timer, const unsigned int interval)
 	orl(AR9170_TIMER_REG_INTERRUPT, BIT(timer));
 }
 
-void clock_set(enum cpu_clock_t _clock, bool on)
+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;
+	}
 
-	fw.ticks_per_msec = GET_VAL(AR9170_PWR_PLL_ADDAC_DIV, get(AR9170_PWR_REG_PLL_ADDAC)) >> 1;
-
-	set(AR9170_PWR_REG_CLOCK_SEL, (uint32_t) ((on ? 0x70 : 0x600) | _clock));
+	timer_init(1, (fw.ticks_per_usec * 25) >> 1);
 }
 
 static void init(void)
@@ -114,11 +136,19 @@ 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 */
 }
 
+static void timer1_isr(void)
+{
+}
+
 static void handle_timer(void)
 {
 	uint32_t intr;
@@ -138,6 +168,8 @@ 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);