From 45a1e08265f5da8f910b44aed091af0f1b5d39b6 Mon Sep 17 00:00:00 2001 From: graham sanderson Date: Thu, 3 Jun 2021 10:36:27 -0500 Subject: [PATCH] fix sem_acquire_block_until function name --- src/common/pico_sync/include/pico/sem.h | 2 +- src/common/pico_sync/sem.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/pico_sync/include/pico/sem.h b/src/common/pico_sync/include/pico/sem.h index ecd3cf5..6244e32 100644 --- a/src/common/pico_sync/include/pico/sem.h +++ b/src/common/pico_sync/include/pico/sem.h @@ -120,7 +120,7 @@ bool sem_acquire_timeout_us(semaphore_t *sem, uint32_t timeout_us); * \return true if permit was acquired, false if the until time was reached before * acquiring. */ -bool sem_acquire_until(semaphore_t *sem, absolute_time_t until); +bool sem_acquire_block_until(semaphore_t *sem, absolute_time_t until); #ifdef __cplusplus } diff --git a/src/common/pico_sync/sem.c b/src/common/pico_sync/sem.c index 4f3dc32..06b4946 100644 --- a/src/common/pico_sync/sem.c +++ b/src/common/pico_sync/sem.c @@ -31,14 +31,14 @@ void __time_critical_func(sem_acquire_blocking)(semaphore_t *sem) { } bool __time_critical_func(sem_acquire_timeout_ms)(semaphore_t *sem, uint32_t timeout_ms) { - return sem_acquire_until(sem, make_timeout_time_ms(timeout_ms)); + return sem_acquire_block_until(sem, make_timeout_time_ms(timeout_ms)); } bool __time_critical_func(sem_acquire_timeout_us)(semaphore_t *sem, uint32_t timeout_us) { - return sem_acquire_until(sem, make_timeout_time_us(timeout_us)); + return sem_acquire_block_until(sem, make_timeout_time_us(timeout_us)); } -bool __time_critical_func(sem_acquire_until)(semaphore_t *sem, absolute_time_t until) { +bool __time_critical_func(sem_acquire_block_until)(semaphore_t *sem, absolute_time_t until) { do { uint32_t save = spin_lock_blocking(sem->core.spin_lock); if (sem->permits > 0) {