Skip to content

fix return type of enable/disable interrupt methods... add host versions for completeness #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kilograham merged 1 commit into from
Mar 9, 2025
Merged

fix return type of enable/disable interrupt methods... add host versions for completeness #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/host/hardware_sync/include/hardware/sync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ void restore_interrupts(uint32_t status);

void restore_interrupts_from_disabled(uint32_t status);

void disable_interrupts(void);

void enable_interrupts(void);

uint spin_lock_get_num(spin_lock_t *lock);

spin_lock_t *spin_lock_instance(uint lock_num);
Expand Down
9 changes: 9 additions & 0 deletions src/host/hardware_sync/sync_core0_only.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ PICO_WEAK_FUNCTION_DEF(restore_interrupts_from_disabled)
void PICO_WEAK_FUNCTION_IMPL_NAME(restore_interrupts_from_disabled)(uint32_t status) {
}

PICO_WEAK_FUNCTION_DEF(disable_interrupts)

void PICO_WEAK_FUNCTION_IMPL_NAME(disable_interrupts)(void) {
}

PICO_WEAK_FUNCTION_DEF(enable_interrupts)

void PICO_WEAK_FUNCTION_IMPL_NAME(enable_interrupts)(void) {
}

PICO_WEAK_FUNCTION_DEF(spin_lock_instance)

Expand Down
4 changes: 2 additions & 2 deletions src/rp2_common/hardware_sync/include/hardware/sync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ __force_inline static void __mem_fence_release(void) {
/*! \brief Explicitly disable interrupts on the calling core
* \ingroup hardware_sync
*/
__force_inline static uint32_t disable_interrupts(void) {
__force_inline static void disable_interrupts(void) {
#ifdef __riscv
__compiler_memory_barrier();
riscv_clear_csr(mstatus, 8);
Expand All @@ -214,7 +214,7 @@ __force_inline static uint32_t disable_interrupts(void) {
/*! \brief Explicitly enable interrupts on the calling core
* \ingroup hardware_sync
*/
__force_inline static uint32_t enable_interrupts(void) {
__force_inline static void enable_interrupts(void) {
#ifdef __riscv
__compiler_memory_barrier();
riscv_set_csr(mstatus, 8);
Expand Down