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

Commit 9974d914 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "GATT: Don't use l2c_int.h functions"

parents 376cfe29 b0de012c

system/bta/gatt/bta_gattc_act.cc

+1 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/btu.h"

#include "stack/l2cap/l2c_int.h"

#include "utl.h"



#if (BTA_HH_LE_INCLUDED == TRUE)
@@ -712,8 +711,7 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb, 
  else if (p_q_cmd != NULL) {

    p_clcb->p_q_cmd = NULL;

    /* execute pending operation of link block still present */

    if (l2cu_find_lcb_by_bd_addr(p_clcb->p_srcb->server_bda,

                                 p_clcb->transport)) {

    if (L2CA_IsLinkEstablished(p_clcb->p_srcb->server_bda, p_clcb->transport)) {

      bta_gattc_sm_execute(p_clcb, p_q_cmd->hdr.event, p_q_cmd);

    }

    /* if the command executed requeued the cmd, we don't

system/main/shim/l2c_api.cc

+6 −0
Original line number Diff line number Diff line
@@ -296,3 +296,9 @@ uint16_t bluetooth::shim::L2CA_FlushChannel(uint16_t lcid, 
  LOG_INFO("UNIMPLEMENTED %s", __func__);

  return 0;

}



bool bluetooth::shim::L2CA_IsLinkEstablished(const RawAddress& bd_addr,

                                             tBT_TRANSPORT transport) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

  return true;

}

system/main/shim/l2c_api.h

+5 −0
Original line number Diff line number Diff line
@@ -615,5 +615,10 @@ void L2CA_AdjustConnectionIntervals(uint16_t* min_interval, 
                                    uint16_t* max_interval,

                                    uint16_t floor_interval);



/**

 * Check whether an ACL or LE link to the remote device is established

 */

bool L2CA_IsLinkEstablished(const RawAddress& bd_addr, tBT_TRANSPORT transport);



}  // namespace shim

}  // namespace bluetooth

system/stack/gatt/gatt_cl.cc

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "bt_common.h"

#include "bt_utils.h"

#include "gatt_int.h"

#include "l2c_int.h"

#include "l2c_api.h"

#include "log/log.h"

#include "osi/include/osi.h"
@@ -1001,7 +1001,7 @@ void gatt_process_mtu_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint16_t len, 
      tcb.payload_size = mtu;

  }



  l2cble_set_fixed_channel_tx_data_length(tcb.peer_bda, L2CAP_ATT_CID,

  L2CA_SetLeFixedChannelTxDataLength(tcb.peer_bda, L2CAP_ATT_CID,

                                     tcb.payload_size);

  gatt_end_operation(p_clcb, status, NULL);

}

system/stack/include/l2c_api.h

+14 −0
Original line number Diff line number Diff line
@@ -941,4 +941,18 @@ extern uint16_t L2CA_GetDisconnectReason(const RawAddress& remote_bda, 
extern void L2CA_AdjustConnectionIntervals(uint16_t* min_interval,

                                           uint16_t* max_interval,

                                           uint16_t floor_interval);



/**

 * Update max fixed channel tx data length if applicable

 */

extern void L2CA_SetLeFixedChannelTxDataLength(const RawAddress& remote_bda,

                                               uint16_t fix_cid,

                                               uint16_t tx_mtu);



/**

 * Check whether an ACL or LE link to the remote device is established

 */

extern bool L2CA_IsLinkEstablished(const RawAddress& bd_addr,

                                   tBT_TRANSPORT transport);



#endif /* L2C_API_H */