alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-03 14:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/add_bda_to_read_rmt_name_param_v4.3' into 'release/v4.3'

Browse Source 
Bugfix/add bda to read rmt name param v4.3

See merge request espressif/esp-idf!18281
This commit is contained in:
Jiang Jiang Jian
2022-06-09 11:12:17 +08:00
parent b08c5b746d 8aa0f77863
commit ae47e3f172
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h
View File

@@ -347,6 +347,7 @@ typedef union {
struct read_rmt_name_param { struct read_rmt_name_param {
esp_bt_status_t stat; /*!< read Remote Name status */ esp_bt_status_t stat; /*!< read Remote Name status */
uint8_t rmt_name[ESP_BT_GAP_MAX_BDNAME_LEN + 1]; /*!< Remote device name */ uint8_t rmt_name[ESP_BT_GAP_MAX_BDNAME_LEN + 1]; /*!< Remote device name */
esp_bd_addr_t bda; /*!< remote bluetooth device address*/
} read_rmt_name; /*!< read Remote Name parameter struct */ } read_rmt_name; /*!< read Remote Name parameter struct */
/** /**

1
components/bt/host/bluedroid/btc/profile/std/gap/btc_gap_bt.c
View File

@@ -743,6 +743,7 @@ static void btc_gap_bt_read_remote_name_cmpl_callback(void *p_data)
msg.pid = BTC_PID_GAP_BT; msg.pid = BTC_PID_GAP_BT;
msg.act = BTC_GAP_BT_READ_REMOTE_NAME_EVT; msg.act = BTC_GAP_BT_READ_REMOTE_NAME_EVT;
memcpy(param.read_rmt_name.bda,result->bd_addr,BD_ADDR_LEN);
param.read_rmt_name.stat = btc_btm_status_to_esp_status(result->status); param.read_rmt_name.stat = btc_btm_status_to_esp_status(result->status);
memcpy(param.read_rmt_name.rmt_name,result->remote_bd_name,ESP_BT_GAP_MAX_BDNAME_LEN); memcpy(param.read_rmt_name.rmt_name,result->remote_bd_name,ESP_BT_GAP_MAX_BDNAME_LEN);

1
components/bt/host/bluedroid/stack/btm/btm_inq.c
View File

@@ -2306,6 +2306,7 @@ void btm_process_remote_name (BD_ADDR bda, BD_NAME bdn, UINT16 evt_len, UINT8 hc
rem_name.length = 0; rem_name.length = 0;
rem_name.remote_bd_name[0] = 0; rem_name.remote_bd_name[0] = 0;
} }
memcpy(rem_name.bd_addr, p_inq->remname_bda, BD_ADDR_LEN);
/* Reset the remote BAD to zero and call callback if possible */ /* Reset the remote BAD to zero and call callback if possible */
memset(p_inq->remname_bda, 0, BD_ADDR_LEN); memset(p_inq->remname_bda, 0, BD_ADDR_LEN);