j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

newlib: skip locking when within the NMI Irq.

Browse source 
NMI Irq error paths call into printf which will use the newlib locks
but these can not be used within the NMI, a task switch can not occur
here. This case would be a terminal error path that is attempting to
write some debug message in the process, so just bail out of the
locking in this case. As a warning a ':' character is emitted and this
will typically prefix lines emitted in this context - it would be an
error for this path to be take in normal operation.
This commit is contained in:
Our Air Quality 2018-03-03 09:47:42 +11:00
parent b77380bad1
commit 4bc6032fa6
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/newlib_syscalls.c
View file

@ -303,6 +303,10 @@ void _lock_acquire(_lock_t *lock) {
void _lock_acquire_recursive(_lock_t *lock) { void _lock_acquire_recursive(_lock_t *lock) {
if (locks_initialized) { if (locks_initialized) {
if (sdk_NMIIrqIsOn) {
uart_putc(0, ':');
return;
}
xSemaphoreTakeRecursive((QueueHandle_t)*lock, portMAX_DELAY); xSemaphoreTakeRecursive((QueueHandle_t)*lock, portMAX_DELAY);
} }
} }
@ -321,6 +325,9 @@ void _lock_release(_lock_t *lock) {
void _lock_release_recursive(_lock_t *lock) { void _lock_release_recursive(_lock_t *lock) {
if (locks_initialized) { if (locks_initialized) {
if (sdk_NMIIrqIsOn) {
return;
}
xSemaphoreGiveRecursive((QueueHandle_t)*lock); xSemaphoreGiveRecursive((QueueHandle_t)*lock);
} }
} }