From 16a40815200a4ab2587df6d6986d59b108bc7770 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 _timeout API for const correctness API that takes _timeout 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 ++-- include/timeout_q.h | 4 ++-- kernel/timeout.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/kernel.h b/include/kernel.h index 0c55c578a45..eea4e62a172 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -1058,8 +1058,8 @@ __syscall void k_thread_abort(k_tid_t thread); */ __syscall void k_thread_start(k_tid_t thread); -extern k_ticks_t z_timeout_expires(struct _timeout *timeout); -extern k_ticks_t z_timeout_remaining(struct _timeout *timeout); +extern k_ticks_t z_timeout_expires(const struct _timeout *timeout); +extern k_ticks_t z_timeout_remaining(const struct _timeout *timeout); #ifdef CONFIG_SYS_CLOCK_EXISTS diff --git a/include/timeout_q.h b/include/timeout_q.h index e32dc138730..d8e169aae9d 100644 --- a/include/timeout_q.h +++ b/include/timeout_q.h @@ -32,7 +32,7 @@ void z_add_timeout(struct _timeout *to, _timeout_func_t fn, int z_abort_timeout(struct _timeout *to); -static inline bool z_is_inactive_timeout(struct _timeout *t) +static inline bool z_is_inactive_timeout(const struct _timeout *t) { return !sys_dnode_is_linked(&t->node); } @@ -58,7 +58,7 @@ int32_t z_get_next_timeout_expiry(void); void z_set_timeout_expiry(int32_t ticks, bool idle); -k_ticks_t z_timeout_remaining(struct _timeout *timeout); +k_ticks_t z_timeout_remaining(const struct _timeout *timeout); #else diff --git a/kernel/timeout.c b/kernel/timeout.c index 5b60828271a..4bc031f74c3 100644 --- a/kernel/timeout.c +++ b/kernel/timeout.c @@ -143,7 +143,7 @@ int z_abort_timeout(struct _timeout *to) } /* must be locked */ -static k_ticks_t timeout_rem(struct _timeout *timeout) +static k_ticks_t timeout_rem(const struct _timeout *timeout) { k_ticks_t ticks = 0; @@ -161,7 +161,7 @@ static k_ticks_t timeout_rem(struct _timeout *timeout) return ticks - elapsed(); } -k_ticks_t z_timeout_remaining(struct _timeout *timeout) +k_ticks_t z_timeout_remaining(const struct _timeout *timeout) { k_ticks_t ticks = 0; @@ -172,7 +172,7 @@ k_ticks_t z_timeout_remaining(struct _timeout *timeout) return ticks; } -k_ticks_t z_timeout_expires(struct _timeout *timeout) +k_ticks_t z_timeout_expires(const struct _timeout *timeout) { k_ticks_t ticks = 0;