projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mpusb'
[fw/altos]
/
src
/
kernel
/
ao_stdio.c
diff --git
a/src/kernel/ao_stdio.c
b/src/kernel/ao_stdio.c
index b79d465afa4975180faab8b3589b4d97bb210d52..dc09b5c772cb37fab569824f25dbe9e602cce8bb 100644
(file)
--- a/
src/kernel/ao_stdio.c
+++ b/
src/kernel/ao_stdio.c
@@
-55,6
+55,9
@@
#ifndef PACKET_HAS_SLAVE
#define PACKET_HAS_SLAVE 0
#endif
#ifndef PACKET_HAS_SLAVE
#define PACKET_HAS_SLAVE 0
#endif
+#ifndef CONSOLE_STDIN
+#define CONSOLE_STDIN 0
+#endif
#define USE_SERIAL_STDIN (USE_SERIAL_0_STDIN + \
USE_SERIAL_1_STDIN + \
#define USE_SERIAL_STDIN (USE_SERIAL_0_STDIN + \
USE_SERIAL_1_STDIN + \
@@
-67,7
+70,7
@@
USE_SERIAL_8_STDIN + \
USE_SERIAL_9_STDIN)
USE_SERIAL_8_STDIN + \
USE_SERIAL_9_STDIN)
-#define AO_NUM_STDIOS (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
+#define AO_NUM_STDIOS (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN
+ CONSOLE_STDIN
)
__xdata struct ao_stdio ao_stdios[AO_NUM_STDIOS];
__xdata struct ao_stdio ao_stdios[AO_NUM_STDIOS];
@@
-81,7
+84,7
@@
__pdata int8_t ao_cur_stdio;
#endif
void
#endif
void
-putchar(char c)
+
ao_
putchar(char c)
{
#if LOW_LEVEL_DEBUG
if (!ao_cur_task) {
{
#if LOW_LEVEL_DEBUG
if (!ao_cur_task) {
@@
-107,7
+110,7
@@
flush(void)
__xdata uint8_t ao_stdin_ready;
char
__xdata uint8_t ao_stdin_ready;
char
-getchar(void) __reentrant
+
ao_
getchar(void) __reentrant
{
int c;
int8_t stdio;
{
int c;
int8_t stdio;