summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/ao_packet.h1
-rw-r--r--src/drivers/ao_packet.c5
-rw-r--r--src/drivers/ao_packet_slave.c1
3 files changed, 6 insertions, 1 deletions
diff --git a/src/core/ao_packet.h b/src/core/ao_packet.h
index f232a878..9058c347 100644
--- a/src/core/ao_packet.h
+++ b/src/core/ao_packet.h
@@ -48,6 +48,7 @@ extern __xdata struct ao_task ao_packet_task;
extern __xdata uint8_t ao_packet_enable;
extern __xdata uint8_t ao_packet_master_sleeping;
extern __pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
+extern __xdata uint8_t ao_packet_restart;
void
ao_packet_send(void);
diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index d813b25f..2bada949 100644
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -27,6 +27,7 @@ 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;
@@ -106,7 +107,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 +128,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
diff --git a/src/drivers/ao_packet_slave.c b/src/drivers/ao_packet_slave.c
index fd5d443e..e45775cb 100644
--- a/src/drivers/ao_packet_slave.c
+++ b/src/drivers/ao_packet_slave.c
@@ -22,6 +22,7 @@ ao_packet_slave(void)
{
ao_tx_packet.addr = ao_serial_number;
ao_tx_packet.len = AO_PACKET_SYN;
+ ao_packet_restart = 1;
while (ao_packet_enable) {
if (ao_packet_recv()) {
ao_xmemcpy(&ao_tx_packet.callsign, &ao_rx_packet.packet.callsign, AO_MAX_CALLSIGN);