Merge branch 'bugfix/btdm_task_yield' into 'master'

component/bt : fix bug of task schedule delayed. See merge request !828
marcospanghero · Jun 7, 2017 · 058eb26 · 058eb26
2 parents 99d5959 + bd30973
commit 058eb26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/components/bt/bt.c b/components/bt/bt.c
@@ -75,6 +75,7 @@ struct osi_funcs_t {
     void (*_interrupt_disable)(void);
     void (*_interrupt_restore)(void);
     void (*_task_yield)(void);
+    void (*_task_yield_from_isr)(void);
     void *(*_semphr_create)(uint32_t max, uint32_t init);
     int32_t (*_semphr_give_from_isr)(void *semphr, void *hptw);
     int32_t (*_semphr_take)(void *semphr, uint32_t block_time_ms);
@@ -104,6 +105,11 @@ static void IRAM_ATTR interrupt_restore(void)
     portEXIT_CRITICAL(&global_int_mux);
 }
 
+static void IRAM_ATTR task_yield_from_isr(void)
+{
+    portYIELD_FROM_ISR();
+}
+
 static void *IRAM_ATTR semphr_create_wrapper(uint32_t max, uint32_t init)
 {
     return (void *)xSemaphoreCreateCounting(max, init);
@@ -155,6 +161,7 @@ static struct osi_funcs_t osi_funcs = {
     ._interrupt_disable = interrupt_disable,
     ._interrupt_restore = interrupt_restore,
     ._task_yield = vPortYield,
+    ._task_yield_from_isr = task_yield_from_isr,
     ._semphr_create = semphr_create_wrapper,
     ._semphr_give_from_isr = semphr_give_from_isr_wrapper,
     ._semphr_take = semphr_take_wrapper,

diff --git a/components/bt/lib b/components/bt/lib