espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-03 18:40:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_bleqabr25_1004' into 'master'

Browse Source 
fix(ble/bluedroid): Fixed the status setting in the HCI event

Closes BLERP-2020

See merge request espressif/esp-idf!40055
This commit is contained in:
Island
2025-08-19 21:10:46 +08:00
parent ba80256748 4ae438cca2
commit 3216dfa3b3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/bluedroid/api/include/api/esp_gap_ble_api.h
View File

@@ -1625,7 +1625,7 @@ typedef union {
* @brief ESP_GAP_BLE_PERIODIC_ADV_SYNC_ESTAB_EVT * @brief ESP_GAP_BLE_PERIODIC_ADV_SYNC_ESTAB_EVT
*/ */
struct ble_periodic_adv_sync_estab_param { struct ble_periodic_adv_sync_estab_param {
uint8_t status; /*!< periodic advertising sync status */ esp_bt_status_t status; /*!< periodic advertising sync status */
uint16_t sync_handle; /*!< periodic advertising sync handle */ uint16_t sync_handle; /*!< periodic advertising sync handle */
uint8_t sid; /*!< periodic advertising sid */ uint8_t sid; /*!< periodic advertising sid */
esp_ble_addr_type_t adv_addr_type; /*!< periodic advertising address type */ esp_ble_addr_type_t adv_addr_type; /*!< periodic advertising address type */

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

@@ -1104,7 +1104,7 @@ void btc_ble_5_gap_callback(tBTA_DM_BLE_5_GAP_EVENT event,
} }
case BTA_DM_BLE_5_GAP_PHY_UPDATE_COMPLETE_EVT: case BTA_DM_BLE_5_GAP_PHY_UPDATE_COMPLETE_EVT:
msg.act = ESP_GAP_BLE_PHY_UPDATE_COMPLETE_EVT; msg.act = ESP_GAP_BLE_PHY_UPDATE_COMPLETE_EVT;
param.phy_update.status = btc_btm_status_to_esp_status(params->phy_update.status); param.phy_update.status = btc_hci_to_esp_status(params->phy_update.status);
memcpy(param.phy_update.bda, params->phy_update.addr, BD_ADDR_LEN); memcpy(param.phy_update.bda, params->phy_update.addr, BD_ADDR_LEN);
param.phy_update.tx_phy = params->phy_update.tx_phy; param.phy_update.tx_phy = params->phy_update.tx_phy;
param.phy_update.rx_phy = params->phy_update.rx_phy; param.phy_update.rx_phy = params->phy_update.rx_phy;
@@ -1169,7 +1169,7 @@ void btc_ble_5_gap_callback(tBTA_DM_BLE_5_GAP_EVENT event,
} }
case BTA_DM_BLE_5_GAP_PERIODIC_ADV_SYNC_ESTAB_EVT: { case BTA_DM_BLE_5_GAP_PERIODIC_ADV_SYNC_ESTAB_EVT: {
msg.act = ESP_GAP_BLE_PERIODIC_ADV_SYNC_ESTAB_EVT; msg.act = ESP_GAP_BLE_PERIODIC_ADV_SYNC_ESTAB_EVT;
param.periodic_adv_sync_estab.status = btc_btm_status_to_esp_status(params->sync_estab.status); param.periodic_adv_sync_estab.status = btc_hci_to_esp_status(params->sync_estab.status);
param.periodic_adv_sync_estab.sync_handle = params->sync_estab.sync_handle; param.periodic_adv_sync_estab.sync_handle = params->sync_estab.sync_handle;
param.periodic_adv_sync_estab.sid = params->sync_estab.sid; param.periodic_adv_sync_estab.sid = params->sync_estab.sid;
param.periodic_adv_sync_estab.adv_addr_type = params->sync_estab.adv_addr_type; param.periodic_adv_sync_estab.adv_addr_type = params->sync_estab.adv_addr_type;
@@ -1204,7 +1204,7 @@ void btc_ble_5_gap_callback(tBTA_DM_BLE_5_GAP_EVENT event,
break; break;
case BTA_BLE_GAP_PERIODIC_ADV_SYNC_TRANS_RECV_EVT: case BTA_BLE_GAP_PERIODIC_ADV_SYNC_TRANS_RECV_EVT:
msg.act = ESP_GAP_BLE_PERIODIC_ADV_SYNC_TRANS_RECV_EVT; msg.act = ESP_GAP_BLE_PERIODIC_ADV_SYNC_TRANS_RECV_EVT;
param.past_received.status = btc_btm_status_to_esp_status(params->past_recv.status); param.past_received.status = btc_hci_to_esp_status(params->past_recv.status);
memcpy(param.past_received.bda, params->past_recv.addr, sizeof(BD_ADDR)); memcpy(param.past_received.bda, params->past_recv.addr, sizeof(BD_ADDR));
param.past_received.service_data = params->past_recv.service_data; param.past_received.service_data = params->past_recv.service_data;
param.past_received.sync_handle = params->past_recv.sync_handle; param.past_received.sync_handle = params->past_recv.sync_handle;