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

diff --git a/src/core/ao_radio_cmac.c b/src/core/ao_radio_cmac.c
index 3e8dce53..bff848f6 100644
--- a/src/core/ao_radio_cmac.c
+++ b/src/core/ao_radio_cmac.c
@@ -15,38 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "ao.h"
-
-#define AO_CMAC_KEY_LEN		AO_AES_LEN
-#define AO_CMAC_MAX_LEN		(128 - AO_CMAC_KEY_LEN)
+#include <ao.h>
+#include <ao_radio_cmac.h>
 
 static __xdata uint8_t ao_radio_cmac_mutex;
-__pdata int16_t ao_radio_cmac_rssi;
+__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
-getnibble(void)
-{
-	int8_t	b;
-
-	b = ao_cmd_hexchar(getchar());
-	if (b < 0) {
-		ao_cmd_status = ao_cmd_lex_error;
-		return 0;
-	}
-	return (uint8_t) b;
-}
 
-static uint8_t
-getbyte(void)
-{
-	uint8_t	b;
-	b = getnibble() << 4;
-	b |= getnibble();
-	return b;
-}
-	
 static uint8_t
 round_len(uint8_t len)
 {
@@ -109,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 = (int16_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;
 
@@ -174,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);
@@ -191,55 +162,3 @@ ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentr
 	return i;
 }
 
-static void
-radio_cmac_send_cmd(void) __reentrant
-{
-	uint8_t	i;
-	uint8_t	len;
-
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	len = ao_cmd_lex_i;
-	if (len > AO_CMAC_MAX_LEN) {
-		ao_cmd_status = ao_cmd_syntax_error;
-		return;
-	}
-	flush();
-	ao_mutex_get(&ao_radio_cmac_mutex);
-	len = ao_cmd_lex_i;
-	for (i = 0; i < len; i++) {
-		cmac_data[i] = getbyte();
-		if (ao_cmd_status != ao_cmd_success)
-			return;
-	}
-	radio_cmac_send(len);
-	ao_mutex_put(&ao_radio_cmac_mutex);
-}
-
-static void
-radio_cmac_recv_cmd(void) __reentrant
-{
-	uint8_t		len, i;
-	uint16_t	timeout;
-
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	len = ao_cmd_lex_i;
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	timeout = AO_MS_TO_TICKS(ao_cmd_lex_i);
-	ao_mutex_get(&ao_radio_cmac_mutex);
-	i = radio_cmac_recv(len, timeout);
-	if (i == AO_RADIO_CMAC_OK) {
-		printf ("PACKET ");
-		for (i = 0; i < len; i++)
-			printf("%02x", cmac_data[i]);
-		printf (" %d\n", ao_radio_cmac_rssi);
-	} else
-		printf ("ERROR %d %d\n", i, ao_radio_cmac_rssi);
-	ao_mutex_put(&ao_radio_cmac_mutex);
-}
-