len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into update-pxcurrentTCB

Browse source
This commit is contained in:
Gaurav-Aggarwal-AWS 2024-08-30 15:16:07 +05:30 committed by GitHub
parent cd0d09cc96 6dab25ae4e
commit 730ae6b1e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
portable/GCC/ARM_CM0/portasm.c
View file

@ -472,7 +472,8 @@ void vClearInterruptMask( __attribute__( ( unused ) ) uint32_t ulMask ) /* __att
" ldr r3, =%1 \n" " ldr r3, =%1 \n"
" cmp r2, r3 \n" " cmp r2, r3 \n"
" beq system_call_exit \n" " beq system_call_exit \n"
" b vPortSVCHandler_C \n" " ldr r3, =vPortSVCHandler_C \n"
" bx r3 \n"
" \n" " \n"
" system_call_enter: \n" " system_call_enter: \n"
" push {lr} \n" " push {lr} \n"
@ -508,11 +509,13 @@ void vClearInterruptMask( __attribute__( ( unused ) ) uint32_t ulMask ) /* __att
" \n" " \n"
" stacking_used_psp: \n" " stacking_used_psp: \n"
" mrs r0, psp \n" " mrs r0, psp \n"
" b vPortSVCHandler_C \n" " ldr r3, =vPortSVCHandler_C \n"
" bx r3 \n"
" \n" " \n"
" stacking_used_msp: \n" " stacking_used_msp: \n"
" mrs r0, msp \n" " mrs r0, msp \n"
" b vPortSVCHandler_C \n" " ldr r3, =vPortSVCHandler_C \n"
" bx r3 \n"
" \n" " \n"
" .align 4 \n" " .align 4 \n"
); );

14
portable/MSVC-MingW/port.c
View file

@ -547,6 +547,20 @@ void vPortCloseRunningThread( void * pvTaskToDelete,
/* This is called from a critical section, which must be exited before the /* This is called from a critical section, which must be exited before the
* thread stops. */ * thread stops. */
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
/* Record that a yield is pending so that the next tick interrupt switches
* out this thread regardless of the value of configUSE_PREEMPTION. This is
* needed when a task deletes itself - the taskYIELD_WITHIN_API within
* vTaskDelete does not get called because this function never returns. If
* we do not pend portINTERRUPT_YIELD here, the next task is not scheduled
* when configUSE_PREEMPTION is set to 0. */
if( pvInterruptEventMutex != NULL )
{
WaitForSingleObject( pvInterruptEventMutex, INFINITE );
ulPendingInterrupts |= ( 1 << portINTERRUPT_YIELD );
ReleaseMutex( pvInterruptEventMutex );
}
CloseHandle( pxThreadState->pvYieldEvent ); CloseHandle( pxThreadState->pvYieldEvent );
ExitThread( 0 ); ExitThread( 0 );
} }