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

Commit 4dfb1157 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Add Api stack/acl/btm_acl::acl_disconnect am: 1a8ca77f 

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

Change-Id: I4e3447f3c66e05ffb7008b51818e738ac0d8b53f
parents 2efcd869 1a8ca77f

system/stack/acl/acl.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ typedef struct { 
  uint16_t pkt_types_mask;

  uint8_t active_remote_addr_type;

  uint8_t conn_addr_type;

  uint8_t disconnect_reason;

  uint8_t encrypt_state;

  uint8_t link_role;

  uint8_t lmp_version;

system/stack/acl/btm_acl.cc

+13 −2
Original line number Diff line number Diff line
@@ -1327,8 +1327,8 @@ uint16_t BTM_GetNumAclLinks(void) { 
 ******************************************************************************/

uint16_t btm_get_acl_disc_reason_code(void) {

  uint8_t res = btm_cb.acl_cb_.acl_disc_reason;

  BTM_TRACE_DEBUG("btm_get_acl_disc_reason_code");

  return (res);

  LOG_WARN("%s This API should require an address for per ACL basis", __func__);

  return res;

}



/*******************************************************************************
@@ -2851,6 +2851,17 @@ void acl_reject_connection_request(const RawAddress& bd_addr, uint8_t reason) { 
  btsnd_hcic_reject_conn(bd_addr, reason);

}



void acl_disconnect(const RawAddress& bd_addr, tBT_TRANSPORT transport,

                    uint8_t reason) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(bd_addr, transport);

  if (p_acl == nullptr) {

    LOG_WARN("%s Acl disconnect request for unknown device", __func__);

    return;

  }

  p_acl->disconnect_reason = reason;

  btsnd_hcic_disconnect(p_acl->hci_handle, reason);

}



void acl_send_data_packet(BT_HDR* p_buf, uint16_t flags) {

  bte_main_hci_send(p_buf, flags);

}

system/stack/include/acl_api.h

+3 −0
Original line number Diff line number Diff line
@@ -345,3 +345,6 @@ bool BTM_ReadPowerMode(const RawAddress& remote_bda, tBTM_PM_MODE* p_mode); 


void btm_acl_created(const RawAddress& bda, uint16_t hci_handle,

                     uint8_t link_role, tBT_TRANSPORT transport);



void acl_disconnect(const RawAddress& bd_addr, tBT_TRANSPORT transport,

                    uint8_t reason);