X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_stdio.c;h=ec3b6607b2e8cfb5ea1cf567a9ea98d22b2eda46;hp=045dff09f340e92b7b32b62ba2ceb914cfc2724f;hb=a5d60fdb9c969c1516feb76a16001c9688112c4c;hpb=f7ff3278bb670df59d7425a014cfe8e3718fea3f

diff --git a/src/ao_stdio.c b/src/ao_stdio.c
index 045dff09..ec3b6607 100644
--- a/src/ao_stdio.c
+++ b/src/ao_stdio.c
@@ -21,38 +21,37 @@
  * Basic I/O functions to support SDCC stdio package
  */
 
-#define AO_NUM_STDIOS	2
+#define AO_NUM_STDIOS	(HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
 
-static __xdata struct ao_stdio stdios[AO_NUM_STDIOS];
-static __data int8_t ao_cur_stdio;
-static __data int8_t ao_num_stdios;
+__xdata struct ao_stdio ao_stdios[AO_NUM_STDIOS];
+__data int8_t ao_cur_stdio;
+__data int8_t ao_num_stdios;
 
 void
 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)
 {
-	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;
 
 char
-getchar(void) __reentrant
+getchar(void) __reentrant __critical
 {
 	char c;
 	int8_t stdio = ao_cur_stdio;
 
-	EA = 0;
 	for (;;) {
-		c = stdios[stdio].pollchar();
+		c = ao_stdios[stdio].pollchar();
 		if (c != AO_READ_AGAIN)
 			break;
 		if (++stdio == ao_num_stdios)
@@ -60,20 +59,26 @@ getchar(void) __reentrant
 		if (stdio == ao_cur_stdio)
 			ao_sleep(&ao_stdin_ready);
 	}
-	EA = 1;
 	ao_cur_stdio = stdio;
 	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 (*flush)(void))
+	     void (*flush)(void)) __reentrant
 {
 	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++;
 }