Skip to content

Commit db14f19

Browse files
committed
GenericGap: remove legacy timeout callback signalling
1 parent d35a6b8 commit db14f19

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

features/FEATURE_BLE/source/generic/GenericGap.tpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
#include "drivers/Timeout.h"
3030

31-
#include "ble/pal/Deprecated.h"
32-
3331
namespace ble {
3432
namespace generic {
3533

@@ -1535,6 +1533,7 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
15351533
template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
15361534
void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandler>::process_advertising_timeout()
15371535
{
1536+
// This will signal timeout via onAdvertisingEnd()
15381537
ble_error_t err = _pal_gap.advertising_enable(false);
15391538
if (err) {
15401539
// TODO: define the mechanism signaling the error
@@ -1544,8 +1543,6 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
15441543
// Stop address rotation if required
15451544
set_random_address_rotation(false);
15461545
#endif
1547-
1548-
LegacyGap::processTimeoutEvent(LegacyGap::TIMEOUT_SRC_ADVERTISING);
15491546
}
15501547

15511548
template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
@@ -1682,11 +1679,6 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
16821679
);
16831680
}
16841681

1685-
// for now notify user that the connection failled by issuing a timeout
1686-
// event
1687-
1688-
// TODO: Define events in case of connection faillure
1689-
LegacyGap::processTimeoutEvent(LegacyGap::TIMEOUT_SRC_CONN);
16901682
return;
16911683
}
16921684

0 commit comments

Comments
 (0)