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

diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index aadee71e..d681f51b 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -17,23 +17,13 @@
 
 #include "ao.h"
 
-static volatile __data uint16_t ao_tick_count;
+volatile __data uint16_t ao_tick_count;
 
 uint16_t ao_time(void) __critical
 {
 	return ao_tick_count;
 }
 
-static __xdata uint8_t ao_forever;
-
-void
-ao_delay(uint16_t ticks)
-{
-	ao_alarm(ticks);
-	ao_sleep(&ao_forever);
-	ao_clear_alarm();
-}
-
 #define T1_CLOCK_DIVISOR	8	/* 24e6/8 = 3e6 */
 #define T1_SAMPLE_TIME		30000	/* 3e6/30000 = 100 */
 
@@ -49,6 +39,9 @@ void ao_timer_isr(void) __interrupt 9
 	if (++ao_adc_count == ao_adc_interval) {
 		ao_adc_count = 0;
 		ao_adc_poll();
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+		ao_wakeup(DATA_TO_XDATA(&ao_adc_count));
+#endif
 	}
 #endif
 }
@@ -90,18 +83,48 @@ ao_timer_init(void)
 	T1CTL = T1CTL_MODE_MODULO | T1CTL_DIV_8;
 }
 
+static void
+ao_clock_delay(void)
+{
+	uint16_t	i = 0;
+
+	while (--i)
+		ao_arch_nop();
+}
+
 /*
  * AltOS always cranks the clock to the max frequency
  */
 void
 ao_clock_init(void)
 {
+	/* Power up both oscillators */
+	SLEEP &= ~(SLEEP_OSC_PD);
+
+	/* Switch to the HFRC oscillator */
+	CLKCON = (CLKCON & ~CLKCON_OSC_MASK) | (CLKCON_OSC_RC);
+
+	/* Wait for the HFRC oscillator to be stable */
+	while (!(SLEEP & SLEEP_HFRC_STB))
+		;
+
+	/* Delay for 'a while' waiting for the crystal to
+	 * stabilize -- the XOSC_STB bit isn't reliable
+	 *
+	 *  http://www.ti.com/lit/er/swrz022c/swrz022c.pdf
+	 */
+
+	ao_clock_delay();
+
 	/* Switch system clock to crystal oscilator */
 	CLKCON = (CLKCON & ~CLKCON_OSC_MASK) | (CLKCON_OSC_XTAL);
 
-	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));