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
kernel/unified/include/wait_q.h
View file

@ -30,20 +30,12 @@
extern "C" {
#endif
#if defined(CONFIG_NANO_TIMEOUTS)
#include <timeout_q.h>
#elif defined(CONFIG_NANO_TIMERS)
#include <timeout_q.h>
#define _init_thread_timeout(thread) do { } while ((0))
#define _abort_thread_timeout(thread) do { } while ((0))
#define _add_thread_timeout(thread, pq, ticks) do { } while (0)
#else
#if !defined(CONFIG_SYS_CLOCK_EXISTS)
#define _init_thread_timeout(thread) do { } while ((0))
#define _abort_thread_timeout(thread) do { } while ((0))
#define _get_next_timeout_expiry() (K_FOREVER)
#define _add_thread_timeout(thread, pq, ticks) do { } while (0)
#endif