X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_packet.c;h=b9331c4d889e38fe0449fa3f3ab7853ee6a61a31;hb=b140da92536d7c48ba37868f1c2afce7bb86dfdb;hp=19fe0558b91892d6de9bc316bafd0818ce6892dc;hpb=1489263b895a2a825e29d0560c9b1dbba8a3f431;p=fw%2Faltos

diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index 19fe0558..b9331c4d 100644
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.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
@@ -17,17 +18,21 @@
 
 #include "ao.h"
 
-__xdata struct ao_packet_recv ao_rx_packet;
-__xdata struct ao_packet ao_tx_packet;
-__pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
+struct ao_packet_recv ao_rx_packet;
+struct ao_packet ao_tx_packet;
+uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
 
-static __xdata char tx_data[AO_PACKET_MAX];
-static __xdata char rx_data[AO_PACKET_MAX];
-static __pdata uint8_t rx_seq;
+static uint8_t tx_data[AO_PACKET_MAX];
+static uint8_t rx_data[AO_PACKET_MAX];
+static uint8_t rx_seq;
 
-__xdata struct ao_task	ao_packet_task;
-__xdata uint8_t ao_packet_enable;
-__xdata uint8_t ao_packet_master_sleeping;
+struct ao_task	ao_packet_task;
+uint8_t ao_packet_enable;
+uint8_t ao_packet_restart;
+
+#if PACKET_HAS_MASTER
+uint8_t ao_packet_master_sleeping;
+#endif
 
 void
 ao_packet_send(void)
@@ -37,7 +42,7 @@ ao_packet_send(void)
 #endif
 	/* If any tx data is pending then copy it into the tx packet */
 	if (ao_packet_tx_used && ao_tx_packet.len == 0) {
-		ao_xmemcpy(&ao_tx_packet.d, tx_data, ao_packet_tx_used);
+		memcpy(&ao_tx_packet.d, tx_data, ao_packet_tx_used);
 		ao_tx_packet.len = ao_packet_tx_used;
 		ao_tx_packet.seq++;
 		ao_packet_tx_used = 0;
@@ -50,33 +55,43 @@ ao_packet_send(void)
 }
 
 uint8_t
-ao_packet_recv(void)
+ao_packet_recv(uint16_t timeout)
 {
 	uint8_t	dma_done;
 
 #ifdef AO_LED_GREEN
 	ao_led_on(AO_LED_GREEN);
 #endif
-	dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv));
+	dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv), timeout);
 #ifdef AO_LED_GREEN
 	ao_led_off(AO_LED_GREEN);
 #endif
+#if AO_PROFILE
+		{
+			extern uint32_t	ao_rx_start_tick, ao_rx_packet_tick, ao_rx_done_tick, ao_rx_last_done_tick;
+			extern uint32_t ao_fec_decode_start, ao_fec_decode_end;
+
+			printf ("between packet: %d\n", ao_rx_start_tick - ao_rx_last_done_tick);
+			printf ("receive start delay: %d\n", ao_rx_packet_tick - ao_rx_start_tick);
+			printf ("decode time: %d\n", ao_fec_decode_end - ao_fec_decode_start);
+			printf ("rx cleanup: %d\n\n", ao_rx_done_tick - ao_fec_decode_end);
+			flush();
+		}
+#endif
 
 	/* Check to see if we got a valid packet */
 	if (!dma_done)
 		return 0;
-#ifdef PKT_APPEND_STATUS_1_CRC_OK
-	if (!(ao_rx_packet.status & PKT_APPEND_STATUS_1_CRC_OK))
+	if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
 		return 0;
-#endif
 
 	/* Accept packets with matching call signs, or any packet if
 	 * our callsign hasn't been configured
 	 */
-	if (ao_xmemcmp(ao_rx_packet.packet.callsign,
+	if (memcmp(ao_rx_packet.packet.callsign,
 		       ao_config.callsign,
 		       AO_MAX_CALLSIGN) != 0 &&
-	    ao_xmemcmp(ao_config.callsign, CODE_TO_XDATA("N0CALL"), 7) != 0)
+	    memcmp(ao_config.callsign, "N0CALL", 7) != 0)
 		return 0;
 
 	/* SYN packets carry no data */
@@ -89,13 +104,14 @@ ao_packet_recv(void)
 		/* Check for incoming data at the next sequence and
 		 * for an empty data buffer
 		 */
-		if (ao_rx_packet.packet.seq == (uint8_t) (rx_seq + (uint8_t) 1) &&
+		if ((ao_rx_packet.packet.seq == (uint8_t) (rx_seq + (uint8_t) 1) ||
+		     ao_packet_restart) &&
 		    ao_packet_rx_used == ao_packet_rx_len) {
 
 			/* Copy data to the receive data buffer and set up the
 			 * offsets
 			 */
-			ao_xmemcpy(rx_data, ao_rx_packet.packet.d, ao_rx_packet.packet.len);
+			memcpy(rx_data, ao_rx_packet.packet.d, ao_rx_packet.packet.len);
 			ao_packet_rx_used = 0;
 			ao_packet_rx_len = ao_rx_packet.packet.len;
 
@@ -109,6 +125,7 @@ ao_packet_recv(void)
 			ao_wakeup(&ao_stdin_ready);
 		}
 	}
+	ao_packet_restart = 0;
 
 	/* If the other side has seen the latest data we queued,
 	 * wake up any task waiting to send data and let them go again
@@ -120,10 +137,6 @@ ao_packet_recv(void)
 	return 1;
 }
 
-#ifndef PACKET_HAS_MASTER
-#define PACKET_HAS_MASTER 1
-#endif
-
 #if PACKET_HAS_MASTER
 void
 ao_packet_flush(void)
@@ -137,8 +150,11 @@ ao_packet_flush(void)
 #endif /* PACKET_HAS_MASTER */
 
 void
-ao_packet_putchar(char c) __reentrant
+ao_packet_putchar(char c) 
 {
+	/* No need to block interrupts, all variables here
+	 * are only manipulated in task context
+	 */
 	while (ao_packet_tx_used == AO_PACKET_MAX && ao_packet_enable) {
 #if PACKET_HAS_MASTER
 		ao_packet_flush();
@@ -150,8 +166,9 @@ ao_packet_putchar(char c) __reentrant
 		tx_data[ao_packet_tx_used++] = c;
 }
 
-char
-ao_packet_pollchar(void) __critical
+/* May be called with interrupts blocked */
+int
+_ao_packet_pollchar(void)
 {
 	if (!ao_packet_enable)
 		return AO_READ_AGAIN;