mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/btdm_switch_gatts_error_#12659' into 'master' 

component/bt:fix the bug of uild error if switch off BLE GATTS. Bug number is #12659.

switch off BLE GATTS and build.

See merge request !766
pull/439/merge
Jiang Jiang Jian 2017-05-18 14:58:24 +08:00
rodzic 9229902dff d13c083397
commit 46519a019c
1 zmienionych plików z 5 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
components/bt/bluedroid/stack/btm/btm_ble_gap.c
Wyświetl plik

@ -651,8 +651,9 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode)
if (!controller_get_interface()->supports_ble()) { if (!controller_get_interface()->supports_ble()) {
return FALSE; return FALSE;
} }
#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE)
uint8_t addr_resolution = 0; 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 */ if (!privacy_mode) { /* if privacy disabled, always use public address */
p_cb->addr_mgnt_cb.own_addr_type = BLE_ADDR_PUBLIC; p_cb->addr_mgnt_cb.own_addr_type = BLE_ADDR_PUBLIC;
p_cb->privacy_mode = BTM_PRIVACY_NONE; 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 */ /* 4.2 controller only allow privacy 1.2 or mixed mode, resolvable private address in controller */
if (controller_get_interface()->supports_ble_privacy()) { if (controller_get_interface()->supports_ble_privacy()) {
#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE)
addr_resolution = 1; addr_resolution = 1;
#endif /* defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE */
/* check vendor specific capability */ /* check vendor specific capability */
p_cb->privacy_mode = btm_cb.ble_ctr_cb.mixed_mode ? BTM_PRIVACY_MIXED : BTM_PRIVACY_1_2; p_cb->privacy_mode = btm_cb.ble_ctr_cb.mixed_mode ? BTM_PRIVACY_MIXED : BTM_PRIVACY_1_2;
} else { /* 4.1/4.0 controller */ } 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); GAP_BleAttrDBUpdate (GATT_UUID_GAP_CENTRAL_ADDR_RESOL, (tGAP_BLE_ATTR_VALUE *)&addr_resolution);
#endif #endif