X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_packet.c;h=8c2db2755d423c51139dfa91a48c4de5a9b9c06e;hp=d813b25f27448c43c3707dc0f46d689b4024f94b;hb=135abf0e7c5ceb5738a0b5f68fe2be4b7abdae5e;hpb=846a6298e4a8bfbe87bb24d7b0802c0bf6f233be

diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index d813b25f..8c2db275 100644
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -21,16 +21,16 @@ __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;
 
-static __xdata char tx_data[AO_PACKET_MAX];
-static __xdata char rx_data[AO_PACKET_MAX];
+static __xdata uint8_t tx_data[AO_PACKET_MAX];
+static __xdata uint8_t rx_data[AO_PACKET_MAX];
 static __pdata uint8_t rx_seq;
 
 __xdata struct ao_task	ao_packet_task;
 __xdata uint8_t ao_packet_enable;
+__xdata uint8_t ao_packet_restart;
 
 #if PACKET_HAS_MASTER
 __xdata uint8_t ao_packet_master_sleeping;
-__xdata uint8_t ao_packet_last_rssi;
 #endif
 
 void
@@ -54,14 +54,14 @@ 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
@@ -81,20 +81,27 @@ ao_packet_recv(void)
 	/* Check to see if we got a valid packet */
 	if (!dma_done)
 		return 0;
-	if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
+	if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK)) {
+		printf("bad crc addr %d len %d seq %d ack %d callsign %8.8s\n",
+			ao_rx_packet.packet.addr,
+			ao_rx_packet.packet.len,
+			ao_rx_packet.packet.seq,
+			ao_rx_packet.packet.ack,
+			ao_rx_packet.packet.callsign);
+		flush();
 		return 0;
+	}
 
-#if PACKET_HAS_MASTER
-	ao_packet_last_rssi = ao_rx_packet.rssi;
-#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,
 		       ao_config.callsign,
 		       AO_MAX_CALLSIGN) != 0 &&
-	    ao_xmemcmp(ao_config.callsign, CODE_TO_XDATA("N0CALL"), 7) != 0)
+	    ao_xmemcmp(ao_config.callsign, CODE_TO_XDATA("N0CALL"), 7) != 0) {
+		printf ("bad call\n"); flush();
 		return 0;
+	}
 
 	/* SYN packets carry no data */
 	if (ao_rx_packet.packet.len == AO_PACKET_SYN) {
@@ -106,7 +113,8 @@ 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
@@ -126,6 +134,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
@@ -152,6 +161,9 @@ ao_packet_flush(void)
 void
 ao_packet_putchar(char c) __reentrant
 {
+	/* 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();
@@ -163,8 +175,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;