altoslib: Increase timeouts when using low baud rate remote protocol

[fw/altos] / src / drivers / ao_packet_master.c

diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c
index 481232dff2b821b229c29dc4ff6f8baad63f41db..d6c99cbd89defb62b07a2def1b7964f8be2f9df9 100644 (file)
--- a/src/drivers/ao_packet_master.c
+++ b/src/drivers/ao_packet_master.c
@@ -20,8 +20,13 @@
 static char
 ao_packet_getchar(void)
 {
-       char c;
-       while ((c = ao_packet_pollchar()) == AO_READ_AGAIN) {
+       int c;
+
+       /* No need to block interrupts in this function as
+        * all packet variables are only modified from task
+        * context, not an interrupt handler
+        */
+       while ((c = _ao_packet_pollchar()) == AO_READ_AGAIN) {
                if (!ao_packet_enable)
                        break;
                if (ao_packet_master_sleeping)
@@ -35,7 +40,7 @@ ao_packet_getchar(void)
 static void
 ao_packet_echo(void) __reentrant
 {
-       char    c;
+       int     c;
        while (ao_packet_enable) {
                c = ao_packet_getchar();
                if (c != AO_READ_AGAIN)
@@ -140,7 +145,7 @@ ao_packet_forward(void) __reentrant
 static void
 ao_packet_signal(void)
 {
-       printf ("RSSI: %d\n", AO_RSSI_FROM_RADIO(ao_packet_last_rssi));
+       printf ("RSSI: %d\n", ao_radio_rssi);
 }
 
 __code struct ao_cmds ao_packet_master_cmds[] = {