altos: Write xdata versions of memory functions

[fw/altos] / src / core / ao_monitor.c

diff --git a/src/core/ao_monitor.c b/src/core/ao_monitor.c
index aaa6bb8b8fae980e4d01ab6f396bd6a5ac2beff7..1a8bb52a29fdb1467ad8799c0008f18c52867adf 100644 (file)
--- a/src/core/ao_monitor.c
+++ b/src/core/ao_monitor.c
@@ -22,7 +22,7 @@
 #error Must define HAS_MONITOR to 1
 #endif
 
-__xdata uint8_t ao_monitoring;
+__data uint8_t ao_monitoring;
 __pdata uint8_t ao_monitor_led;
 
 __xdata union ao_monitor ao_monitor_ring[AO_MONITOR_RING];
@@ -37,7 +37,7 @@ ao_monitor_get(void)
        for (;;) {
                switch (ao_monitoring) {
                case 0:
-                       ao_sleep(&ao_monitoring);
+                       ao_sleep(DATA_TO_XDATA(&ao_monitoring));
                        continue;
                case AO_MONITORING_ORIG:
                        size = sizeof (struct ao_telemetry_orig_recv);
@@ -55,7 +55,15 @@ ao_monitor_get(void)
                        continue;
                ao_monitor_head = ao_monitor_ring_next(ao_monitor_head);
                ao_wakeup(DATA_TO_XDATA(&ao_monitor_head));
-               ao_led_toggle(ao_monitor_led);
+       }
+}
+
+void
+ao_monitor_blink(void)
+{
+       for (;;) {
+               ao_sleep(DATA_TO_XDATA(&ao_monitor_head));
+               ao_led_for(ao_monitor_led, AO_MS_TO_TICKS(100));
        }
 }
 
@@ -86,7 +94,7 @@ ao_monitor_put(void)
 
                        /* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
                        rssi = (int16_t) (recv_orig.rssi >> 1) - 74;
-                       memcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
+                       ao_xmemcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
                        if (state > ao_flight_invalid)
                                state = ao_flight_invalid;
                        if (recv_orig.status & PKT_APPEND_STATUS_1_CRC_OK) {
@@ -163,7 +171,7 @@ ao_monitor_put(void)
 
                        /* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
                        rssi = (int16_t) (recv_tiny.rssi >> 1) - 74;
-                       memcpy(callsign, recv_tiny.telemetry_tiny.callsign, AO_MAX_CALLSIGN);
+                       ao_xmemcpy(callsign, recv_tiny.telemetry_tiny.callsign, AO_MAX_CALLSIGN);
                        if (state > ao_flight_invalid)
                                state = ao_flight_invalid;
                        if (recv_tiny.status & PKT_APPEND_STATUS_1_CRC_OK) {
@@ -246,6 +254,7 @@ ao_monitor_put(void)
 
 __xdata struct ao_task ao_monitor_get_task;
 __xdata struct ao_task ao_monitor_put_task;
+__xdata struct ao_task ao_monitor_blink_task;
 
 void
 ao_set_monitor(uint8_t monitoring)
@@ -253,7 +262,7 @@ ao_set_monitor(uint8_t monitoring)
        if (ao_monitoring)
                ao_radio_recv_abort();
        ao_monitoring = monitoring;
-       ao_wakeup(&ao_monitoring);
+       ao_wakeup(DATA_TO_XDATA(&ao_monitoring));
 }
 
 static void
@@ -276,4 +285,6 @@ ao_monitor_init(uint8_t monitor_led, uint8_t monitoring) __reentrant
        ao_cmd_register(&ao_monitor_cmds[0]);
        ao_add_task(&ao_monitor_get_task, ao_monitor_get, "monitor_get");
        ao_add_task(&ao_monitor_put_task, ao_monitor_put, "monitor_put");
+       if (ao_monitor_led)
+               ao_add_task(&ao_monitor_blink_task, ao_monitor_blink, "monitor_blink");
 }