alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

components/bt: Backport 3 bugfixs into release v3.2

Browse Source 
1. Bugfix btdm sleep twice after wakeup request
2. Fix connect fail duo to loop of send extended feature request
3. Clear BT/BLE interrupts after controller_disable to overwrite the default non-zero value of intcntl registers
This commit is contained in:
baohongde 2019-08-08 14:37:01 +08:00 committed by bot
parent db898de8fb
commit dc1db1c4e7
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/bluedroid/hci/hci_hal_h4.c
View File

@ -189,10 +189,10 @@ task_post_status_t hci_hal_h4_task_post(task_post_t timeout)
evt.par = 0; evt.par = 0;
if (xQueueSend(xHciH4Queue, &evt, timeout) != pdTRUE) { if (xQueueSend(xHciH4Queue, &evt, timeout) != pdTRUE) {
return TASK_POST_SUCCESS; return TASK_POST_FAIL;
} }
return TASK_POST_FAIL; return TASK_POST_SUCCESS;
} }
#if (C2H_FLOW_CONTROL_INCLUDED == TRUE) #if (C2H_FLOW_CONTROL_INCLUDED == TRUE)

17
components/bt/bt.c
View File

@ -195,7 +195,8 @@ extern void btdm_controller_enable_sleep(bool enable);
extern void btdm_controller_set_sleep_mode(uint8_t mode); extern void btdm_controller_set_sleep_mode(uint8_t mode);
extern uint8_t btdm_controller_get_sleep_mode(void); extern uint8_t btdm_controller_get_sleep_mode(void);
extern bool btdm_power_state_active(void); extern bool btdm_power_state_active(void);
extern void btdm_wakeup_request(void); extern void btdm_wakeup_request(bool request_lock);
extern void btdm_wakeup_request_end(void);
/* Low Power Clock */ /* Low Power Clock */
extern bool btdm_lpclk_select_src(uint32_t sel); extern bool btdm_lpclk_select_src(uint32_t sel);
extern bool btdm_lpclk_set_div(uint32_t div); extern bool btdm_lpclk_set_div(uint32_t div);
@ -877,6 +878,8 @@ bool esp_vhci_host_check_send_available(void)
void esp_vhci_host_send_packet(uint8_t *data, uint16_t len) void esp_vhci_host_send_packet(uint8_t *data, uint16_t len)
{ {
bool do_wakeup_request = false;
if (!btdm_power_state_active()) { if (!btdm_power_state_active()) {
#if CONFIG_PM_ENABLE #if CONFIG_PM_ENABLE
if (semphr_take_wrapper(s_pm_lock_sem, 0)) { if (semphr_take_wrapper(s_pm_lock_sem, 0)) {
@ -884,9 +887,15 @@ void esp_vhci_host_send_packet(uint8_t *data, uint16_t len)
} }
esp_timer_stop(s_btdm_slp_tmr); esp_timer_stop(s_btdm_slp_tmr);
#endif #endif
btdm_wakeup_request(); do_wakeup_request = true;
btdm_wakeup_request(true);
} }
API_vhci_host_send_packet(data, len); API_vhci_host_send_packet(data, len);
if (do_wakeup_request) {
btdm_wakeup_request_end();
}
} }
esp_err_t esp_vhci_host_register_callback(const esp_vhci_host_callback_t *callback) esp_err_t esp_vhci_host_register_callback(const esp_vhci_host_callback_t *callback)
@ -1285,7 +1294,7 @@ esp_err_t esp_bt_controller_disable(void)
if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_ORIG) { if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_ORIG) {
btdm_controller_enable_sleep(false); btdm_controller_enable_sleep(false);
if (!btdm_power_state_active()) { if (!btdm_power_state_active()) {
btdm_wakeup_request(); btdm_wakeup_request(false);
} }
while (!btdm_power_state_active()) { while (!btdm_power_state_active()) {
ets_delay_us(1000); ets_delay_us(1000);
@ -1421,7 +1430,7 @@ void esp_bt_controller_wakeup_request(void)
return; return;
} }
btdm_wakeup_request(); btdm_wakeup_request(false);
} }
esp_err_t esp_bredr_sco_datapath_set(esp_sco_data_path_t data_path) esp_err_t esp_bredr_sco_datapath_set(esp_sco_data_path_t data_path)

2
components/bt/lib

@ -1 +1 @@
Subproject commit fcc2270670482db974c5539fd62bcdf5800fc669 Subproject commit e9f4807fa20671f7083f931d2805b309a63d7d67