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

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

Some ERTM values are constant am: 511dec54 

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

Change-Id: I0803905600edcfd0c0012d51917c584815ef87d8
parents c1f53628 511dec54

system/btif/src/btif_sock_l2cap.cc

+2 −4
Original line number Diff line number Diff line
@@ -685,10 +685,8 @@ const tL2CAP_FCR_OPTS obex_l2c_fcr_opts_def = { 
    OBX_FCR_OPT_MONITOR_TOUT,          /* Monitor timeout (12 secs) */

    OBX_FCR_OPT_MAX_PDU_SIZE           /* MPS segment size */

};

const tL2CAP_ERTM_INFO obex_l2c_etm_opt = {

    L2CAP_FCR_ERTM_MODE,     /* Mandatory for OBEX over l2cap */

    OBX_USER_RX_BUF_SIZE,    OBX_USER_TX_BUF_SIZE,

    OBX_FCR_RX_BUF_SIZE,     OBX_FCR_TX_BUF_SIZE};

const tL2CAP_ERTM_INFO obex_l2c_etm_opt = {L2CAP_FCR_ERTM_MODE,

                                           /* Mandatory for OBEX over l2cap */};



/**

 * When using a dynamic PSM, a PSM allocation is requested from

system/internal_include/bt_target.h

+0 −10
Original line number Diff line number Diff line
@@ -168,16 +168,6 @@ 
#define L2CAP_CMD_BUF_SIZE BT_SMALL_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

#endif



/* Receives L2CAP segmented packets in ERTM mode */

#ifndef L2CAP_FCR_RX_BUF_SIZE

#define L2CAP_FCR_RX_BUF_SIZE BT_DEFAULT_BUFFER_SIZE

#endif



#ifndef L2CAP_FCR_ERTM_BUF_SIZE

#define L2CAP_FCR_ERTM_BUF_SIZE (10240 + 24)

#endif

system/stack/avct/avct_api.cc

+0 −4
Original line number Diff line number Diff line
@@ -66,10 +66,6 @@ void AVCT_Register() { 
  /* Include the browsing channel which uses eFCR */

  tL2CAP_ERTM_INFO ertm_info;

  ertm_info.preferred_mode = L2CAP_FCR_ERTM_MODE;

  ertm_info.user_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.user_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.fcr_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.fcr_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;



  L2CA_Register2(AVCT_BR_PSM, avct_l2c_br_appl, true /*enable_snoop*/,

                 &ertm_info, kAvrcBrMtu, AVCT_MIN_BROWSE_MTU,

system/stack/avct/avct_bcb_act.cc

+0 −4
Original line number Diff line number Diff line
@@ -107,10 +107,6 @@ void avct_bcb_chnl_open(tAVCT_BCB* p_bcb, UNUSED_ATTR tAVCT_LCB_EVT* p_data) { 


  /* Set the FCR options: Browsing channel mandates ERTM */

  ertm_info.preferred_mode = L2CAP_FCR_ERTM_MODE;

  ertm_info.user_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.user_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.fcr_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.fcr_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;



  /* call l2cap connect req */

  p_bcb->ch_state = AVCT_CH_CONN;

system/stack/avct/avct_l2c_br.cc

+0 −4
Original line number Diff line number Diff line
@@ -145,10 +145,6 @@ void avct_l2c_br_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, 


  /* Set the FCR options: Browsing channel mandates ERTM */

  ertm_info.preferred_mode = L2CAP_FCR_ERTM_MODE;

  ertm_info.user_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.user_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.fcr_rx_buf_size = BT_DEFAULT_BUFFER_SIZE;

  ertm_info.fcr_tx_buf_size = BT_DEFAULT_BUFFER_SIZE;



  /* Send L2CAP connect rsp */

  L2CA_ErtmConnectRsp(bd_addr, id, lcid, result, 0, &ertm_info);