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

Commit 7fb71186 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove callback param from BTM_DeviceReset 

it's never used

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

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void BTA_EnableTestMode(void) { 


/** Disable bluetooth device under test mode */

void BTA_DisableTestMode(void) {

  do_in_main_thread(FROM_HERE, base::Bind(BTM_DeviceReset, nullptr));

  do_in_main_thread(FROM_HERE, base::Bind(BTM_DeviceReset));

}



/** This function sets the Bluetooth name of local device */

system/bta/sys/bta_sys_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ void bta_sys_hw_api_enable(tBTA_SYS_HW_MSG* p_sys_hw_msg) { 
    /* register which HW module was turned on */

    bta_sys_cb.bluetooth_active = true;



    BTM_DeviceReset(NULL);

    BTM_DeviceReset();

  } else {

    bta_sys_cb.bluetooth_active = true;

system/main/shim/btm_api.h

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ uint8_t BTM_BleMaxMultiAdvInstanceCount(); 
 * Returns          void

 *

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

void BTM_DeviceReset(tBTM_CMPL_CB* p_cb);

void BTM_DeviceReset();



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

 *

system/stack/btm/btm_devctl.cc

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void reset_complete(void* result) { 
}



// TODO(zachoverflow): remove this function

void BTM_DeviceReset(UNUSED_ATTR tBTM_CMPL_CB* p_cb) {

void BTM_DeviceReset() {

  /* Flush all ACL connections */

  btm_acl_device_down();

system/stack/btu/btu_hcif.cc

+1 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ static void btu_hcif_hardware_error_evt(uint8_t* p) { 
  btm_report_device_status(BTM_DEV_STATUS_DOWN);



  /* Reset the controller */

  if (BTM_IsDeviceUp()) BTM_DeviceReset(NULL);

  if (BTM_IsDeviceUp()) BTM_DeviceReset();

}



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