carl9170 firmware: 5/10 MHz Channel Support for carl9170

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

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index e36dfad2df0013ad7d22567b63754bf5065db7f3..47b4da449356004cc5e7dbb49c91ff05e235f55d 100644 (file)
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -84,10 +84,13 @@ static void handle_fw(void)
 
 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;
@@ -98,7 +101,7 @@ 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++;
 }
@@ -137,7 +140,7 @@ static void __noreturn main_loop(void)
 
 void __section(boot) __noreturn __visible start(void)
 {
-       clock_set(AHB_40MHZ_OSC, true);
+       clock_set(AHB_40MHZ_OSC, true, 0);
 
        /* watchdog magic pattern check */
        if ((get(AR9170_PWR_REG_WATCH_DOG_MAGIC) & 0xffff0000) == 0x12340000) {