projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
kernel
/
ao_stdio.c
diff --git
a/src/kernel/ao_stdio.c
b/src/kernel/ao_stdio.c
index 227499c81524ae4a3d521bf25ad4a460f7882cd5..c3b51d123ef1407702200798feaf17c6711c3e02 100644
(file)
--- a/
src/kernel/ao_stdio.c
+++ b/
src/kernel/ao_stdio.c
@@
-72,13
+72,13
@@
#define AO_NUM_STDIOS (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN + CONSOLE_STDIN)
#define AO_NUM_STDIOS (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN + CONSOLE_STDIN)
-
__xdata
struct ao_stdio ao_stdios[AO_NUM_STDIOS];
+struct ao_stdio ao_stdios[AO_NUM_STDIOS];
#if AO_NUM_STDIOS > 1
#if AO_NUM_STDIOS > 1
-
__pdata
int8_t ao_cur_stdio;
-
__pdata
int8_t ao_num_stdios;
+int8_t ao_cur_stdio;
+int8_t ao_num_stdios;
#else
#else
-
__pdata
int8_t ao_cur_stdio;
+int8_t ao_cur_stdio;
#define ao_cur_stdio 0
#define ao_num_stdios 0
#endif
#define ao_cur_stdio 0
#define ao_num_stdios 0
#endif
@@
-108,10
+108,10
@@
flush(void)
ao_stdios[ao_cur_stdio].flush();
}
ao_stdios[ao_cur_stdio].flush();
}
-
__xdata
uint8_t ao_stdin_ready;
+uint8_t ao_stdin_ready;
char
char
-ao_getchar(void)
__reentrant
+ao_getchar(void)
{
int c;
int8_t stdio;
{
int c;
int8_t stdio;
@@
-145,7
+145,7
@@
ao_echo(void)
int8_t
ao_add_stdio(int (*_pollchar)(void),
void (*putchar)(char),
int8_t
ao_add_stdio(int (*_pollchar)(void),
void (*putchar)(char),
- void (*flush)(void))
__reentrant
+ void (*flush)(void))
{
if (ao_num_stdios == AO_NUM_STDIOS)
ao_panic(AO_PANIC_STDIO);
{
if (ao_num_stdios == AO_NUM_STDIOS)
ao_panic(AO_PANIC_STDIO);