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

Merge pull request #14264 from paul-szczepanek-arm/fix-terminate-sync 

BLE: fix termination of periodic advertising sync
pull/14277/head
Martin Kojtal 2021-02-12 09:16:55 +00:00 committed by GitHub
parent d041654fa2 938aedac91
commit 3174a4c6a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.cpp
View File

@ -32,6 +32,9 @@ bool dummy_gap_event_handler(const wsfMsgHdr_t *msg)
} }
} }
#if BLE_FEATURE_PERIODIC_ADVERTISING && BLE_ROLE_OBSERVER
sync_handle_t PalGap::_pending_periodic_sync_handle = 0;
#endif
bool PalGap::is_feature_supported( bool PalGap::is_feature_supported(
ble::controller_supported_features_t feature ble::controller_supported_features_t feature
@ -592,7 +595,8 @@ void PalGap::gap_handler(const wsfMsgHdr_t *msg)
handler->on_periodic_advertising_sync_established( handler->on_periodic_advertising_sync_established(
hci_error_code_t(evt->status), hci_error_code_t(evt->status),
evt->syncHandle, /* the Cordio host stack uses a different ID to identify the control block */
_pending_periodic_sync_handle,
evt->advSid, evt->advSid,
connection_peer_address_type_t(evt->advAddrType), connection_peer_address_type_t(evt->advAddrType),
evt->advAddr, evt->advAddr,
@ -1343,6 +1347,8 @@ ble_error_t PalGap::periodic_advertising_create_sync(
if (sync_id == DM_SYNC_ID_NONE) { if (sync_id == DM_SYNC_ID_NONE) {
return BLE_ERROR_INTERNAL_STACK_FAILURE; return BLE_ERROR_INTERNAL_STACK_FAILURE;
} else { } else {
/* this is not the real handle, this is CORDIO internal handle but the user doesn't need to know that */
_pending_periodic_sync_handle = sync_id;
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }
} }

4
connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.h
View File

@ -566,6 +566,10 @@ private:
} }
private: private:
#if BLE_FEATURE_PERIODIC_ADVERTISING && BLE_ROLE_OBSERVER
/* must be static because is needed in a static handler, there can only be one sync in progress */
static sync_handle_t _pending_periodic_sync_handle;
#endif
PalGapEventHandler *_pal_event_handler; PalGapEventHandler *_pal_event_handler;
address_t device_random_address; address_t device_random_address;
bool use_active_scanning; bool use_active_scanning;