Skip to content

Freertosrp2350: use FreeRTOS macros in noInterrupts/interrupts when applicable. #2456

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
merged 6 commits into from
Sep 16, 2024
Merged

Freertosrp2350: use FreeRTOS macros in noInterrupts/interrupts when applicable. #2456

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c425a44
Added mutex around malloc/free/... (not for PSRAM yet)
fietser28 Sep 13, 2024
6b41bfb
Revert "Added mutex around malloc/free/... (not for PSRAM yet)"
fietser28 Sep 14, 2024
ec449b1
use FreeRTOS macros in noInterrupts/interrupts when applicable.
fietser28 Sep 15, 2024
0bcdde1
astyle
earlephilhower Sep 15, 2024
d33e9ea
Fixed calling taskEXIT_CRITICAL and taskENTER_CRITICAL
fietser28 Sep 16, 2024
db3f8bd
Merge branch 'freertosrp2350' into freertosrp2350
earlephilhower Sep 16, 2024
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
33 changes: 22 additions & 11 deletions cores/rp2040/wiring_private.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
#include <hardware/sync.h>
#include <map>

// FreeRTOS potential includes
extern void taskEXIT_CRITICAL() __attribute__((weak));
extern void taskENTER_CRITICAL() __attribute__((weak));

// Support nested IRQ disable/re-enable
#ifndef maxIRQs
#define maxIRQs 15
Expand All @@ -32,22 +36,29 @@ static uint32_t _irqStackTop[2] = { 0, 0 };
static uint32_t _irqStack[2][maxIRQs];

extern "C" void interrupts() {
auto core = get_core_num();
if (!_irqStackTop[core]) {
// ERROR
return;
if (__freeRTOSinitted) {
taskEXIT_CRITICAL();
} else {
auto core = get_core_num();
if (!_irqStackTop[core]) {
// ERROR
return;
}
restore_interrupts(_irqStack[core][--_irqStackTop[core]]);
}
restore_interrupts(_irqStack[core][--_irqStackTop[core]]);
}

extern "C" void noInterrupts() {
auto core = get_core_num();
if (_irqStackTop[core] == maxIRQs) {
// ERROR
panic("IRQ stack overflow");
if (__freeRTOSinitted) {
taskENTER_CRITICAL();
} else {
auto core = get_core_num();
if (_irqStackTop[core] == maxIRQs) {
// ERROR
panic("IRQ stack overflow");
}
_irqStack[core][_irqStackTop[core]++] = save_and_disable_interrupts();
}

_irqStack[core][_irqStackTop[core]++] = save_and_disable_interrupts();
}

// Only 1 GPIO IRQ callback for all pins, so we need to look at the pin it's for and
Expand Down