espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_optimiz_adv_cb_func' into 'master'

Browse Source 
Bugfix/btdm optimiz adv cb func

See merge request !1619
This commit is contained in:
Jiang Jiang Jian
2017-12-19 17:35:00 +08:00
parent 956133387d 967ff895e7
commit 9c2db2ea7a
7 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/bt/bluedroid/bta/dm/bta_dm_act.c
View File

@@ -4731,20 +4731,17 @@ void bta_dm_ble_set_adv_params (tBTA_DM_MSG *p_data)
*******************************************************************************/ *******************************************************************************/
void bta_dm_ble_set_adv_params_all (tBTA_DM_MSG *p_data) void bta_dm_ble_set_adv_params_all (tBTA_DM_MSG *p_data)
{ {
tBTA_STATUS status = BTA_FAILURE;
if (BTM_BleSetAdvParamsStartAdv(p_data->ble_set_adv_params_all.adv_int_min, if (BTM_BleSetAdvParamsStartAdv(p_data->ble_set_adv_params_all.adv_int_min,
p_data->ble_set_adv_params_all.adv_int_max, p_data->ble_set_adv_params_all.adv_int_max,
p_data->ble_set_adv_params_all.adv_type, p_data->ble_set_adv_params_all.adv_type,
p_data->ble_set_adv_params_all.addr_type_own, p_data->ble_set_adv_params_all.addr_type_own,
p_data->ble_set_adv_params_all.p_dir_bda, p_data->ble_set_adv_params_all.p_dir_bda,
p_data->ble_set_adv_params_all.channel_map, p_data->ble_set_adv_params_all.channel_map,
p_data->ble_set_adv_params_all.adv_filter_policy) == BTM_SUCCESS) { p_data->ble_set_adv_params_all.adv_filter_policy,
status = BTA_SUCCESS; p_data->ble_set_adv_params_all.p_start_adv_cback) == BTM_SUCCESS) {
} APPL_TRACE_DEBUG("%s(), success to start ble adv.", __func__);
} else {
if (p_data->ble_set_adv_params_all.p_start_adv_cback) { APPL_TRACE_ERROR("%s(), fail to start ble adv.", __func__);
(*p_data->ble_set_adv_params_all.p_start_adv_cback)(status);
} }
} }
@@ -4888,15 +4885,13 @@ void bta_dm_ble_broadcast (tBTA_DM_MSG *p_data)
tBTM_STATUS status = 0; tBTM_STATUS status = 0;
BOOLEAN start = p_data->ble_observe.start; BOOLEAN start = p_data->ble_observe.start;
status = BTM_BleBroadcast(start); status = BTM_BleBroadcast(start, p_data->ble_observe.p_stop_adv_cback);
if (p_data->ble_observe.p_stop_adv_cback){ if (p_data->ble_observe.p_stop_adv_cback){
if (status != BTM_SUCCESS){ if (status != BTM_SUCCESS){
APPL_TRACE_WARNING("%s, %s, status=0x%x\n", __func__,\ APPL_TRACE_WARNING("%s, %s, status=0x%x\n", __func__,\
(start == TRUE) ? "start adv failed" : "stop adv failed", status); (start == TRUE) ? "start adv failed" : "stop adv failed", status);
} }
status = (status == BTM_SUCCESS ? BTA_SUCCESS : BTA_FAILURE);
p_data->ble_observe.p_stop_adv_cback(status);
} }
} }

4
components/bt/bluedroid/bta/gatt/bta_gattc_act.c
View File

@@ -2172,7 +2172,7 @@ void bta_gattc_broadcast(tBTA_GATTC_CB *p_cb, tBTA_GATTC_DATA *p_msg)
UNUSED(p_cb); UNUSED(p_cb);
cb_data.reg_oper.client_if = p_msg->api_listen.client_if; cb_data.reg_oper.client_if = p_msg->api_listen.client_if;
cb_data.reg_oper.status = BTM_BleBroadcast(p_msg->api_listen.start); cb_data.reg_oper.status = BTM_BleBroadcast(p_msg->api_listen.start, NULL);
if (p_clreg && p_clreg->p_cback) { if (p_clreg && p_clreg->p_cback) {
(*p_clreg->p_cback)(BTA_GATTC_LISTEN_EVT, &cb_data); (*p_clreg->p_cback)(BTA_GATTC_LISTEN_EVT, &cb_data);
@@ -2361,6 +2361,7 @@ static void bta_gattc_wait4_service_change_ccc_cback (TIMER_LIST_ENT *p_tle)
p_tle->param = (TIMER_PARAM_TYPE)0; p_tle->param = (TIMER_PARAM_TYPE)0;
if (p_timer_param == NULL){ if (p_timer_param == NULL){
APPL_TRACE_ERROR("p_timer_param is NULL in %s\n", __func__); APPL_TRACE_ERROR("p_timer_param is NULL in %s\n", __func__);
osi_mutex_unlock(&write_ccc_mutex);
return; return;
} }
@@ -2368,6 +2369,7 @@ static void bta_gattc_wait4_service_change_ccc_cback (TIMER_LIST_ENT *p_tle)
if (p_conn == NULL){ if (p_conn == NULL){
APPL_TRACE_ERROR("p_conn is NULL in %s\n", __func__); APPL_TRACE_ERROR("p_conn is NULL in %s\n", __func__);
osi_free(p_timer_param); osi_free(p_timer_param);
osi_mutex_unlock(&write_ccc_mutex);
return; return;
} }

5
components/bt/bluedroid/bta/include/bta_api.h
View File

@@ -400,7 +400,10 @@ typedef struct {
typedef void (tBTA_SET_ADV_DATA_CMPL_CBACK) (tBTA_STATUS status); typedef void (tBTA_SET_ADV_DATA_CMPL_CBACK) (tBTA_STATUS status);
typedef void (tBTA_START_ADV_CMPL_CBACK) (tBTA_STATUS status); typedef tBTM_START_ADV_CMPL_CBACK tBTA_START_ADV_CMPL_CBACK;
typedef tBTM_START_STOP_ADV_CMPL_CBACK tBTA_START_STOP_ADV_CMPL_CBACK;
typedef tBTM_ADD_WHITELIST_CBACK tBTA_ADD_WHITELIST_CBACK; typedef tBTM_ADD_WHITELIST_CBACK tBTA_ADD_WHITELIST_CBACK;

16
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
View File

@@ -438,7 +438,7 @@ static void btc_ble_set_scan_rsp_data_raw(uint8_t *raw_scan_rsp, uint32_t raw_sc
BTA_DmBleSetScanRspRaw(raw_scan_rsp, raw_scan_rsp_len, p_scan_rsp_data_cback); BTA_DmBleSetScanRspRaw(raw_scan_rsp, raw_scan_rsp_len, p_scan_rsp_data_cback);
} }
static void btc_start_adv_callback(tBTA_STATUS status) static void btc_start_adv_callback(uint8_t status)
{ {
esp_ble_gap_cb_param_t param; esp_ble_gap_cb_param_t param;
bt_status_t ret; bt_status_t ret;
@@ -447,7 +447,7 @@ static void btc_start_adv_callback(tBTA_STATUS status)
msg.sig = BTC_SIG_API_CB; msg.sig = BTC_SIG_API_CB;
msg.pid = BTC_PID_GAP_BLE; msg.pid = BTC_PID_GAP_BLE;
msg.act = ESP_GAP_BLE_ADV_START_COMPLETE_EVT; msg.act = ESP_GAP_BLE_ADV_START_COMPLETE_EVT;
param.adv_start_cmpl.status = status; param.adv_start_cmpl.status = btc_hci_to_esp_status(status);
ret = btc_transfer_context(&msg, &param, ret = btc_transfer_context(&msg, &param,
sizeof(esp_ble_gap_cb_param_t), NULL); sizeof(esp_ble_gap_cb_param_t), NULL);
@@ -457,7 +457,7 @@ static void btc_start_adv_callback(tBTA_STATUS status)
} }
} }
static void btc_stop_adv_callback(tBTA_STATUS status) static void btc_stop_adv_callback(uint8_t status)
{ {
esp_ble_gap_cb_param_t param; esp_ble_gap_cb_param_t param;
bt_status_t ret; bt_status_t ret;
@@ -466,7 +466,7 @@ static void btc_stop_adv_callback(tBTA_STATUS status)
msg.sig = BTC_SIG_API_CB; msg.sig = BTC_SIG_API_CB;
msg.pid = BTC_PID_GAP_BLE; msg.pid = BTC_PID_GAP_BLE;
msg.act = ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT; msg.act = ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT;
param.adv_stop_cmpl.status = status; param.adv_stop_cmpl.status = btc_hci_to_esp_status(status);
ret = btc_transfer_context(&msg, &param, ret = btc_transfer_context(&msg, &param,
sizeof(esp_ble_gap_cb_param_t), NULL); sizeof(esp_ble_gap_cb_param_t), NULL);
@@ -546,8 +546,8 @@ static void btc_ble_set_scan_params(esp_ble_scan_params_t *scan_params, tBLE_SCA
scan_params->own_addr_type, scan_params->own_addr_type,
scan_param_setup_cback); scan_param_setup_cback);
} else { } else {
btc_scan_params_callback(ESP_DEFAULT_GATT_IF, BTM_ILLEGAL_VALUE); btc_scan_params_callback(ESP_DEFAULT_GATT_IF, BTM_ILLEGAL_VALUE);
} }
} }
static void btc_search_callback(tBTA_DM_SEARCH_EVT event, tBTA_DM_SEARCH *p_data) static void btc_search_callback(tBTA_DM_SEARCH_EVT event, tBTA_DM_SEARCH *p_data)
@@ -566,7 +566,7 @@ static void btc_search_callback(tBTA_DM_SEARCH_EVT event, tBTA_DM_SEARCH *p_data
param.scan_rst.dev_type = p_data->inq_res.device_type; param.scan_rst.dev_type = p_data->inq_res.device_type;
param.scan_rst.rssi = p_data->inq_res.rssi; param.scan_rst.rssi = p_data->inq_res.rssi;
param.scan_rst.ble_addr_type = p_data->inq_res.ble_addr_type; param.scan_rst.ble_addr_type = p_data->inq_res.ble_addr_type;
param.scan_rst.ble_evt_type = p_data->inq_res.ble_evt_type; param.scan_rst.ble_evt_type = p_data->inq_res.ble_evt_type;
param.scan_rst.flag = p_data->inq_res.flag; param.scan_rst.flag = p_data->inq_res.flag;
param.scan_rst.num_resps = 1; param.scan_rst.num_resps = 1;
param.scan_rst.adv_data_len = p_data->inq_res.adv_data_len; param.scan_rst.adv_data_len = p_data->inq_res.adv_data_len;
@@ -601,7 +601,7 @@ static void btc_search_callback(tBTA_DM_SEARCH_EVT event, tBTA_DM_SEARCH *p_data
btc_transfer_context(&msg, &param, sizeof(esp_ble_gap_cb_param_t), NULL); btc_transfer_context(&msg, &param, sizeof(esp_ble_gap_cb_param_t), NULL);
} }
static void btc_start_scan_callback(tBTA_STATUS status) static void btc_start_scan_callback(uint8_t status)
{ {
esp_ble_gap_cb_param_t param; esp_ble_gap_cb_param_t param;
bt_status_t ret; bt_status_t ret;

14
components/bt/bluedroid/stack/btm/btm_ble_gap.c
View File

@@ -501,7 +501,7 @@ tBTM_STATUS BTM_BleScan(BOOLEAN start, UINT32 duration,
** Returns status. ** Returns status.
** **
*******************************************************************************/ *******************************************************************************/
tBTM_STATUS BTM_BleBroadcast(BOOLEAN start) tBTM_STATUS BTM_BleBroadcast(BOOLEAN start, tBTM_START_STOP_ADV_CMPL_CBACK *p_stop_adv_cback)
{ {
tBTM_STATUS status = BTM_NO_RESOURCES; tBTM_STATUS status = BTM_NO_RESOURCES;
tBTM_LE_RANDOM_CB *p_addr_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb; tBTM_LE_RANDOM_CB *p_addr_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;
@@ -539,6 +539,8 @@ tBTM_STATUS BTM_BleBroadcast(BOOLEAN start)
status = btm_ble_start_adv (); status = btm_ble_start_adv ();
} else if (!start) { } else if (!start) {
//save the stop adv callback to the BTM env.
p_cb->p_stop_adv_cb = p_stop_adv_cback;
status = btm_ble_stop_adv(); status = btm_ble_stop_adv();
#if BLE_PRIVACY_SPT == TRUE #if BLE_PRIVACY_SPT == TRUE
btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, TRUE); btm_ble_disable_resolving_list(BTM_BLE_RL_ADV, TRUE);
@@ -1152,7 +1154,7 @@ tBTM_STATUS BTM_BleSetAdvParams(UINT16 adv_int_min, UINT16 adv_int_max,
*******************************************************************************/ *******************************************************************************/
tBTM_STATUS BTM_BleSetAdvParamsStartAdv(UINT16 adv_int_min, UINT16 adv_int_max, UINT8 adv_type, tBTM_STATUS BTM_BleSetAdvParamsStartAdv(UINT16 adv_int_min, UINT16 adv_int_max, UINT8 adv_type,
tBLE_ADDR_TYPE own_bda_type, tBLE_BD_ADDR *p_dir_bda, tBLE_ADDR_TYPE own_bda_type, tBLE_BD_ADDR *p_dir_bda,
tBTM_BLE_ADV_CHNL_MAP chnl_map, tBTM_BLE_AFP afp) tBTM_BLE_ADV_CHNL_MAP chnl_map, tBTM_BLE_AFP afp, tBTM_START_ADV_CMPL_CBACK *adv_cb)
{ {
tBTM_LE_RANDOM_CB *p_addr_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb; tBTM_LE_RANDOM_CB *p_addr_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;
tBTM_BLE_INQ_CB *p_cb = &btm_cb.ble_ctr_cb.inq_var; tBTM_BLE_INQ_CB *p_cb = &btm_cb.ble_ctr_cb.inq_var;
@@ -1182,6 +1184,7 @@ tBTM_STATUS BTM_BleSetAdvParamsStartAdv(UINT16 adv_int_min, UINT16 adv_int_max,
p_addr_cb->own_addr_type = own_bda_type; p_addr_cb->own_addr_type = own_bda_type;
p_cb->evt_type = adv_type; p_cb->evt_type = adv_type;
p_cb->afp = afp; p_cb->afp = afp;
p_cb->p_adv_cb = adv_cb;
if (p_dir_bda) { if (p_dir_bda) {
memcpy(&p_cb->direct_bda, p_dir_bda, sizeof(tBLE_BD_ADDR)); memcpy(&p_cb->direct_bda, p_dir_bda, sizeof(tBLE_BD_ADDR));
@@ -3495,7 +3498,14 @@ void btm_ble_read_remote_features_complete(UINT8 *p)
void btm_ble_write_adv_enable_complete(UINT8 *p) void btm_ble_write_adv_enable_complete(UINT8 *p)
{ {
tBTM_BLE_INQ_CB *p_cb = &btm_cb.ble_ctr_cb.inq_var; tBTM_BLE_INQ_CB *p_cb = &btm_cb.ble_ctr_cb.inq_var;
UINT8 status = *p;
// callback to the APP after receive the adv complete from the controller.
if (p_cb->p_adv_cb && p_cb->adv_mode == BTM_BLE_ADV_ENABLE) {
(*p_cb->p_adv_cb)(status);
} else if (p_cb->p_stop_adv_cb && p_cb->adv_mode == BTM_BLE_ADV_DISABLE) {
(*p_cb->p_stop_adv_cb)(status);
}
/* if write adv enable/disbale not succeed */ /* if write adv enable/disbale not succeed */
if (*p != HCI_SUCCESS) { if (*p != HCI_SUCCESS) {
/* toggle back the adv mode */ /* toggle back the adv mode */

9
components/bt/bluedroid/stack/include/btm_ble_api.h
View File

@@ -852,6 +852,11 @@ typedef void (*tBLE_SCAN_PARAM_SETUP_CBACK)(tGATT_IF client_if, tBTM_STATUS stat
tBTM_BLE_SCAN_SETUP_CBACK bta_ble_scan_setup_cb; tBTM_BLE_SCAN_SETUP_CBACK bta_ble_scan_setup_cb;
typedef void (tBTM_START_ADV_CMPL_CBACK) (UINT8 status);
typedef void (tBTM_START_STOP_ADV_CMPL_CBACK) (UINT8 status);
/***************************************************************************** /*****************************************************************************
** EXTERNAL FUNCTION DECLARATIONS ** EXTERNAL FUNCTION DECLARATIONS
*****************************************************************************/ *****************************************************************************/
@@ -943,7 +948,7 @@ tBTM_STATUS BTM_BleSetAdvParams(UINT16 adv_int_min, UINT16 adv_int_max,
*******************************************************************************/ *******************************************************************************/
tBTM_STATUS BTM_BleSetAdvParamsStartAdv(UINT16 adv_int_min, UINT16 adv_int_max, UINT8 adv_type, tBTM_STATUS BTM_BleSetAdvParamsStartAdv(UINT16 adv_int_min, UINT16 adv_int_max, UINT8 adv_type,
tBLE_ADDR_TYPE own_bda_type, tBLE_BD_ADDR *p_dir_bda, tBLE_ADDR_TYPE own_bda_type, tBLE_BD_ADDR *p_dir_bda,
tBTM_BLE_ADV_CHNL_MAP chnl_map, tBTM_BLE_AFP afp); tBTM_BLE_ADV_CHNL_MAP chnl_map, tBTM_BLE_AFP afp, tBTM_START_ADV_CMPL_CBACK *adv_cb);
/******************************************************************************* /*******************************************************************************
@@ -1610,7 +1615,7 @@ BOOLEAN BTM_ReadConnectedTransportAddress(BD_ADDR remote_bda,
** **
*******************************************************************************/ *******************************************************************************/
//extern //extern
tBTM_STATUS BTM_BleBroadcast(BOOLEAN start); tBTM_STATUS BTM_BleBroadcast(BOOLEAN start, tBTM_START_STOP_ADV_CMPL_CBACK *p_stop_adv_cback);
/******************************************************************************* /*******************************************************************************
** **

4
components/bt/bluedroid/stack/include/btm_ble_int.h
View File

@@ -147,7 +147,8 @@ typedef struct {
UINT16 adv_interval_max; UINT16 adv_interval_max;
tBTM_BLE_AFP afp; /* advertising filter policy */ tBTM_BLE_AFP afp; /* advertising filter policy */
tBTM_BLE_SFP sfp; /* scanning filter policy */ tBTM_BLE_SFP sfp; /* scanning filter policy */
tBTM_START_ADV_CMPL_CBACK *p_adv_cb;
tBTM_START_STOP_ADV_CMPL_CBACK *p_stop_adv_cb;
tBLE_ADDR_TYPE adv_addr_type; tBLE_ADDR_TYPE adv_addr_type;
UINT8 evt_type; UINT8 evt_type;
UINT8 adv_mode; UINT8 adv_mode;
@@ -319,7 +320,6 @@ typedef struct {
UINT32 scan_int; UINT32 scan_int;
UINT32 scan_win; UINT32 scan_win;
tBTM_BLE_SEL_CBACK *p_select_cback; tBTM_BLE_SEL_CBACK *p_select_cback;
/* white list information */ /* white list information */
UINT8 white_list_avail_size; UINT8 white_list_avail_size;
tBTM_ADD_WHITELIST_CBACK *add_wl_cb; tBTM_ADD_WHITELIST_CBACK *add_wl_cb;