projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Configure SPI GPIO pins to 50MHz
[fw/altos]
/
src
/
kernel
/
ao_radio_cmac.c
diff --git
a/src/kernel/ao_radio_cmac.c
b/src/kernel/ao_radio_cmac.c
index 155fce350b69f77c464d5fefe747ede3c6478b14..5f09344af8915dd273b4ab044ca95fdc5a1df49d 100644
(file)
--- a/
src/kernel/ao_radio_cmac.c
+++ b/
src/kernel/ao_radio_cmac.c
@@
-37,7
+37,7
@@
round_len(uint8_t len)
len = AO_CMAC_KEY_LEN;
rem = len % AO_CMAC_KEY_LEN;
if (rem != 0)
len = AO_CMAC_KEY_LEN;
rem = len % AO_CMAC_KEY_LEN;
if (rem != 0)
- len += (AO_CMAC_KEY_LEN - rem);
+ len += (
uint8_t) (
AO_CMAC_KEY_LEN - rem);
return len;
}
return len;
}
@@
-77,7
+77,7
@@
radio_cmac_send(uint8_t len)
*/
static int8_t
*/
static int8_t
-radio_cmac_recv(uint8_t len,
uint16_t
timeout)
+radio_cmac_recv(uint8_t len,
AO_TICK_TYPE
timeout)
{
uint8_t i;
{
uint8_t i;
@@
-132,7
+132,7
@@
ao_radio_cmac_send(void *packet, uint8_t len)
if (len > AO_CMAC_MAX_LEN)
return AO_RADIO_CMAC_LEN_ERROR;
ao_mutex_get(&ao_radio_cmac_mutex);
if (len > AO_CMAC_MAX_LEN)
return AO_RADIO_CMAC_LEN_ERROR;
ao_mutex_get(&ao_radio_cmac_mutex);
-
ao_x
memcpy(cmac_data, packet, len);
+ memcpy(cmac_data, packet, len);
#if AO_LED_TX
ao_led_on(AO_LED_TX);
#endif
#if AO_LED_TX
ao_led_on(AO_LED_TX);
#endif
@@
-145,7
+145,7
@@
ao_radio_cmac_send(void *packet, uint8_t len)
}
int8_t
}
int8_t
-ao_radio_cmac_recv(void *packet, uint8_t len,
uint16_t
timeout)
+ao_radio_cmac_recv(void *packet, uint8_t len,
AO_TICK_TYPE
timeout)
{
int8_t i;
if (len > AO_CMAC_MAX_LEN)
{
int8_t i;
if (len > AO_CMAC_MAX_LEN)
@@
-159,7
+159,7
@@
ao_radio_cmac_recv(void *packet, uint8_t len, uint16_t timeout)
ao_led_off(AO_LED_RX);
#endif
if (i == AO_RADIO_CMAC_OK)
ao_led_off(AO_LED_RX);
#endif
if (i == AO_RADIO_CMAC_OK)
-
ao_x
memcpy(packet, cmac_data, len);
+ memcpy(packet, cmac_data, len);
ao_mutex_put(&ao_radio_cmac_mutex);
return i;
}
ao_mutex_put(&ao_radio_cmac_mutex);
return i;
}