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

Commit 6710df93 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use proper type stack/acl/::tLINK_POLICY am: 1d81ef31 am: 9333a354 am: 2785a428 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32bb53a7a3ff7f84a700ed139de78e9e1f95e6c6
parents 022cd56c 2785a428

system/stack/acl/acl.h

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ typedef enum : uint16_t { 
  HCI_ENABLE_HOLD_MODE = (1u << 1),

  HCI_ENABLE_SNIFF_MODE = (1u << 2),

  HCI_ENABLE_PARK_MODE = (1u << 3),

} tLINK_POLICY;

} tLINK_POLICY_BITMASK;

typedef uint16_t tLINK_POLICY;



static const char* link_policy_string[] = {

    " role_switch ",
@@ -173,7 +174,8 @@ typedef struct { 


  uint16_t flush_timeout_in_ticks;

  uint16_t hci_handle;

  uint16_t link_policy;

  tLINK_POLICY link_policy;



  uint16_t link_super_tout;

  uint16_t pkt_types_mask;

  tBLE_ADDR_TYPE active_remote_addr_type;

system/stack/acl/btm_acl.cc

+8 −7
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct StackAclBtmAcl { 
  tBTM_STATUS btm_set_packet_types(tACL_CONN* p, uint16_t pkt_types);

  void btm_establish_continue(tACL_CONN* p_acl_cb);

  void btm_read_remote_features(uint16_t handle);

  void btm_set_default_link_policy(uint16_t settings);

  void btm_set_default_link_policy(tLINK_POLICY settings);

  void btm_acl_role_changed(tHCI_STATUS hci_status, const RawAddress& bd_addr,

                            uint8_t new_role);

};
@@ -128,8 +128,8 @@ static void btm_read_failed_contact_counter_timeout(void* data); 
static void btm_read_remote_ext_features(uint16_t handle, uint8_t page_number);

static void btm_read_rssi_timeout(void* data);

static void btm_read_tx_power_timeout(void* data);

static void btm_set_link_policy(tACL_CONN* conn, uint16_t policy);

static void check_link_policy(uint16_t* settings);

static void btm_set_link_policy(tACL_CONN* conn, tLINK_POLICY policy);

static void check_link_policy(tLINK_POLICY* settings);



namespace {

void NotifyAclLinkUp(tACL_CONN& p_acl) {
@@ -647,7 +647,7 @@ void btm_acl_encrypt_change(uint16_t handle, uint8_t status, 
  }

}



static void check_link_policy(uint16_t* settings) {

static void check_link_policy(tLINK_POLICY* settings) {

  const controller_t* controller = controller_get_interface();



  if ((*settings & HCI_ENABLE_CENTRAL_PERIPHERAL_SWITCH) &&
@@ -672,14 +672,15 @@ static void check_link_policy(uint16_t* settings) { 
  }

}



static void btm_set_link_policy(tACL_CONN* conn, uint16_t policy) {

static void btm_set_link_policy(tACL_CONN* conn, tLINK_POLICY policy) {

  conn->link_policy = policy;

  check_link_policy(&conn->link_policy);

  if ((conn->link_policy & HCI_ENABLE_CENTRAL_PERIPHERAL_SWITCH) &&

      interop_match_addr(INTEROP_DISABLE_SNIFF, &(conn->remote_addr))) {

    conn->link_policy &= (~HCI_ENABLE_SNIFF_MODE);

  }

  btsnd_hcic_write_policy_set(conn->hci_handle, conn->link_policy);

  btsnd_hcic_write_policy_set(conn->hci_handle,

                              static_cast<uint16_t>(conn->link_policy));

}



static void btm_toggle_policy_on_for(const RawAddress& peer_addr,
@@ -727,7 +728,7 @@ void BTM_block_role_switch_for(const RawAddress& peer_addr) { 
  btm_toggle_policy_off_for(peer_addr, HCI_ENABLE_CENTRAL_PERIPHERAL_SWITCH);

}



void StackAclBtmAcl::btm_set_default_link_policy(uint16_t settings) {

void StackAclBtmAcl::btm_set_default_link_policy(tLINK_POLICY settings) {

  check_link_policy(&settings);

  btm_cb.acl_cb_.btm_def_link_policy = settings;

  btsnd_hcic_write_def_policy_set(settings);