Skip to content

Commit 7c49aeb

Browse files
committed
Remove connection_params from internal on_connected()
The callback on_connected() in ConnectionEventMonitorEventHandler contains a parameter ConnectionParams_t which is superceded by ConnectionParameters. Since it's not used, remove it.
1 parent d6eeab1 commit 7c49aeb

File tree

4 files changed

+5
-19
lines changed

4 files changed

+5
-19
lines changed

features/FEATURE_BLE/ble/generic/GenericSecurityManager.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,7 @@ class GenericSecurityManager :
435435
peer_address_type_t peer_address_type,
436436
address_t peer_address,
437437
own_address_type_t local_address_type,
438-
address_t local_address,
439-
const ::Gap::ConnectionParams_t *connection_params
438+
address_t local_address
440439
);
441440

442441
/**

features/FEATURE_BLE/ble/pal/ConnectionEventMonitor.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,15 @@ class ConnectionEventMonitorEventHandler {
5454
ble::peer_address_type_t peer_address_type,
5555
address_t peer_address,
5656
own_address_type_t local_address_type,
57-
const address_t local_address,
58-
const ::Gap::ConnectionParams_t *connection_params
57+
const address_t local_address
5958
) {
6059
self()->on_connected_(
6160
connection,
6261
role,
6362
peer_address_type,
6463
peer_address,
6564
local_address_type,
66-
local_address,
67-
connection_params
65+
local_address
6866
);
6967
}
7068

features/FEATURE_BLE/source/generic/GenericGap.tpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,15 +1165,6 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
11651165
}
11661166
#endif // BLE_ROLE_PERIPHERAL
11671167

1168-
// using these parameters if stupid, there is no range for the
1169-
// connection interval when the connection is established
1170-
ConnectionParams_t connection_params = {
1171-
/* minConnectionInterval */ e.connection_interval,
1172-
/* maxConnectionInterval */ e.connection_interval,
1173-
e.connection_latency,
1174-
e.supervision_timeout
1175-
};
1176-
11771168
ble::address_t address;
11781169
if (_address_type == own_address_type_t::PUBLIC) {
11791170
address = _pal_gap.get_device_address();
@@ -1189,8 +1180,7 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
11891180
e.peer_address_type,
11901181
e.peer_address,
11911182
_address_type,
1192-
address,
1193-
&connection_params
1183+
address
11941184
);
11951185
}
11961186

features/FEATURE_BLE/source/generic/GenericSecurityManager.tpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,8 +1108,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_connected_(
11081108
peer_address_type_t peer_address_type,
11091109
address_t peer_address,
11101110
own_address_type_t local_address_type,
1111-
address_t local_address,
1112-
const ::Gap::ConnectionParams_t *connection_params
1111+
address_t local_address
11131112
) {
11141113
#if BLE_FEATURE_SECURITY
11151114
MBED_ASSERT(_db);

0 commit comments

Comments
 (0)