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

Commit 41ee91c5 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove functions orphaned by the removal of BTM_VendorCleanup 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I660901a409762bf7bb19b9f81773cbfbc909d58b
parent b06d3dca

system/stack/btm/btm_ble_adv_filter.cc

+0 −15
Original line number Diff line number Diff line
@@ -902,18 +902,3 @@ void btm_ble_adv_filter_init(void) { 
        sizeof(tBTM_BLE_PF_COUNT) * cmn_ble_vsc_cb.max_filter);

  }

}
 


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

 *

 * Function         btm_ble_adv_filter_cleanup

 *

 * Description      This function de-initializes the adv filter control block

 *

 * Parameters

 *

 * Returns          status

 *

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

void btm_ble_adv_filter_cleanup(void) {

  osi_free_and_reset((void**)&btm_ble_adv_filt_cb.p_addr_filter_count);

}

system/stack/btm/btm_ble_batchscan.cc

+0 −10
Original line number Diff line number Diff line
@@ -542,13 +542,3 @@ void btm_ble_batchscan_init(void) { 
  memset(&ble_advtrack_cb, 0, sizeof(tBTM_BLE_ADV_TRACK_CB));

  BTM_RegisterForVSEvents(btm_ble_batchscan_filter_track_adv_vse_cback, true);

}
 


/**

 * This function cleans the batch scan control block.

 **/

void btm_ble_batchscan_cleanup(void) {

  BTM_TRACE_EVENT("%s", __func__);



  memset(&ble_batchscan_cb, 0, sizeof(tBTM_BLE_BATCH_SCAN_CB));

  memset(&ble_advtrack_cb, 0, sizeof(tBTM_BLE_ADV_TRACK_CB));

}

system/stack/btm/btm_ble_int.h

+0 −3
Original line number Diff line number Diff line
@@ -157,15 +157,12 @@ extern void btm_ble_enable_resolving_list(uint8_t); 
extern bool btm_ble_disable_resolving_list(uint8_t rl_mask, bool to_resume);

extern void btm_ble_enable_resolving_list_for_platform(uint8_t rl_mask);

extern void btm_ble_resolving_list_init(uint8_t max_irk_list_sz);

extern void btm_ble_resolving_list_cleanup(void);

#endif



extern void btm_ble_adv_init(void);

extern void btm_ble_multi_adv_cleanup(void);

extern void btm_ble_batchscan_init(void);

extern void btm_ble_batchscan_cleanup(void);

extern void btm_ble_adv_filter_init(void);

extern void btm_ble_adv_filter_cleanup(void);

extern bool btm_ble_topology_check(tBTM_BLE_STATE_MASK request);

extern bool btm_ble_clear_topology_mask(tBTM_BLE_STATE_MASK request_state);

extern bool btm_ble_set_topology_mask(tBTM_BLE_STATE_MASK request_state);

system/stack/btm/btm_ble_privacy.cc

+0 −22
Original line number Diff line number Diff line
@@ -908,26 +908,4 @@ void btm_ble_resolving_list_init(uint8_t max_irk_list_sz) { 
  btm_ble_clear_resolving_list();

  btm_cb.ble_ctr_cb.resolving_list_avail_size = max_irk_list_sz;

}



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

 *

 * Function         btm_ble_resolving_list_cleanup

 *

 * Description      Cleanup resolving list dynamic memory

 *

 * Parameters

 *

 * Returns          void

 *

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

void btm_ble_resolving_list_cleanup(void) {

  tBTM_BLE_RESOLVE_Q* p_q = &btm_cb.ble_ctr_cb.resolving_list_pend_q;



  osi_free_and_reset((void**)&p_q->resolve_q_random_pseudo);

  osi_free_and_reset((void**)&p_q->resolve_q_action);



  controller_get_interface()->set_ble_resolving_list_max_size(0);



  osi_free_and_reset((void**)&btm_cb.ble_ctr_cb.irk_list_mask);

}

#endif