Add eeprom driver and command loop

[fw/altos] / ao_adc.c

diff --git a/ao_adc.c b/ao_adc.c
index f043b5a133a3d1b099e9793bcd02124ec14e9111..549cc9440847070868fa392d0423782e744da595 100644 (file)
--- a/ao_adc.c
+++ b/ao_adc.c
@@ -21,7 +21,30 @@
 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));
-}
-