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

Commit 3dd66ad1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Report credit count change, when credits are received for LE CoC"

parents 03a7ff1a be25dbe7

system/stack/avct/avct_l2c.cc

+12 −13
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ void avct_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested); 
void avct_l2c_data_ind_cback(uint16_t lcid, BT_HDR* p_buf);



/* L2CAP callback function structure */

const tL2CAP_APPL_INFO avct_l2c_appl = {

    avct_l2c_connect_ind_cback,

const tL2CAP_APPL_INFO avct_l2c_appl = {avct_l2c_connect_ind_cback,

                                        avct_l2c_connect_cfm_cback,

                                        NULL,

                                        avct_l2c_config_ind_cback,
@@ -59,8 +58,8 @@ const tL2CAP_APPL_INFO avct_l2c_appl = { 
                                        NULL,

                                        avct_l2c_data_ind_cback,

                                        avct_l2c_congestion_ind_cback,

    NULL /* tL2CA_TX_COMPLETE_CB */

};

                                        NULL, /* tL2CA_TX_COMPLETE_CB */

                                        NULL /* tL2CA_CREDITS_RECEIVED_CB */};



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

 *

system/stack/avct/avct_l2c_br.cc

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ const tL2CAP_APPL_INFO avct_l2c_br_appl = { 
    NULL,

    avct_l2c_br_data_ind_cback,

    avct_l2c_br_congestion_ind_cback,

    NULL /* tL2CA_TX_COMPLETE_CB */

};

    NULL, /* tL2CA_TX_COMPLETE_CB */

    NULL /* tL2CA_CREDITS_RECEIVED_CB */};



/* Browsing channel eL2CAP default options */

const tL2CAP_FCR_OPTS avct_l2c_br_fcr_opts_def = {

system/stack/avdt/avdt_l2c.cc

+12 −13
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ void avdt_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested); 
void avdt_l2c_data_ind_cback(uint16_t lcid, BT_HDR* p_buf);



/* L2CAP callback function structure */

const tL2CAP_APPL_INFO avdt_l2c_appl = {

    avdt_l2c_connect_ind_cback,

const tL2CAP_APPL_INFO avdt_l2c_appl = {avdt_l2c_connect_ind_cback,

                                        avdt_l2c_connect_cfm_cback,

                                        NULL,

                                        avdt_l2c_config_ind_cback,
@@ -59,8 +58,8 @@ const tL2CAP_APPL_INFO avdt_l2c_appl = { 
                                        NULL,

                                        avdt_l2c_data_ind_cback,

                                        avdt_l2c_congestion_ind_cback,

    NULL /* tL2CA_TX_COMPLETE_CB */

};

                                        NULL, /* tL2CA_TX_COMPLETE_CB */

                                        NULL /* tL2CA_CREDITS_RECEIVED_CB */};



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

 *

system/stack/gatt/gatt_main.cc

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ static const tL2CAP_APPL_INFO dyn_info = {gatt_l2cif_connect_ind_cback, 
                                          NULL,

                                          gatt_l2cif_data_ind_cback,

                                          gatt_l2cif_congest_cback,

                                          NULL};

                                          NULL,

                                          NULL /* tL2CA_CREDITS_RECEIVED_CB */};



tGATT_CB gatt_cb;

system/stack/hid/hidd_conn.cc

+13 −11
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ static void hidd_l2cif_disconnect_cfm(uint16_t cid, uint16_t result); 
static void hidd_l2cif_data_ind(uint16_t cid, BT_HDR* p_msg);

static void hidd_l2cif_cong_ind(uint16_t cid, bool congested);



static const tL2CAP_APPL_INFO dev_reg_info = {hidd_l2cif_connect_ind,

static const tL2CAP_APPL_INFO dev_reg_info = {

    hidd_l2cif_connect_ind,

    hidd_l2cif_connect_cfm,

    NULL,

    hidd_l2cif_config_ind,
@@ -64,7 +65,8 @@ static const tL2CAP_APPL_INFO dev_reg_info = {hidd_l2cif_connect_ind, 
    NULL,

    hidd_l2cif_data_ind,

    hidd_l2cif_cong_ind,

                                              NULL};

    NULL,

    NULL /* tL2CA_CREDITS_RECEIVED_CB */};



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

 *