From d13c0833971aabb34ecf46f3048b5e70d9d0b453 Mon Sep 17 00:00:00 2001 From: Yulong Date: Wed, 17 May 2017 07:17:22 -0400 Subject: [PATCH] component/bt:fix the bug of uild error if switch off BLE GATTS. Bug number is #12659. --- components/bt/bluedroid/stack/btm/btm_ble_gap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/bt/bluedroid/stack/btm/btm_ble_gap.c b/components/bt/bluedroid/stack/btm/btm_ble_gap.c index dfa3b068d..d823710cc 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_gap.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_gap.c @@ -651,8 +651,9 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode) if (!controller_get_interface()->supports_ble()) { return FALSE; } - +#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE) uint8_t addr_resolution = 0; +#endif /* defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE */ if (!privacy_mode) { /* if privacy disabled, always use public address */ p_cb->addr_mgnt_cb.own_addr_type = BLE_ADDR_PUBLIC; p_cb->privacy_mode = BTM_PRIVACY_NONE; @@ -667,7 +668,9 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode) /* 4.2 controller only allow privacy 1.2 or mixed mode, resolvable private address in controller */ if (controller_get_interface()->supports_ble_privacy()) { +#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE) addr_resolution = 1; +#endif /* defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE */ /* check vendor specific capability */ p_cb->privacy_mode = btm_cb.ble_ctr_cb.mixed_mode ? BTM_PRIVACY_MIXED : BTM_PRIVACY_1_2; } else { /* 4.1/4.0 controller */ @@ -675,7 +678,7 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode) } } -#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE) +#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE) GAP_BleAttrDBUpdate (GATT_UUID_GAP_CENTRAL_ADDR_RESOL, (tGAP_BLE_ATTR_VALUE *)&addr_resolution); #endif