X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_radio.c;h=c7c8dc8d7620bc69883bac47d76b4e004adba569;hp=2dfa9279d4b6f808649237e5cfbc1979f6cc8785;hb=87e6f3e5c1688503ab8595912d8d6eb7139830b7;hpb=7b14c3e609749f4fc00dbd660541375048535218

diff --git a/src/ao_radio.c b/src/ao_radio.c
index 2dfa9279..c7c8dc8d 100644
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -281,6 +281,24 @@ static __code uint8_t packet_setup[] = {
 				 RF_PKTCTRL0_LENGTH_CONFIG_FIXED),
 };
 
+__xdata uint8_t	ao_radio_dma;
+__xdata uint8_t ao_radio_dma_done;
+__xdata uint8_t ao_radio_done;
+__xdata uint8_t ao_radio_mutex;
+
+void
+ao_radio_general_isr(void) interrupt 16
+{
+	S1CON &= ~0x03;
+	if (RFIF & RFIF_IM_TIMEOUT) {
+		ao_dma_abort(ao_radio_dma);
+		RFIF &= ~ RFIF_IM_TIMEOUT;
+	} else if (RFIF & RFIF_IM_DONE) {
+		ao_radio_done = 1;
+		ao_wakeup(&ao_radio_done);
+		RFIF &= ~RFIF_IM_DONE;
+	}
+}
 
 void
 ao_radio_set_telemetry(void)
@@ -306,10 +324,6 @@ ao_radio_set_rdf(void)
 		RF[rdf_setup[i]] = rdf_setup[i+1];
 }
 
-__xdata uint8_t	ao_radio_dma;
-__xdata uint8_t ao_radio_dma_done;
-__xdata uint8_t ao_radio_mutex;
-
 void
 ao_radio_idle(void)
 {
@@ -328,6 +342,7 @@ ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
 	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,
 			    telemetry,
@@ -341,8 +356,8 @@ ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
 			    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);
 }
 
@@ -420,9 +435,9 @@ ao_radio_rdf(int ms)
 }
 
 void
-ao_radio_abort(uint8_t reason)
+ao_radio_abort(void)
 {
-	ao_dma_abort(ao_radio_dma, reason);
+	ao_dma_abort(ao_radio_dma);
 	ao_radio_idle();
 }
 
@@ -430,9 +445,29 @@ void
 ao_radio_rdf_abort(void)
 {
 	if (ao_radio_rdf_running)
-		ao_radio_abort(AO_DMA_ABORTED);
+		ao_radio_abort();
 }
 
+/* Output carrier */
+void
+ao_radio_test(void)
+{
+	ao_config_get();
+	ao_mutex_get(&ao_radio_mutex);
+	ao_radio_idle();
+	printf ("Hit a character to stop..."); flush();
+	RFST = RFST_STX;
+	getchar();
+	ao_radio_idle();
+	ao_mutex_put(&ao_radio_mutex);
+	putchar('\n');
+}
+
+__code struct ao_cmds ao_radio_cmds[] = {
+	{ 'C',	ao_radio_test,	"C                                  Radio carrier test" },
+	{ 0,	ao_radio_test,	NULL },
+};
+
 void
 ao_radio_init(void)
 {
@@ -442,4 +477,8 @@ ao_radio_init(void)
 	ao_radio_set_telemetry();
 	ao_radio_dma_done = 1;
 	ao_radio_dma = ao_dma_alloc(&ao_radio_dma_done);
+	RFIF = 0;
+	RFIM = RFIM_IM_TIMEOUT|RFIM_IM_DONE;
+	IEN2 |= IEN2_RFIE;
+	ao_cmd_register(&ao_radio_cmds[0]);
 }