michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unified: merge NANO_TIMERS and NANO_TIMEOUTS with SYS_CLOCK_EXISTS

Browse source 
Timers are based off timeouts now, which can only be enabled when the
system clock is enabled. So the three are really just one setting now.

Keep the NANO_TIMERS and NANO_TIMEOUTS around for now until all
middleware that rely on them is updated. They are always enabled when
SYS_CLOCK_EXISTS is enabled.

Change-Id: Iaef1302ef9ad8fc5640542ab6d7304d67aafcfdc
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2016-10-06 15:04:23 -04:00
commit 1a5450bb8e
9 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/kernel.h
View file

@ -138,7 +138,7 @@ extern void k_thread_abort(k_tid_t thread);
#endif
#endif
#ifdef CONFIG_NANO_TIMEOUTS
#ifdef CONFIG_SYS_CLOCK_EXISTS
#define _THREAD_TIMEOUT_INIT(obj) \
(obj).nano_timeout = { \
.node = { {0}, {0} }, \
@ -552,7 +552,7 @@ static inline int k_work_pending(struct k_work *work)
extern void k_work_q_start(struct k_work_q *work_q,
const struct k_thread_config *config);
#if defined(CONFIG_NANO_TIMEOUTS)
#if defined(CONFIG_SYS_CLOCK_EXISTS)
/*
* @brief An item which can be scheduled on a @ref k_work_q with a
@ -607,7 +607,7 @@ extern int k_delayed_work_submit_to_queue(struct k_work_q *work_q,
*/
extern int k_delayed_work_cancel(struct k_delayed_work *work);
#endif /* CONFIG_NANO_TIMEOUTS */
#endif /* CONFIG_SYS_CLOCK_EXISTS */
#if defined(CONFIG_SYSTEM_WORKQUEUE)
@ -627,7 +627,7 @@ static inline void k_work_submit(struct k_work *work)
k_work_submit_to_queue(&k_sys_work_q, work);
}
#if defined(CONFIG_NANO_TIMEOUTS)
#if defined(CONFIG_SYS_CLOCK_EXISTS)
/*
* @brief Submit a delayed work item to the system workqueue.
*
@ -643,7 +643,7 @@ static inline int k_delayed_work_submit(struct k_delayed_work *work,
return k_delayed_work_submit_to_queue(&k_sys_work_q, work, ticks);
}
#endif /* CONFIG_NANO_TIMEOUTS */
#endif /* CONFIG_SYS_CLOCK_EXISTS */
#endif /* CONFIG_SYSTEM_WORKQUEUE */
/**