X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco_func.c;h=06350694145d4bda978ac894eb2a011160543ada;hp=32c00068a58d9d89b0a5c29358458afc6c332c1d;hb=6aeb000899ad7f22e92b487b5891664554bc4d33;hpb=4828be0ca5252ac9cd6061209385dcd6c4c57965

diff --git a/src/drivers/ao_lco_func.c b/src/drivers/ao_lco_func.c
index 32c00068..06350694 100644
--- a/src/drivers/ao_lco_func.c
+++ b/src/drivers/ao_lco_func.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,8 +21,8 @@
 #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)
@@ -44,9 +45,9 @@ 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() - *tick_offset;
+	command.tick = 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();
@@ -63,21 +64,20 @@ 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.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(uint16_t box, uint8_t channels, uint16_t tick_offset)
+ao_lco_ignite(uint8_t cmd)
 {
 	ao_mutex_get(&ao_lco_mutex);
-	command.tick = ao_time() - tick_offset;
-	command.box = box;
-	command.cmd = AO_LAUNCH_FIRE;
-	command.channels = channels;
+	command.tick = 0;
+	command.box = 0;
+	command.cmd = cmd;
+	command.channels = 0;
 	ao_radio_cmac_send(&command, sizeof (command));
 	ao_mutex_put(&ao_lco_mutex);
 }
-