projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Switch ao_rssi.c __xdata to __pdata
[fw/altos]
/
src
/
ao_packet_master.c
diff --git
a/src/ao_packet_master.c
b/src/ao_packet_master.c
index 0808bc80af419c68efbfa4f8869eb8526bef634a..e721ffba39c948a0d17a5fc35cf45ccfec664eea 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;
@@
-35,11
+35,11
@@
ao_packet_getchar(void) __critical
static void
ao_packet_echo(void) __reentrant
{
static void
ao_packet_echo(void) __reentrant
{
-
uint8_t
c;
+
char
c;
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();
}
@@
-75,7
+75,6
@@
void
ao_packet_master(void)
{
ao_config_get();
ao_packet_master(void)
{
ao_config_get();
- ao_radio_set_packet();
ao_tx_packet.addr = ao_serial_number;
ao_tx_packet.len = AO_PACKET_SYN;
ao_packet_master_time = ao_time();
ao_tx_packet.addr = ao_serial_number;
ao_tx_packet.len = AO_PACKET_SYN;
ao_packet_master_time = ao_time();
@@
-99,7
+98,6
@@
ao_packet_master(void)
ao_packet_master_sleeping = 0;
}
}
ao_packet_master_sleeping = 0;
}
}
- ao_radio_set_telemetry();
ao_exit();
}
ao_exit();
}
@@
-114,7
+112,7
@@
ao_packet_forward(void) __reentrant
ao_set_monitor(0);
ao_add_task(&ao_packet_task, ao_packet_master, "master");
ao_add_task(&ao_packet_echo_task, ao_packet_echo, "echo");
ao_set_monitor(0);
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);
}
@@
-133,8
+131,8
@@
ao_packet_forward(void) __reentrant
__code struct ao_cmds ao_packet_master_cmds[] = {
__code struct ao_cmds ao_packet_master_cmds[] = {
- {
'p', ao_packet_forward, "p
Remote packet link." },
- { 0,
ao_packet_forward,
NULL },
+ {
ao_packet_forward, "p\0
Remote packet link." },
+ { 0, NULL },
};
void
};
void