espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-15 10:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/ll/css: Fix moving connection to an earlier slot

Browse Source 
Moving connection to an earlier slot means we are effectively skipping
one period and we have to account for this, otherwise event counter and
period index will be out of sync.

The reason for this is because when moving to an earlier slot we have to
wait for next connection event and then move anchor further by a tx win
offset, so effectively we are in next period.
This commit is contained in:
Andrzej Kaczmarek
2022-06-22 15:18:14 +02:00
parent d7dc9d9ed7
commit 277fd466b8
1 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_conn.c
+35 -13
View File
@@ -2230,7 +2230,9 @@ ble_ll_conn_next_event(struct ble_ll_conn_sm *connsm)
uint16_t trans_next_event_cntr;
uint16_t subrate_conn_upd_event_cntr;
#endif
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
uint8_t anchor_calc_for_css = 0;
#endif
/* XXX: deal with connection request procedure here as well */
ble_ll_conn_chk_csm_flags(connsm);
@@ -2356,11 +2358,12 @@ ble_ll_conn_next_event(struct ble_ll_conn_sm *connsm)
if (connsm->conn_role == BLE_LL_CONN_ROLE_CENTRAL) {
connsm->css_period_idx += event_cntr_diff;
/* If this is non-reference connection, we set anchor from reference
* instead of calculating manually.
/* If this is non-reference connection, we calculate anchor point from
* reference connection instead of using connection interval. This is
* to make sure connections do not drift over time.
*/
if (g_ble_ll_conn_css_ref != connsm) {
ble_ll_sched_css_set_conn_anchor(connsm);
anchor_calc_for_css = 1;
skip_anchor_calc = 1;
}
}
@@ -2410,6 +2413,28 @@ ble_ll_conn_next_event(struct ble_ll_conn_sm *connsm)
}
#endif
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
if (connsm->conn_role == BLE_LL_CONN_ROLE_CENTRAL) {
BLE_LL_ASSERT(connsm->css_slot_idx_pending !=
BLE_LL_CONN_CSS_NO_SLOT);
/* If we are moving to an earlier slot, we are effectively skipping
* one period.
*/
if (connsm->css_slot_idx_pending < connsm->css_slot_idx) {
connsm->css_period_idx++;
}
connsm->css_slot_idx = connsm->css_slot_idx_pending;
connsm->css_slot_idx_pending = BLE_LL_CONN_CSS_NO_SLOT;
if (anchor_calc_for_css) {
ble_ll_sched_css_set_conn_anchor(connsm);
anchor_calc_for_css = 0;
}
}
#endif
connsm->supervision_tmo = upd->timeout;
connsm->periph_latency = upd->latency;
connsm->tx_win_size = upd->winsize;
@@ -2430,15 +2455,6 @@ ble_ll_conn_next_event(struct ble_ll_conn_sm *connsm)
/* Reset the starting point of the connection supervision timeout */
connsm->last_rxd_pdu_cputime = connsm->anchor_point;
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
if (connsm->conn_role == BLE_LL_CONN_ROLE_CENTRAL) {
BLE_LL_ASSERT(connsm->css_slot_idx_pending !=
BLE_LL_CONN_CSS_NO_SLOT);
connsm->css_slot_idx = connsm->css_slot_idx_pending;
connsm->css_slot_idx_pending = BLE_LL_CONN_CSS_NO_SLOT;
}
#endif
/* Reset update scheduled flag */
connsm->csmflags.cfbit.conn_update_sched = 0;
}
@@ -2471,6 +2487,12 @@ ble_ll_conn_next_event(struct ble_ll_conn_sm *connsm)
check to make sure we dont have to restart! */
}
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
if (anchor_calc_for_css) {
ble_ll_sched_css_set_conn_anchor(connsm);
}
#endif
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
if (CONN_F_PHY_UPDATE_SCHED(connsm) &&
(connsm->event_cntr == connsm->phy_instant)) {