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

Commit 8b064d80 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

AVCT_BR: Move L2cap disconnect logic together 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7a5a9e29936fd3022c7b718d48c67b8ea74523f4
parent 7790355f

system/stack/avct/avct_bcb_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ void avct_bcb_chk_disc(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data) { 
 *

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

void avct_bcb_chnl_disc(tAVCT_BCB* p_bcb, UNUSED_ATTR tAVCT_LCB_EVT* p_data) {

  L2CA_DisconnectReq(p_bcb->ch_lcid);

  avct_l2c_br_disconnect(p_bcb->ch_lcid, 0);

}



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

system/stack/avct/avct_int.h

+2 −0
Original line number Diff line number Diff line
@@ -220,4 +220,6 @@ extern tAVCT_CB avct_cb; 
extern const tL2CAP_APPL_INFO avct_l2c_appl;

extern const tL2CAP_APPL_INFO avct_l2c_br_appl;



void avct_l2c_br_disconnect(uint16_t lcid, uint16_t result);



#endif /* AVCT_INT_H */

system/stack/avct/avct_l2c_br.cc

+4 −13
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ 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_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_disconnect_cfm_cback(uint16_t lcid, uint16_t result);

void avct_l2c_br_congestion_ind_cback(uint16_t lcid, bool is_congested);

void avct_l2c_br_data_ind_cback(uint16_t lcid, BT_HDR* p_buf);
@@ -245,7 +244,7 @@ void avct_l2c_br_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) { 
    p_lcb->ch_result = p_cfg->result;



    /* Send L2CAP disconnect req */

    L2CA_DisconnectReq(lcid);

    avct_l2c_br_disconnect(lcid, 0);

  }

}
@@ -341,17 +340,9 @@ void avct_l2c_br_disconnect_ind_cback(uint16_t lcid, bool ack_needed) { 
  avct_bcb_event(p_lcb, AVCT_LCB_LL_CLOSE_EVT, &avct_lcb_evt);

}



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

 *

 * Function         avct_l2c_br_disconnect_cfm_cback

 *

 * Description      This is the L2CAP disconnect confirm callback function.

 *

 *

 * Returns          void

 *

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

void avct_l2c_br_disconnect_cfm_cback(uint16_t lcid, uint16_t result) {

void avct_l2c_br_disconnect(uint16_t lcid, uint16_t result) {

  L2CA_DisconnectReq(lcid);



  tAVCT_BCB* p_lcb;

  uint16_t res;