From 8ddc643e974627fcb21bc59ff6dda837bdbfc697 Mon Sep 17 00:00:00 2001 From: zhiweijian Date: Tue, 31 Mar 2026 11:56:39 +0800 Subject: [PATCH] fix(ble/bluedroid): Fixed bluedrodi CI build error --- .../bt/host/bluedroid/bta/dm/bta_dm_act.c | 45 ++++++++++++------- .../bt/host/bluedroid/stack/btm/btm_acl.c | 6 ++- .../host/bluedroid/stack/btm/btm_ble_bgconn.c | 3 +- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c index a73436b2d1a..93ce6114fdc 100644 --- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c @@ -5216,7 +5216,7 @@ void bta_dm_ble_set_conn_params (tBTA_DM_MSG *p_data) void bta_dm_ble_set_scan_fil_params(tBTA_DM_MSG *p_data) { tBTM_STATUS status; - + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; status = BTM_BleSetScanFilterParams (p_data->ble_set_scan_fil_params.client_if, p_data->ble_set_scan_fil_params.scan_int, @@ -5230,7 +5230,7 @@ void bta_dm_ble_set_scan_fil_params(tBTA_DM_MSG *p_data) APPL_TRACE_ERROR("%s(), fail to set scan params.", __func__); } - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_SCAN_PARAMS_SET_COMPLETE_EVT, &cb_params); } @@ -5281,6 +5281,8 @@ void bta_dm_ble_disconnect (tBTA_DM_MSG *p_data) void bta_dm_ble_set_rand_address(tBTA_DM_MSG *p_data) { tBTM_STATUS status = BTM_SET_STATIC_RAND_ADDR_FAIL; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; + if (p_data->set_addr.addr_type != BLE_ADDR_RANDOM) { APPL_TRACE_ERROR("Invalid random address type = %d\n", p_data->set_addr.addr_type); goto _addr_set_end; @@ -5289,7 +5291,7 @@ void bta_dm_ble_set_rand_address(tBTA_DM_MSG *p_data) status = BTM_BleSetRandAddress(p_data->set_addr.address); _addr_set_end: - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_SET_RANDOM_ADDR_EVT, &cb_params); @@ -5359,6 +5361,8 @@ void bta_dm_ble_set_key_material (tBTA_DM_MSG *p_data) void bta_dm_ble_scan (tBTA_DM_MSG *p_data) { tBTM_STATUS status; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; + if (p_data->ble_scan.start) { /*Save the callback to be called when a scan results are available */ bta_dm_search_cb.p_scan_cback = p_data->ble_scan.p_cback; @@ -5368,7 +5372,7 @@ void bta_dm_ble_scan (tBTA_DM_MSG *p_data) APPL_TRACE_WARNING(" %s start scan failed. status=0x%x\n", __FUNCTION__, status); } - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); status = (status == BTM_CMD_STARTED ? BTA_SUCCESS : BTA_FAILURE); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_SCAN_START_COMPLETE_EVT, &cb_params); @@ -5381,7 +5385,7 @@ void bta_dm_ble_scan (tBTA_DM_MSG *p_data) APPL_TRACE_WARNING(" %s stop scan failed, status=0x%x\n", __FUNCTION__, status); } - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); status = (status == BTM_CMD_STARTED ? BTA_SUCCESS : BTA_FAILURE); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_SCAN_STOP_COMPLETE_EVT, &cb_params); @@ -5409,6 +5413,8 @@ void bta_dm_ble_scan (tBTA_DM_MSG *p_data) void bta_dm_ble_start_adv_with_params (tBTA_DM_MSG *p_data) { tBTM_STATUS status = BTA_FAILURE; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; + status = BTM_BleStartAdvWithParams(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_type, @@ -5425,7 +5431,7 @@ void bta_dm_ble_start_adv_with_params (tBTA_DM_MSG *p_data) status = BTM_BleStartAdv(); _adv_param_error: - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_ADV_START_COMPLETE_EVT, &cb_params); } @@ -5461,11 +5467,12 @@ void bta_dm_ble_update_duplicate_exceptional_list(tBTA_DM_MSG *p_data) void bta_dm_ble_set_adv_config (tBTA_DM_MSG *p_data) { tBTM_STATUS status; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; status = BTM_BleWriteAdvData(p_data->ble_set_adv_data.data_mask, (tBTM_BLE_ADV_DATA *)p_data->ble_set_adv_data.p_adv_cfg); - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_ADV_DATA_SET_COMPLETE_EVT, &cb_params); } @@ -5482,11 +5489,12 @@ void bta_dm_ble_set_adv_config (tBTA_DM_MSG *p_data) void bta_dm_ble_set_adv_config_raw (tBTA_DM_MSG *p_data) { tBTM_STATUS status; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; status = BTM_BleWriteAdvDataRaw(p_data->ble_set_adv_data_raw.p_raw_adv, p_data->ble_set_adv_data_raw.raw_adv_len); - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_ADV_RAW_SET_COMPLETE_EVT, &cb_params); } @@ -5503,11 +5511,12 @@ void bta_dm_ble_set_adv_config_raw (tBTA_DM_MSG *p_data) void bta_dm_ble_set_scan_rsp (tBTA_DM_MSG *p_data) { tBTM_STATUS status; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; status = BTM_BleWriteScanRsp(p_data->ble_set_adv_data.data_mask, (tBTM_BLE_ADV_DATA *)p_data->ble_set_adv_data.p_adv_cfg); - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_SCAN_RSP_SET_COMPLETE_EVT, &cb_params); } @@ -5524,11 +5533,12 @@ void bta_dm_ble_set_scan_rsp (tBTA_DM_MSG *p_data) void bta_dm_ble_set_scan_rsp_raw (tBTA_DM_MSG *p_data) { tBTM_STATUS status; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; status = BTM_BleWriteScanRspRaw(p_data->ble_set_adv_data_raw.p_raw_adv, p_data->ble_set_adv_data_raw.raw_adv_len); - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_RSP_RAW_SET_COMPLETE_EVT, &cb_params); } @@ -5546,10 +5556,13 @@ void bta_dm_ble_set_data_length(tBTA_DM_MSG *p_data) { UINT8 status = BTM_SUCCESS; tACL_CONN *p_acl_cb = btm_bda_to_acl(p_data->ble_set_data_length.remote_bda, BT_TRANSPORT_LE); + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; + uint16_t length; + if (p_acl_cb == NULL) { APPL_TRACE_ERROR("%s error: Invalid connection remote_bda.", __func__); - uint16_t length = controller_get_interface()->get_acl_data_size_ble(); - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + length = controller_get_interface()->get_acl_data_size_ble(); + memset(&cb_params, 0, sizeof(cb_params)); cb_params.data_length_params.status = BTM_UNKNOWN_ADDR; cb_params.data_length_params.rx_len = length; cb_params.data_length_params.tx_len = length; @@ -5581,7 +5594,7 @@ void bta_dm_ble_set_data_length(tBTA_DM_MSG *p_data) if (status != BTM_SUCCESS) { APPL_TRACE_ERROR("%s failed\n", __FUNCTION__); if (p_acl_cb->data_length_params.tx_len == 0){ - uint16_t length = controller_get_interface()->get_acl_data_size_ble(); + length = controller_get_interface()->get_acl_data_size_ble(); p_acl_cb->data_length_params.rx_len = length; p_acl_cb->data_length_params.tx_len = length; } @@ -5592,7 +5605,7 @@ void bta_dm_ble_set_data_length(tBTA_DM_MSG *p_data) } _data_length_set_complete: - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.data_length_params.status = status; cb_params.data_length_params.rx_len = p_acl_cb->data_length_params.rx_len; cb_params.data_length_params.tx_len = p_acl_cb->data_length_params.tx_len; @@ -5614,13 +5627,15 @@ _data_length_set_complete: void bta_dm_ble_advstop (tBTA_DM_MSG *p_data) { tBTM_STATUS status; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; + status = BTM_BleAdvStop(); if (status != BTM_SUCCESS) { APPL_TRACE_ERROR("%s failed\n", __FUNCTION__); } - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.status = status; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_ADV_STOP_COMPLETE_EVT, &cb_params); diff --git a/components/bt/host/bluedroid/stack/btm/btm_acl.c b/components/bt/host/bluedroid/stack/btm/btm_acl.c index 45e80f9ce85..5b7b2618680 100644 --- a/components/bt/host/bluedroid/stack/btm/btm_acl.c +++ b/components/bt/host/bluedroid/stack/btm/btm_acl.c @@ -2280,6 +2280,7 @@ tBTM_STATUS BTM_ReadChannelMap(BD_ADDR remote_bda) { tACL_CONN *p; tBTM_BLE_CH_MAP_RESULTS result; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; UINT8 status; BTM_TRACE_DEBUG("BTM_ReadChannelMap: RemBdAddr: %02x%02x%02x%02x%02x%02x\n", @@ -2310,7 +2311,7 @@ tBTM_STATUS BTM_ReadChannelMap(BD_ADDR remote_bda) result.status = BTM_UNKNOWN_ADDR; _ch_map_err: - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); // `ch_map_read` is same as `results` memcpy(&cb_params.ch_map_results, &result, sizeof(tBTM_BLE_CH_MAP_RESULTS)); BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_READ_CHANNEL_MAP_EVT, &cb_params); @@ -2362,6 +2363,7 @@ void btm_read_channel_map_complete(UINT8 *p) BTM_TRACE_DEBUG("btm_read_channel_map_complete\n"); if (btm_cb.devcb.is_ch_map_cb) { + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; /* Reset the callback pointer to prevent duplicate calls */ btm_cb.devcb.is_ch_map_cb = false; /* Extract HCI status from the response */ @@ -2390,7 +2392,7 @@ void btm_read_channel_map_complete(UINT8 *p) } /* Invoke the registered callback with the results */ - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); // `ch_map_read` is same as `results` memcpy(&cb_params.ch_map_results, &results, sizeof(tBTM_BLE_CH_MAP_RESULTS)); BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_READ_CHANNEL_MAP_EVT, &cb_params); diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c b/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c index 8ebfe0e290e..7a0e4dd7606 100644 --- a/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c +++ b/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c @@ -283,6 +283,7 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBLE_ADDR_ { BOOLEAN result = TRUE; UINT8 status; + tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params; #if (BLE_50_FEATURE_SUPPORT == TRUE) if (addr_type > BLE_ADDR_RANDOM && addr_type != BLE_ADDR_ANONYMOUS) #else @@ -366,7 +367,7 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBLE_ADDR_ return TRUE; _wl_end: - tBTM_BLE_LEGACY_GAP_CB_PARAMS cb_params = {0}; + memset(&cb_params, 0, sizeof(cb_params)); cb_params.white_list_update.status = status; cb_params.white_list_update.operation = to_add ? BTM_WHITELIST_ADD : BTM_WHITELIST_REMOVE; BTM_LegacyBleCallbackTrigger(BTM_BLE_LEGACY_GAP_WHITE_LIST_UPDATE_EVT, &cb_params);