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

diff --git a/ao_adc.c b/ao_adc.c
index d45e10b1..9cd3d46c 100644
--- a/ao_adc.c
+++ b/ao_adc.c
@@ -3,8 +3,7 @@
  *
  * 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,10 +17,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[AO_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 = AO_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,15 +57,16 @@ 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)
+		if (ao_adc_head == AO_ADC_RING)
 			ao_adc_head = 0;
 		ao_wakeup(ao_adc_ring);
 	}
 }
 
-void ao_adc_init(void)
+void
+ao_adc_init(void)
 {
 	ADCCFG = ((1 << 0) |	/* acceleration */
 		  (1 << 1) |	/* pressure */
@@ -57,17 +80,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));
-}
-