X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_timer.c;h=eee5a6d4512c7ffa5a44080df9446153286586cd;hp=702159b73f64f0bb918a6e3417c3b971ff5c13a4;hb=ad0d2d88a91cbd02c56ea5ff6dab23e16aec6510;hpb=acc4fc635edb70ec1ba2dff9f7ac0c8542c72c47

diff --git a/ao_timer.c b/ao_timer.c
index 702159b7..eee5a6d4 100644
--- a/ao_timer.c
+++ b/ao_timer.c
@@ -19,15 +19,9 @@
 
 static volatile __data uint16_t ao_tick_count;
 
-uint16_t ao_time(void)
+uint16_t ao_time(void) __critical
 {
-	volatile bit ea_save;
-	__data uint16_t ret;
-	
-	ea_save = EA;
-	ret = ao_tick_count;
-	EA = ea_save;
-	return ret;
+	return ao_tick_count;
 }
 
 void
@@ -42,8 +36,8 @@ ao_delay(uint16_t ticks)
 #define T1_CLOCK_DIVISOR	8	/* 24e6/8 = 3e6 */
 #define T1_SAMPLE_TIME		30000	/* 3e6/30000 = 100 */
 
-__data uint8_t	ao_adc_interval = 1;
-__data uint8_t	ao_adc_count;
+volatile __data uint8_t	ao_adc_interval = 1;
+volatile __data uint8_t	ao_adc_count;
 
 void ao_timer_isr(void) interrupt 9
 {
@@ -55,6 +49,12 @@ void ao_timer_isr(void) interrupt 9
 	ao_wakeup(DATA_TO_XDATA(&ao_tick_count));
 }
 
+void
+ao_timer_set_adc_interval(uint8_t interval) __critical
+{
+	ao_adc_interval = interval;
+}
+
 void
 ao_timer_init(void)
 {
@@ -65,7 +65,7 @@ ao_timer_init(void)
 
 	/* set the sample rate */
 	T1CC0H = T1_SAMPLE_TIME >> 8;
-	T1CC0L = T1_SAMPLE_TIME;
+	T1CC0L = (uint8_t) T1_SAMPLE_TIME;
 
 	T1CCTL0 = T1CCTL_MODE_COMPARE;
 	T1CCTL1 = 0;