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

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

diff --git a/src/drivers/ao_lco_func.c b/src/drivers/ao_lco_func.c
index 862cb1be76d628745a8402da16cce6ac2e4655eb..5aacd0e48c3f51dd52d81fb1e75e15cff0bd4693 100644 (file)
--- a/src/drivers/ao_lco_func.c
+++ b/src/drivers/ao_lco_func.c
@@ -21,15 +21,15 @@
 #include <ao_radio_cmac.h>
 #include <ao_lco_func.h>
 
-static __xdata struct ao_pad_command   command;
-static __xdata uint8_t                 ao_lco_mutex;
+static struct ao_pad_command   command;
+static uint8_t                 ao_lco_mutex;
 
 int8_t
 ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
 {
        int8_t          r;
-       uint16_t        sent_time;
-       uint16_t        timeout = AO_MS_TO_TICKS(10);
+       AO_TICK_TYPE    sent_time;
+       AO_TICK_TYPE    timeout = AO_MS_TO_TICKS(10);
 
 #if HAS_RADIO_RATE
        switch (ao_config.radio_rate) {
@@ -45,15 +45,15 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
        }
 #endif
        ao_mutex_get(&ao_lco_mutex);
-       command.tick = ao_time();
+       command.tick = (uint16_t) ao_time();
        command.box = box;
-       command.cmd = AO_LAUNCH_QUERY;
+       command.cmd = AO_PAD_QUERY;
        command.channels = 0;
        ao_radio_cmac_send(&command, sizeof (command));
        sent_time = ao_time();
        r = ao_radio_cmac_recv(query, sizeof (*query), timeout);
        if (r == AO_RADIO_CMAC_OK)
-               *tick_offset = sent_time - query->tick;
+               *tick_offset = (uint16_t) sent_time - query->tick;
        ao_mutex_put(&ao_lco_mutex);
        return r;
 }
@@ -62,21 +62,21 @@ void
 ao_lco_arm(uint16_t box, uint8_t channels, uint16_t tick_offset)
 {
        ao_mutex_get(&ao_lco_mutex);
-       command.tick = ao_time() - tick_offset;
+       command.tick = (uint16_t) ao_time() - tick_offset;
        command.box = box;
-       command.cmd = AO_LAUNCH_ARM;
+       command.cmd = AO_PAD_ARM;
        command.channels = channels;
        ao_radio_cmac_send(&command, sizeof (command));
        ao_mutex_put(&ao_lco_mutex);
 }
 
 void
-ao_lco_ignite(void)
+ao_lco_ignite(uint8_t cmd)
 {
        ao_mutex_get(&ao_lco_mutex);
        command.tick = 0;
        command.box = 0;
-       command.cmd = AO_LAUNCH_FIRE;
+       command.cmd = cmd;
        command.channels = 0;
        ao_radio_cmac_send(&command, sizeof (command));
        ao_mutex_put(&ao_lco_mutex);