From e02c720e3da3c6d102a2882a242d50ca4001f97a Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Mon, 19 Sep 2016 15:49:11 -0400 Subject: [PATCH] unified: Remove obsolete wait_q.h macros Removes the following wait_q.h macros _NANO_OBJECT_WAIT() _TIMEOUT_UPDATE() _TIMEOUT_TICK_GET() Change-Id: I7cb78728aaad74acf7f121c79f03d32fa6af5aac Signed-off-by: Peter Mitsis --- kernel/unified/include/wait_q.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/kernel/unified/include/wait_q.h b/kernel/unified/include/wait_q.h index 6987d35c339..0ecefd1f974 100644 --- a/kernel/unified/include/wait_q.h +++ b/kernel/unified/include/wait_q.h @@ -81,8 +81,6 @@ static inline void _timeout_remove_tcs_from_wait_q(struct tcs *tcs) } #include - #define _TIMEOUT_TICK_GET() sys_tick_get() - #define _TIMEOUT_ADD(thread, pq, ticks) \ do { \ if ((ticks) != TICKS_UNLIMITED) { \ @@ -90,37 +88,20 @@ static inline void _timeout_remove_tcs_from_wait_q(struct tcs *tcs) } \ } while (0) - #define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) \ - do { \ - if ((timeout) != TICKS_UNLIMITED) { \ - (timeout) = (int32_t)((limit) - (cur_ticks)); \ - } \ - } while (0) - #elif defined(CONFIG_NANO_TIMERS) #include #define _timeout_tcs_init(tcs) do { } while ((0)) #define _timeout_abort(tcs) do { } while ((0)) - #define _TIMEOUT_TICK_GET() 0 #define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0) - #define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0) #else #define _timeout_tcs_init(tcs) do { } while ((0)) #define _timeout_abort(tcs) do { } while ((0)) #define _timeout_get_next_expiry() (K_FOREVER) - #define _TIMEOUT_TICK_GET() 0 #define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0) - #define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0) #endif - #define _NANO_OBJECT_WAIT(queue, data, timeout, key) \ - do { \ - nano_cpu_atomic_idle(key); \ - key = irq_lock(); \ - } while (0) - #ifdef __cplusplus } #endif