patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers: timer: nrf_grtc_timer: fix return type signedness

Browse source 
Negative error codes cannot be returned if the function returns an
unsigned integer. Change function's API to return the read compare
register value through a pointer and the actual result as a signed
integer.

Signed-off-by: Jędrzej Ciupis <jedrzej.ciupis@nordicsemi.no>
This commit is contained in:
Jędrzej Ciupis 2024-03-19 12:24:03 +01:00 committed by Fabio Baltieri
parent 6e66aa1f7c
commit f18ea95758
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/timer/nrf_grtc_timer.c
View file

@ -123,19 +123,18 @@ static inline uint64_t counter(void)
return now; return now;
} }
static inline uint64_t get_comparator(uint32_t chan) static inline int get_comparator(uint32_t chan, uint64_t *cc)
{ {
uint64_t cc;
nrfx_err_t result; nrfx_err_t result;
result = nrfx_grtc_syscounter_cc_value_read(chan, &cc); result = nrfx_grtc_syscounter_cc_value_read(chan, cc);
if (result != NRFX_SUCCESS) { if (result != NRFX_SUCCESS) {
if (result != NRFX_ERROR_INVALID_PARAM) { if (result != NRFX_ERROR_INVALID_PARAM) {
return -EAGAIN; return -EAGAIN;
} }
return -EPERM; return -EPERM;
} }
return cc; return 0;
} }
static void system_timeout_set(uint64_t value) static void system_timeout_set(uint64_t value)
@ -260,11 +259,11 @@ void z_nrf_grtc_timer_compare_int_unlock(int32_t chan, bool key)
compare_int_unlock(chan, key); compare_int_unlock(chan, key);
} }
uint64_t z_nrf_grtc_timer_compare_read(int32_t chan) int z_nrf_grtc_timer_compare_read(int32_t chan, uint64_t *val)
{ {
IS_CHANNEL_ALLOWED_ASSERT(chan); IS_CHANNEL_ALLOWED_ASSERT(chan);
return get_comparator(chan); return get_comparator(chan, val);
} }
static int compare_set_nolocks(int32_t chan, uint64_t target_time, static int compare_set_nolocks(int32_t chan, uint64_t target_time,

6
include/zephyr/drivers/timer/nrf_grtc_timer.h
View file

@ -101,11 +101,13 @@ void z_nrf_grtc_timer_compare_int_unlock(int32_t chan, bool key);
* *
* @param chan Channel ID. * @param chan Channel ID.
* *
* @retval >=0 Positive is a Value set in the compare register * @param val Pointer to store the value.
*
* @retval 0 if the compare register was read successfully.
* @retval -EAGAIN if compare for given channel is not set. * @retval -EAGAIN if compare for given channel is not set.
* @retval -EPERM if either channel is unavailable or SYSCOUNTER is not running. * @retval -EPERM if either channel is unavailable or SYSCOUNTER is not running.
*/ */
uint64_t z_nrf_grtc_timer_compare_read(int32_t chan); int z_nrf_grtc_timer_compare_read(int32_t chan, uint64_t *val);
/** @brief Set compare channel to given value. /** @brief Set compare channel to given value.
* *