michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unified: Remove obsolete wait_q.h macros

Browse source 
Removes the following wait_q.h macros
  _NANO_OBJECT_WAIT()
  _TIMEOUT_UPDATE()
  _TIMEOUT_TICK_GET()

Change-Id: I7cb78728aaad74acf7f121c79f03d32fa6af5aac
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2016-09-19 15:49:11 -04:00 • committed by Benjamin Walsh
commit e02c720e3d
1 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kernel/unified/include/wait_q.h
View file

@ -81,8 +81,6 @@ static inline void _timeout_remove_tcs_from_wait_q(struct tcs *tcs)
} }
#include <timeout_q.h> #include <timeout_q.h>
#define _TIMEOUT_TICK_GET() sys_tick_get()
#define _TIMEOUT_ADD(thread, pq, ticks) \ #define _TIMEOUT_ADD(thread, pq, ticks) \
do { \ do { \
if ((ticks) != TICKS_UNLIMITED) { \ if ((ticks) != TICKS_UNLIMITED) { \
@ -90,37 +88,20 @@ static inline void _timeout_remove_tcs_from_wait_q(struct tcs *tcs)
} \ } \
} while (0) } 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) #elif defined(CONFIG_NANO_TIMERS)
#include <timeout_q.h> #include <timeout_q.h>
#define _timeout_tcs_init(tcs) do { } while ((0)) #define _timeout_tcs_init(tcs) do { } while ((0))
#define _timeout_abort(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_ADD(thread, pq, ticks) do { } while (0)
#define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0)
#else #else
#define _timeout_tcs_init(tcs) do { } while ((0)) #define _timeout_tcs_init(tcs) do { } while ((0))
#define _timeout_abort(tcs) do { } while ((0)) #define _timeout_abort(tcs) do { } while ((0))
#define _timeout_get_next_expiry() (K_FOREVER) #define _timeout_get_next_expiry() (K_FOREVER)
#define _TIMEOUT_TICK_GET() 0
#define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0) #define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0)
#define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0)
#endif #endif
#define _NANO_OBJECT_WAIT(queue, data, timeout, key) \
do { \
nano_cpu_atomic_idle(key); \
key = irq_lock(); \
} while (0)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif