Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5d56f55 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Change initial order of commands after establishing an LE connection 

This patch changes order of commands send to LE device after connecting.
This will cause update connection parameters to be send after read
remote version. Having it other way around cause some problems with
broadcom chips, even though it should work both ways.

Bug: 28435172
Change-Id: I8ecf76217b036842e1d9ec7df714da94a99df7d5
parent f23acdad

system/stack/l2cap/l2c_ble.c

+38 −31
Original line number Diff line number Diff line
@@ -229,6 +229,42 @@ UINT16 L2CA_GetDisconnectReason (BD_ADDR remote_bda, tBT_TRANSPORT transport) 
    return reason;

}



void l2cble_use_preferred_conn_params(BD_ADDR bda) {

    tL2C_LCB *p_lcb = l2cu_find_lcb_by_bd_addr (bda, BT_TRANSPORT_LE);

    tBTM_SEC_DEV_REC    *p_dev_rec = btm_find_or_alloc_dev (bda);



    /* If there are any preferred connection parameters, set them now */

    if ( (p_dev_rec->conn_params.min_conn_int     >= BTM_BLE_CONN_INT_MIN ) &&

         (p_dev_rec->conn_params.min_conn_int     <= BTM_BLE_CONN_INT_MAX ) &&

         (p_dev_rec->conn_params.max_conn_int     >= BTM_BLE_CONN_INT_MIN ) &&

         (p_dev_rec->conn_params.max_conn_int     <= BTM_BLE_CONN_INT_MAX ) &&

         (p_dev_rec->conn_params.slave_latency    <= BTM_BLE_CONN_LATENCY_MAX ) &&

         (p_dev_rec->conn_params.supervision_tout >= BTM_BLE_CONN_SUP_TOUT_MIN) &&

         (p_dev_rec->conn_params.supervision_tout <= BTM_BLE_CONN_SUP_TOUT_MAX) &&

         ((p_lcb->min_interval < p_dev_rec->conn_params.min_conn_int &&

          p_dev_rec->conn_params.min_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ||

          (p_lcb->min_interval > p_dev_rec->conn_params.max_conn_int) ||

          (p_lcb->latency > p_dev_rec->conn_params.slave_latency) ||

          (p_lcb->timeout > p_dev_rec->conn_params.supervision_tout)))

    {

        L2CAP_TRACE_DEBUG ("%s: HANDLE=%d min_conn_int=%d max_conn_int=%d slave_latency=%d supervision_tout=%d", __func__,

                            p_lcb->handle, p_dev_rec->conn_params.min_conn_int, p_dev_rec->conn_params.max_conn_int,

                            p_dev_rec->conn_params.slave_latency, p_dev_rec->conn_params.supervision_tout);



        p_lcb->min_interval = p_dev_rec->conn_params.min_conn_int;

        p_lcb->max_interval = p_dev_rec->conn_params.max_conn_int;

        p_lcb->timeout      = p_dev_rec->conn_params.supervision_tout;

        p_lcb->latency      = p_dev_rec->conn_params.slave_latency;



        btsnd_hcic_ble_upd_ll_conn_params (p_lcb->handle,

                                           p_dev_rec->conn_params.min_conn_int,

                                           p_dev_rec->conn_params.max_conn_int,

                                           p_dev_rec->conn_params.slave_latency,

                                           p_dev_rec->conn_params.supervision_tout,

                                           0, 0);

    }

}



/*******************************************************************************

**

** Function l2cble_notify_le_connection
@@ -259,6 +295,8 @@ void l2cble_notify_le_connection (BD_ADDR bda) 
        if (p_ccb->chnl_state == CST_CLOSED)

            l2c_csm_execute (p_ccb, L2CEVT_LP_CONNECT_CFM, NULL);

    }



    l2cble_use_preferred_conn_params(bda);

}



/*******************************************************************************
@@ -335,37 +373,6 @@ void l2cble_scanner_conn_comp (UINT16 handle, BD_ADDR bda, tBLE_ADDR_TYPE type, 
#if BLE_PRIVACY_SPT == TRUE

    btm_ble_disable_resolving_list(BTM_BLE_RL_INIT, TRUE);

#endif



    /* If there are any preferred connection parameters, set them now */

    if ( (p_dev_rec->conn_params.min_conn_int     >= BTM_BLE_CONN_INT_MIN ) &&

         (p_dev_rec->conn_params.min_conn_int     <= BTM_BLE_CONN_INT_MAX ) &&

         (p_dev_rec->conn_params.max_conn_int     >= BTM_BLE_CONN_INT_MIN ) &&

         (p_dev_rec->conn_params.max_conn_int     <= BTM_BLE_CONN_INT_MAX ) &&

         (p_dev_rec->conn_params.slave_latency    <= BTM_BLE_CONN_LATENCY_MAX ) &&

         (p_dev_rec->conn_params.supervision_tout >= BTM_BLE_CONN_SUP_TOUT_MIN) &&

         (p_dev_rec->conn_params.supervision_tout <= BTM_BLE_CONN_SUP_TOUT_MAX) &&

         ((conn_interval < p_dev_rec->conn_params.min_conn_int &&

          p_dev_rec->conn_params.min_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ||

          (conn_interval > p_dev_rec->conn_params.max_conn_int) ||

          (conn_latency > p_dev_rec->conn_params.slave_latency) ||

          (conn_timeout > p_dev_rec->conn_params.supervision_tout)))

    {

        L2CAP_TRACE_ERROR ("upd_ll_conn_params: HANDLE=%d min_conn_int=%d max_conn_int=%d slave_latency=%d supervision_tout=%d",

                            handle, p_dev_rec->conn_params.min_conn_int, p_dev_rec->conn_params.max_conn_int,

                            p_dev_rec->conn_params.slave_latency, p_dev_rec->conn_params.supervision_tout);



        p_lcb->min_interval = p_dev_rec->conn_params.min_conn_int;

        p_lcb->max_interval = p_dev_rec->conn_params.max_conn_int;

        p_lcb->timeout      = p_dev_rec->conn_params.supervision_tout;

        p_lcb->latency      = p_dev_rec->conn_params.slave_latency;



        btsnd_hcic_ble_upd_ll_conn_params (handle,

                                           p_dev_rec->conn_params.min_conn_int,

                                           p_dev_rec->conn_params.max_conn_int,

                                           p_dev_rec->conn_params.slave_latency,

                                           p_dev_rec->conn_params.supervision_tout,

                                           0, 0);

    }

}