altos/stm-demo: Make this build again after various API and CFLAGS changes

[fw/altos] / src / stm-demo / ao_demo.c

diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index db432c2ae91a6f257a6a02847aa88f02c868e7ff..93eb92f48c238e8d2ee698bf824cca5c80ec58b3 100644 (file)
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -27,35 +27,6 @@ struct ao_task demo_task;
 
 static inline int min(int a, int b) { return a < b ? a : b; }
 
-void
-ao_demo(void)
-{
-       char    message[] = "Hello, Mike & Bdale --- ";
-       char    part[7];
-       int     i = 0;
-       int     len = sizeof(message) - 1;
-       int     first, second;
-
-       part[6] = '\0';
-       for (;;) {
-               ao_delay(AO_MS_TO_TICKS(150));
-               first = min(6, len - i);
-               second = 6 - first;
-               memcpy(part, message + i, first);
-               memcpy(part + first, message, second);
-               ao_lcd_font_string(part);
-               if (++i >= len)
-                       i = 0;
-       }
-}
-
-void _close() { }
-void _sbrk() { }
-void _isatty() { }
-void _lseek() { }
-void _exit () { }
-void _read () { }
-void _fstat() { }
 
 #define AO_DMA_TEST_INDEX      STM_DMA_INDEX(4)
 
@@ -125,7 +96,7 @@ ao_i2c_write(void) {
        for (i = 0; i < 10; i++) {
                ao_i2c_get(0);
                if (ao_i2c_start(0, 0x55))
-                       ao_i2c_send(data, 4, 0, TRUE);
+                       ao_i2c_send(data, 4, 0, true);
                else {
                        printf ("i2c start failed\n");
                        ao_i2c_put(0);
@@ -197,7 +168,7 @@ ao_blink_toggle(void)
 }
 
 
-__code struct ao_cmds ao_demo_cmds[] = {
+const struct ao_cmds ao_demo_cmds[] = {
        { ao_dma_test,  "D\0DMA test" },
        { ao_spi_write, "W\0SPI write" },
        { ao_spi_read, "R\0SPI read" },
@@ -215,7 +186,7 @@ main(void)
        
        ao_task_init();
 
-       ao_led_init(LEDS_AVAILABLE);
+       ao_led_init();
        ao_led_on(AO_LED_GREEN);
        ao_led_off(AO_LED_BLUE);
        ao_timer_init();
@@ -223,11 +194,12 @@ main(void)
        ao_cmd_init();
 //     ao_lcd_stm_init();
 //     ao_lcd_font_init();
-//     ao_spi_init();
+       ao_spi_init();
 //     ao_i2c_init();
 //     ao_exti_init();
 //     ao_quadrature_init();
 //     ao_button_init();
+       ao_storage_init();
 
 //     ao_timer_set_adc_interval(100);