mirror/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2025-02-05 18:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix harware_alarm_irq_number typo (#1619)

Browse Source
This commit is contained in:
Sonya Vasquez 2024-06-21 12:38:20 -07:00 committed by GitHub
parent 2de70c79c2
commit 9290bdde58
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rp2_common/hardware_timer/timer.c
View File

@ -106,7 +106,7 @@ void busy_wait_until(absolute_time_t t) {
} }
/// \end::busy_wait[] /// \end::busy_wait[]
static inline uint harware_alarm_irq_number(uint alarm_num) { static inline uint hardware_alarm_irq_number(uint alarm_num) {
return TIMER_IRQ_0 + alarm_num; return TIMER_IRQ_0 + alarm_num;
} }
@ -150,7 +150,7 @@ void hardware_alarm_set_callback(uint alarm_num, hardware_alarm_callback_t callb
// note this should probably be subsumed by irq_set_exclusive_handler anyway, since that // note this should probably be subsumed by irq_set_exclusive_handler anyway, since that
// should disallow IRQ handlers on both cores // should disallow IRQ handlers on both cores
check_hardware_alarm_num_param(alarm_num); check_hardware_alarm_num_param(alarm_num);
uint irq_num = harware_alarm_irq_number(alarm_num); uint irq_num = hardware_alarm_irq_number(alarm_num);
spin_lock_t *lock = spin_lock_instance(PICO_SPINLOCK_ID_TIMER); spin_lock_t *lock = spin_lock_instance(PICO_SPINLOCK_ID_TIMER);
uint32_t save = spin_lock_blocking(lock); uint32_t save = spin_lock_blocking(lock);
if (callback) { if (callback) {
@ -208,7 +208,7 @@ bool hardware_alarm_set_target(uint alarm_num, absolute_time_t target) {
timer_hw->intr = 1u << alarm_num; timer_hw->intr = 1u << alarm_num;
// ... including anything pending on the processor - perhaps unnecessary, but // ... including anything pending on the processor - perhaps unnecessary, but
// our timer flag says we aren't expecting anything. // our timer flag says we aren't expecting anything.
irq_clear(harware_alarm_irq_number(alarm_num)); irq_clear(hardware_alarm_irq_number(alarm_num));
// and clear our flag so that if the IRQ handler is already active (because it is on // and clear our flag so that if the IRQ handler is already active (because it is on
// the other core) it will also skip doing anything // the other core) it will also skip doing anything
timer_callbacks_pending = old_timer_callbacks_pending; timer_callbacks_pending = old_timer_callbacks_pending;
@ -238,4 +238,4 @@ void hardware_alarm_force_irq(uint alarm_num) {
timer_callbacks_pending |= (uint8_t)(1u << alarm_num); timer_callbacks_pending |= (uint8_t)(1u << alarm_num);
spin_unlock(lock, save); spin_unlock(lock, save);
hw_set_bits(&timer_hw->intf, 1u << alarm_num); hw_set_bits(&timer_hw->intf, 1u << alarm_num);
} }