From 15b1e4345ce2f113122551c820d25bb1be14f29d Mon Sep 17 00:00:00 2001 From: Christopher Collins Date: Mon, 19 Nov 2018 10:44:51 -0800 Subject: [PATCH] rename ble_hs_enabled --> ble_hs_is_enabled --- nimble/host/include/host/ble_hs.h | 2 +- nimble/host/src/ble_gap.c | 8 ++++---- nimble/host/src/ble_hs.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nimble/host/include/host/ble_hs.h b/nimble/host/include/host/ble_hs.h index 6719a6f05..3bf466540 100644 --- a/nimble/host/include/host/ble_hs.h +++ b/nimble/host/include/host/ble_hs.h @@ -296,7 +296,7 @@ extern struct ble_hs_cfg ble_hs_cfg; * @return 1 if the host is enabled; * 0 if the host is disabled. */ -int ble_hs_enabled(void); +int ble_hs_is_enabled(void); /** * Indicates whether the host has synchronized with the controller. diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c index 6824f7950..50e15969b 100644 --- a/nimble/host/src/ble_gap.c +++ b/nimble/host/src/ble_gap.c @@ -2093,7 +2093,7 @@ ble_gap_adv_start(uint8_t own_addr_type, const ble_addr_t *direct_addr, } } - if (!ble_hs_enabled()) { + if (!ble_hs_is_enabled()) { rc = BLE_HS_EDISABLED; goto done; } @@ -3104,7 +3104,7 @@ ble_gap_disc_ext_validate(uint8_t own_addr_type) return BLE_HS_EALREADY; } - if (!ble_hs_enabled()) { + if (!ble_hs_is_enabled()) { return BLE_HS_EDISABLED; } @@ -3588,7 +3588,7 @@ ble_gap_ext_connect(uint8_t own_addr_type, const ble_addr_t *peer_addr, goto done; } - if (!ble_hs_enabled()) { + if (!ble_hs_is_enabled()) { return BLE_HS_EDISABLED; } @@ -3715,7 +3715,7 @@ ble_gap_connect(uint8_t own_addr_type, const ble_addr_t *peer_addr, goto done; } - if (!ble_hs_enabled()) { + if (!ble_hs_is_enabled()) { rc = BLE_HS_EDISABLED; goto done; } diff --git a/nimble/host/src/ble_hs.c b/nimble/host/src/ble_hs.c index 3ee17575c..2f50409c6 100644 --- a/nimble/host/src/ble_hs.c +++ b/nimble/host/src/ble_hs.c @@ -308,7 +308,7 @@ ble_hs_clear_rx_queue(void) } int -ble_hs_enabled(void) +ble_hs_is_enabled(void) { return ble_hs_enabled_state == BLE_HS_ENABLED_STATE_ON; } @@ -442,7 +442,7 @@ ble_hs_timer_reset(uint32_t ticks) { int rc; - if (!ble_hs_enabled()) { + if (!ble_hs_is_enabled()) { ble_npl_callout_stop(&ble_hs_timer); } else { rc = ble_npl_callout_reset(&ble_hs_timer, ticks);