From f5d87ab7cf9362c4466b16865404a8051caedeb0 Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Wed, 2 Sep 2020 17:56:56 -0700 Subject: [PATCH] Remove API constant stack/btm/btm_ble_gap::btm_ble_start_inquiry First param is a constant from only call junction Towards readable code Bug: 163134718 Tag: #refactor Test: compile & verify basic functions working Change-Id: I78b8b602a8d1d207e52903e8e5ba307cabd9119e --- stack/btm/btm_ble_gap.cc | 10 +++++----- stack/btm/btm_ble_int.h | 2 +- stack/btm/btm_inq.cc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stack/btm/btm_ble_gap.cc b/stack/btm/btm_ble_gap.cc index fc56c7e68..4736e1a98 100644 --- a/stack/btm/btm_ble_gap.cc +++ b/stack/btm/btm_ble_gap.cc @@ -1140,13 +1140,13 @@ void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int, * BTM_BUSY - if an inquiry is already active * ******************************************************************************/ -tBTM_STATUS btm_ble_start_inquiry(uint8_t mode, uint8_t duration) { +tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) { tBTM_STATUS status = BTM_CMD_STARTED; tBTM_BLE_CB* p_ble_cb = &btm_cb.ble_ctr_cb; tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars; - BTM_TRACE_DEBUG("btm_ble_start_inquiry: mode = %02x inq_active = 0x%02x", - mode, btm_cb.btm_inq_vars.inq_active); + BTM_TRACE_DEBUG("btm_ble_start_inquiry: inq_active = 0x%02x", + btm_cb.btm_inq_vars.inq_active); /* if selective connection is active, or inquiry is already active, reject it */ @@ -1180,8 +1180,8 @@ tBTM_STATUS btm_ble_start_inquiry(uint8_t mode, uint8_t duration) { } if (status == BTM_CMD_STARTED) { - p_inq->inq_active |= mode; - p_ble_cb->scan_activity |= mode; + p_inq->inq_active |= BTM_BLE_GENERAL_INQUIRY; + p_ble_cb->scan_activity |= BTM_BLE_GENERAL_INQUIRY; BTM_TRACE_DEBUG("btm_ble_start_inquiry inq_active = 0x%02x", p_inq->inq_active); diff --git a/stack/btm/btm_ble_int.h b/stack/btm/btm_ble_int.h index 3f57be0aa..a8ca146c9 100644 --- a/stack/btm/btm_ble_int.h +++ b/stack/btm/btm_ble_int.h @@ -48,7 +48,7 @@ extern void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int, uint16_t scan_win, uint8_t addr_type_own, uint8_t scan_filter_policy); -extern tBTM_STATUS btm_ble_start_inquiry(uint8_t mode, uint8_t duration); +extern tBTM_STATUS btm_ble_start_inquiry(uint8_t duration); extern void btm_ble_stop_scan(void); extern void btm_clear_all_pending_le_entry(void); diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc index 384149a6b..40c0e60a7 100644 --- a/stack/btm/btm_inq.cc +++ b/stack/btm/btm_inq.cc @@ -505,7 +505,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, p_inq->inq_active); if (controller_get_interface()->supports_ble()) { - btm_ble_start_inquiry(BTM_BLE_GENERAL_INQUIRY, p_inq->inqparms.duration); + btm_ble_start_inquiry(p_inq->inqparms.duration); } p_inq->inqparms.mode &= ~BTM_BLE_INQUIRY_MASK; -- 2.11.0