diff options
| author | JF <jf@codingfield.com> | 2021-06-20 15:09:24 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-06-20 15:09:24 (GMT) |
| commit | d96395c81021778af35b8b4bf965bfe8663eb081 (patch) | |
| tree | 979e75d716bca8bcd69b86f24a2f2d0270a274d0 /src/FreeRTOS | |
| parent | fb133a0167f7ea4281bca45be6efc928720d4f82 (diff) | |
| parent | 20a24f8cf56551eae1202f8dc5733bd0cf61adbf (diff) | |
Merge branch 'develop' of JF/PineTime into master
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 */ |