diff options
| author | Shell <[email protected]> | 2024-08-06 11:20:38 +0800 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2024-08-13 04:13:51 -0400 |
| commit | e9b683d0b338b4c92190702d151e5180d0b10ca0 (patch) | |
| tree | 48f54401e8986d83973222659664073eaf2c64a7 /include/rtatomic.h | |
| parent | e418b959d76ff54746b31eb6991ebe9b6fe096e5 (diff) | |
feat: set RT_USING_STDC_ATOMIC to first priority
RT_USING_STDC_ATOMIC is a user selected option on current config system.
While the RT_USING_HW_ATOMIC is a forced option selected by Kconfig
under libcpu. And the RT_USING_STDC_ATOMIC will be meaningless if we set
RT_USING_HW_ATOMIC to first priority if the arch has hw-atomic.
Changes:
- set RT_USING_STDC_ATOMIC to first priority on rttypes.h
Signed-off-by: Shell <[email protected]>
Diffstat (limited to 'include/rtatomic.h')
| -rw-r--r-- | include/rtatomic.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/rtatomic.h b/include/rtatomic.h index b91145e40b..1c8cde5396 100644 --- a/include/rtatomic.h +++ b/include/rtatomic.h @@ -27,20 +27,7 @@ void rt_hw_atomic_flag_clear(volatile rt_atomic_t *ptr); rt_atomic_t rt_hw_atomic_flag_test_and_set(volatile rt_atomic_t *ptr); rt_atomic_t rt_hw_atomic_compare_exchange_strong(volatile rt_atomic_t *ptr, rt_atomic_t *expected, rt_atomic_t desired); -#if defined(RT_USING_HW_ATOMIC) -#define rt_atomic_load(ptr) rt_hw_atomic_load(ptr) -#define rt_atomic_store(ptr, v) rt_hw_atomic_store(ptr, v) -#define rt_atomic_add(ptr, v) rt_hw_atomic_add(ptr, v) -#define rt_atomic_sub(ptr, v) rt_hw_atomic_sub(ptr, v) -#define rt_atomic_and(ptr, v) rt_hw_atomic_and(ptr, v) -#define rt_atomic_or(ptr, v) rt_hw_atomic_or(ptr, v) -#define rt_atomic_xor(ptr, v) rt_hw_atomic_xor(ptr, v) -#define rt_atomic_exchange(ptr, v) rt_hw_atomic_exchange(ptr, v) -#define rt_atomic_flag_clear(ptr) rt_hw_atomic_flag_clear(ptr) -#define rt_atomic_flag_test_and_set(ptr) rt_hw_atomic_flag_test_and_set(ptr) -#define rt_atomic_compare_exchange_strong(ptr, v,des) rt_hw_atomic_compare_exchange_strong(ptr, v ,des) - -#elif defined(RT_USING_STDC_ATOMIC) +#if defined(RT_USING_STDC_ATOMIC) #ifndef __STDC_NO_ATOMICS__ #define rt_atomic_load(ptr) atomic_load(ptr) @@ -58,6 +45,19 @@ rt_atomic_t rt_hw_atomic_compare_exchange_strong(volatile rt_atomic_t *ptr, rt_a #error "The standard library C doesn't support the atomic operation" #endif /* __STDC_NO_ATOMICS__ */ +#elif defined(RT_USING_HW_ATOMIC) +#define rt_atomic_load(ptr) rt_hw_atomic_load(ptr) +#define rt_atomic_store(ptr, v) rt_hw_atomic_store(ptr, v) +#define rt_atomic_add(ptr, v) rt_hw_atomic_add(ptr, v) +#define rt_atomic_sub(ptr, v) rt_hw_atomic_sub(ptr, v) +#define rt_atomic_and(ptr, v) rt_hw_atomic_and(ptr, v) +#define rt_atomic_or(ptr, v) rt_hw_atomic_or(ptr, v) +#define rt_atomic_xor(ptr, v) rt_hw_atomic_xor(ptr, v) +#define rt_atomic_exchange(ptr, v) rt_hw_atomic_exchange(ptr, v) +#define rt_atomic_flag_clear(ptr) rt_hw_atomic_flag_clear(ptr) +#define rt_atomic_flag_test_and_set(ptr) rt_hw_atomic_flag_test_and_set(ptr) +#define rt_atomic_compare_exchange_strong(ptr, v,des) rt_hw_atomic_compare_exchange_strong(ptr, v ,des) + #else #include <rthw.h> #define rt_atomic_load(ptr) rt_soft_atomic_load(ptr) |