@@ -2645,7 +2645,7 @@ static UINT8 bta_dm_authorize_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NA
26452645 return BTM_NOT_AUTHORIZED ;
26462646 }
26472647}
2648-
2648+
26492649
26502650
26512651
@@ -4338,7 +4338,7 @@ static UINT8 bta_dm_ble_smp_cback (tBTM_LE_EVT event, BD_ADDR bda, tBTM_LE_EVT_D
43384338 } else {
43394339 sec_event .auth_cmpl .success = TRUE;
43404340 if (!p_data -> complt .smp_over_br ) {
4341-
4341+
43424342 }
43434343 }
43444344
@@ -4900,25 +4900,26 @@ void bta_dm_ble_set_scan_rsp_raw (tBTA_DM_MSG *p_data)
49004900void bta_dm_ble_set_data_length (tBTA_DM_MSG * p_data )
49014901{
49024902 tACL_CONN * p_acl_cb = btm_bda_to_acl (p_data -> ble_set_data_length .remote_bda , BT_TRANSPORT_LE );
4903- if (p_acl_cb == NULL ) {
4904- APPL_TRACE_ERROR ("%s error: Invalid connection remote_bda." , __func__ );
4905- return ;
4906- } else {
4907- p_acl_cb -> p_set_pkt_data_cback = p_data -> ble_set_data_length .p_set_pkt_data_cback ;
4908- }
4909- UINT8 status = BTM_SetBleDataLength (p_data -> ble_set_data_length .remote_bda ,
4910- p_data -> ble_set_data_length .tx_data_length );
4911- if (status != BTM_SUCCESS ) {
4903+ if (p_acl_cb == NULL ) {
4904+ APPL_TRACE_ERROR ("%s error: Invalid connection remote_bda." , __func__ );
4905+ return ;
4906+ } else {
4907+ p_acl_cb -> p_set_pkt_data_cback = p_data -> ble_set_data_length .p_set_pkt_data_cback ;
4908+ }
4909+ UINT8 status = BTM_SetBleDataLength (p_data -> ble_set_data_length .remote_bda ,
4910+ p_data -> ble_set_data_length .tx_data_length );
4911+ if (status != BTM_SUCCESS ) {
49124912 APPL_TRACE_ERROR ("%s failed\n" , __FUNCTION__ );
4913- if (p_data -> ble_set_data_length .p_set_pkt_data_cback ) {
4914- if (p_acl_cb -> data_length_params .tx_len == 0 ){
4915- uint16_t length = controller_get_interface ()-> get_acl_data_size_ble ();
4916- p_acl_cb -> data_length_params .rx_len = length ;
4917- p_acl_cb -> data_length_params .tx_len = length ;
4918- }
4919- (* p_data -> ble_set_data_length .p_set_pkt_data_cback )(status , & p_acl_cb -> data_length_params );
4913+ }
4914+ if (p_data -> ble_set_data_length .p_set_pkt_data_cback ) {
4915+ if (p_acl_cb -> data_length_params .tx_len == 0 ){
4916+ uint16_t length = controller_get_interface ()-> get_acl_data_size_ble ();
4917+ p_acl_cb -> data_length_params .rx_len = length ;
4918+ p_acl_cb -> data_length_params .tx_len = length ;
49204919 }
4920+ (* p_data -> ble_set_data_length .p_set_pkt_data_cback )(status , & p_acl_cb -> data_length_params );
49214921 }
4922+
49224923}
49234924
49244925/*******************************************************************************
@@ -5394,7 +5395,7 @@ static void bta_ble_energy_info_cmpl(tBTM_BLE_TX_TIME_MS tx_time,
53945395 if (BTA_SUCCESS == st ) {
53955396 ctrl_state = bta_dm_pm_obtain_controller_state ();
53965397 }
5397- #endif
5398+ #endif
53985399 if (bta_dm_cb .p_energy_info_cback ) {
53995400 bta_dm_cb .p_energy_info_cback (tx_time , rx_time , idle_time , energy_used , ctrl_state , st );
54005401 }
0 commit comments