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 #9907 from pan-/fix-cordio-conf 

BLE - Fix cordio configuration
pull/9998/head
Cruz Monrreal 2019-03-06 13:45:41 -06:00 committed by GitHub
parent f05a343678 b21e1d23d5
commit 7b3cc93cb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/FEATURE_BLE/source/generic/GenericGap.tpp
View File

@ -1465,6 +1465,11 @@ ble_error_t GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEve
#if BLE_ROLE_OBSERVER #if BLE_ROLE_OBSERVER
_scan_timeout.detach(); _scan_timeout.detach();
#endif #endif
if (_deprecated_scan_api_used == true) {
return BLE_ERROR_NONE;
}
#if BLE_FEATURE_EXTENDED_ADVERTISING #if BLE_FEATURE_EXTENDED_ADVERTISING
if (is_extended_advertising_available()) { if (is_extended_advertising_available()) {
/* stop all advertising sets */ /* stop all advertising sets */

9
features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioBLE.cpp
View File

@ -394,10 +394,8 @@ void BLE::stack_setup()
WsfTimerInit(); WsfTimerInit();
#if BLE_FEATURE_SECURITY // Note: SecInit required for RandInit.
SecInit(); SecInit();
#endif
SecRandInit(); SecRandInit();
#if BLE_FEATURE_SECURITY #if BLE_FEATURE_SECURITY
@ -519,11 +517,14 @@ void BLE::stack_setup()
DmConnRegister(DM_CLIENT_ID_APP, BLE::device_manager_cb); DmConnRegister(DM_CLIENT_ID_APP, BLE::device_manager_cb);
#endif #endif
#if BLE_FEATURE_GATT_SERVER
AttConnRegister(BLE::connection_handler);
#endif
#if BLE_FEATURE_ATT #if BLE_FEATURE_ATT
#if BLE_FEATURE_GATT_CLIENT #if BLE_FEATURE_GATT_CLIENT
AttRegister((attCback_t) ble::pal::vendor::cordio::CordioAttClient::att_client_handler); AttRegister((attCback_t) ble::pal::vendor::cordio::CordioAttClient::att_client_handler);
#else #else
AttConnRegister(BLE::connection_handler);
AttRegister((attCback_t) ble::vendor::cordio::GattServer::att_cb); AttRegister((attCback_t) ble::vendor::cordio::GattServer::att_cb);
#endif // BLE_FEATURE_GATT_CLIENT #endif // BLE_FEATURE_GATT_CLIENT
#endif #endif