X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_radio_cmac.c;h=bff848f6d249fd797bfd02198619e5f366fe68e8;hp=fc0ca8b1310382912895f25d7f6e023525f1c0e2;hb=5c9172ba5681ff93d63c9c263a453d0025170045;hpb=b635cb26ba54c8f5c6a958e0ab0bc4d34d33b635

diff --git a/src/core/ao_radio_cmac.c b/src/core/ao_radio_cmac.c
index fc0ca8b1..bff848f6 100644
--- a/src/core/ao_radio_cmac.c
+++ b/src/core/ao_radio_cmac.c
@@ -21,7 +21,6 @@
 static __xdata uint8_t ao_radio_cmac_mutex;
 __pdata int8_t ao_radio_cmac_rssi;
 static __xdata uint8_t cmac_data[AO_CMAC_MAX_LEN + AO_CMAC_KEY_LEN + 2 + AO_CMAC_KEY_LEN];
-static __pdata uint8_t ao_radio_cmac_len;
 
 static uint8_t
 round_len(uint8_t len)
@@ -85,18 +84,14 @@ radio_cmac_recv(uint8_t len, uint16_t timeout) __reentrant
 #if HAS_MONITOR
 	ao_monitor_set(0);
 #endif
-	if (timeout)
-		ao_alarm(timeout);
-
-	i = ao_radio_recv(cmac_data, len + AO_CMAC_KEY_LEN + 2);
-	ao_clear_alarm();
+	i = ao_radio_recv(cmac_data, len + AO_CMAC_KEY_LEN + 2, timeout);
 
 	if (!i) {
 		ao_radio_cmac_rssi = 0;
 		return AO_RADIO_CMAC_TIMEOUT;
 	}
 
-	ao_radio_cmac_rssi = (int8_t) (((int8_t) cmac_data[len + AO_CMAC_KEY_LEN]) >> 1) - 74;
+	ao_radio_cmac_rssi = ao_radio_rssi;
 	if (!(cmac_data[len + AO_CMAC_KEY_LEN +1] & AO_RADIO_STATUS_CRC_OK))
 		return AO_RADIO_CMAC_CRC_ERROR;
 
@@ -150,7 +145,7 @@ ao_radio_cmac_send(__xdata void *packet, uint8_t len) __reentrant
 int8_t
 ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentrant
 {
-	uint8_t	i;
+	int8_t	i;
 	if (len > AO_CMAC_MAX_LEN)
 		return AO_RADIO_CMAC_LEN_ERROR;
 	ao_mutex_get(&ao_radio_cmac_mutex);