carl9170 firmware: checkpatch/style fixes

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

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index 475308be145f7ec5f68a2615701a11a7cf941296..17cbaf922d06500a76234b4e78988edfc19cc76f 100644 (file)
--- 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,36 @@ 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.
         */
-
-       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));
+#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)
@@ -144,6 +164,27 @@ 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 __noreturn main_loop(void)
 {
        /* main loop */
@@ -162,7 +203,7 @@ static void __noreturn main_loop(void)
 
                handle_timer();
 
-               fw.counter++;
+               tally_update();
        }
 }
 
@@ -176,7 +217,7 @@ static void __noreturn main_loop(void)
  * we put _start() there with the linker script carl9170.lds.
  */
 
-void start(void)
+void __section(boot) start(void)
 {
        clock_set(AHB_40MHZ_OSC, true);