From c7cfb0dc16ac3fb11b5e14af79c81a22cf903974 Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Tue, 3 Nov 2020 15:44:41 -0800 Subject: [PATCH] Remove return value stack/btm/btm_ble_gap::btm_ble_start_scan Toward readable code Bug: 163134718 Tag: #refactor Test: compile & verify basic functions working Change-Id: I02c553cd9b31897bf91d27107e8bc1b2c0758658 --- stack/btm/btm_ble_gap.cc | 8 +++----- stack/btm/btm_ble_int.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/stack/btm/btm_ble_gap.cc b/stack/btm/btm_ble_gap.cc index 366e91fa1..68ff43d11 100644 --- a/stack/btm/btm_ble_gap.cc +++ b/stack/btm/btm_ble_gap.cc @@ -430,7 +430,7 @@ tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, p_inq->scan_type, (uint16_t)scan_interval, (uint16_t)scan_window, btm_cb.ble_ctr_cb.addr_mgnt_cb.own_addr_type, BTM_BLE_DEFAULT_SFP); - status = btm_ble_start_scan(); + btm_ble_start_scan(); } if (status == BTM_CMD_STARTED) { @@ -1172,7 +1172,7 @@ tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) { /* enable IRK list */ btm_ble_enable_resolving_list_for_platform(BTM_BLE_RL_SCAN); p_ble_cb->inq_var.scan_type = BTM_BLE_SCAN_MODE_ACTI; - status = btm_ble_start_scan(); + btm_ble_start_scan(); } else if ((p_ble_cb->inq_var.scan_interval != BTM_BLE_LOW_LATENCY_SCAN_INT) || (p_ble_cb->inq_var.scan_window != BTM_BLE_LOW_LATENCY_SCAN_WIN)) { @@ -1923,7 +1923,7 @@ void btm_ble_process_phy_update_pkt(uint8_t len, uint8_t* data) { * Returns void * ******************************************************************************/ -tBTM_STATUS btm_ble_start_scan(void) { +void btm_ble_start_scan() { tBTM_BLE_INQ_CB* p_inq = &btm_cb.ble_ctr_cb.inq_var; /* start scan, disable duplicate filtering */ btm_send_hci_scan_enable(BTM_BLE_SCAN_ENABLE, BTM_BLE_DUPLICATE_DISABLE); @@ -1932,8 +1932,6 @@ tBTM_STATUS btm_ble_start_scan(void) { btm_ble_set_topology_mask(BTM_BLE_STATE_ACTIVE_SCAN_BIT); else btm_ble_set_topology_mask(BTM_BLE_STATE_PASSIVE_SCAN_BIT); - - return BTM_CMD_STARTED; } /******************************************************************************* diff --git a/stack/btm/btm_ble_int.h b/stack/btm/btm_ble_int.h index a7c5977db..518f1a37e 100644 --- a/stack/btm/btm_ble_int.h +++ b/stack/btm/btm_ble_int.h @@ -55,7 +55,7 @@ extern void btm_ble_connected_from_address_with_type( extern tBTM_STATUS btm_ble_start_adv(void); extern tBTM_STATUS btm_ble_stop_adv(void); -extern tBTM_STATUS btm_ble_start_scan(void); +extern void btm_ble_start_scan(void); /* LE security function from btm_sec.cc */ extern void btm_ble_link_sec_check(const RawAddress& bd_addr, -- 2.11.0