altos: Do not release interrupts from any pollchar function

[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 66f94288fabd5cd6a0888907344f6a58c2ca1bf2..4c0dc57303005e6132bfa961f88be5c3b6b86346 100644 (file)
--- a/src/drivers/ao_packet_master.c
+++ b/src/drivers/ao_packet_master.c
@@ -18,10 +18,15 @@
 #include "ao.h"
 
 static char
-ao_packet_getchar(void) __critical
+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) __critical
 static void
 ao_packet_echo(void) __reentrant
 {
-       char    c;
+       int     c;
        while (ao_packet_enable) {
                c = ao_packet_getchar();
                if (c != AO_READ_AGAIN)
@@ -137,10 +142,15 @@ ao_packet_forward(void) __reentrant
 #endif
 }
 
-
+static void
+ao_packet_signal(void)
+{
+       printf ("RSSI: %d\n", AO_RSSI_FROM_RADIO(ao_packet_last_rssi));
+}
 
 __code struct ao_cmds ao_packet_master_cmds[] = {
        { ao_packet_forward,    "p\0Remote packet link." },
+       { ao_packet_signal,     "s\0Report signal strength." },
        { 0,    NULL },
 };