X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_packet_master.c;h=641b49f411a48a5c5821e376f055a9872d754363;hp=72bb908a671e4e2f790f1f6492c340627e43468a;hb=3ffaa5d1c00b28be20fd4a26deb7bd41d953e92a;hpb=afea6c264c5ebf12f1d629bd4bc724da86d11b7a

diff --git a/src/ao_packet_master.c b/src/ao_packet_master.c
index 72bb908a..641b49f4 100644
--- a/src/ao_packet_master.c
+++ b/src/ao_packet_master.c
@@ -29,6 +29,8 @@ ao_packet_getchar(void) __critical
 			ao_wake_task(&ao_packet_task);
 		ao_usb_flush();
 		ao_sleep(&ao_stdin_ready);
+		if (!ao_packet_enable)
+			break;
 	}
 	return c;
 }
@@ -121,12 +123,15 @@ ao_packet_forward(void) __reentrant
 		if (c == '\r') c = '\n';
 		ao_packet_putchar(c);
 	}
+
+	/* Wait for a second if there is any pending data */
+	for (c = 0; (ao_packet_tx_used || ao_tx_packet.len) && c < 10; c++)
+		ao_delay(AO_MS_TO_TICKS(100));
 	ao_packet_enable = 0;
-	ao_radio_abort();
 	while (ao_packet_echo_task.wchan || ao_packet_task.wchan) {
-		ao_wake_task(&ao_packet_echo_task);
-		ao_wake_task(&ao_packet_task);
-		ao_yield();
+		if (ao_packet_echo_task.wchan)
+			ao_wake_task(&ao_packet_echo_task);
+		ao_delay(AO_MS_TO_TICKS(10));
 	}
 }