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

GenericGap: remove legacy timeout callback signalling

pull/12730/head
Lingkai Dong 2020-03-25 13:50:34 +00:00
parent d35a6b88a9
commit db14f196e7
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,6 @@
#include "drivers/Timeout.h" #include "drivers/Timeout.h"
#include "ble/pal/Deprecated.h"
namespace ble { namespace ble {
namespace generic { namespace generic {
@ -1535,6 +1533,7 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler> template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandler>::process_advertising_timeout() void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandler>::process_advertising_timeout()
{ {
// This will signal timeout via onAdvertisingEnd()
ble_error_t err = _pal_gap.advertising_enable(false); ble_error_t err = _pal_gap.advertising_enable(false);
if (err) { if (err) {
// TODO: define the mechanism signaling the error // TODO: define the mechanism signaling the error
@ -1544,8 +1543,6 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
// Stop address rotation if required // Stop address rotation if required
set_random_address_rotation(false); set_random_address_rotation(false);
#endif #endif
LegacyGap::processTimeoutEvent(LegacyGap::TIMEOUT_SRC_ADVERTISING);
} }
template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler> template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
@ -1682,11 +1679,6 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
); );
} }
// for now notify user that the connection failled by issuing a timeout
// event
// TODO: Define events in case of connection faillure
LegacyGap::processTimeoutEvent(LegacyGap::TIMEOUT_SRC_CONN);
return; return;
} }