altos: Remove 8051 address space specifiers

[fw/altos] / src / avr / ao_adc_avr.c

diff --git a/src/avr/ao_adc_avr.c b/src/avr/ao_adc_avr.c
index 9f45acaf04f8a5fc40aacd66a994537999b1fbae..2aae95ace70054fb14a14ac83868fad43f9569f6 100644 (file)
--- a/src/avr/ao_adc_avr.c
+++ b/src/avr/ao_adc_avr.c
@@ -3,7 +3,8 @@
  *
  * 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; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,10 @@
  */
 
 #include "ao.h"
+#include "ao_pwmin.h"
 
-volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
-volatile __data uint8_t                ao_adc_head;
+volatile struct ao_data        ao_data_ring[AO_DATA_RING];
+volatile uint8_t               ao_data_head;
 
 #ifdef TELESCIENCE
 const uint8_t  adc_channels[AO_LOG_TELESCIENCE_NUM_ADC] = {
@@ -47,6 +49,7 @@ const uint8_t adc_channels[AO_TELEPYRO_NUM_ADC] = {
        0x23,   /* ADC11 sense_e */
        0x22,   /* ADC10 sense_f */
        0x21,   /* ADC9 sense_g */
+       0x20,   /* ADC8 sense_h */
 };
 #endif
 
@@ -65,7 +68,7 @@ static uint8_t        ao_adc_channel;
 
 #define ADCSRB_INIT    ((0 << ADHSM) |         /* No high-speed mode */ \
                         (0 << ACME) |          /* Some comparitor thing */ \
-                        (2 << ADTS0))          /* Free running mode (don't care) */
+                        (0 << ADTS0))          /* Free running mode (don't care) */
 
 static void
 ao_adc_start(void)
@@ -91,14 +94,18 @@ ISR(ADC_vect)
        /* Must read ADCL first or the value there will be lost */
        value = ADCL;
        value |= (ADCH << 8);
-       ao_adc_ring[ao_adc_head].adc[ao_adc_channel] = value;
-       if (++ao_adc_channel < NUM_ADC)
+       ao_data_ring[ao_data_head].adc.adc[ao_adc_channel] = value;
+       if (++ao_adc_channel < NUM_ADC - HAS_ICP3_COUNT)
                ao_adc_start();
        else {
+#if HAS_ICP3_COUNT
+               /* steal last adc channel for pwm input */
+               ao_data_ring[ao_data_head].adc.adc[ao_adc_channel] = ao_icp3_count;
+#endif
                ADCSRA = ADCSRA_INIT;
-               ao_adc_ring[ao_adc_head].tick = ao_time();
-               ao_adc_head = ao_adc_ring_next(ao_adc_head);
-               ao_wakeup((void *) &ao_adc_head);
+               ao_data_ring[ao_data_head].tick = ao_time();
+               ao_data_head = ao_data_ring_next(ao_data_head);
+               ao_wakeup((void *) &ao_data_head);
                ao_cpu_sleep_disable = 0;
        }
 }
@@ -112,32 +119,33 @@ ao_adc_poll(void)
 }
 
 void
-ao_adc_get(__xdata struct ao_adc *packet)
+ao_data_get(struct ao_data *packet)
 {
-       uint8_t i = ao_adc_ring_prev(ao_adc_head);
-       memcpy(packet, (void *) &ao_adc_ring[i], sizeof (struct ao_adc));
+       uint8_t i = ao_data_ring_prev(ao_data_head);
+       memcpy(packet, (void *) &ao_data_ring[i], sizeof (struct ao_data));
 }
 
 static void
-ao_adc_dump(void) __reentrant
+ao_adc_dump(void) 
 {
-       static __xdata struct ao_adc    packet;
+       static struct ao_data   packet;
        uint8_t i;
-       ao_adc_get(&packet);
+       ao_data_get(&packet);
        printf("tick: %5u",  packet.tick);
        for (i = 0; i < NUM_ADC; i++)
-               printf (" %2d: %5u", i, packet.adc[i]);
-       printf ("\n");
+               printf (" %2d: %5u", i, packet.adc.adc[i]);
+       printf("\n");
 }
 
-__code struct ao_cmds ao_adc_cmds[] = {
-       { ao_adc_dump,  "a\0Display current ADC values" },
+const struct ao_cmds ao_adc_cmds[] = {
+       { ao_adc_dump,  "a\0ADC" },
        { 0, NULL },
 };
 
 void
 ao_adc_init(void)
 {
+       PRR0 &= ~(1 << PRADC);
        DIDR0 = 0xf3;
        DIDR2 = 0x3f;
        ADCSRB = ADCSRB_INIT;