espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-29 05:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

porting: Fix FreeRTOS NPL

Browse Source 
Make ble_npl_eventq_remove properly handle calling from ISR.
This commit is contained in:
Andrzej Kaczmarek
2018-05-24 12:03:43 +02:00
parent 3c07cb1898
commit daed64e786
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
porting/npl/freertos/src/npl_os_freertos.c
+33 -11
View File
@@ -82,6 +82,7 @@ npl_freertos_eventq_remove(struct ble_npl_eventq *evq,
BaseType_t ret;
int i;
int count;
BaseType_t woken, woken2;
if (!ev->queued) {
return;
@@ -94,22 +95,43 @@ npl_freertos_eventq_remove(struct ble_npl_eventq *evq,
* better use counting semaphore with os_queue to handle this in future.
*/
vPortEnterCritical();
if (in_isr()) {
woken = pdFALSE;
count = uxQueueMessagesWaiting(evq->q);
for (i = 0; i < count; i++) {
ret = xQueueReceive(evq->q, &tmp_ev, 0);
assert(ret == pdPASS);
count = uxQueueMessagesWaitingFromISR(evq->q);
for (i = 0; i < count; i++) {
ret = xQueueReceiveFromISR(evq->q, &tmp_ev, &woken2);
assert(ret == pdPASS);
woken |= woken2;
if (tmp_ev == ev) {
continue;
if (tmp_ev == ev) {
continue;
}
ret = xQueueSendToBackFromISR(evq->q, &tmp_ev, &woken2);
assert(ret == pdPASS);
woken |= woken2;
}
ret = xQueueSendToBack(evq->q, &tmp_ev, 0);
assert(ret == pdPASS);
}
portYIELD_FROM_ISR(woken);
} else {
vPortEnterCritical();
vPortExitCritical();
count = uxQueueMessagesWaiting(evq->q);
for (i = 0; i < count; i++) {
ret = xQueueReceive(evq->q, &tmp_ev, 0);
assert(ret == pdPASS);
if (tmp_ev == ev) {
continue;
}
ret = xQueueSendToBack(evq->q, &tmp_ev, 0);
assert(ret == pdPASS);
}
vPortExitCritical();
}
ev->queued = 0;
}