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

Commit 761066bf authored by Hansong Zhang's avatar Hansong Zhang
Browse files

L2CA_ConfigCfm_Cb only need to provide result 

Users only care about result.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ife07db2454f938fb1dd1b7fde2136b8de887fa3b
parent 04b0402d

system/main/shim/l2cap.cc

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ bool bluetooth::shim::legacy::L2cap::ConfigRequest( 
    do_in_main_thread(

        FROM_HERE,

        base::Bind(classic_.Callbacks(CidToPsm(cid)).pL2CA_ConfigCfm_Cb, cid,

                   base::Unretained(&cfg_info)));

                   L2CAP_CFG_OK));

  });

  return true;

}

system/stack/avct/avct_l2c.cc

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
void avct_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid,

                                uint16_t psm, uint8_t id);

void avct_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result);

void avct_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);

void avct_l2c_config_cfm_cback(uint16_t lcid, uint16_t result);

void avct_l2c_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);

void avct_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed);

void avct_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested);
@@ -207,18 +207,18 @@ void avct_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result) { 
 * Returns          void

 *

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

void avct_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) {

void avct_l2c_config_cfm_cback(uint16_t lcid, uint16_t result) {

  tAVCT_LCB* p_lcb;



  /* look up lcb for this channel */

  p_lcb = avct_lcb_by_lcid(lcid);

  if (p_lcb != NULL) {

    AVCT_TRACE_DEBUG("avct_l2c_config_cfm_cback: 0x%x, ch_state: %d, res: %d",

                     lcid, p_lcb->ch_state, p_cfg->result);

                     lcid, p_lcb->ch_state, result);

    /* if in correct state */

    if (p_lcb->ch_state == AVCT_CH_CFG) {

      /* if result successful */

      if (p_cfg->result == L2CAP_CFG_OK) {

      if (result == L2CAP_CFG_OK) {

        /* update flags */

        p_lcb->ch_flags |= AVCT_L2C_CFG_CFM_DONE;
@@ -234,7 +234,7 @@ void avct_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) { 
            "ERROR avct_l2c_config_cfm_cback L2CA_DisconnectReq %d ",

            p_lcb->ch_state);

        /* store result value */

        p_lcb->ch_result = p_cfg->result;

        p_lcb->ch_result = result;



        /* Send L2CAP disconnect req */

        L2CA_DisconnectReq(lcid);

system/stack/avct/avct_l2c_br.cc

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
void avct_l2c_br_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid,

                                   uint16_t psm, uint8_t id);

void avct_l2c_br_connect_cfm_cback(uint16_t lcid, uint16_t result);

void avct_l2c_br_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);

void avct_l2c_br_config_cfm_cback(uint16_t lcid, uint16_t result);

void avct_l2c_br_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);

void avct_l2c_br_disconnect_ind_cback(uint16_t lcid, bool ack_needed);

void avct_l2c_br_congestion_ind_cback(uint16_t lcid, bool is_congested);
@@ -148,7 +148,7 @@ void avct_l2c_br_connect_cfm_cback(uint16_t lcid, uint16_t result) { 
 * Returns          void

 *

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

void avct_l2c_br_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) {

void avct_l2c_br_config_cfm_cback(uint16_t lcid, uint16_t result) {

  tAVCT_BCB* p_lcb;



  /* look up lcb for this channel */
@@ -156,7 +156,7 @@ void avct_l2c_br_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) { 
  if ((p_lcb == NULL) || (p_lcb->ch_state != AVCT_CH_CFG)) return;



  /* if result successful */

  if (p_cfg->result == L2CAP_CFG_OK) {

  if (result == L2CAP_CFG_OK) {

    /* update flags */

    p_lcb->ch_flags |= AVCT_L2C_CFG_CFM_DONE;
@@ -169,7 +169,7 @@ void avct_l2c_br_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) { 
  /* else failure */

  else {

    /* store result value */

    p_lcb->ch_result = p_cfg->result;

    p_lcb->ch_result = result;



    /* Send L2CAP disconnect req */

    avct_l2c_br_disconnect(lcid, 0);

system/stack/avdt/avdt_l2c.cc

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid,

                                uint16_t psm, uint8_t id);

void avdt_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result);

void avdt_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);

void avdt_l2c_config_cfm_cback(uint16_t lcid, uint16_t result);

void avdt_l2c_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);

void avdt_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed);

void avdt_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested);
@@ -297,7 +297,7 @@ void avdt_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result) { 
 * Returns          void

 *

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

void avdt_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) {

void avdt_l2c_config_cfm_cback(uint16_t lcid, uint16_t result) {

  AvdtpTransportChannel* p_tbl;



  AVDT_TRACE_DEBUG("%s: lcid: %d", __func__, lcid);
@@ -310,7 +310,7 @@ void avdt_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) { 
    /* if in correct state */

    if (p_tbl->state == AVDT_AD_ST_CFG) {

      /* if result successful */

      if (p_cfg->result == L2CAP_CONN_OK) {

      if (result == L2CAP_CONN_OK) {

        /* update cfg_flags */

        p_tbl->cfg_flags |= AVDT_L2C_CFG_CFM_DONE;

system/stack/bnep/bnep_main.cc

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void bnep_connect_ind(const RawAddress& bd_addr, uint16_t l2cap_cid, 
                             uint16_t psm, uint8_t l2cap_id);

static void bnep_connect_cfm(uint16_t l2cap_cid, uint16_t result);

static void bnep_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg);

static void bnep_config_cfm(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg);

static void bnep_config_cfm(uint16_t l2cap_cid, uint16_t result);

static void bnep_disconnect_ind(uint16_t l2cap_cid, bool ack_needed);

static void bnep_data_ind(uint16_t l2cap_cid, BT_HDR* p_msg);

static void bnep_congestion_ind(uint16_t lcid, bool is_congested);
@@ -236,11 +236,11 @@ static void bnep_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) { 
 * Returns          void

 *

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

static void bnep_config_cfm(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) {

static void bnep_config_cfm(uint16_t l2cap_cid, uint16_t result) {

  tBNEP_CONN* p_bcb;



  BNEP_TRACE_EVENT("BNEP - Rcvd cfg cfm, CID: 0x%x  Result: %d", l2cap_cid,

                   p_cfg->result);

                   result);



  /* Find CCB based on CID */

  p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);
@@ -251,7 +251,7 @@ static void bnep_config_cfm(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) { 
  }



  /* For now, always accept configuration from the other side */

  if (p_cfg->result == L2CAP_CFG_OK) {

  if (result == L2CAP_CFG_OK) {

    p_bcb->con_flags |= BNEP_FLAGS_MY_CFG_DONE;



    if (p_bcb->con_flags & BNEP_FLAGS_HIS_CFG_DONE) {