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

diff --git a/src/ao_stdio.c b/src/ao_stdio.c
index fb8ce093..ec3b6607 100644
--- a/src/ao_stdio.c
+++ b/src/ao_stdio.c
@@ -21,22 +21,64 @@
  * Basic I/O functions to support SDCC stdio package
  */
 
+#define AO_NUM_STDIOS	(HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
+
+__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')
-		ao_usb_putchar('\r');
-	ao_usb_putchar(c);
+		(*ao_stdios[ao_cur_stdio].putchar)('\r');
+	(*ao_stdios[ao_cur_stdio].putchar)(c);
 }
 
 void
 flush(void)
 {
-	ao_usb_flush();
+	if (ao_stdios[ao_cur_stdio].flush)
+		ao_stdios[ao_cur_stdio].flush();
 }
 
+__xdata uint8_t ao_stdin_ready;
+
 char
-getchar(void)
+getchar(void) __reentrant __critical
+{
+	char c;
+	int8_t stdio = ao_cur_stdio;
+
+	for (;;) {
+		c = ao_stdios[stdio].pollchar();
+		if (c != AO_READ_AGAIN)
+			break;
+		if (++stdio == ao_num_stdios)
+			stdio = 0;
+		if (stdio == ao_cur_stdio)
+			ao_sleep(&ao_stdin_ready);
+	}
+	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)) __reentrant
 {
-	return ao_usb_getchar();
+	if (ao_num_stdios == AO_NUM_STDIOS)
+		ao_panic(AO_PANIC_STDIO);
+	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++;
 }