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

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

Remove unnecessary definition am: b9c23db2 

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

Change-Id: I82073c462fe23457dc86e2cb3580de5da844b8d0
parents d96057f6 b9c23db2

system/internal_include/bt_target.h

+0 −13
Original line number Diff line number Diff line
@@ -168,14 +168,6 @@ 
#define L2CAP_CMD_BUF_SIZE BT_SMALL_BUFFER_SIZE

#endif



#ifndef L2CAP_USER_TX_BUF_SIZE

#define L2CAP_USER_TX_BUF_SIZE BT_DEFAULT_BUFFER_SIZE

#endif



#ifndef L2CAP_USER_RX_BUF_SIZE

#define L2CAP_USER_RX_BUF_SIZE BT_DEFAULT_BUFFER_SIZE

#endif



/* Sends L2CAP segmented packets in ERTM mode */

#ifndef L2CAP_FCR_TX_BUF_SIZE

#define L2CAP_FCR_TX_BUF_SIZE BT_DEFAULT_BUFFER_SIZE
@@ -208,11 +200,6 @@ 
#define OBX_LRG_DATA_BUF_SIZE (8080 + 26)

#endif



/* Used to send data to L2CAP. */

#ifndef GAP_DATA_BUF_SIZE

#define GAP_DATA_BUF_SIZE BT_DEFAULT_BUFFER_SIZE

#endif



/* BNEP data and protocol messages. */

#ifndef BNEP_BUF_SIZE

#define BNEP_BUF_SIZE BT_DEFAULT_BUFFER_SIZE

system/stack/gap/gap_conn.cc

+2 −2
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id, 
  if (p_ccb->cfg.fcr_present) {

    if (ertm_info == NULL) {

      p_ccb->ertm_info.preferred_mode = p_ccb->cfg.fcr.mode;

      p_ccb->ertm_info.user_rx_buf_size = GAP_DATA_BUF_SIZE;

      p_ccb->ertm_info.user_tx_buf_size = GAP_DATA_BUF_SIZE;

      p_ccb->ertm_info.user_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

      p_ccb->ertm_info.user_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;

      p_ccb->ertm_info.fcr_rx_buf_size = L2CAP_INVALID_ERM_BUF_SIZE;

      p_ccb->ertm_info.fcr_tx_buf_size = L2CAP_INVALID_ERM_BUF_SIZE;

    } else {

system/stack/l2cap/l2c_api.cc

+4 −4
Original line number Diff line number Diff line
@@ -407,10 +407,10 @@ uint16_t L2CA_ErtmConnectReq(uint16_t psm, const RawAddress& p_bd_addr, 
      p_ccb->ertm_info.fcr_tx_buf_size = L2CAP_FCR_TX_BUF_SIZE;



    if (p_ccb->ertm_info.user_rx_buf_size == L2CAP_INVALID_ERM_BUF_SIZE)

      p_ccb->ertm_info.user_rx_buf_size = L2CAP_USER_RX_BUF_SIZE;

      p_ccb->ertm_info.user_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;



    if (p_ccb->ertm_info.user_tx_buf_size == L2CAP_INVALID_ERM_BUF_SIZE)

      p_ccb->ertm_info.user_tx_buf_size = L2CAP_USER_TX_BUF_SIZE;

      p_ccb->ertm_info.user_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;



    p_ccb->max_rx_mtu =

        p_ertm_info->user_rx_buf_size -
@@ -830,10 +830,10 @@ bool L2CA_ErtmConnectRsp(const RawAddress& p_bd_addr, uint8_t id, uint16_t lcid, 
      p_ccb->ertm_info.fcr_tx_buf_size = L2CAP_FCR_TX_BUF_SIZE;



    if (p_ccb->ertm_info.user_rx_buf_size == L2CAP_INVALID_ERM_BUF_SIZE)

      p_ccb->ertm_info.user_rx_buf_size = L2CAP_USER_RX_BUF_SIZE;

      p_ccb->ertm_info.user_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;



    if (p_ccb->ertm_info.user_tx_buf_size == L2CAP_INVALID_ERM_BUF_SIZE)

      p_ccb->ertm_info.user_tx_buf_size = L2CAP_USER_TX_BUF_SIZE;

      p_ccb->ertm_info.user_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;



    p_ccb->max_rx_mtu =

        p_ertm_info->user_rx_buf_size -

system/stack/l2cap/l2c_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -1373,8 +1373,8 @@ tL2C_CCB* l2cu_allocate_ccb(tL2C_LCB* p_lcb, uint16_t cid) { 
      L2CAP_FCR_BASIC_MODE; /* Default mode for channel is basic mode */

  p_ccb->ertm_info.fcr_rx_buf_size = L2CAP_FCR_RX_BUF_SIZE;

  p_ccb->ertm_info.fcr_tx_buf_size = L2CAP_FCR_TX_BUF_SIZE;

  p_ccb->ertm_info.user_rx_buf_size = L2CAP_USER_RX_BUF_SIZE;

  p_ccb->ertm_info.user_tx_buf_size = L2CAP_USER_TX_BUF_SIZE;

  p_ccb->ertm_info.user_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  p_ccb->ertm_info.user_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  p_ccb->max_rx_mtu = L2CAP_MTU_SIZE;

  p_ccb->tx_mps = L2CAP_FCR_TX_BUF_SIZE - 32;