From ad3f3c86a5304c4fe709877ce43c6ee1ebd9cf75 Mon Sep 17 00:00:00 2001 From: Vincent Coubard Date: Sat, 10 Nov 2018 13:42:07 +0000 Subject: [PATCH] BLE: Move implementation to cpp file. --- features/FEATURE_BLE/ble/generic/GenericGap.h | 37 ++--------------- .../FEATURE_BLE/source/generic/GenericGap.cpp | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+), 33 deletions(-) diff --git a/features/FEATURE_BLE/ble/generic/GenericGap.h b/features/FEATURE_BLE/ble/generic/GenericGap.h index d2efb2d1dd..eba86bbc60 100644 --- a/features/FEATURE_BLE/ble/generic/GenericGap.h +++ b/features/FEATURE_BLE/ble/generic/GenericGap.h @@ -564,42 +564,13 @@ private: mutable bool _non_deprecated_scan_api_used : 1; private: - bool is_extended_advertising_enabled() { - return _pal_gap.is_feature_supported(pal::Gap::ControllerSupportedFeatures_t::LE_EXTENDED_ADVERTISING); - } + bool is_extended_advertising_enabled(); - static bool get_adv_set_bit(const uint8_t *bytes, uint8_t bit_number) { - if (bit_number > MAX_ADVERTISING_SETS) { - return false; - } - uint8_t byte = bit_number / 8; - uint8_t bit = bit_number - byte; - bytes += byte; - bool value = ((*bytes) >> bit) & 0x01; - return value; - } + static bool get_adv_set_bit(const uint8_t *bytes, uint8_t bit_number); - static bool set_adv_set_bit(uint8_t *bytes, uint8_t bit_number) { - if (bit_number > MAX_ADVERTISING_SETS) { - return false; - } - uint8_t byte = bit_number / 8; - uint8_t bit = bit_number - byte; - bytes += byte; - *bytes = *bytes | (0x01 >> bit); - return true; - } + static bool set_adv_set_bit(uint8_t *bytes, uint8_t bit_number); - static bool clear_adv_set_bit(uint8_t *bytes, uint8_t bit_number) { - if (bit_number > MAX_ADVERTISING_SETS) { - return false; - } - uint8_t byte = bit_number / 8; - uint8_t bit = bit_number - byte; - bytes += byte; - *bytes = *bytes & (0x00 >> bit); - return true; - } + static bool clear_adv_set_bit(uint8_t *bytes, uint8_t bit_number); }; } diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp index 3477702da0..463f57cc5d 100644 --- a/features/FEATURE_BLE/source/generic/GenericGap.cpp +++ b/features/FEATURE_BLE/source/generic/GenericGap.cpp @@ -2042,5 +2042,45 @@ void GenericGap::use_non_deprecated_scan_api() const _non_deprecated_scan_api_used = true; } +bool GenericGap::is_extended_advertising_enabled() +{ + return _pal_gap.is_feature_supported( + pal::Gap::ControllerSupportedFeatures_t::LE_EXTENDED_ADVERTISING + ); +} + +bool GenericGap::get_adv_set_bit(const uint8_t *bytes, uint8_t bit_number) { + if (bit_number > MAX_ADVERTISING_SETS) { + return false; + } + uint8_t byte = bit_number / 8; + uint8_t bit = bit_number - byte; + bytes += byte; + bool value = ((*bytes) >> bit) & 0x01; + return value; +} + +bool GenericGap::set_adv_set_bit(uint8_t *bytes, uint8_t bit_number) { + if (bit_number > MAX_ADVERTISING_SETS) { + return false; + } + uint8_t byte = bit_number / 8; + uint8_t bit = bit_number - byte; + bytes += byte; + *bytes = *bytes | (0x01 >> bit); + return true; +} + +bool GenericGap::clear_adv_set_bit(uint8_t *bytes, uint8_t bit_number) { + if (bit_number > MAX_ADVERTISING_SETS) { + return false; + } + uint8_t byte = bit_number / 8; + uint8_t bit = bit_number - byte; + bytes += byte; + *bytes = *bytes & (0x00 >> bit); + return true; +} + } // namespace generic } // namespace ble