From 0d9300e65b2523817ebbfb615da8e786cfa836ca Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Mon, 28 Dec 2020 20:03:50 +0800 Subject: [PATCH] add barrier countdownlatch completion macro define to config --- kernel/core/include/tos_barrier.h | 4 ++++ kernel/core/include/tos_completion.h | 4 ++++ kernel/core/include/tos_countdownlatch.h | 3 +++ kernel/core/tos_barrier.c | 3 +++ kernel/core/tos_completion.c | 3 +++ kernel/core/tos_countdownlatch.c | 3 +++ 6 files changed, 20 insertions(+) diff --git a/kernel/core/include/tos_barrier.h b/kernel/core/include/tos_barrier.h index 6fc500fe..98622ae1 100644 --- a/kernel/core/include/tos_barrier.h +++ b/kernel/core/include/tos_barrier.h @@ -20,6 +20,8 @@ __CDECLS_BEGIN +#if TOS_CFG_BARRIER_EN > 0 + typedef struct k_barrier_st { #if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; @@ -82,6 +84,8 @@ __API__ k_err_t tos_barrier_pend(k_barrier_t *barrier); */ __API__ k_err_t tos_barrier_reset(k_barrier_t *barrier, k_barrier_cnt_t count); +#endif /* TOS_CFG_BARRIER_EN */ + __CDECLS_END #endif /* _TOS_BARRIER_H_ */ diff --git a/kernel/core/include/tos_completion.h b/kernel/core/include/tos_completion.h index dac660f2..5bf48f17 100644 --- a/kernel/core/include/tos_completion.h +++ b/kernel/core/include/tos_completion.h @@ -20,6 +20,8 @@ __CDECLS_BEGIN +#if TOS_CFG_COMPLETION_EN > 0 + typedef uint16_t completion_done_t; typedef struct k_completion_st { @@ -146,6 +148,8 @@ __API__ k_err_t tos_completion_reset(k_completion_t *completion); */ __API__ int tos_completion_is_done(k_completion_t *completion); +#endif /* TOS_CFG_COMPLETION_EN */ + __CDECLS_END #endif /* _TOS_COMPLETION_H_ */ diff --git a/kernel/core/include/tos_countdownlatch.h b/kernel/core/include/tos_countdownlatch.h index b9beb85d..460b9dd7 100644 --- a/kernel/core/include/tos_countdownlatch.h +++ b/kernel/core/include/tos_countdownlatch.h @@ -20,6 +20,7 @@ __CDECLS_BEGIN +#if TOS_CFG_COUNTDOWNLATCH_EN > 0 typedef struct k_countdownlatch_st { #if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; @@ -115,6 +116,8 @@ __API__ k_err_t tos_countdownlatch_post(k_countdownlatch_t *countdownlatch); */ __API__ k_err_t tos_countdownlatch_reset(k_countdownlatch_t *countdownlatch, k_countdownlatch_cnt_t count); +#endif /* TOS_CFG_COUNTDOWNLATCH_EN */ + __CDECLS_END #endif /* _TOS_COUNTDOWNLATCH_H_ */ diff --git a/kernel/core/tos_barrier.c b/kernel/core/tos_barrier.c index 50bab687..f0933f22 100644 --- a/kernel/core/tos_barrier.c +++ b/kernel/core/tos_barrier.c @@ -17,6 +17,8 @@ #include "tos_k.h" +#if TOS_CFG_BARRIER_EN > 0 + __API__ k_err_t tos_barrier_create(k_barrier_t *barrier, k_barrier_cnt_t count) { TOS_PTR_SANITY_CHECK(barrier); @@ -104,3 +106,4 @@ __API__ k_err_t tos_barrier_reset(k_barrier_t *barrier, k_barrier_cnt_t count) return K_ERR_NONE; } +#endif /* TOS_CFG_BARRIER_EN */ diff --git a/kernel/core/tos_completion.c b/kernel/core/tos_completion.c index f4bb7153..65642278 100644 --- a/kernel/core/tos_completion.c +++ b/kernel/core/tos_completion.c @@ -17,6 +17,8 @@ #include "tos_k.h" +#if TOS_CFG_COMPLETION_EN > 0 + __API__ k_err_t tos_completion_create(k_completion_t *completion) { TOS_PTR_SANITY_CHECK(completion); @@ -155,3 +157,4 @@ __API__ int tos_completion_is_done(k_completion_t *completion) return is_done; } +#endif /* TOS_CFG_COMPLETION_EN */ diff --git a/kernel/core/tos_countdownlatch.c b/kernel/core/tos_countdownlatch.c index b69154ea..cdb01860 100644 --- a/kernel/core/tos_countdownlatch.c +++ b/kernel/core/tos_countdownlatch.c @@ -17,6 +17,8 @@ #include "tos_k.h" +#if TOS_CFG_COUNTDOWNLATCH_EN > 0 + __API__ k_err_t tos_countdownlatch_create(k_countdownlatch_t *countdownlatch, k_countdownlatch_cnt_t count) { TOS_PTR_SANITY_CHECK(countdownlatch); @@ -130,3 +132,4 @@ __API__ k_err_t tos_countdownlatch_reset(k_countdownlatch_t *countdownlatch, k_c return K_ERR_NONE; } +#endif /* TOS_CFG_COUNTDOWNLATCH_EN */