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

Commit 53ca8ae3 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

L2CA_SetIdleTimeout is unused 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iadfc923936e0fcd2f64454d3d989bceb79e5cb6f
parent 4f331a9c

system/main/shim/l2c_api.cc

+0 −6
Original line number Diff line number Diff line
@@ -418,12 +418,6 @@ bool bluetooth::shim::L2CA_GetRemoteCid(uint16_t lcid, uint16_t* rcid) { 
  return shim_l2cap.GetRemoteCid(lcid, rcid);

}



bool bluetooth::shim::L2CA_SetIdleTimeout(uint16_t cid, uint16_t timeout,

                                          bool is_global) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

  return false;

}



bool bluetooth::shim::L2CA_SetTxPriority(uint16_t cid,

                                         tL2CAP_CHNL_PRIORITY priority) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

system/main/shim/l2c_api.h

+0 −17
Original line number Diff line number Diff line
@@ -293,23 +293,6 @@ uint8_t L2CA_DataWrite(uint16_t cid, BT_HDR* p_data); 
// modify the value pointed at by |rcid|. |rcid| may be NULL.

bool L2CA_GetRemoteCid(uint16_t lcid, uint16_t* rcid);



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

 *

 * Function         L2CA_SetIdleTimeout

 *

 * Description      Higher layers call this function to set the idle timeout for

 *                  a connection, or for all future connections. The "idle

 *                  timeout" is the amount of time that a connection can remain

 *                  up with no L2CAP channels on it. A timeout of zero means

 *                  that the connection will be torn down immediately when the

 *                  last channel is removed. A timeout of 0xFFFF means no

 *                  timeout. Values are in seconds.

 *

 * Returns          true if command succeeded, false if failed

 *

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

bool L2CA_SetIdleTimeout(uint16_t cid, uint16_t timeout, bool is_global);



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

 *

 * Function         L2CA_SetIdleTimeoutByBdAddr

system/stack/include/l2c_api.h

+0 −17
Original line number Diff line number Diff line
@@ -552,23 +552,6 @@ extern uint8_t L2CA_DataWrite(uint16_t cid, BT_HDR* p_data); 
// modify the value pointed at by |rcid|. |rcid| may be NULL.

bool L2CA_GetRemoteCid(uint16_t lcid, uint16_t* rcid);



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

 *

 * Function         L2CA_SetIdleTimeout

 *

 * Description      Higher layers call this function to set the idle timeout for

 *                  a connection, or for all future connections. The "idle

 *                  timeout" is the amount of time that a connection can remain

 *                  up with no L2CAP channels on it. A timeout of zero means

 *                  that the connection will be torn down immediately when the

 *                  last channel is removed. A timeout of 0xFFFF means no

 *                  timeout. Values are in seconds.

 *

 * Returns          true if command succeeded, false if failed

 *

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

extern bool L2CA_SetIdleTimeout(uint16_t cid, uint16_t timeout, bool is_global);



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

 *

 * Function         L2CA_SetIdleTimeoutByBdAddr

system/stack/l2cap/l2c_api.cc

+0 −49
Original line number Diff line number Diff line
@@ -1029,55 +1029,6 @@ bool L2CA_GetRemoteCid(uint16_t lcid, uint16_t* rcid) { 
  return true;

}



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

 *

 * Function         L2CA_SetIdleTimeout

 *

 * Description      Higher layers call this function to set the idle timeout for

 *                  a connection, or for all future connections. The "idle

 *                  timeout" is the amount of time that a connection can remain

 *                  up with no L2CAP channels on it. A timeout of zero means

 *                  that the connection will be torn down immediately when the

 *                  last channel is removed. A timeout of 0xFFFF means no

 *                  timeout. Values are in seconds.

 *

 * Returns          true if command succeeded, false if failed

 *

 * NOTE             This timeout takes effect after at least 1 channel has been

 *                  established and removed. L2CAP maintains its own timer from

 *                  whan a connection is established till the first channel is

 *                  set up.

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

bool L2CA_SetIdleTimeout(uint16_t cid, uint16_t timeout, bool is_global) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::L2CA_SetIdleTimeout(cid, timeout, is_global);

  }



  tL2C_CCB* p_ccb;

  tL2C_LCB* p_lcb;



  if (is_global) {

    l2cb.idle_timeout = timeout;

  } else {

    /* Find the channel control block. We don't know the link it is on. */

    p_ccb = l2cu_find_ccb_by_cid(NULL, cid);

    if (p_ccb == NULL) {

      L2CAP_TRACE_WARNING("L2CAP - no CCB for L2CA_SetIdleTimeout, CID: %d",

                          cid);

      return (false);

    }



    p_lcb = p_ccb->p_lcb;



    if ((p_lcb) && (p_lcb->in_use) && (p_lcb->link_state == LST_CONNECTED))

      p_lcb->idle_timeout = timeout;

    else

      return (false);

  }



  return (true);

}



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

 *

 * Function         L2CA_SetIdleTimeoutByBdAddr