From: Keith Packard <keithp@keithp.com>
Date: Sat, 19 Dec 2009 19:34:16 +0000 (-0800)
Subject: Use ao_radio_get/ao_radio_put in packet code.
X-Git-Tag: debian/0.6+60+g10d1bbc~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=10d1bbcd9709a5eee8d50989215242b16feb7232

Use ao_radio_get/ao_radio_put in packet code.

The ao_radio_get function both acquires the mutex *and* configures the
radio channel and frequency. Failing to use this in the packet code
would leave the radio frequency unconfigured.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/ao.h b/src/ao.h
index 39f7bea2..096a4d80 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -835,6 +835,11 @@ extern __xdata uint8_t ao_radio_mutex;
 void
 ao_radio_general_isr(void) interrupt 16;
 
+void
+ao_radio_get(void);
+
+#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
+
 void
 ao_radio_set_telemetry(void);
 
diff --git a/src/ao_packet.c b/src/ao_packet.c
index 3ce7e9ab..98fdcb90 100644
--- a/src/ao_packet.c
+++ b/src/ao_packet.c
@@ -33,8 +33,9 @@ void
 ao_packet_send(void)
 {
 	ao_led_on(AO_LED_RED);
-	ao_config_get();
-	ao_mutex_get(&ao_radio_mutex);
+	ao_radio_get();
+
+	/* If any tx data is pending then copy it into the tx packet */
 	if (ao_packet_tx_used && ao_tx_packet.len == 0) {
 		memcpy(&ao_tx_packet.d, tx_data, ao_packet_tx_used);
 		ao_tx_packet.len = ao_packet_tx_used;
@@ -42,9 +43,7 @@ ao_packet_send(void)
 		ao_packet_tx_used = 0;
 		ao_wakeup(&tx_data);
 	}
-	ao_radio_idle();
 	ao_radio_done = 0;
-	RF_CHANNR = ao_config.radio_channel;
 	ao_dma_set_transfer(ao_radio_dma,
 			    &ao_tx_packet,
 			    &RFDXADDR,
@@ -59,7 +58,7 @@ ao_packet_send(void)
 	RFST = RFST_STX;
 	__critical while (!ao_radio_done)
 		ao_sleep(&ao_radio_done);
-	ao_mutex_put(&ao_radio_mutex);
+	ao_radio_put();
 	ao_led_off(AO_LED_RED);
 }
 
@@ -69,10 +68,7 @@ ao_packet_recv(void)
 	uint8_t	dma_done;
 
 	ao_led_on(AO_LED_GREEN);
-	ao_config_get();
-	ao_mutex_get(&ao_radio_mutex);
-	ao_radio_idle();
-	RF_CHANNR = ao_config.radio_channel;
+	ao_radio_get();
 	ao_dma_set_transfer(ao_radio_dma,
 			    &RFDXADDR,
 			    &ao_rx_packet,
@@ -89,7 +85,7 @@ ao_packet_recv(void)
 			   if (ao_sleep(&ao_radio_dma_done) != 0)
 				   ao_radio_abort();
 	dma_done = ao_radio_dma_done;
-	ao_mutex_put(&ao_radio_mutex);
+	ao_radio_put();
 	ao_led_off(AO_LED_GREEN);
 
 	if (dma_done & AO_DMA_DONE) {
diff --git a/src/ao_radio.c b/src/ao_radio.c
index 4dea6dce..1a0cf4fa 100644
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -324,7 +324,7 @@ ao_radio_idle(void)
 	}
 }
 
-static void
+void
 ao_radio_get(void)
 {
 	ao_config_get();
@@ -336,7 +336,6 @@ ao_radio_get(void)
 	RF_FREQ0 = (uint8_t) (ao_config.radio_cal);
 }
 
-#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
 
 void
 ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant