From acc642801aa5f8c0c05bde134e5924fe957ce023 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 28 Jan 2022 15:31:09 -0800 Subject: [PATCH] ao_radio_cmac: Make recv timeouts AO_TICK_TYPE While these should generally be short enough to live in a 16-bit type, use AO_TICK_TYPE for consistency. Signed-off-by: Keith Packard --- src/kernel/ao_radio_cmac.c | 6 +++--- src/kernel/ao_radio_cmac.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kernel/ao_radio_cmac.c b/src/kernel/ao_radio_cmac.c index c7b48e06..5f09344a 100644 --- 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 += (uint8_t) (AO_CMAC_KEY_LEN - rem); return len; } @@ -77,7 +77,7 @@ radio_cmac_send(uint8_t len) */ 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; @@ -145,7 +145,7 @@ ao_radio_cmac_send(void *packet, uint8_t len) } 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) diff --git a/src/kernel/ao_radio_cmac.h b/src/kernel/ao_radio_cmac.h index 5fd6e105..2977cd3e 100644 --- a/src/kernel/ao_radio_cmac.h +++ b/src/kernel/ao_radio_cmac.h @@ -36,7 +36,7 @@ ao_radio_cmac_send(void *packet, uint8_t len); #define AO_RADIO_CMAC_TIMEOUT -4 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); void ao_radio_cmac_init(void); -- 2.30.2