X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_packet_master.c;h=e63771e55dd406569be34d44a858787a7e6856c5;hp=2354504981d6f09d3b51046d02fab1e300bc6b3a;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=d83afa9320c24056469984873af0a3c70bee0962

diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c
index 23545049..e63771e5 100644
--- a/src/drivers/ao_packet_master.c
+++ b/src/drivers/ao_packet_master.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,7 +18,7 @@
 
 #include "ao.h"
 
-static char
+static int
 ao_packet_getchar(void)
 {
 	int c;
@@ -97,9 +98,7 @@ ao_packet_master(void)
 		if (ao_tx_packet.len)
 			ao_packet_master_busy();
 		ao_packet_master_check_busy();
-		ao_alarm(AO_PACKET_MASTER_RECV_DELAY);
-		r = ao_packet_recv();
-		ao_clear_alarm();
+		r = ao_packet_recv(AO_PACKET_MASTER_RECV_DELAY);
 		if (r) {
 			/* if we can transmit data, do so */
 			if (ao_packet_tx_used && ao_tx_packet.len == 0)
@@ -107,9 +106,7 @@ ao_packet_master(void)
 			if (ao_rx_packet.packet.len)
 				ao_packet_master_busy();
 			ao_packet_master_sleeping = 1;
-			ao_alarm(ao_packet_master_delay);
-			ao_sleep(&ao_packet_master_sleeping);
-			ao_clear_alarm();
+			ao_sleep_for(&ao_packet_master_sleeping, ao_packet_master_delay);
 			ao_packet_master_sleeping = 0;
 		}
 	}
@@ -121,6 +118,7 @@ ao_packet_forward(void) __reentrant
 {
 	char c;
 	ao_packet_enable = 1;
+	ao_packet_tx_used = 0;
 	ao_cmd_white();
 
 	flush();