From 0c2af37b96936174a3fdd9f0de71cd25cd161db9 Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Sun, 14 Mar 2021 16:40:14 +0800 Subject: [PATCH] fix a bug in the kernel obj verify function --- kernel/core/include/tos_barrier.h | 2 -- kernel/core/include/tos_bitmap.h | 2 -- kernel/core/include/tos_completion.h | 2 -- kernel/core/include/tos_countdownlatch.h | 2 -- kernel/core/include/tos_event.h | 4 +--- kernel/core/include/tos_mmblk.h | 2 -- kernel/core/include/tos_mutex.h | 2 -- kernel/core/include/tos_rwlock.h | 2 -- kernel/core/include/tos_sem.h | 2 -- kernel/core/include/tos_stopwatch.h | 2 -- test/suit_timer.c | 2 ++ 11 files changed, 3 insertions(+), 21 deletions(-) diff --git a/kernel/core/include/tos_barrier.h b/kernel/core/include/tos_barrier.h index 98622ae1..a8a0f9fd 100644 --- a/kernel/core/include/tos_barrier.h +++ b/kernel/core/include/tos_barrier.h @@ -23,9 +23,7 @@ __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; -#endif pend_obj_t pend_obj; k_barrier_cnt_t count; diff --git a/kernel/core/include/tos_bitmap.h b/kernel/core/include/tos_bitmap.h index ce39eba5..975fd596 100644 --- a/kernel/core/include/tos_bitmap.h +++ b/kernel/core/include/tos_bitmap.h @@ -21,9 +21,7 @@ typedef uint32_t k_bmtbl_t; typedef struct k_bitmap_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif uint32_t bit_ndx_max; uint32_t bit_max; diff --git a/kernel/core/include/tos_completion.h b/kernel/core/include/tos_completion.h index 5bf48f17..45cba417 100644 --- a/kernel/core/include/tos_completion.h +++ b/kernel/core/include/tos_completion.h @@ -25,9 +25,7 @@ __CDECLS_BEGIN typedef uint16_t completion_done_t; typedef struct k_completion_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif pend_obj_t pend_obj; completion_done_t done; diff --git a/kernel/core/include/tos_countdownlatch.h b/kernel/core/include/tos_countdownlatch.h index 460b9dd7..8a4645c4 100644 --- a/kernel/core/include/tos_countdownlatch.h +++ b/kernel/core/include/tos_countdownlatch.h @@ -22,9 +22,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; -#endif pend_obj_t pend_obj; k_countdownlatch_cnt_t count; diff --git a/kernel/core/include/tos_event.h b/kernel/core/include/tos_event.h index 5da2f55a..6357bf1f 100644 --- a/kernel/core/include/tos_event.h +++ b/kernel/core/include/tos_event.h @@ -43,9 +43,7 @@ typedef enum opt_event_post_en { } opt_event_post_t; typedef struct k_event_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif pend_obj_t pend_obj; k_event_flag_t flag; @@ -83,7 +81,7 @@ __API__ k_err_t tos_event_destroy(k_event_t *event); * pend an event. * * @attention if opt is TOS_OPT_EVENT_PEND_ANY, any of the flag_expect is set is ok; - * if opt is TOS_OPT_EVENT_PEND_ALL£¬ must all the flag_expect is set is ok. + * if opt is TOS_OPT_EVENT_PEND_ALL�� must all the flag_expect is set is ok. * * @param[in] event pointer to the handler of the event. * @param[in] flag_expect the flag we expect from the event. diff --git a/kernel/core/include/tos_mmblk.h b/kernel/core/include/tos_mmblk.h index aa4cbe60..8d784b57 100644 --- a/kernel/core/include/tos_mmblk.h +++ b/kernel/core/include/tos_mmblk.h @@ -24,9 +24,7 @@ __CDECLS_BEGIN #define K_MMBLK_ALIGN_MASK (sizeof(void *) - 1u) typedef struct k_mmblk_pool_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif void *pool_start; void *free_list; diff --git a/kernel/core/include/tos_mutex.h b/kernel/core/include/tos_mutex.h index 5ce2e341..8c4cca86 100644 --- a/kernel/core/include/tos_mutex.h +++ b/kernel/core/include/tos_mutex.h @@ -23,9 +23,7 @@ __CDECLS_BEGIN #if TOS_CFG_MUTEX_EN > 0u typedef struct k_mutex_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif pend_obj_t pend_obj; k_nesting_t pend_nesting; diff --git a/kernel/core/include/tos_rwlock.h b/kernel/core/include/tos_rwlock.h index 1c56c65b..37bed085 100644 --- a/kernel/core/include/tos_rwlock.h +++ b/kernel/core/include/tos_rwlock.h @@ -25,9 +25,7 @@ __CDECLS_BEGIN typedef uint16_t rw_cnt_t; typedef struct k_rwlock_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif k_mutex_t lock; k_sem_t signal; diff --git a/kernel/core/include/tos_sem.h b/kernel/core/include/tos_sem.h index 664186dd..feefb579 100644 --- a/kernel/core/include/tos_sem.h +++ b/kernel/core/include/tos_sem.h @@ -23,9 +23,7 @@ __CDECLS_BEGIN #if TOS_CFG_SEM_EN > 0u typedef struct k_sem_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif pend_obj_t pend_obj; k_sem_cnt_t count; diff --git a/kernel/core/include/tos_stopwatch.h b/kernel/core/include/tos_stopwatch.h index 507dedc6..ec762a20 100644 --- a/kernel/core/include/tos_stopwatch.h +++ b/kernel/core/include/tos_stopwatch.h @@ -21,9 +21,7 @@ __CDECLS_BEGIN typedef struct k_stopwatch_st { -#if TOS_CFG_OBJECT_VERIFY_EN > 0u knl_obj_t knl_obj; -#endif k_tick_t until; } k_stopwatch_t; diff --git a/test/suit_timer.c b/test/suit_timer.c index 52e74cc8..a5e84a82 100644 --- a/test/suit_timer.c +++ b/test/suit_timer.c @@ -109,8 +109,10 @@ TEST test_tos_timer_stop(void) err = tos_timer_stop(K_NULL); ASSERT_EQ(err, K_ERR_OBJ_PTR_NULL); +#if TOS_CFG_OBJECT_VERIFY_EN > 0u err = tos_timer_stop(&test_timer_00); ASSERT_EQ(err, K_ERR_OBJ_INVALID); +#endif err = tos_timer_create(&test_timer_00, (k_tick_t)500u, (k_tick_t)0u, test_timer_call_back_dummy, K_NULL, -- GitLab