X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_pad.c;h=7e139c7808d1504f09f375e2e39245aab9fa7197;hb=2de8922b505f0358a36933721fbddf6a9ef7e9a4;hp=ed749d1cf756e4be62a961abab7e8bf69fc4d866;hpb=99642f9c4f89aa5577376a9cd118e7cff26e2762;p=fw%2Faltos

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index ed749d1c..7e139c78 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -22,14 +22,14 @@
 #include <ao_74hc165.h>
 #include <ao_radio_cmac.h>
 
-static __xdata uint8_t ao_pad_ignite;
-static __xdata struct ao_pad_command	command;
-static __xdata struct ao_pad_query	query;
-static __pdata uint8_t	ao_pad_armed;
-static __pdata uint16_t	ao_pad_arm_time;
-static __pdata uint8_t	ao_pad_box;
-static __xdata uint8_t	ao_pad_disabled;
-static __pdata uint16_t	ao_pad_packet_time;
+static uint8_t ao_pad_ignite;
+static struct ao_pad_command	command;
+static struct ao_pad_query	query;
+static uint8_t	ao_pad_armed;
+static uint16_t	ao_pad_arm_time;
+static uint8_t	ao_pad_box;
+static uint8_t	ao_pad_disabled;
+static uint16_t	ao_pad_packet_time;
 
 #ifndef AO_PAD_RSSI_MINIMUM
 #define AO_PAD_RSSI_MINIMUM	-90
@@ -38,7 +38,7 @@ static __pdata uint16_t	ao_pad_packet_time;
 #define DEBUG	1
 
 #if DEBUG
-static __pdata uint8_t	ao_pad_debug;
+static uint8_t	ao_pad_debug;
 #define PRINTD(...) (ao_pad_debug ? (printf(__VA_ARGS__), 0) : 0)
 #define FLUSHD()    (ao_pad_debug ? (flush(), 0) : 0)
 #else
@@ -189,18 +189,21 @@ ao_pad_monitor(void)
 {
 	uint8_t			c;
 	uint8_t			sample;
-	__pdata uint8_t		prev = 0, cur = 0;
-	__pdata uint8_t		beeping = 0;
-	__xdata volatile struct ao_data	*packet;
-	__pdata uint16_t	arm_beep_time = 0;
+	AO_LED_TYPE	prev = 0, cur = 0;
+	uint8_t		beeping = 0;
+	volatile struct ao_data	*packet;
+	uint16_t	arm_beep_time = 0;
 
 	sample = ao_data_head;
+	ao_led_set(LEDS_AVAILABLE);
+	ao_delay(AO_MS_TO_TICKS(1000));
+	ao_led_set(0);
 	for (;;) {
-		__pdata int16_t			pyro;
+		int16_t			pyro;
 
 		ao_arch_critical(
 			while (sample == ao_data_head)
-				ao_sleep((void *) DATA_TO_XDATA(&ao_data_head));
+				ao_sleep((void *) &ao_data_head);
 			);
 
 
@@ -370,7 +373,6 @@ ao_pad(void)
 	int8_t	ret;
 
 	ao_pad_box = 0;
-	ao_led_set(0);
 	for (;;) {
 		FLUSHD();
 		while (ao_pad_disabled)
@@ -524,9 +526,9 @@ ao_pad_manual(void)
 	}
 }
 
-static __xdata struct ao_task ao_pad_task;
-static __xdata struct ao_task ao_pad_ignite_task;
-static __xdata struct ao_task ao_pad_monitor_task;
+static struct ao_task ao_pad_task;
+static struct ao_task ao_pad_ignite_task;
+static struct ao_task ao_pad_monitor_task;
 
 #if DEBUG
 void
@@ -558,7 +560,7 @@ ao_pad_alarm_debug(void)
 }
 #endif
 
-__code struct ao_cmds ao_pad_cmds[] = {
+const struct ao_cmds ao_pad_cmds[] = {
 	{ ao_pad_test,	"t\0Test pad continuity" },
 	{ ao_pad_manual,	"i <key> <n>\0Fire igniter. <key> is doit with D&I" },
 #if DEBUG