X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_packet.c;h=da33bb4c6dfc8d4e92cf59ec4f94af46ab2f27e4;hp=ccd83785daaf3d3e15364aebd441b443415b4058;hb=d46797e5c08d4955d516458185e2cfb51ee2d567;hpb=b428faf74ae145126ec1da972028fcfe0b4b2b18

diff --git a/src/ao_packet.c b/src/ao_packet.c
index ccd83785..da33bb4c 100644
--- a/src/ao_packet.c
+++ b/src/ao_packet.c
@@ -24,66 +24,17 @@ static __xdata char rx_data[AO_PACKET_MAX];
 static __pdata uint8_t rx_len, rx_used, tx_used;
 static __pdata uint8_t rx_seq;
 
-static __xdata uint16_t ao_packet_timer_delay;
-static __xdata uint8_t ao_packet_timer_cancelled;
-
 static __xdata struct ao_task	ao_packet_task;
-static __xdata struct ao_task	ao_packet_timer_task;
 static __xdata uint8_t ao_packet_enable;
 static __xdata uint8_t ao_packet_master_sleeping;
 
-void
-ao_packet_timer(void) __reentrant
-{
-	uint16_t	delay;
-
-	while (ao_packet_enable) {
-
-		/* wait until the timer task is needed
-		 */
-		while (!ao_packet_timer_delay && ao_packet_enable)
-			ao_sleep(&ao_packet_timer_delay);
-
-		delay = ao_packet_timer_delay;
-		ao_packet_timer_delay = 0;
-
-		/* pause waiting for either a timeout or
-		 * a timer cancel
-		 */
-		ao_delay(delay);
-
-		/* if not canceled, abort the receive
-		 */
-		if (!ao_packet_timer_cancelled) {
-			printf ("packet timeout\n"); flush();
-			ao_radio_abort(AO_DMA_TIMEOUT);
-		}
-	}
-	ao_exit();
-}
-
-void
-ao_packet_timer_set(uint16_t delay)
-{
-	ao_packet_timer_delay = delay;
-	ao_packet_timer_cancelled = 0;
-	ao_wakeup(&ao_packet_timer_delay);
-}
-
-void
-ao_packet_timer_cancel(void)
-{
-	ao_packet_timer_cancelled = 1;
-	ao_packet_timer_delay = 0;
-	ao_wake_task(&ao_packet_timer_task);
-}
-
 void
 ao_packet_send(void)
 {
 	ao_config_get();
 	ao_mutex_get(&ao_radio_mutex);
 	ao_radio_idle();
+	ao_radio_done = 0;
 	RF_CHANNR = ao_config.radio_channel;
 	ao_dma_set_transfer(ao_radio_dma,
 			    &tx_packet,
@@ -97,8 +48,8 @@ ao_packet_send(void)
 			    DMA_CFG1_PRIORITY_HIGH);
 	ao_dma_start(ao_radio_dma);
 	RFST = RFST_STX;
-	__critical while (!ao_radio_dma_done)
-		ao_sleep(&ao_radio_dma_done);
+	__critical while (!ao_radio_done)
+		ao_sleep(&ao_radio_done);
 	ao_mutex_put(&ao_radio_mutex);
 }
 
@@ -124,7 +75,10 @@ ao_packet_recv(void)
 	ao_dma_start(ao_radio_dma);
 	RFST = RFST_SRX;
 	__critical while (!ao_radio_dma_done)
-		ao_sleep(&ao_radio_dma_done);
+			   if (ao_sleep(&ao_radio_dma_done) != 0) {
+				   printf("recv timeout\n"); flush();
+				   ao_radio_abort();
+			   }
 	dma_done = ao_radio_dma_done;
 	ao_mutex_put(&ao_radio_mutex);
 
@@ -174,19 +128,22 @@ void
 ao_packet_master(void)
 {
 	uint8_t	status;
-	tx_packet.addr = ao_serial_number;
+
 	ao_radio_set_packet();
+	tx_packet.addr = ao_serial_number;
+	tx_packet.len = AO_PACKET_SYN;
 	while (ao_packet_enable) {
+		ao_led_on(AO_LED_RED);
 		ao_delay(AO_MS_TO_TICKS(100));
 		ao_packet_send();
-		ao_led_toggle(AO_LED_RED);
-		ao_packet_timer_set(AO_MS_TO_TICKS(1000));
+		ao_led_off(AO_LED_RED);
+		ao_led_on(AO_LED_GREEN);
+		ao_alarm(AO_MS_TO_TICKS(1000));
 		status = ao_packet_recv();
-		ao_packet_timer_cancel();
+		ao_led_off(AO_LED_GREEN);
 		if (status & AO_DMA_DONE) {
-			ao_led_toggle(AO_LED_GREEN);
 			ao_packet_master_sleeping = 1;
-			ao_sleep(AO_MS_TO_TICKS(1000));
+			ao_delay(AO_MS_TO_TICKS(1000));
 			ao_packet_master_sleeping = 0;
 		}
 	}
@@ -260,25 +217,8 @@ ao_packet_forward(void) __reentrant
 	ao_packet_enable = 1;
 	ao_cmd_white();
 
-	ao_radio_set_packet();
-	if (ao_cmd_lex_c == 'm') {
-		while ((c = getchar()) != '~')
-			ao_packet_send();
-	} else {
-		for (;;) {
-			ao_packet_recv();
-			ao_led_toggle(AO_LED_GREEN);
-			if (rx_packet.packet.d[0] == (uint8_t) '@')
-				break;
-		}
-	}
-	ao_packet_enable = 0;
-	return;
-#if 0
-	if (ao_cmd_lex_c == 'm') {
-		ao_add_task(&ao_packet_timer_task, ao_packet_timer, "timeout");
+	if (ao_cmd_lex_c == 'm')
 		ao_add_task(&ao_packet_task, ao_packet_master, "master");
-	}
 	else
 		ao_add_task(&ao_packet_task, ao_packet_slave, "slave");
 	ao_add_task(&ao_packet_echo_task, ao_packet_echo, "echo");