X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_timer.c;h=2fbc6621dfdf43c9b989f5d1cbad0092b8498a9f;hp=d681f51bb6689e224bbf2aa259f230a4fd182801;hb=940ec6a2d5b054f68da39945a00f4d1b36d1b318;hpb=feb0b5f8b28767197f87e5818812d6640c1f40e6

diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index d681f51b..2fbc6621 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -83,6 +83,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 +96,7 @@ ao_clock_delay(void)
 	while (--i)
 		ao_arch_nop();
 }
+#endif
 
 /*
  * AltOS always cranks the clock to the max frequency
@@ -98,6 +104,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 +122,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));