X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_radio_cmac_cmd.c;h=6d29f3925b186a5478fb4802bd11fe052e413f29;hb=master;hp=64410921e436a953d15a5a1d5e4a0e89dbfedacd;hpb=24167015705ae831692b95735968b04a876f935e;p=fw%2Faltos

diff --git a/src/kernel/ao_radio_cmac_cmd.c b/src/kernel/ao_radio_cmac_cmd.c
index 64410921..fe9eaf27 100644
--- a/src/kernel/ao_radio_cmac_cmd.c
+++ b/src/kernel/ao_radio_cmac_cmd.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +20,7 @@
 #include <ao_radio_cmac_cmd.h>
 #include <ao_radio_cmac.h>
 
-static __xdata uint8_t cmac_data[AO_CMAC_MAX_LEN];
+static uint8_t cmac_data[AO_CMAC_MAX_LEN];
 
 static uint8_t
 getnibble(void)
@@ -44,54 +45,55 @@ getbyte(void)
 }
 	
 static void
-radio_cmac_send_cmd(void) __reentrant
+radio_cmac_send_cmd(void) 
 {
-	uint8_t	i;
-	uint8_t	len;
+	uint32_t i;
+	uint32_t len;
 
-	ao_cmd_decimal();
+	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();
-	len = ao_cmd_lex_i;
 	for (i = 0; i < len; i++) {
 		cmac_data[i] = getbyte();
 		if (ao_cmd_status != ao_cmd_success)
 			return;
 	}
-	ao_radio_cmac_send(cmac_data, len);
+	ao_radio_cmac_send(cmac_data, (uint8_t) len);
 }
 
 static void
-radio_cmac_recv_cmd(void) __reentrant
+radio_cmac_recv_cmd(void) 
 {
-	uint8_t		len, i;
-	uint16_t	timeout;
+	uint32_t len, l;
+	int8_t i;
+	AO_TICK_TYPE	timeout;
 
-	ao_cmd_decimal();
+	len = ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	len = ao_cmd_lex_i;
-	ao_cmd_decimal();
+	if (len > AO_CMAC_MAX_LEN) {
+		ao_cmd_status = ao_cmd_syntax_error;
+		return;
+	}
+	timeout = AO_MS_TO_TICKS(ao_cmd_decimal());
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	timeout = AO_MS_TO_TICKS(ao_cmd_lex_i);
-	i = ao_radio_cmac_recv(cmac_data, len, timeout);
+	i = ao_radio_cmac_recv(cmac_data, (uint8_t) len, timeout);
 	if (i == AO_RADIO_CMAC_OK) {
 		printf ("PACKET ");
-		for (i = 0; i < len; i++)
-			printf("%02x", cmac_data[i]);
+		for (l = 0; l < len; l++)
+			printf("%02x", cmac_data[l]);
 		printf (" %d\n", ao_radio_cmac_rssi);
 	} else
 		printf ("ERROR %d %d\n", i, ao_radio_cmac_rssi);
 }
 
-static __code struct ao_cmds ao_radio_cmac_cmds[] = {
+static const struct ao_cmds ao_radio_cmac_cmds[] = {
 	{ radio_cmac_send_cmd,	"s <length>\0Send AES-CMAC packet. Bytes to send follow on next line" },
 	{ radio_cmac_recv_cmd,	"S <length> <timeout>\0Receive AES-CMAC packet. Timeout in ms" },
 	{ 0, NULL },