diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-06-04 06:57:40 (GMT) |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-06-04 06:57:40 (GMT) |
| commit | f2d01166c380b72ebcb13ef649def88ff4cf2d21 (patch) | |
| tree | cbd7126f19a04983f1c97c3b0ee4fcda5160b39c /src/FreeRTOS | |
| parent | 565601ef5060cd4372be9e5bab130aff64f12223 (diff) | |
| parent | 79f0fcb07aa80eb70385223272e29f2ba5657bc8 (diff) | |
Merge remote-tracking branch 'upstream/develop' into pinetimestyle
Diffstat (limited to 'src/FreeRTOS')
| -rw-r--r-- | src/FreeRTOS/port_cmsis.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/FreeRTOS/port_cmsis.c b/src/FreeRTOS/port_cmsis.c index d8850b5..0ccf2e2 100644 --- a/src/FreeRTOS/port_cmsis.c +++ b/src/FreeRTOS/port_cmsis.c @@ -294,6 +294,25 @@ static void vPortEnableVFP( void ) } /*-----------------------------------------------------------*/ +uint32_t ulSetInterruptMaskFromISR( void ) +{ + __asm volatile ( + " mrs r0, PRIMASK \n" + " cpsid i \n" + " bx lr " + ::: "memory" + ); +} + +void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) +{ + __asm volatile ( + " msr PRIMASK, r0 \n" + " bx lr " + ::: "memory" + ); +} + #if ( configASSERT_DEFINED == 1 ) void vPortValidateInterruptPriority( void ) @@ -354,24 +373,4 @@ static void vPortEnableVFP( void ) configASSERT( NVIC_GetPriorityGrouping() <= ulMaxPRIGROUPValue ); } -uint32_t ulSetInterruptMaskFromISR( void ) -{ - __asm volatile ( - " mrs r0, PRIMASK \n" - " cpsid i \n" - " bx lr " - ::: "memory" - ); -} -/*-----------------------------------------------------------*/ - -void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) -{ - __asm volatile ( - " msr PRIMASK, r0 \n" - " bx lr " - ::: "memory" - ); -} - #endif /* configASSERT_DEFINED */ |