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

Commit 8198720c authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap fixed channel tx complete is unused am: 83fbde67 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1447000

Change-Id: I1ebdfc4983fba567d29d1fd1d7c66b9fd1bb361a
parents c3d53340 83fbde67

system/stack/include/l2c_api.h

+0 −2
Original line number Diff line number Diff line
@@ -600,8 +600,6 @@ typedef struct { 
  tL2CA_FIXED_CONGESTION_STATUS_CB* pL2CA_FixedCong_Cb;



  uint16_t default_idle_tout;

  tL2CA_TX_COMPLETE_CB*

      pL2CA_FixedTxComplete_Cb; /* fixed channel tx complete callback */

} tL2CAP_FIXED_CHNL_REG;



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

system/stack/l2cap/l2c_int.h

+0 −3
Original line number Diff line number Diff line
@@ -528,7 +528,6 @@ typedef void(tL2C_FCR_MGMT_EVT_HDLR)(uint8_t, tL2C_CCB*); 
typedef struct {

  uint16_t local_cid;

  uint16_t num_sdu;

  tL2CA_TX_COMPLETE_CB* cb;

} tL2C_TX_COMPLETE_CB_INFO;



/* The offset in a buffer that L2CAP will use when building commands.
@@ -600,8 +599,6 @@ extern void l2cu_set_acl_hci_header(BT_HDR* p_buf, tL2C_CCB* p_ccb); 
extern void l2cu_check_channel_congestion(tL2C_CCB* p_ccb);

extern void l2cu_disconnect_chnl(tL2C_CCB* p_ccb);



extern void l2cu_tx_complete(tL2C_TX_COMPLETE_CB_INFO* p_cbi);



extern void l2cu_send_peer_ble_par_req(tL2C_LCB* p_lcb, uint16_t min_int,

                                       uint16_t max_int, uint16_t latency,

                                       uint16_t timeout);

system/stack/l2cap/l2c_link.cc

+0 −4
Original line number Diff line number Diff line
@@ -1112,7 +1112,6 @@ static void l2c_link_send_to_lower(tL2C_LCB* p_lcb, BT_HDR* p_buf, 
  } else {

    l2c_link_send_to_lower_ble(p_lcb, p_buf);

  }

  if (p_cbi) l2cu_tx_complete(p_cbi);

}



/*******************************************************************************
@@ -1402,8 +1401,6 @@ BT_HDR* l2cu_get_next_buffer_to_send(tL2C_LCB* p_lcb, 
/* Highest priority are fixed channels */

  int xx;



  p_cbi->cb = NULL;



  for (xx = 0; xx < L2CAP_NUM_FIXED_CHNLS; xx++) {

    p_ccb = p_lcb->p_fixed_ccbs[xx];

    if (p_ccb == NULL) continue;
@@ -1437,7 +1434,6 @@ BT_HDR* l2cu_get_next_buffer_to_send(tL2C_LCB* p_lcb, 
        }



        /* Prepare callback info for TX completion */

        p_cbi->cb = l2cb.fixed_reg[xx].pL2CA_FixedTxComplete_Cb;

        p_cbi->local_cid = p_ccb->local_cid;

        p_cbi->num_sdu = 1;

system/stack/l2cap/l2c_utils.cc

+0 −4
Original line number Diff line number Diff line
@@ -2885,10 +2885,6 @@ tL2C_CCB* l2cu_find_ccb_by_cid(tL2C_LCB* p_lcb, uint16_t local_cid) { 
  return (p_ccb);

}



void l2cu_tx_complete(tL2C_TX_COMPLETE_CB_INFO* p_cbi) {

  if (p_cbi->cb != NULL) p_cbi->cb(p_cbi->local_cid, p_cbi->num_sdu);

}



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

 *

 * Function         l2cu_set_acl_hci_header

system/stack/smp/smp_l2c.cc

+0 −12
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 


#include "smp_int.h"



static void smp_tx_complete_callback(uint16_t cid, uint16_t num_pkt);



static void smp_connect_callback(uint16_t channel, const RawAddress& bd_addr,

                                 bool connected, uint16_t reason,

                                 tBT_TRANSPORT transport);
@@ -60,7 +58,6 @@ void smp_l2cap_if_init(void) { 


  fixed_reg.pL2CA_FixedConn_Cb = smp_connect_callback;

  fixed_reg.pL2CA_FixedData_Cb = smp_data_received;

  fixed_reg.pL2CA_FixedTxComplete_Cb = smp_tx_complete_callback;



  fixed_reg.pL2CA_FixedCong_Cb =

      NULL; /* do not handle congestion on this channel */
@@ -201,15 +198,6 @@ static void smp_data_received(uint16_t channel, const RawAddress& bd_addr, 
  osi_free(p_buf);

}



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

 *

 * Function         smp_tx_complete_callback

 *

 * Description      SMP channel tx complete callback

 *

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

static void smp_tx_complete_callback(uint16_t cid, uint16_t num_pkt) {}



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

 *

 * Function         smp_br_connect_callback