altos: ADS124S0X driver compiles now

[fw/altos] / src / stm / ao_adc_single_stm.c

diff --git a/src/stm/ao_adc_single_stm.c b/src/stm/ao_adc_single_stm.c
index 907a064efe0e8a24915f267c30cd67cbf84be397..c3a332f4f19dd58bc97e6f3c3880f2bb3c5947e1 100644 (file)
--- a/src/stm/ao_adc_single_stm.c
+++ b/src/stm/ao_adc_single_stm.c
@@ -18,6 +18,7 @@
 
 #include <ao.h>
 #include <ao_data.h>
+#include <ao_adc_single.h>
 
 static uint8_t                 ao_adc_ready;
 
@@ -87,72 +88,6 @@ ao_adc_single_get(struct ao_adc *packet)
        ao_arch_release_interrupts();
 }
 
-#ifdef AO_ADC_SQ1_NAME
-static const char *ao_adc_name[AO_NUM_ADC] = {
-       AO_ADC_SQ1_NAME,
-#ifdef AO_ADC_SQ2_NAME
-       AO_ADC_SQ2_NAME,
-#endif
-#ifdef AO_ADC_SQ3_NAME
-       AO_ADC_SQ3_NAME,
-#endif
-#ifdef AO_ADC_SQ4_NAME
-       AO_ADC_SQ4_NAME,
-#endif
-#ifdef AO_ADC_SQ5_NAME
-       AO_ADC_SQ5_NAME,
-#endif
-#ifdef AO_ADC_SQ6_NAME
-       AO_ADC_SQ6_NAME,
-#endif
-#ifdef AO_ADC_SQ7_NAME
-       AO_ADC_SQ7_NAME,
-#endif
-#ifdef AO_ADC_SQ8_NAME
-       AO_ADC_SQ8_NAME,
-#endif
-#ifdef AO_ADC_SQ9_NAME
-       AO_ADC_SQ9_NAME,
-#endif
-#ifdef AO_ADC_SQ10_NAME
-       AO_ADC_SQ10_NAME,
-#endif
-#ifdef AO_ADC_SQ11_NAME
-       AO_ADC_SQ11_NAME,
-#endif
-#ifdef AO_ADC_SQ12_NAME
-       AO_ADC_SQ12_NAME,
-#endif
-#ifdef AO_ADC_SQ13_NAME
-       AO_ADC_SQ13_NAME,
-#endif
-#ifdef AO_ADC_SQ14_NAME
-       AO_ADC_SQ14_NAME,
-#endif
-#ifdef AO_ADC_SQ15_NAME
-       AO_ADC_SQ15_NAME,
-#endif
-#ifdef AO_ADC_SQ16_NAME
-       AO_ADC_SQ16_NAME,
-#endif
-#ifdef AO_ADC_SQ17_NAME
-       AO_ADC_SQ17_NAME,
-#endif
-#ifdef AO_ADC_SQ18_NAME
-       AO_ADC_SQ18_NAME,
-#endif
-#ifdef AO_ADC_SQ19_NAME
-       AO_ADC_SQ19_NAME,
-#endif
-#ifdef AO_ADC_SQ20_NAME
-       AO_ADC_SQ20_NAME,
-#endif
-#ifdef AO_ADC_SQ21_NAME
-       #error "too many ADC names"
-#endif
-};
-#endif
-
 static void
 ao_adc_dump(void)
 {
@@ -161,7 +96,7 @@ ao_adc_dump(void)
        AO_ADC_DUMP(&packet);
 }
 
-__code struct ao_cmds ao_adc_cmds[] = {
+const struct ao_cmds ao_adc_cmds[] = {
        { ao_adc_dump,  "a\0Display current ADC values" },
        { 0, NULL },
 };