X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_radio.c;h=2c4a661ec7883755b3448b0c709d10d8f5ea0dde;hb=33f8f7add27a02d24b0671da353b59762224c1ee;hp=75f241d4d2391e3664181fc3a0b230919e283e89;hpb=c8a00bb9ccdf0d4257f037c2bf996ce5e6b0b0c0;p=fw%2Faltos

diff --git a/src/cc1111/ao_radio.c b/src/cc1111/ao_radio.c
index 75f241d4..2c4a661e 100644
--- a/src/cc1111/ao_radio.c
+++ b/src/cc1111/ao_radio.c
@@ -260,7 +260,7 @@ ao_radio_general_isr(void) __interrupt 16
 	}
 }
 
-void
+static void
 ao_radio_set_packet(void)
 {
 	uint8_t	i;
@@ -268,7 +268,7 @@ ao_radio_set_packet(void)
 		RF[fixed_pkt_setup[i]] = fixed_pkt_setup[i+1];
 }
 
-void
+static void
 ao_radio_idle(void)
 {
 	if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
@@ -280,13 +280,15 @@ ao_radio_idle(void)
 	}
 }
 
-void
+#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
+
+static void
 ao_radio_get(uint8_t len)
 {
 	ao_config_get();
 	ao_mutex_get(&ao_radio_mutex);
 	ao_radio_idle();
-	RF_CHANNR = ao_config.radio_channel;
+	RF_CHANNR = 0;
 	RF_FREQ2 = (uint8_t) (ao_config.radio_setting >> 16);
 	RF_FREQ1 = (uint8_t) (ao_config.radio_setting >> 8);
 	RF_FREQ0 = (uint8_t) (ao_config.radio_setting);
@@ -421,7 +423,7 @@ ao_radio_test(void)
 	mode++;
 	if ((mode & 2) && !radio_on) {
 #if HAS_MONITOR
-		ao_set_monitor(0);
+		ao_monitor_disable();
 #endif
 #if PACKET_HAS_SLAVE
 		ao_packet_slave_stop();
@@ -439,6 +441,9 @@ ao_radio_test(void)
 		ao_radio_idle();
 		ao_radio_put();
 		radio_on = 0;
+#if HAS_MONITOR
+		ao_monitor_enable();
+#endif
 	}
 }