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

Merge branch 'bugfix/btdm_smp_compile_err' into 'release/v2.1'

Browse source 
component/bt: Fix ble compile error when close the SMP module.

See merge request !1541
This commit is contained in:
Jiang Jiang Jian 2017-11-16 11:31:07 +08:00
commit c092079587
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/bt/bluedroid/api/esp_gap_ble_api.c
View file

@ -262,7 +262,7 @@ esp_err_t esp_ble_gap_config_scan_rsp_data_raw(uint8_t *raw_data, uint32_t raw_d
} }
#if (SMP_INCLUDED)
esp_err_t esp_ble_gap_set_security_param(esp_ble_sm_param_t param_type, esp_err_t esp_ble_gap_set_security_param(esp_ble_sm_param_t param_type,
void *value, uint8_t len) void *value, uint8_t len)
{ {
@ -392,6 +392,7 @@ esp_err_t esp_ble_get_bond_device_list(int *dev_num, esp_ble_bond_dev_t *dev_lis
return (ret == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL); return (ret == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
} }
#endif /* #if (SMP_INCLUDED) */
esp_err_t esp_ble_gap_disconnect(esp_bd_addr_t remote_device) esp_err_t esp_ble_gap_disconnect(esp_bd_addr_t remote_device)
{ {

2
components/bt/bluedroid/btc/core/btc_dm.c
View file

@ -460,6 +460,7 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
case BTA_DM_SP_KEY_NOTIF_EVT: case BTA_DM_SP_KEY_NOTIF_EVT:
break; break;
case BTA_DM_DEV_UNPAIRED_EVT: { case BTA_DM_DEV_UNPAIRED_EVT: {
#if (SMP_INCLUDED)
bt_bdaddr_t bd_addr; bt_bdaddr_t bd_addr;
rsp_app = true; rsp_app = true;
LOG_ERROR("BTA_DM_DEV_UNPAIRED_EVT"); LOG_ERROR("BTA_DM_DEV_UNPAIRED_EVT");
@ -472,6 +473,7 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
ble_msg.act = ESP_GAP_BLE_REMOVE_BOND_DEV_COMPLETE_EVT; ble_msg.act = ESP_GAP_BLE_REMOVE_BOND_DEV_COMPLETE_EVT;
param.remove_bond_dev_cmpl.status = (p_data->link_down.status == HCI_SUCCESS) ? ESP_BT_STATUS_SUCCESS : ESP_BT_STATUS_FAIL; param.remove_bond_dev_cmpl.status = (p_data->link_down.status == HCI_SUCCESS) ? ESP_BT_STATUS_SUCCESS : ESP_BT_STATUS_FAIL;
memcpy(param.remove_bond_dev_cmpl.bd_addr, p_data->link_down.bd_addr, sizeof(BD_ADDR)); memcpy(param.remove_bond_dev_cmpl.bd_addr, p_data->link_down.bd_addr, sizeof(BD_ADDR));
#endif /* #if (SMP_INCLUDED) */
break; break;
} }
case BTA_DM_BUSY_LEVEL_EVT: case BTA_DM_BUSY_LEVEL_EVT: