X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_packet_master.c;h=42a4f5bfd35f064f22aa9cd682aa5295a897fe3b;hp=481232dff2b821b229c29dc4ff6f8baad63f41db;hb=0d08c427188f7b748d9ea7651143bc843e9c2691;hpb=282f0451dd141db3304ab73e4020a849e59721eb

diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c
index 481232df..42a4f5bf 100644
--- a/src/drivers/ao_packet_master.c
+++ b/src/drivers/ao_packet_master.c
@@ -17,11 +17,16 @@
 
 #include "ao.h"
 
-static char
+static int
 ao_packet_getchar(void)
 {
-	char c;
-	while ((c = ao_packet_pollchar()) == AO_READ_AGAIN) {
+	int c;
+
+	/* No need to block interrupts in this function as
+	 * all packet variables are only modified from task
+	 * context, not an interrupt handler
+	 */
+	while ((c = _ao_packet_pollchar()) == AO_READ_AGAIN) {
 		if (!ao_packet_enable)
 			break;
 		if (ao_packet_master_sleeping)
@@ -35,7 +40,7 @@ ao_packet_getchar(void)
 static void
 ao_packet_echo(void) __reentrant
 {
-	char	c;
+	int	c;
 	while (ao_packet_enable) {
 		c = ao_packet_getchar();
 		if (c != AO_READ_AGAIN)
@@ -52,6 +57,12 @@ static __xdata uint16_t		ao_packet_master_time;
 #define AO_PACKET_MASTER_DELAY_LONG	AO_MS_TO_TICKS(1000)
 #define AO_PACKET_MASTER_DELAY_TIMEOUT	AO_MS_TO_TICKS(2000)
 
+#if HAS_RADIO_RATE
+#define AO_PACKET_MASTER_RECV_DELAY	AO_MS_TO_TICKS(100) << (ao_config.radio_rate << 1)
+#else
+#define AO_PACKET_MASTER_RECV_DELAY	AO_MS_TO_TICKS(100)
+#endif
+
 static void
 ao_packet_master_busy(void)
 {
@@ -86,7 +97,7 @@ ao_packet_master(void)
 		if (ao_tx_packet.len)
 			ao_packet_master_busy();
 		ao_packet_master_check_busy();
-		ao_alarm(ao_packet_master_delay);
+		ao_alarm(AO_PACKET_MASTER_RECV_DELAY);
 		r = ao_packet_recv();
 		ao_clear_alarm();
 		if (r) {
@@ -140,7 +151,7 @@ ao_packet_forward(void) __reentrant
 static void
 ao_packet_signal(void)
 {
-	printf ("RSSI: %d\n", AO_RSSI_FROM_RADIO(ao_packet_last_rssi));
+	printf ("RSSI: %d\n", ao_radio_rssi);
 }
 
 __code struct ao_cmds ao_packet_master_cmds[] = {