X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_stdio.c;h=977d74b1800bdafc2cc24be64bcc99331f608ed1;hp=1748dfe8d940ecc550ff41911db01b0259291ec9;hb=4f1f3e836393304434130d362771a39f6f8f859a;hpb=7afcec1a1dce140dfa569469df4ef42ed407a742

diff --git a/src/core/ao_stdio.c b/src/core/ao_stdio.c
index 1748dfe8..977d74b1 100644
--- a/src/core/ao_stdio.c
+++ b/src/core/ao_stdio.c
@@ -99,20 +99,21 @@ char
 getchar(void) __reentrant
 {
 	int c;
-	ao_arch_critical(
-		int8_t stdio = ao_cur_stdio;
+	int8_t 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;
-		);
+	ao_arch_block_interrupts();
+	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;
+	ao_arch_release_interrupts();
 	return c;
 }
 
@@ -123,13 +124,13 @@ ao_echo(void)
 }
 
 int8_t
-ao_add_stdio(int (*pollchar)(void),
+ao_add_stdio(int (*_pollchar)(void),
 	     void (*putchar)(char),
 	     void (*flush)(void)) __reentrant
 {
 	if (ao_num_stdios == AO_NUM_STDIOS)
 		ao_panic(AO_PANIC_STDIO);
-	ao_stdios[ao_num_stdios].pollchar = pollchar;
+	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;