From f1b86caff32e7f3d34fd4151f885aedc405f90dd Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Fri, 18 Sep 2020 16:24:57 -0500 Subject: [PATCH] kernel: timer: update k_timer API for const correctness API that takes k_timer structures but doesn't change data in them is updated to const-qualify the underlying object, allowing information to be retrieved from contexts where the containing object is immutable. Signed-off-by: Peter A. Bigot --- include/kernel.h | 4 ++-- kernel/timer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/kernel.h b/include/kernel.h index eea4e62a172..9c353d025d3 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -2024,9 +2024,9 @@ static inline void z_impl_k_timer_user_data_set(struct k_timer *timer, * * @return The user data. */ -__syscall void *k_timer_user_data_get(struct k_timer *timer); +__syscall void *k_timer_user_data_get(const struct k_timer *timer); -static inline void *z_impl_k_timer_user_data_get(struct k_timer *timer) +static inline void *z_impl_k_timer_user_data_get(const struct k_timer *timer) { return timer->user_data; } diff --git a/kernel/timer.c b/kernel/timer.c index cc1c9182c50..d338c172220 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -256,7 +256,7 @@ static inline k_ticks_t z_vrfy_k_timer_expires_ticks(struct k_timer *timer) } #include -static inline void *z_vrfy_k_timer_user_data_get(struct k_timer *timer) +static inline void *z_vrfy_k_timer_user_data_get(const struct k_timer *timer) { Z_OOPS(Z_SYSCALL_OBJ(timer, K_OBJ_TIMER)); return z_impl_k_timer_user_data_get(timer);