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

Commit aa4e59e8 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Remove busy level event flags am: 3349affd am: 0d2058cc 

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

Change-Id: I66b61b83f31789ec4ee39a7c91de4169700d7071
parents cccf0fe0 0d2058cc

system/bta/dm/bta_dm_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -426,8 +426,7 @@ static void bta_dm_sys_hw_cback(tBTA_SYS_HW_EVT status) { 
    BTM_WritePageTimeout(p_bta_dm_cfg->page_timeout);

    bta_dm_cb.cur_policy = p_bta_dm_cfg->policy_settings;

    BTM_SetDefaultLinkPolicy(bta_dm_cb.cur_policy);

    BTM_RegBusyLevelNotif(bta_dm_bl_change_cback,

                          BTM_BL_UPDATE_MASK | BTM_BL_ROLE_CHG_MASK);

    BTM_RegBusyLevelNotif(bta_dm_bl_change_cback);



#if (BLE_VND_INCLUDED == TRUE)

    BTM_BleReadControllerFeatures(bta_dm_ctrl_features_rd_cmpl_cback);

system/main/shim/btm_api.h

+1 −2
Original line number Diff line number Diff line
@@ -1318,8 +1318,7 @@ tBTM_STATUS BTM_ReadTxPower(const RawAddress& remote_bda, 
 *                  busy level change events.

 *

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

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb,

                           tBTM_BL_EVENT_MASK evt_mask);

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb);



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

 *

system/stack/acl/acl.h

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

  uint16_t btm_def_link_super_tout;



  tBTM_BL_EVENT_MASK bl_evt_mask;

  tBTM_BL_CHANGE_CB* p_bl_changed_cb; /* Callback for when Busy Level changed */



  uint8_t pm_pend_link; /* the index of acl_db, which has a pending PM cmd */

system/stack/acl/btm_acl.cc

+4 −9
Original line number Diff line number Diff line
@@ -498,8 +498,7 @@ void btm_acl_update_busy_level(tBTM_BLI_EVENT event) { 
    evt.event = BTM_BL_UPDATE_EVT;

    evt.busy_level = busy_level;

    btm_cb.busy_level = busy_level;

    if (btm_cb.acl_cb_.p_bl_changed_cb &&

        (btm_cb.acl_cb_.bl_evt_mask & BTM_BL_UPDATE_MASK)) {

    if (btm_cb.acl_cb_.p_bl_changed_cb) {

      tBTM_BL_EVENT_DATA btm_bl_event_data;

      btm_bl_event_data.update = evt;

      (*btm_cb.acl_cb_.p_bl_changed_cb)(&btm_bl_event_data);
@@ -699,8 +698,7 @@ void btm_acl_encrypt_change(uint16_t handle, uint8_t status, 
                               &p->remote_addr);



    /* if role change event is registered, report it now */

    if (btm_cb.acl_cb_.p_bl_changed_cb &&

        (btm_cb.acl_cb_.bl_evt_mask & BTM_BL_ROLE_CHG_MASK)) {

    if (btm_cb.acl_cb_.p_bl_changed_cb) {

      tBTM_BL_ROLE_CHG_DATA evt;

      evt.event = BTM_BL_ROLE_CHG_EVT;

      evt.new_role = btm_cb.devcb.switch_role_ref_data.role;
@@ -1492,8 +1490,7 @@ void btm_acl_role_changed(uint8_t hci_status, const RawAddress* bd_addr, 
  btm_acl_report_role_change(hci_status, bd_addr);



  /* if role change event is registered, report it now */

  if (btm_cb.acl_cb_.p_bl_changed_cb &&

      (btm_cb.acl_cb_.bl_evt_mask & BTM_BL_ROLE_CHG_MASK)) {

  if (btm_cb.acl_cb_.p_bl_changed_cb) {

    tBTM_BL_ROLE_CHG_DATA evt;

    evt.event = BTM_BL_ROLE_CHG_EVT;

    evt.new_role = new_role;
@@ -1733,10 +1730,8 @@ uint8_t* BTM_ReadRemoteFeatures(const RawAddress& addr) { 
 *                  busy level change events.

 *

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

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb,

                           tBTM_BL_EVENT_MASK evt_mask) {

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb) {

  BTM_TRACE_DEBUG("BTM_RegBusyLevelNotif");

  btm_cb.acl_cb_.bl_evt_mask = evt_mask;

  btm_cb.acl_cb_.p_bl_changed_cb = p_cb;

}

system/stack/include/acl_api.h

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
 *                  busy level change events.

 *

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

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb,

                           tBTM_BL_EVENT_MASK evt_mask);

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb);



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

 *  ACL CHANNEL MANAGEMENT FUNCTIONS