carl9170 firmware: refactor timer functions

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

diff --git a/carlfw/src/timer.c b/carlfw/src/timer.c
index 7cbd196dbb65ff716c9c0ae350ecd10b179b8d99..95058183cbd97245fa9b2ac793b81b578b861d62 100644 (file)
--- a/carlfw/src/timer.c
+++ b/carlfw/src/timer.c
@@ -1,12 +1,12 @@
 /*
  * carl9170 firmware - used by the ar9170 wireless device
  *
- * Clock, Timer & Timing functions
+ * timer code
  *
  * Copyright (c) 2000-2005 ZyDAS Technology Corporation
  * Copyright (c) 2007-2009 Atheros Communications, Inc.
  * Copyright   2009    Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2012 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,10 +24,10 @@
  */
 
 #include "carl9170.h"
-#include "printf.h"
 #include "timer.h"
-#include "wl.h"
 #include "gpio.h"
+#include "printf.h"
+#include "wl.h"
 
 void timer_init(const unsigned int timer, const unsigned int interval)
 {
@@ -41,33 +41,36 @@ void timer_init(const unsigned int timer, const unsigned int interval)
        orl(AR9170_TIMER_REG_INTERRUPT, BIT(timer));
 }
 
-static void clock_calibrate(void)
-{
-       uint32_t t0, loop = 13;
-
-       t0 = get_clock_counter();
-
-       /*
-        * TODO:
-        * Write this code in assembler, so the reading is accurate
-        * and can be used to correct the timer intervals.
-        */
-       while (((get_clock_counter() - t0) & (BIT(18)-1)) < 1000)
-               loop += 9;      /* really rough uOP estimation */
-
-       fw.bogoclock = loop;
-}
-
-void clock_set(const bool on, const enum cpu_clock_t _clock)
+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.
         */
-
-       set(AR9170_PWR_REG_CLOCK_SEL, (uint32_t) ((on ? 0x70 : 0x600) | _clock));
-       clock_calibrate();
+#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 timer0_isr(void)