altos: Switch to newlib-nano for libc on arm

[fw/altos] / src / kernel / ao_stdio.c

diff --git a/src/kernel/ao_stdio.c b/src/kernel/ao_stdio.c
index b79d465afa4975180faab8b3589b4d97bb210d52..227499c81524ae4a3d521bf25ad4a460f7882cd5 100644 (file)
--- a/src/kernel/ao_stdio.c
+++ b/src/kernel/ao_stdio.c
@@ -55,6 +55,9 @@
 #ifndef PACKET_HAS_SLAVE
 #define PACKET_HAS_SLAVE       0
 #endif
+#ifndef CONSOLE_STDIN
+#define CONSOLE_STDIN          0
+#endif
 
 #define USE_SERIAL_STDIN (USE_SERIAL_0_STDIN + \
                          USE_SERIAL_1_STDIN +  \
@@ -67,7 +70,7 @@
                          USE_SERIAL_8_STDIN +  \
                          USE_SERIAL_9_STDIN)
 
-#define AO_NUM_STDIOS  (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
+#define AO_NUM_STDIOS  (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN + CONSOLE_STDIN)
 
 __xdata struct ao_stdio ao_stdios[AO_NUM_STDIOS];
 
@@ -80,8 +83,8 @@ __pdata int8_t ao_cur_stdio;
 #define ao_num_stdios  0
 #endif
 
-void
-putchar(char c)
+int
+ao_putchar(char c)
 {
 #if LOW_LEVEL_DEBUG
        if (!ao_cur_task) {
@@ -89,12 +92,13 @@ putchar(char c)
                if (c == '\n')
                        ao_debug_out('\r');
                ao_debug_out(c);
-               return;
+               return 0;
        }
 #endif
        if (c == '\n')
                (*ao_stdios[ao_cur_stdio].putchar)('\r');
        (*ao_stdios[ao_cur_stdio].putchar)(c);
+       return 0;
 }
 
 void
@@ -107,7 +111,7 @@ flush(void)
 __xdata uint8_t ao_stdin_ready;
 
 char
-getchar(void) __reentrant
+ao_getchar(void) __reentrant
 {
        int c;
        int8_t stdio;
@@ -155,3 +159,33 @@ ao_add_stdio(int (*_pollchar)(void),
        return 0;
 #endif
 }
+
+/*
+ * Basic I/O functions to support newlib tinystdio package
+ */
+
+static int
+ao_putc(char c, FILE *ignore)
+{
+       (void) ignore;
+       return ao_putchar(c);
+}
+
+static int
+ao_getc(FILE *ignore)
+{
+       (void) ignore;
+       return ao_getchar();
+}
+
+static int
+ao_flushc(FILE *ignore)
+{
+       (void) ignore;
+       flush();
+       return 0;
+}
+
+static FILE __stdio = FDEV_SETUP_STREAM(ao_putc, ao_getc, ao_flushc, _FDEV_SETUP_RW);
+
+FILE *const __iob[3] = { &__stdio, &__stdio, &__stdio };