Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / kernel / ao_forward.c

diff --git a/src/kernel/ao_forward.c b/src/kernel/ao_forward.c
index 721b52d08d8b3ad5c119a1d49b811587024aa6b7..6f664b60578add2e8c579f0ce198ddf571e67c0a 100644 (file)
--- a/src/kernel/ao_forward.c
+++ b/src/kernel/ao_forward.c
@@ -23,11 +23,11 @@ static void
 ao_monitor_forward(void)
 {
        uint32_t                                        recv_radio_setting;
-       static __xdata struct ao_telemetry_all_recv     packet;
+       static struct ao_telemetry_all_recv     packet;
 
        for (;;) {
                while (ao_monitoring)
-                       ao_sleep(DATA_TO_XDATA(&ao_monitoring));
+                       ao_sleep(&ao_monitoring);
 
                if (!ao_radio_recv(&packet, sizeof(packet), 0))
                        continue;
@@ -40,10 +40,10 @@ ao_monitor_forward(void)
        }
 }
 
-static __xdata struct ao_task ao_monitor_forward_task;
+static struct ao_task ao_monitor_forward_task;
 
 void
-ao_monitor_forward_init(void) __reentrant
+ao_monitor_forward_init(void) 
 {
        ao_add_task(&ao_monitor_forward_task, ao_monitor_forward, "monitor_forward");
 }