Switch from GPLv2 to GPLv2+

[fw/altos] / src / cc1111 / ao_timer.c

diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index d681f51bb6689e224bbf2aa259f230a4fd182801..0acef562608f7760104ae230e837b7aa90856eb5 100644 (file)
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -3,7 +3,8 @@
  *
  * 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
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -83,6 +84,11 @@ ao_timer_init(void)
        T1CTL = T1CTL_MODE_MODULO | T1CTL_DIV_8;
 }
 
+#ifndef NEEDS_CC1111_CLOCK_HACK
+#define NEEDS_CC1111_CLOCK_HACK                1
+#endif
+
+#if NEEDS_CC1111_CLOCK_HACK
 static void
 ao_clock_delay(void)
 {
@@ -91,6 +97,7 @@ ao_clock_delay(void)
        while (--i)
                ao_arch_nop();
 }
+#endif
 
 /*
  * AltOS always cranks the clock to the max frequency
@@ -98,6 +105,7 @@ ao_clock_delay(void)
 void
 ao_clock_init(void)
 {
+#if NEEDS_CC1111_CLOCK_HACK
        /* Power up both oscillators */
        SLEEP &= ~(SLEEP_OSC_PD);
 
@@ -115,16 +123,18 @@ ao_clock_init(void)
         */
 
        ao_clock_delay();
+#endif
 
        /* Switch system clock to crystal oscilator */
        CLKCON = (CLKCON & ~CLKCON_OSC_MASK) | (CLKCON_OSC_XTAL);
 
+       /* Wait for the HFRC oscillator to be stable */
+       while (!(SLEEP & SLEEP_XOSC_STB))
+               ;
+
        /* Power down the unused HFRC oscillator */
        SLEEP |= SLEEP_OSC_PD;
 
-       /* Wait for HFRC to power down */
-       while ((SLEEP & SLEEP_HFRC_STB) != 0)
-               ;
        /* Crank up the timer tick and system clock speed */
        CLKCON = ((CLKCON & ~(CLKCON_TICKSPD_MASK | CLKCON_CLKSPD_MASK)) |
                  (CLKCON_TICKSPD_1 | CLKCON_CLKSPD_1));