X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco_func.c;h=32c00068a58d9d89b0a5c29358458afc6c332c1d;hb=HEAD;hp=92b344ed66c8d3a8b367c51f285f6bf75968823f;hpb=d75351c5a07241bcbb951758796b4f639ace6b1f;p=fw%2Faltos

diff --git a/src/drivers/ao_lco_func.c b/src/drivers/ao_lco_func.c
index 92b344ed..f5e27e60 100644
--- 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(20);
 
 #if HAS_RADIO_RATE
 	switch (ao_config.radio_rate) {
@@ -37,7 +37,7 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
 	default:
 		break;
 	case AO_RADIO_RATE_9600:
-		timeout = AO_MS_TO_TICKS(20);
+		timeout = AO_MS_TO_TICKS(30);
 		break;
 	case AO_RADIO_RATE_2400:
 		timeout = AO_MS_TO_TICKS(80);
@@ -45,7 +45,7 @@ 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_PAD_QUERY;
 	command.channels = 0;
@@ -53,7 +53,7 @@ ao_lco_query(uint16_t box, struct ao_pad_query *query, uint16_t *tick_offset)
 	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,7 +62,7 @@ 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_PAD_ARM;
 	command.channels = channels;