X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_adc.c;h=549cc9440847070868fa392d0423782e744da595;hp=d45e10b1f7de252000ff0ad9066f67bd879ced0a;hb=ac99982b10fd5772218660137ee21db9b90cd885;hpb=e14f07bfdb8824fc7ed6df1129c66ee39ffd6d54

diff --git a/ao_adc.c b/ao_adc.c
index d45e10b1..549cc944 100644
--- a/ao_adc.c
+++ b/ao_adc.c
@@ -18,10 +18,33 @@
 
 #include "ao.h"
 
-__xdata struct ao_adc	ao_adc_ring[ADC_RING];
-__data uint8_t		ao_adc_head;
+volatile __xdata struct ao_adc	ao_adc_ring[ADC_RING];
+volatile __data uint8_t		ao_adc_head;
 
-void ao_adc_isr(void) interrupt 1
+void
+ao_adc_poll(void)
+{
+	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
+}
+
+void
+ao_adc_sleep(void)
+{
+	ao_sleep(&ao_adc_ring);
+}
+
+void
+ao_adc_get(__xdata struct ao_adc *packet)
+{
+	uint8_t	i = ao_adc_head;
+	if (i == 0)
+		i = ADC_RING;
+	i--;
+	memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
+}
+
+void
+ao_adc_isr(void) interrupt 1
 {
 	uint8_t sequence;
 	uint8_t	__xdata *a;
@@ -35,7 +58,7 @@ void ao_adc_isr(void) interrupt 1
 		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
 	} else {
 		/* record this conversion series */
-		ao_adc_ring[ao_adc_head].tick = ao_time;
+		ao_adc_ring[ao_adc_head].tick = ao_time();
 		ao_adc_head++;
 		if (ao_adc_head == ADC_RING)
 			ao_adc_head = 0;
@@ -43,7 +66,8 @@ void ao_adc_isr(void) interrupt 1
 	}
 }
 
-void ao_adc_init(void)
+void
+ao_adc_init(void)
 {
 	ADCCFG = ((1 << 0) |	/* acceleration */
 		  (1 << 1) |	/* pressure */
@@ -57,17 +81,3 @@ void ao_adc_init(void)
 	IEN0 |= IEN0_ADCIE;
 }
 
-void ao_adc_poll(void)
-{
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
-}
-
-void ao_adc_get(__xdata struct ao_adc *packet)
-{
-	uint8_t	i = ao_adc_head;
-	if (i == 0)
-		i = ADC_RING;
-	i--;
-	memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
-}
-