From 01e194426d51ffb1a6e9e3162567f29c2a84154d Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Sun, 14 Feb 2021 14:42:30 +0100 Subject: Fix IRQ management in FreeRTOS to avoid crash and deadlock in BLE stack. --- src/FreeRTOS/portmacro_cmsis.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/FreeRTOS/portmacro_cmsis.h') diff --git a/src/FreeRTOS/portmacro_cmsis.h b/src/FreeRTOS/portmacro_cmsis.h index 0497538f..e6e09158 100644 --- a/src/FreeRTOS/portmacro_cmsis.h +++ b/src/FreeRTOS/portmacro_cmsis.h @@ -104,8 +104,10 @@ typedef unsigned long UBaseType_t; /* Critical section management. */ extern void vPortEnterCritical( void ); extern void vPortExitCritical( void ); -#define portSET_INTERRUPT_MASK_FROM_ISR() ulPortRaiseBASEPRI() -#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) vPortSetBASEPRI(x) +extern uint32_t ulSetInterruptMaskFromISR( void ) __attribute__( ( naked ) ); +extern void vClearInterruptMaskFromISR( uint32_t ulMask ) __attribute__( ( naked ) ); +#define portSET_INTERRUPT_MASK_FROM_ISR() ulSetInterruptMaskFromISR() +#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) vClearInterruptMaskFromISR( x ) #define portDISABLE_INTERRUPTS() __asm volatile ( " cpsid i " ::: "memory" ) #define portENABLE_INTERRUPTS() __asm volatile ( " cpsie i " ::: "memory" ) #define portENTER_CRITICAL() vPortEnterCritical() -- cgit v1.2.3-70-g09d2