You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2020/10/05 05:57:59 UTC
[mynewt-nimble] branch master updated: nimble/ble_gap:
adv_enable_tx preprocessor directives corrections There wher compilation
errors for blecent if NIMBLE_BLE_ADVERTISE was not set. Appropriate
preprocessor if conditions where added.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new d11729a nimble/ble_gap: adv_enable_tx preprocessor directives corrections There wher compilation errors for blecent if NIMBLE_BLE_ADVERTISE was not set. Appropriate preprocessor if conditions where added.
d11729a is described below
commit d11729a60aaee277a9516d93d8fb8fe6be78c5ee
Author: Krzysztof Kopyściński <kr...@codecoup.pl>
AuthorDate: Fri Oct 2 11:09:02 2020 +0200
nimble/ble_gap: adv_enable_tx preprocessor directives corrections
There wher compilation errors for blecent if NIMBLE_BLE_ADVERTISE was
not set. Appropriate preprocessor if conditions where added.
---
nimble/host/src/ble_gap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index c5bde77..1631cf4 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -930,7 +930,7 @@ ble_gap_master_ticks_until_exp(void)
return 0;
}
-#if !MYNEWT_VAL(BLE_EXT_ADV)
+#if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
static uint32_t
ble_gap_slave_ticks_until_exp(void)
{
@@ -1941,7 +1941,7 @@ ble_gap_master_timer(void)
return BLE_HS_FOREVER;
}
-#if !MYNEWT_VAL(BLE_EXT_ADV)
+#if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
static int32_t
ble_gap_slave_timer(void)
{
@@ -2040,7 +2040,7 @@ ble_gap_timer(void)
min_ticks = min(master_ticks, update_ticks);
-#if !MYNEWT_VAL(BLE_EXT_ADV)
+#if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
min_ticks = min(min_ticks, ble_gap_slave_timer());
#endif