X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_stdio.c;h=cd144d6b45899861d1640478ab1bed393f5f98c6;hp=c0138a30dbd730bc26bcea06b38fe872ce8650e2;hb=2ecb6a8276b2ce40d2a4da586dbc17581cfda26d;hpb=1c344b760776cd5d8c0297d8db9bf02687381b4e

diff --git a/src/core/ao_stdio.c b/src/core/ao_stdio.c
index c0138a30..cd144d6b 100644
--- a/src/core/ao_stdio.c
+++ b/src/core/ao_stdio.c
@@ -21,15 +21,73 @@
  * Basic I/O functions to support SDCC stdio package
  */
 
+#ifndef USE_SERIAL_0_STDIN
+#define USE_SERIAL_0_STDIN	0
+#endif
+#ifndef USE_SERIAL_1_STDIN
+#define USE_SERIAL_1_STDIN	0
+#endif
+#ifndef USE_SERIAL_2_STDIN
+#define USE_SERIAL_2_STDIN	0
+#endif
+#ifndef USE_SERIAL_3_STDIN
+#define USE_SERIAL_3_STDIN	0
+#endif
+#ifndef USE_SERIAL_4_STDIN
+#define USE_SERIAL_4_STDIN	0
+#endif
+#ifndef USE_SERIAL_5_STDIN
+#define USE_SERIAL_5_STDIN	0
+#endif
+#ifndef USE_SERIAL_6_STDIN
+#define USE_SERIAL_6_STDIN	0
+#endif
+#ifndef USE_SERIAL_7_STDIN
+#define USE_SERIAL_7_STDIN	0
+#endif
+#ifndef USE_SERIAL_8_STDIN
+#define USE_SERIAL_8_STDIN	0
+#endif
+#ifndef USE_SERIAL_9_STDIN
+#define USE_SERIAL_9_STDIN	0
+#endif
+
+#define USE_SERIAL_STDIN (USE_SERIAL_0_STDIN +	\
+			  USE_SERIAL_1_STDIN +	\
+			  USE_SERIAL_2_STDIN +	\
+			  USE_SERIAL_3_STDIN +	\
+			  USE_SERIAL_4_STDIN +	\
+			  USE_SERIAL_5_STDIN +	\
+			  USE_SERIAL_6_STDIN +	\
+			  USE_SERIAL_7_STDIN +	\
+			  USE_SERIAL_8_STDIN +	\
+			  USE_SERIAL_9_STDIN)
+
 #define AO_NUM_STDIOS	(HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
 
 __xdata struct ao_stdio ao_stdios[AO_NUM_STDIOS];
+
+#if AO_NUM_STDIOS > 1
 __pdata int8_t ao_cur_stdio;
 __pdata int8_t ao_num_stdios;
+#else
+__pdata int8_t ao_cur_stdio;
+#define ao_cur_stdio	0
+#define ao_num_stdios	0
+#endif
 
 void
 putchar(char c)
 {
+#if LOW_LEVEL_DEBUG
+	if (!ao_cur_task) {
+		extern void ao_debug_out(char c);
+		if (c == '\n')
+			ao_debug_out('\r');
+		ao_debug_out(c);
+		return;
+	}
+#endif
 	if (c == '\n')
 		(*ao_stdios[ao_cur_stdio].putchar)('\r');
 	(*ao_stdios[ao_cur_stdio].putchar)(c);
@@ -45,21 +103,28 @@ flush(void)
 __xdata uint8_t ao_stdin_ready;
 
 char
-getchar(void) __reentrant __critical
+getchar(void) __reentrant
 {
-	char c;
-	int8_t stdio = ao_cur_stdio;
+	int c;
+	int8_t stdio;
 
+	ao_arch_block_interrupts();
+	stdio = ao_cur_stdio;
 	for (;;) {
-		c = ao_stdios[stdio].pollchar();
+		c = ao_stdios[stdio]._pollchar();
 		if (c != AO_READ_AGAIN)
 			break;
+#if AO_NUM_STDIOS > 1
 		if (++stdio == ao_num_stdios)
 			stdio = 0;
 		if (stdio == ao_cur_stdio)
+#endif
 			ao_sleep(&ao_stdin_ready);
 	}
+#if AO_NUM_STDIOS > 1
 	ao_cur_stdio = stdio;
+#endif
+	ao_arch_release_interrupts();
 	return c;
 }
 
@@ -70,15 +135,21 @@ ao_echo(void)
 }
 
 int8_t
-ao_add_stdio(char (*pollchar)(void),
+ao_add_stdio(int (*_pollchar)(void),
 	     void (*putchar)(char),
 	     void (*flush)(void)) __reentrant
 {
+#if AO_NUM_STDIOS > 1
 	if (ao_num_stdios == AO_NUM_STDIOS)
 		ao_panic(AO_PANIC_STDIO);
-	ao_stdios[ao_num_stdios].pollchar = pollchar;
+#endif
+	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;
+#if AO_NUM_STDIOS > 1
 	return ao_num_stdios++;
+#else
+	return 0;
+#endif
 }