ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change function names

pull/14672/head
Paul Szczepanek 2021-06-01 15:45:08 +01:00
parent 4767b7e1ac
commit e99741dd3d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
View File

@ -2403,8 +2403,8 @@ ble_error_t Gap::startAdvertising(
} }
_event_queue.post([this, handle, maxDuration, maxEvents] { _event_queue.post([this, handle, maxDuration, maxEvents] {
start_advertising_enable(handle, maxDuration, maxEvents); queue_advertising_start(handle, maxDuration, maxEvents);
evaluate_advertising_enable_queue(); process_enable_queue();
}); });
} else } else
@ -2448,7 +2448,7 @@ ble_error_t Gap::startAdvertising(
#endif #endif
#if BLE_FEATURE_EXTENDED_ADVERTISING #if BLE_FEATURE_EXTENDED_ADVERTISING
void Gap::start_advertising_enable( void Gap::queue_advertising_start(
advertising_handle_t handle, advertising_handle_t handle,
adv_duration_t maxDuration, adv_duration_t maxDuration,
uint8_t maxEvents uint8_t maxEvents
@ -2470,7 +2470,7 @@ void Gap::start_advertising_enable(
} }
next = &(*next)->next; next = &(*next)->next;
} }
*next = new AdvertisingEnableStackNode_t(); *next = new(std::nothrow) AdvertisingEnableStackNode_t();
if (!*next) { if (!*next) {
tr_error("Out of memory creating pending advertising enable node for handle %d", handle); tr_error("Out of memory creating pending advertising enable node for handle %d", handle);
return; return;
@ -2482,7 +2482,7 @@ void Gap::start_advertising_enable(
} }
} }
void Gap::evaluate_advertising_enable_queue() void Gap::process_enable_queue()
{ {
tr_info("Evaluating pending advertising sets to be started"); tr_info("Evaluating pending advertising sets to be started");
if (_advertising_enable_pending) { if (_advertising_enable_pending) {
@ -2575,7 +2575,7 @@ ble_error_t Gap::stopAdvertising(advertising_handle_t handle)
} }
_pending_stop_sets.set(handle); _pending_stop_sets.set(handle);
if (!delay) { if (!delay) {
evaluate_advertising_stop(); process_stop();
} }
}); });
@ -2604,7 +2604,7 @@ ble_error_t Gap::stopAdvertising(advertising_handle_t handle)
} }
#if BLE_FEATURE_EXTENDED_ADVERTISING #if BLE_FEATURE_EXTENDED_ADVERTISING
void Gap::evaluate_advertising_stop() void Gap::process_stop()
{ {
// refresh for address for all connectable advertising sets // refresh for address for all connectable advertising sets
for (size_t i = 0; i < BLE_GAP_MAX_ADVERTISING_SETS; ++i) { for (size_t i = 0; i < BLE_GAP_MAX_ADVERTISING_SETS; ++i) {
@ -3461,7 +3461,7 @@ void Gap::on_advertising_set_started(const mbed::Span<const uint8_t>& handles)
_event_queue.post([this] { _event_queue.post([this] {
_advertising_enable_pending = false; _advertising_enable_pending = false;
evaluate_advertising_enable_queue(); process_enable_queue();
}); });
for (const auto &handle : handles) { for (const auto &handle : handles) {
@ -3506,7 +3506,7 @@ void Gap::on_advertising_set_terminated(
_event_queue.post([this, advertising_handle] { _event_queue.post([this, advertising_handle] {
_pending_stop_sets.clear(advertising_handle); _pending_stop_sets.clear(advertising_handle);
evaluate_advertising_stop(); process_stop();
}); });
if (!_event_handler) { if (!_event_handler) {

6
connectivity/FEATURE_BLE/source/generic/GapImpl.h
View File

@ -563,14 +563,14 @@ private:
#if BLE_ROLE_BROADCASTER #if BLE_ROLE_BROADCASTER
#if BLE_FEATURE_EXTENDED_ADVERTISING #if BLE_FEATURE_EXTENDED_ADVERTISING
void start_advertising_enable( void queue_advertising_start(
advertising_handle_t handle, advertising_handle_t handle,
adv_duration_t maxDuration, adv_duration_t maxDuration,
uint8_t maxEvents uint8_t maxEvents
); );
void evaluate_advertising_enable_queue(); void process_enable_queue();
void evaluate_advertising_stop(); void process_stop();
#endif // BLE_FEATURE_EXTENDED_ADVERTISING #endif // BLE_FEATURE_EXTENDED_ADVERTISING
ble_error_t setAdvertisingData( ble_error_t setAdvertisingData(