From bccec79c9f58c76b065b286bc09625b1149c7d8a Mon Sep 17 00:00:00 2001 From: Kinbay_Wu Date: Thu, 26 Sep 2024 16:39:25 +0800 Subject: [PATCH] [BPM-36584] [MT-1985] Fix Pair new RCU fail when connect with Kids RCU and another RCU [1/2] Impact projects: 1. system/bt 2. vendor/amlogic/common Signed-off-by: Kinbay_Wu --- bta/gatt/bta_gattc_act.cc | 6 ++---- stack/btm/btm_ble_bgconn.cc | 4 ++-- stack/btm/btm_inq.cc | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc index 7c06658c02..486f9f34f7 100644 --- a/bta/gatt/bta_gattc_act.cc +++ b/bta/gatt/bta_gattc_act.cc @@ -1163,19 +1163,17 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr, if (send_update_ind == false) { send_update_ind = true; + LOG_INFO("LL_CONNECTION_UPDATE_IND %s", (char*)bdname.name); if(strncmp((char*)bdname.name, "BOS_KR01", 8) == 0) { - LOG_INFO("LL_CONNECTION_UPDATE_IND BOS_KR01"); - L2CA_UpdateBleConnParams(bdaddr, 8, 8, 133, 1000, 0, 8); + L2CA_UpdateBleConnParams(bdaddr, 8, 8, 149, 1000, 0, 8); } else if(strncmp((char*)bdname.name, "BRM_SA02", 8) == 0) { - LOG_INFO("LL_CONNECTION_UPDATE_IND BRM_SA02"); L2CA_UpdateBleConnParams(bdaddr, 9, 9, 266, 1000, 0, 8); } else { - LOG_INFO("LL_CONNECTION_UPDATE_IND %s", (char*)bdname.name); L2CA_UpdateBleConnParams(bdaddr, 9, 9, 133, 1000, 0, 8 ); } } diff --git a/stack/btm/btm_ble_bgconn.cc b/stack/btm/btm_ble_bgconn.cc index 2415b46822..7e7e140e4d 100755 --- a/stack/btm/btm_ble_bgconn.cc +++ b/stack/btm/btm_ble_bgconn.cc @@ -342,10 +342,10 @@ bool btm_ble_start_auto_conn() { ASSERT(p_cb != nullptr); const uint16_t scan_int = (p_cb->scan_int == BTM_BLE_SCAN_PARAM_UNDEF) - ? BTM_BLE_SCAN_SLOW_INT_1 + ? BTM_BLE_SCAN_FAST_INT : p_cb->scan_int; const uint16_t scan_win = (p_cb->scan_win == BTM_BLE_SCAN_PARAM_UNDEF) - ? BTM_BLE_SCAN_SLOW_WIN_1 + ? BTM_BLE_SCAN_FAST_WIN : p_cb->scan_win; uint8_t own_addr_type = p_cb->addr_mgnt_cb.own_addr_type; uint8_t peer_addr_type = BLE_ADDR_PUBLIC; diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc index 07ce727c4a..fde161fe10 100644 --- a/stack/btm/btm_inq.cc +++ b/stack/btm/btm_inq.cc @@ -76,8 +76,8 @@ using bluetooth::Uuid; #endif //Vas River modiied for UEI BLE RCU, 2019/09/27 -//#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 10 -#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 15 +#define BTIF_DM_DEFAULT_INQ_MAX_DURATION 20 //system timeout duration (second) +#define BTIF_DM_DEFAULT_INQ_LENGTH 10 //UCI sent to BT controller x1.28 second 0~48 /******************************************************************************/ @@ -557,7 +557,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, (uint16_t)(BT_DEFAULT_BUFFER_SIZE / sizeof(tINQ_BDADDR)); bluetooth::legacy::hci::GetInterface().StartInquiry( - general_inq_lap, p_inq->inqparms.duration, 0); + general_inq_lap, BTIF_DM_DEFAULT_INQ_LENGTH, 0); return BTM_CMD_STARTED; } -- 2.25.1