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

porting: Fix FreeRTOS NPL

Browse Source 
This fixes few issues in FreeRTOS NPL related to API usage from ISR
context.
This commit is contained in:
Andrzej Kaczmarek
2018-05-22 11:41:41 +02:00
parent 7ba4796846
commit 02f148412c
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
porting/npl/freertos/src/npl_os_freertos.c
+29 -22
View File
@@ -45,9 +45,16 @@ struct ble_npl_event *
npl_freertos_eventq_get(struct ble_npl_eventq *evq, ble_npl_time_t tmo)
{
struct ble_npl_event *ev = NULL;
BaseType_t woken;
BaseType_t ret;
ret = xQueueReceive(evq->q, &ev, tmo);
if (in_isr()) {
assert(tmo == 0);
ret = xQueueReceiveFromISR(evq->q, &ev, &woken);
portYIELD_FROM_ISR(woken);
} else {
ret = xQueueReceive(evq->q, &ev, tmo);
}
assert(ret == pdPASS || ret == errQUEUE_EMPTY);
if (ev) {
@@ -60,6 +67,7 @@ npl_freertos_eventq_get(struct ble_npl_eventq *evq, ble_npl_time_t tmo)
void
npl_freertos_eventq_put(struct ble_npl_eventq *evq, struct ble_npl_event *ev)
{
BaseType_t woken;
BaseType_t ret;
if (ev->queued) {
@@ -68,7 +76,13 @@ npl_freertos_eventq_put(struct ble_npl_eventq *evq, struct ble_npl_event *ev)
ev->queued = true;
ret = xQueueSendToBack(evq->q, &ev, 0);
if (in_isr()) {
ret = xQueueSendToBackFromISR(evq->q, &ev, &woken);
portYIELD_FROM_ISR(woken);
} else {
ret = xQueueSendToBack(evq->q, &ev, portMAX_DELAY);
}
assert(ret == pdPASS);
}
@@ -128,6 +142,8 @@ npl_freertos_mutex_init(struct ble_npl_mutex *mu)
ble_npl_error_t
npl_freertos_mutex_pend(struct ble_npl_mutex *mu, ble_npl_time_t timeout)
{
BaseType_t ret;
if (!mu) {
return BLE_NPL_INVALID_PARAM;
}
@@ -135,14 +151,13 @@ npl_freertos_mutex_pend(struct ble_npl_mutex *mu, ble_npl_time_t timeout)
assert(mu->handle);
if (in_isr()) {
ret = pdFAIL;
assert(0);
} else {
if (xSemaphoreTakeRecursive(mu->handle, timeout) != pdPASS) {
return BLE_NPL_TIMEOUT;
}
ret = xSemaphoreTakeRecursive(mu->handle, timeout);
}
return BLE_NPL_OK;
return ret == pdPASS ? BLE_NPL_OK : BLE_NPL_TIMEOUT;
}
ble_npl_error_t
@@ -182,6 +197,7 @@ ble_npl_error_t
npl_freertos_sem_pend(struct ble_npl_sem *sem, ble_npl_time_t timeout)
{
BaseType_t woken;
BaseType_t ret;
if (!sem) {
return BLE_NPL_INVALID_PARAM;
@@ -191,18 +207,13 @@ npl_freertos_sem_pend(struct ble_npl_sem *sem, ble_npl_time_t timeout)
if (in_isr()) {
assert(timeout == 0);
if (xSemaphoreTakeFromISR(sem->handle, &woken) != pdPASS) {
portYIELD_FROM_ISR(woken);
return BLE_NPL_TIMEOUT;
}
ret = xSemaphoreTakeFromISR(sem->handle, &woken);
portYIELD_FROM_ISR(woken);
} else {
if (xSemaphoreTake(sem->handle, timeout) != pdPASS) {
return BLE_NPL_TIMEOUT;
}
ret = xSemaphoreTake(sem->handle, timeout);
}
return BLE_NPL_OK;
return ret == pdPASS ? BLE_NPL_OK : BLE_NPL_TIMEOUT;
}
ble_npl_error_t
@@ -219,14 +230,12 @@ npl_freertos_sem_release(struct ble_npl_sem *sem)
if (in_isr()) {
ret = xSemaphoreGiveFromISR(sem->handle, &woken);
assert(ret == pdPASS);
portYIELD_FROM_ISR(woken);
} else {
ret = xSemaphoreGive(sem->handle);
assert(ret == pdPASS);
}
assert(ret == pdPASS);
return BLE_NPL_OK;
}
@@ -288,18 +297,16 @@ npl_freertos_callout_remaining_ticks(struct ble_npl_callout *co,
ble_npl_time_t now)
{
ble_npl_time_t rt;
uint32_t exp = xTimerGetExpiryTime(co->handle);
uint32_t exp;
taskENTER_CRITICAL();
exp = xTimerGetExpiryTime(co->handle);
if (exp > now) {
rt = exp - now;
} else {
return 0;
rt = 0;
}
taskEXIT_CRITICAL();
return rt;
}