diff options
| author | Dawid Niedzwiecki <dn@semihalf.com> | 2020-09-24 09:20:41 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-06 09:44:48 +0000 |
| commit | 32b7e8875e0a08290168ec7dda040d5a5db513fa (patch) | |
| tree | c1336b4c3c0a5e037618bef1ae944485e3f7840b /core/cortex-m | |
| parent | b536c348359487f0408a17af8d9d506f5a1d18a6 (diff) | |
| download | chrome-ec-32b7e8875e0a08290168ec7dda040d5a5db513fa.tar.gz | |
core: rename atomic_clear to atomic_clear_bits
Change the name of atomic_clear to atomic_clear_bits to make to name more
clear - the function clears only selected bits, but the name may suggest
that it clears the whole variable.
It is done as a part of porting to Zephyr, where atomic_clear zeros the
variable.
BUG=b:169151160
BRANCH=none
TEST=buildall
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: I7b0b47959c6c54af40f61bca8d9baebaa0375970
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2428943
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'core/cortex-m')
| -rw-r--r-- | core/cortex-m/atomic.h | 4 | ||||
| -rw-r--r-- | core/cortex-m/task.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/cortex-m/atomic.h b/core/cortex-m/atomic.h index 4d56ce3e4e..736d5887b4 100644 --- a/core/cortex-m/atomic.h +++ b/core/cortex-m/atomic.h @@ -36,8 +36,8 @@ * removed in the following patches. Please see b:169151160 for more details. */ -static inline void deprecated_atomic_clear(uint32_t volatile *addr, - uint32_t bits) +static inline void deprecated_atomic_clear_bits(uint32_t volatile *addr, + uint32_t bits) { ATOMIC_OP(bic, addr, bits); } diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c index 058b892a46..510d18fca0 100644 --- a/core/cortex-m/task.c +++ b/core/cortex-m/task.c @@ -421,7 +421,7 @@ static uint32_t __wait_evt(int timeout_us, task_id_t resched) if (timeout_us > 0) { timer_cancel(me); /* Ensure timer event is clear, we no longer care about it */ - deprecated_atomic_clear(&tsk->events, TASK_EVENT_TIMER); + deprecated_atomic_clear_bits(&tsk->events, TASK_EVENT_TIMER); } return evt; } @@ -501,7 +501,7 @@ void task_enable_task(task_id_t tskid) void task_disable_task(task_id_t tskid) { - deprecated_atomic_clear(&tasks_enabled, BIT(tskid)); + deprecated_atomic_clear_bits(&tasks_enabled, BIT(tskid)); if (!in_interrupt_context() && tskid == task_get_current()) __schedule(0, 0); @@ -579,8 +579,8 @@ static void deferred_task_reset(void) while (deferred_reset_task_ids) { task_id_t reset_id = __fls(deferred_reset_task_ids); - deprecated_atomic_clear(&deferred_reset_task_ids, - 1 << reset_id); + deprecated_atomic_clear_bits(&deferred_reset_task_ids, + 1 << reset_id); do_task_reset(reset_id); } } @@ -760,7 +760,7 @@ int task_reset_cleanup(void) * itself back to the list of tasks to notify, * and we will notify it again. */ - deprecated_atomic_clear(state, 1 << notify_id); + deprecated_atomic_clear_bits(state, 1 << notify_id); /* * Skip any invalid ids set by tasks that * requested a non-blocking reset. @@ -897,7 +897,7 @@ void mutex_lock(struct mutex *mtx) task_wait_event_mask(TASK_EVENT_MUTEX, 0); } while (value); - deprecated_atomic_clear(&mtx->waiters, id); + deprecated_atomic_clear_bits(&mtx->waiters, id); } void mutex_unlock(struct mutex *mtx) @@ -923,7 +923,7 @@ void mutex_unlock(struct mutex *mtx) } /* Ensure no event is remaining from mutex wake-up */ - deprecated_atomic_clear(&tsk->events, TASK_EVENT_MUTEX); + deprecated_atomic_clear_bits(&tsk->events, TASK_EVENT_MUTEX); } void task_print_list(void) |