X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_packet_master.c;h=5c4ab0ddd3f8b9914e47df9257a978d7bd8091f0;hb=1e56ed44e562f808addfd76bfb352f981db94094;hp=641b49f411a48a5c5821e376f055a9872d754363;hpb=ddc83b4c401be965a9947782becf20cc8c54e6a2;p=fw%2Faltos

diff --git a/src/ao_packet_master.c b/src/ao_packet_master.c
index 641b49f4..5c4ab0dd 100644
--- a/src/ao_packet_master.c
+++ b/src/ao_packet_master.c
@@ -21,16 +21,13 @@ static char
 ao_packet_getchar(void) __critical
 {
 	char c;
-	while ((c = ao_packet_pollchar()) == AO_READ_AGAIN)
-	{
+	while ((c = ao_packet_pollchar()) == AO_READ_AGAIN) {
 		if (!ao_packet_enable)
 			break;
 		if (ao_packet_master_sleeping)
-			ao_wake_task(&ao_packet_task);
+			ao_wakeup(&ao_packet_master_sleeping);
 		ao_usb_flush();
 		ao_sleep(&ao_stdin_ready);
-		if (!ao_packet_enable)
-			break;
 	}
 	return c;
 }
@@ -38,10 +35,10 @@ ao_packet_getchar(void) __critical
 static void
 ao_packet_echo(void) __reentrant
 {
-	uint8_t	c;
+	char	c;
 	while (ao_packet_enable) {
 		c = ao_packet_getchar();
-		if (ao_packet_enable)
+		if (c != AO_READ_AGAIN)
 			ao_usb_putchar(c);
 	}
 	ao_exit();
@@ -77,8 +74,6 @@ ao_packet_master_check_busy(void)
 void
 ao_packet_master(void)
 {
-	uint8_t	status;
-
 	ao_config_get();
 	ao_radio_set_packet();
 	ao_tx_packet.addr = ao_serial_number;
@@ -92,15 +87,15 @@ ao_packet_master(void)
 			ao_packet_master_busy();
 		ao_packet_master_check_busy();
 		ao_alarm(ao_packet_master_delay);
-		status = ao_packet_recv();
-		if (status & AO_DMA_DONE) {
+		if (ao_packet_recv()) {
 			/* if we can transmit data, do so */
 			if (ao_packet_tx_used && ao_tx_packet.len == 0)
 				continue;
 			if (ao_rx_packet.packet.len)
 				ao_packet_master_busy();
 			ao_packet_master_sleeping = 1;
-			ao_delay(ao_packet_master_delay);
+			ao_alarm(ao_packet_master_delay);
+			ao_sleep(&ao_packet_master_sleeping);
 			ao_packet_master_sleeping = 0;
 		}
 	}
@@ -129,8 +124,8 @@ ao_packet_forward(void) __reentrant
 		ao_delay(AO_MS_TO_TICKS(100));
 	ao_packet_enable = 0;
 	while (ao_packet_echo_task.wchan || ao_packet_task.wchan) {
-		if (ao_packet_echo_task.wchan)
-			ao_wake_task(&ao_packet_echo_task);
+		ao_radio_recv_abort();
+		ao_wakeup(&ao_stdin_ready);
 		ao_delay(AO_MS_TO_TICKS(10));
 	}
 }
@@ -138,8 +133,8 @@ ao_packet_forward(void) __reentrant
 
 
 __code struct ao_cmds ao_packet_master_cmds[] = {
-	{ 'p',	ao_packet_forward,	"p                                  Remote packet link." },
-	{ 0,	ao_packet_forward,	NULL },
+	{ ao_packet_forward,	"p\0Remote packet link." },
+	{ 0,	NULL },
 };
 
 void