Imagelibrary/threadx
1
0
Fork 1
mirror of https://github.com/eclipse-threadx/threadx.git synced 2025-11-16 12:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 6.1.10

Browse Source
This commit is contained in:
Yuxin Zhou
2022-01-29 00:24:03 +00:00
parent b216ceb25e
commit f7f0957188
3111 changed files with 495735 additions and 40800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
utility/rtos_compatibility_layers/FreeRTOS/tx_freertos.c
View File

@@ -26,6 +26,9 @@
/* 10-15-2021 William E. Lamie Modified comment(s), and */
/* fixed compiler warnings, */
/* resulting in version 6.1.7 */
/* 01-31-2022 William E. Lamie Modified comment(s), and */
/* fixed compiler warnings, */
/* resulting in version 6.1.10 */
/* */
/**************************************************************************/
@@ -1334,43 +1337,30 @@ BaseType_t xSemaphoreGive(SemaphoreHandle_t xSemaphore)
configASSERT(xSemaphore != NULL);
if(xSemaphore->p_set != NULL) {
TX_DISABLE;
_tx_thread_preempt_disable++;
}
if(xSemaphore->is_mutex == 1u) {
ret = tx_mutex_put(&xSemaphore->mutex);
if(ret != TX_SUCCESS) {
return pdFALSE;
}
} else {
if(xSemaphore->p_set == NULL) {
TX_DISABLE;
_tx_thread_preempt_disable++;
}
if(xSemaphore->sem.tx_semaphore_count >= xSemaphore->max_count) {
/* Maximum semaphore count reached return failure. */
_tx_thread_preempt_disable--;
TX_RESTORE
return pdFALSE;
}
return pdTRUE;
}
ret = tx_semaphore_put(&xSemaphore->sem);
if(ret != TX_SUCCESS) {
_tx_thread_preempt_disable--;
TX_RESTORE;
return pdFALSE;
}
TX_DISABLE;
_tx_thread_preempt_disable++;
if(xSemaphore->p_set == NULL) {
_tx_thread_preempt_disable--;
TX_RESTORE;
if(xSemaphore->sem.tx_semaphore_count >= xSemaphore->max_count) {
/* Maximum semaphore count reached return failure. */
_tx_thread_preempt_disable--;
TX_RESTORE
return pdFALSE;
}
_tx_thread_system_preempt_check();
}
ret = tx_semaphore_put(&xSemaphore->sem);
if(ret != TX_SUCCESS) {
_tx_thread_preempt_disable--;
TX_RESTORE;
return pdFALSE;
}
if(xSemaphore->p_set != NULL) {
@@ -1383,13 +1373,13 @@ BaseType_t xSemaphoreGive(SemaphoreHandle_t xSemaphore)
TX_FREERTOS_ASSERT_FAIL();
return pdFALSE;
}
_tx_thread_preempt_disable--;
TX_RESTORE;
_tx_thread_system_preempt_check();
}
_tx_thread_preempt_disable--;
TX_RESTORE;
_tx_thread_system_preempt_check();
return pdTRUE;
}