Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_task_yield' into 'master'

Browse source 
component/bt : fix bug of task schedule delayed.

See merge request !828
This commit is contained in:
Jiang Jiang Jian 2017-06-07 16:16:06 +08:00
commit 058eb26574
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/bt/bt.c
View file

@ -75,6 +75,7 @@ struct osi_funcs_t {
void (*_interrupt_disable)(void); void (*_interrupt_disable)(void);
void (*_interrupt_restore)(void); void (*_interrupt_restore)(void);
void (*_task_yield)(void); void (*_task_yield)(void);
void (*_task_yield_from_isr)(void);
void *(*_semphr_create)(uint32_t max, uint32_t init); void *(*_semphr_create)(uint32_t max, uint32_t init);
int32_t (*_semphr_give_from_isr)(void *semphr, void *hptw); int32_t (*_semphr_give_from_isr)(void *semphr, void *hptw);
int32_t (*_semphr_take)(void *semphr, uint32_t block_time_ms); 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); 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) static void *IRAM_ATTR semphr_create_wrapper(uint32_t max, uint32_t init)
{ {
return (void *)xSemaphoreCreateCounting(max, init); return (void *)xSemaphoreCreateCounting(max, init);
@ -155,6 +161,7 @@ static struct osi_funcs_t osi_funcs = {
._interrupt_disable = interrupt_disable, ._interrupt_disable = interrupt_disable,
._interrupt_restore = interrupt_restore, ._interrupt_restore = interrupt_restore,
._task_yield = vPortYield, ._task_yield = vPortYield,
._task_yield_from_isr = task_yield_from_isr,
._semphr_create = semphr_create_wrapper, ._semphr_create = semphr_create_wrapper,
._semphr_give_from_isr = semphr_give_from_isr_wrapper, ._semphr_give_from_isr = semphr_give_from_isr_wrapper,
._semphr_take = semphr_take_wrapper, ._semphr_take = semphr_take_wrapper,

2
components/bt/lib

@ -1 +1 @@
Subproject commit 8f6c2c5481d30342be8f69067a68ca7344d7b0c3 Subproject commit e1f7dbc3bd717e142ca6c717b82a7a813c1e36f4