unified: fix remaining issues for building without SYS_CLOCK_EXIST

Do not include timeout_q.h when !SYS_CLOCK_EXIST, this allows removing
_unpend_thread_timing_out() in that case.

Have _abort_thread_timeout() return 0 (success) when !SYS_CLOCK_EXIST.

With this change, the minimal footprint nanokernel project compiles for
the unified kernel.

Change-Id: Ifbf9167a82fb3ebcf6941bf3f85c105c23c9060c
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2016-10-06 16:27:45 -04:00
commit a6e85b248a
2 changed files with 7 additions and 11 deletions

View file

@ -30,13 +30,14 @@
extern "C" {
#endif
#ifdef CONFIG_SYS_CLOCK_EXISTS
#include <timeout_q.h>
#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)
#else
#define _init_thread_timeout(thread) do { } while ((0))
#define _nano_timeout_tcs_init(thread) _init_thread_timeout(thread)
#define _add_thread_timeout(thread, wait_q, timeout) do { } while (0)
static inline int _abort_thread_timeout(struct k_thread *thread) { return 0; }
#define _get_next_timeout_expiry() (K_FOREVER)
#endif
#ifdef __cplusplus