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

Commit 951e3ccf authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove BTM_RegBusyLevelNotif & friends 

We now no longer need the "busy level" concept at all.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I13111ca217de8655e52f450278a4e776923ae5da
parent 4206e410

system/bta/dm/bta_dm_act.cc

+0 −6
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ static uint8_t bta_dm_authentication_complete_cback(const RawAddress& bd_addr, 
                                                    int result);

static void bta_dm_local_name_cback(void* p_name);

static bool bta_dm_check_av(uint16_t event);

static void bta_dm_bl_change_cback(tBTM_BL_EVENT_DATA* p_data);



static void bta_dm_policy_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,

                                uint8_t app_id, const RawAddress& peer_addr);
@@ -426,7 +425,6 @@ 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);



#if (BLE_VND_INCLUDED == TRUE)

    BTM_BleReadControllerFeatures(bta_dm_ctrl_features_rd_cmpl_cback);
@@ -2835,10 +2833,6 @@ void BTA_dm_acl_down(const RawAddress bd_addr, tBT_TRANSPORT transport) { 
  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_acl_down, bd_addr, transport));

}



/** Callback from btm when acl connection goes up or down */

static void bta_dm_bl_change_cback(tBTM_BL_EVENT_DATA* p_data) {

}



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

 *

 * Function         bta_dm_rs_cback

system/main/shim/btm_api.h

+0 −10
Original line number Diff line number Diff line
@@ -1310,16 +1310,6 @@ tBTM_STATUS BTM_ReadAutomaticFlushTimeout(const RawAddress& remote_bda, 
tBTM_STATUS BTM_ReadTxPower(const RawAddress& remote_bda,

                            tBT_TRANSPORT transport, tBTM_CMPL_CB* p_cb);



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

 *

 * Function         BTM_RegBusyLevelNotif

 *

 * Description      This function is called to register a callback to receive

 *                  busy level change events.

 *

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

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb);



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

 *

 * Function         BTM_GetNumAclLinks

system/stack/acl/acl.h

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

  uint16_t btm_def_link_super_tout;



  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 */



  /* Packet types supported by the local device */

system/stack/acl/btm_acl.cc

+0 −13
Original line number Diff line number Diff line
@@ -1639,19 +1639,6 @@ uint8_t* BTM_ReadRemoteFeatures(const RawAddress& addr) { 
  return (p->peer_lmp_feature_pages[0]);

}



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

 *

 * Function         BTM_RegBusyLevelNotif

 *

 * Description      This function is called to register a callback to receive

 *                  busy level change events.

 *

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

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb) {

  BTM_TRACE_DEBUG("BTM_RegBusyLevelNotif");

  btm_cb.acl_cb_.p_bl_changed_cb = p_cb;

}



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

 *

 * Function         BTM_ReadRSSI

system/stack/include/acl_api.h

+0 −10
Original line number Diff line number Diff line
@@ -25,16 +25,6 @@ 


// Note: From stack/include/btm_api.h



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

 *

 * Function         BTM_RegBusyLevelNotif

 *

 * Description      This function is called to register a callback to receive

 *                  busy level change events.

 *

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

void BTM_RegBusyLevelNotif(tBTM_BL_CHANGE_CB* p_cb);



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

 *  ACL CHANNEL MANAGEMENT FUNCTIONS

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