X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_stdio.c;h=1748dfe8d940ecc550ff41911db01b0259291ec9;hb=dfff41c2bec16fe4c7b198a4720eb40d8e740ac4;hp=656b23c9e88fadc5f65b560af8487692d2b27c89;hpb=29edf6d901432a1afc65900ff599c963edac5a2b;p=fw%2Faltos

diff --git a/src/core/ao_stdio.c b/src/core/ao_stdio.c
index 656b23c9..1748dfe8 100644
--- a/src/core/ao_stdio.c
+++ b/src/core/ao_stdio.c
@@ -96,21 +96,23 @@ 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;
+	ao_arch_critical(
+		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;
+		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;
 }
 
@@ -121,7 +123,7 @@ ao_echo(void)
 }
 
 int8_t
-ao_add_stdio(char (*pollchar)(void),
+ao_add_stdio(int (*pollchar)(void),
 	     void (*putchar)(char),
 	     void (*flush)(void)) __reentrant
 {