projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Merge common config code in ao_config.c
[fw/altos]
/
src
/
ao_packet_master.c
diff --git
a/src/ao_packet_master.c
b/src/ao_packet_master.c
index 069bc5df4044f9fadb2c1e6e1f6e0a1a2894b0aa..b0fdf5a8804288386651c070ba6f5be8f7f703fc 100644
(file)
--- a/
src/ao_packet_master.c
+++ b/
src/ao_packet_master.c
@@
-26,7
+26,7
@@
ao_packet_getchar(void) __critical
break;
if (ao_packet_master_sleeping)
ao_wakeup(&ao_packet_master_sleeping);
break;
if (ao_packet_master_sleeping)
ao_wakeup(&ao_packet_master_sleeping);
-
ao_usb_
flush();
+ flush();
ao_sleep(&ao_stdin_ready);
}
return c;
ao_sleep(&ao_stdin_ready);
}
return c;
@@
-39,7
+39,7
@@
ao_packet_echo(void) __reentrant
while (ao_packet_enable) {
c = ao_packet_getchar();
if (c != AO_READ_AGAIN)
while (ao_packet_enable) {
c = ao_packet_getchar();
if (c != AO_READ_AGAIN)
-
ao_usb_
putchar(c);
+ putchar(c);
}
ao_exit();
}
}
ao_exit();
}
@@
-109,10
+109,12
@@
ao_packet_forward(void) __reentrant
ao_cmd_white();
flush();
ao_cmd_white();
flush();
+#if HAS_MONITOR
ao_set_monitor(0);
ao_set_monitor(0);
+#endif
ao_add_task(&ao_packet_task, ao_packet_master, "master");
ao_add_task(&ao_packet_echo_task, ao_packet_echo, "echo");
ao_add_task(&ao_packet_task, ao_packet_master, "master");
ao_add_task(&ao_packet_echo_task, ao_packet_echo, "echo");
- while ((c =
ao_usb_
getchar()) != '~') {
+ while ((c = getchar()) != '~') {
if (c == '\r') c = '\n';
ao_packet_putchar(c);
}
if (c == '\r') c = '\n';
ao_packet_putchar(c);
}