X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_packet_master.c;h=688ab6db557db23a3140b329c409ac8647ea1bfd;hb=6f7d530b9ca06272354d1b7c05813a2523b24887;hp=e63771e55dd406569be34d44a858787a7e6856c5;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c
index e63771e5..688ab6db 100644
--- a/src/drivers/ao_packet_master.c
+++ b/src/drivers/ao_packet_master.c
@@ -39,20 +39,20 @@ ao_packet_getchar(void)
 }
 
 static void
-ao_packet_echo(void) __reentrant
+ao_packet_echo(void) 
 {
 	int	c;
 	while (ao_packet_enable) {
 		c = ao_packet_getchar();
 		if (c != AO_READ_AGAIN)
-			putchar(c);
+			putchar((char) c);
 	}
 	ao_exit();
 }
 
-static __xdata struct ao_task	ao_packet_echo_task;
-static __xdata uint16_t		ao_packet_master_delay;
-static __xdata uint16_t		ao_packet_master_time;
+static struct ao_task	ao_packet_echo_task;
+static AO_TICK_TYPE	ao_packet_master_delay;
+static AO_TICK_TYPE	ao_packet_master_time;
 
 #define AO_PACKET_MASTER_DELAY_SHORT	AO_MS_TO_TICKS(100)
 #define AO_PACKET_MASTER_DELAY_LONG	AO_MS_TO_TICKS(1000)
@@ -74,26 +74,26 @@ ao_packet_master_busy(void)
 static void
 ao_packet_master_check_busy(void)
 {
-	int16_t	idle;
+	AO_TICK_SIGNED	idle;
 	if (ao_packet_master_delay != AO_PACKET_MASTER_DELAY_SHORT)
 		return;
-	idle = (int16_t) (ao_time() - ao_packet_master_time);
+	idle = (AO_TICK_SIGNED) (ao_time() - ao_packet_master_time);
 
 	if (idle > AO_PACKET_MASTER_DELAY_TIMEOUT)
 		ao_packet_master_delay = AO_PACKET_MASTER_DELAY_LONG;
 }
 
-void
+static void
 ao_packet_master(void)
 {
 	ao_config_get();
-	ao_tx_packet.addr = ao_serial_number;
+	ao_tx_packet.addr = (uint8_t) ao_serial_number;
 	ao_tx_packet.len = AO_PACKET_SYN;
 	ao_packet_master_time = ao_time();
 	ao_packet_master_delay = AO_PACKET_MASTER_DELAY_SHORT;
 	while (ao_packet_enable) {
 		uint8_t	r;
-		ao_xmemcpy(ao_tx_packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
+		memcpy(ao_tx_packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
 		ao_packet_send();
 		if (ao_tx_packet.len)
 			ao_packet_master_busy();
@@ -114,7 +114,7 @@ ao_packet_master(void)
 }
 
 static void
-ao_packet_forward(void) __reentrant
+ao_packet_forward(void) 
 {
 	char c;
 	ao_packet_enable = 1;
@@ -152,7 +152,7 @@ ao_packet_signal(void)
 	printf ("RSSI: %d\n", ao_radio_rssi);
 }
 
-__code struct ao_cmds ao_packet_master_cmds[] = {
+const struct ao_cmds ao_packet_master_cmds[] = {
 	{ ao_packet_forward,	"p\0Remote packet link." },
 	{ ao_packet_signal,	"s\0Report signal strength." },
 	{ 0,	NULL },