X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_radio_cmac_cmd.c;h=fe9eaf27a27a797247619fb222cef77b3f417cd1;hb=a3fd78224f222adc4cec394a2c8f4153d6e8571c;hp=e5b4ffdf1cd14563b6a049e1d78860ca8aa6cd5c;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;p=fw%2Faltos

diff --git a/src/kernel/ao_radio_cmac_cmd.c b/src/kernel/ao_radio_cmac_cmd.c
index e5b4ffdf..fe9eaf27 100644
--- a/src/kernel/ao_radio_cmac_cmd.c
+++ b/src/kernel/ao_radio_cmac_cmd.c
@@ -47,46 +47,47 @@ getbyte(void)
 static void
 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) 
 {
-	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);