Merge branch 'contrib/github_pr_10199_v4.4' into 'release/v4.4'

Removed the 'configASSERT( xInheritanceOccurred == pdFALSE )' assertion from xQueueSemaphoreTake (GitHub PR)(v4.4)

See merge request espressif/esp-idf!21501
pull/11369/head
Jiang Jiang Jian 2022-12-22 19:28:20 +08:00
commit 2497798036
1 zmienionych plików z 0 dodań i 9 usunięć

Wyświetl plik

@ -1616,15 +1616,6 @@ BaseType_t xQueueSemaphoreTake( QueueHandle_t xQueue,
{
if( xTicksToWait == ( TickType_t ) 0 )
{
/* For inheritance to have occurred there must have been an
* initial timeout, and an adjusted timeout cannot become 0, as
* if it were 0 the function would have exited. */
#if ( configUSE_MUTEXES == 1 )
{
configASSERT( xInheritanceOccurred == pdFALSE );
}
#endif /* configUSE_MUTEXES */
/* The semaphore count was 0 and no block time is specified
* (or the block time has expired) so exit now. */
taskEXIT_CRITICAL();