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

diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index d681f51b..a3d454da 100644
--- 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
@@ -61,7 +62,7 @@ ao_timer_init(void)
 	/* NOTE:  This uses a timer only present on cc1111 architecture. */
 
 	/* disable timer 1 */
-	T1CTL = 0;
+/*	T1CTL = 0; */
 
 	/* set the sample rate */
 	T1CC0H = T1_SAMPLE_TIME >> 8;
@@ -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));