From 845c2601ece4c2323a03c6d705cd16545f6df08a Mon Sep 17 00:00:00 2001 From: Adam Hampson Date: Tue, 27 May 2014 13:14:30 -0700 Subject: [PATCH] fix compliation when BLE_VND_INCLUDED is false Change-Id: I48785d6d36965fb03657523ee6eb48cb63fd5364 Signed-off-by: Adam Hampson --- stack/btm/btm_ble_bgconn.c | 2 ++ stack/btm/btm_ble_gap.c | 3 ++- stack/l2cap/l2c_ble.c | 2 +- vnd/ble/vendor_ble.c | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stack/btm/btm_ble_bgconn.c b/stack/btm/btm_ble_bgconn.c index bcc51e8cf..967f90bad 100644 --- a/stack/btm/btm_ble_bgconn.c +++ b/stack/btm/btm_ble_bgconn.c @@ -86,10 +86,12 @@ BOOLEAN btm_add_dev_to_controller (BOOLEAN to_add, BD_ADDR bd_addr, UINT8 attr) { if (p_dev_rec->ble.ble_addr_type == BLE_ADDR_PUBLIC || !BTM_BLE_IS_RESOLVE_BDA(bd_addr)) { +#if (defined BLE_VND_INCLUDED && BLE_VND_INCLUDED == TRUE) #if (defined BLE_PRIVACY_SPT && BLE_PRIVACY_SPT == TRUE) /* add device into IRK list */ btm_ble_vendor_irk_list_load_dev(p_dev_rec); #endif +#endif started = btsnd_hcic_ble_add_white_list (p_dev_rec->ble.ble_addr_type, bd_addr); } if (memcmp(p_dev_rec->ble.static_addr, bd_addr, BD_ADDR_LEN) != 0 && diff --git a/stack/btm/btm_ble_gap.c b/stack/btm/btm_ble_gap.c index 6d53a6cf1..fa32a2e48 100644 --- a/stack/btm/btm_ble_gap.c +++ b/stack/btm/btm_ble_gap.c @@ -328,11 +328,12 @@ tBTM_STATUS BTM_BleObserve(BOOLEAN start, UINT8 duration, btm_cb.ble_ctr_cb.addr_mgnt_cb.own_addr_type, BTM_BLE_DEFAULT_SFP); /* assume observe always not using white list */ +#if (defined BLE_VND_INCLUDED && BLE_VND_INCLUDED == TRUE) #if (defined BLE_PRIVACY_SPT && BLE_PRIVACY_SPT == TRUE) /* enable IRK list */ btm_ble_vendor_irk_list_known_dev (TRUE); #endif - +#endif status = btm_ble_start_scan(BTM_BLE_DUPLICATE_DISABLE); } if (status == BTM_CMD_STARTED) diff --git a/stack/l2cap/l2c_ble.c b/stack/l2cap/l2c_ble.c index b1af83754..377e945ea 100644 --- a/stack/l2cap/l2c_ble.c +++ b/stack/l2cap/l2c_ble.c @@ -644,7 +644,7 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb) return FALSE; } #if BLE_PRIVACY_SPT == TRUE -#if (defined BLE_VND_INCLUDED || BLE_VND_INCLUDED == TRUE) +#if (defined BLE_VND_INCLUDED && BLE_VND_INCLUDED == TRUE) extern tBTM_STATUS BTM_BleEnableIRKFeature(BOOLEAN enable); if (btm_ble_vendor_irk_list_load_dev(p_dev_rec)) BTM_BleEnableIRKFeature(TRUE); diff --git a/vnd/ble/vendor_ble.c b/vnd/ble/vendor_ble.c index db1dadfb4..1ba93efb1 100644 --- a/vnd/ble/vendor_ble.c +++ b/vnd/ble/vendor_ble.c @@ -1228,7 +1228,9 @@ void btm_ble_vendor_irk_vsc_op_cmpl (tBTM_VSC_CMPL *p_params) STREAM_TO_BDADDR(target_bda, p); STREAM_TO_BDADDR(rra, p); +#if (defined BLE_VND_INCLUDED && BLE_VND_INCLUDED == TRUE) btm_ble_refresh_rra(target_bda, rra); +#endif } } -- 2.11.0