altos: Make cmd echo per-connection instead of global

[fw/altos] / src / ao_stdio.c

diff --git a/src/ao_stdio.c b/src/ao_stdio.c
index 3dd457f7c63959d6da9b70363aca0d4db44960e4..ec3b6607b2e8cfb5ea1cf567a9ea98d22b2eda46 100644 (file)
--- a/src/ao_stdio.c
+++ b/src/ao_stdio.c
@@ -23,7 +23,7 @@
 
 #define AO_NUM_STDIOS  (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
 
 
 #define AO_NUM_STDIOS  (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
 

-static __xdata struct ao_stdio stdios[AO_NUM_STDIOS];
+__xdata struct ao_stdio ao_stdios[AO_NUM_STDIOS];

 __data int8_t ao_cur_stdio;
 __data int8_t ao_num_stdios;
 
 __data int8_t ao_cur_stdio;
 __data int8_t ao_num_stdios;
 


@@ -31,15 +31,15 @@ void
 putchar(char c)
 {
        if (c == '\n')
 putchar(char c)
 {
        if (c == '\n')

-               (*stdios[ao_cur_stdio].putchar)('\r');
-       (*stdios[ao_cur_stdio].putchar)(c);
+               (*ao_stdios[ao_cur_stdio].putchar)('\r');
+       (*ao_stdios[ao_cur_stdio].putchar)(c);

 }
 
 void
 flush(void)
 {
 }
 
 void
 flush(void)
 {

-       if (stdios[ao_cur_stdio].flush)
-               stdios[ao_cur_stdio].flush();
+       if (ao_stdios[ao_cur_stdio].flush)
+               ao_stdios[ao_cur_stdio].flush();

 }
 
 __xdata uint8_t ao_stdin_ready;
 }
 
 __xdata uint8_t ao_stdin_ready;


@@ -51,7 +51,7 @@ getchar(void) __reentrant __critical
        int8_t stdio = ao_cur_stdio;
 
        for (;;) {
        int8_t stdio = ao_cur_stdio;
 
        for (;;) {

-               c = stdios[stdio].pollchar();
+               c = ao_stdios[stdio].pollchar();

                if (c != AO_READ_AGAIN)
                        break;
                if (++stdio == ao_num_stdios)
                if (c != AO_READ_AGAIN)
                        break;
                if (++stdio == ao_num_stdios)


@@ -63,6 +63,12 @@ getchar(void) __reentrant __critical
        return c;
 }
 
        return c;
 }
 

+uint8_t
+ao_echo(void)
+{
+       return ao_stdios[ao_cur_stdio].echo;
+}
+

 void
 ao_add_stdio(char (*pollchar)(void),
             void (*putchar)(char),
 void
 ao_add_stdio(char (*pollchar)(void),
             void (*putchar)(char),


@@ -70,8 +76,9 @@ ao_add_stdio(char (*pollchar)(void),
 {
        if (ao_num_stdios == AO_NUM_STDIOS)
                ao_panic(AO_PANIC_STDIO);
 {
        if (ao_num_stdios == AO_NUM_STDIOS)
                ao_panic(AO_PANIC_STDIO);

-       stdios[ao_num_stdios].pollchar = pollchar;
-       stdios[ao_num_stdios].putchar = putchar;
-       stdios[ao_num_stdios].flush = flush;
+       ao_stdios[ao_num_stdios].pollchar = pollchar;
+       ao_stdios[ao_num_stdios].putchar = putchar;
+       ao_stdios[ao_num_stdios].flush = flush;
+       ao_stdios[ao_num_stdios].echo = 1;

        ao_num_stdios++;
 }
        ao_num_stdios++;
 }