summaryrefslogtreecommitdiff
path: root/common/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/timer.c')
-rw-r--r--common/timer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/timer.c b/common/timer.c
index c359efb541..7b6cd0b5f5 100644
--- a/common/timer.c
+++ b/common/timer.c
@@ -41,7 +41,7 @@ static int timer_irq;
static void expire_timer(task_id_t tskid)
{
/* we are done with this timer */
- deprecated_atomic_clear_bits(&timer_running, 1 << tskid);
+ atomic_clear_bits(&timer_running, 1 << tskid);
/* wake up the taks waiting for this timer */
task_set_event(tskid, TASK_EVENT_TIMER, 0);
}
@@ -132,7 +132,7 @@ int timer_arm(timestamp_t event, task_id_t tskid)
return EC_ERROR_BUSY;
timer_deadline[tskid] = event;
- deprecated_atomic_or(&timer_running, BIT(tskid));
+ atomic_or(&timer_running, BIT(tskid));
/* Modify the next event if needed */
if ((event.le.hi < now.le.hi) ||
@@ -146,7 +146,7 @@ void timer_cancel(task_id_t tskid)
{
ASSERT(tskid < TASK_ID_COUNT);
- deprecated_atomic_clear_bits(&timer_running, BIT(tskid));
+ atomic_clear_bits(&timer_running, BIT(tskid));
/*
* Don't need to cancel the hardware timer interrupt, instead do
* timer-related housekeeping when the next timer interrupt fires.
@@ -186,8 +186,8 @@ void usleep(unsigned us)
/* Re-queue other events which happened in the meanwhile */
if (evt)
- deprecated_atomic_or(task_get_event_bitmap(task_get_current()),
- evt & ~TASK_EVENT_TIMER);
+ atomic_or(task_get_event_bitmap(task_get_current()),
+ evt & ~TASK_EVENT_TIMER);
}
timestamp_t get_time(void)