From 196793dccb3fe40a90dc8f93216d3295f509a6eb Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Tue, 4 Sep 2018 17:06:48 +0800 Subject: [PATCH] component/bt : fix bug that set discovery mode will stop ble adv As the bluedroid original implmentation of BR/EDR and BLE dual mode about discovery mode, when set discovery mode for BR/EDR, it will stop ble advertising. Reference to https://github.com/espressif/esp-idf/issues/2306 --- components/bt/bluedroid/stack/btm/btm_inq.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/components/bt/bluedroid/stack/btm/btm_inq.c b/components/bt/bluedroid/stack/btm/btm_inq.c index 968c416f3..8b95fae60 100644 --- a/components/bt/bluedroid/stack/btm/btm_inq.c +++ b/components/bt/bluedroid/stack/btm/btm_inq.c @@ -170,16 +170,6 @@ tBTM_STATUS BTM_SetDiscoverability (UINT16 inq_mode, UINT16 window, UINT16 inter BOOLEAN cod_limited; BTM_TRACE_API ("BTM_SetDiscoverability\n"); -#if (BLE_INCLUDED == TRUE && BLE_INCLUDED == TRUE) - if (controller_get_interface()->supports_ble()) { - if (btm_ble_set_discoverability((UINT16)(inq_mode)) - == BTM_SUCCESS) { - btm_cb.btm_inq_vars.discoverable_mode &= (~BTM_BLE_DISCOVERABLE_MASK); - btm_cb.btm_inq_vars.discoverable_mode |= (inq_mode & BTM_BLE_DISCOVERABLE_MASK); - } - } - inq_mode &= ~BTM_BLE_DISCOVERABLE_MASK; -#endif /*** Check mode parameter ***/ if (inq_mode > BTM_MAX_DISCOVERABLE) { @@ -601,17 +591,6 @@ tBTM_STATUS BTM_SetConnectability (UINT16 page_mode, UINT16 window, UINT16 inter BTM_TRACE_API ("BTM_SetConnectability\n"); -#if (BLE_INCLUDED == TRUE && BLE_INCLUDED == TRUE) - if (controller_get_interface()->supports_ble()) { - if (btm_ble_set_connectability(page_mode) != BTM_SUCCESS) { - return BTM_NO_RESOURCES; - } - p_inq->connectable_mode &= (~BTM_BLE_CONNECTABLE_MASK); - p_inq->connectable_mode |= (page_mode & BTM_BLE_CONNECTABLE_MASK); - } - page_mode &= ~BTM_BLE_CONNECTABLE_MASK; -#endif - /*** Check mode parameter ***/ if (page_mode != BTM_NON_CONNECTABLE && page_mode != BTM_CONNECTABLE) { return (BTM_ILLEGAL_VALUE);