altos: Don't use ao_data on cc1111 projects

cc1111 ao_adc.c supplies the needed globals at this point, and linking
both into the program leads to two different versions of each at
different addresses (yay SDCC linker!)

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 97a39c4d92a6f66a545253fc5e20a18c7286b32a..154296770c7dec724f824f2d09212d1790d58758 100644 (file)
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -19,6 +19,9 @@
 
 volatile __xdata struct ao_data        ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t                ao_data_head;
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+volatile __data uint8_t                ao_data_present;
+#endif
 
 #ifdef TELENANO_V_0_1
 # define AO_ADC_FIRST_PIN      1

diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
index 5550e17224b36c9d3c16d0ae000796fb08a382ea..40878778268af832cefd0aaa6030db6a286b6c9b 100644 (file)
--- a/src/telemini-v2.0/Makefile
+++ b/src/telemini-v2.0/Makefile
@@ -24,7 +24,8 @@ INC = \
        ao_product.h \
        ao_int64.h \
        ao_sample.h \
-       ao_exti.h
+       ao_exti.h \
+       ao_task.h
 
 CORE_SRC = \
        ao_cmd.c \
@@ -58,7 +59,6 @@ CC1111_SRC = \
        ao_spi.c \
        ao_usb.c \
        ao_convert_pa.c \
-       ao_data.c \
        ao_beep.c \
        ao_timer.c \
        ao_exti.c \