projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make cmd number parsing functions return value
[fw/altos]
/
src
/
kernel
/
ao_radio_cmac_cmd.c
diff --git
a/src/kernel/ao_radio_cmac_cmd.c
b/src/kernel/ao_radio_cmac_cmd.c
index e5b4ffdf1cd14563b6a049e1d78860ca8aa6cd5c..1433e96d84523ceb9e5bcbadc491482305a27c4d 100644
(file)
--- a/
src/kernel/ao_radio_cmac_cmd.c
+++ b/
src/kernel/ao_radio_cmac_cmd.c
@@
-50,16
+50,14
@@
radio_cmac_send_cmd(void)
uint8_t i;
uint8_t len;
uint8_t i;
uint8_t len;
- ao_cmd_decimal();
+
len =
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
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();
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)
for (i = 0; i < len; i++) {
cmac_data[i] = getbyte();
if (ao_cmd_status != ao_cmd_success)
@@
-74,14
+72,12
@@
radio_cmac_recv_cmd(void)
uint8_t len, i;
uint16_t timeout;
uint8_t len, i;
uint16_t timeout;
- ao_cmd_decimal();
+
len =
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
if (ao_cmd_status != ao_cmd_success)
return;
- len = ao_cmd_lex_i;
- ao_cmd_decimal();
+ timeout = AO_MS_TO_TICKS(ao_cmd_decimal());
if (ao_cmd_status != ao_cmd_success)
return;
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);
if (i == AO_RADIO_CMAC_OK) {
printf ("PACKET ");
i = ao_radio_cmac_recv(cmac_data, len, timeout);
if (i == AO_RADIO_CMAC_OK) {
printf ("PACKET ");