michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Implement Secondary_Advertising_Max_Skip

Browse source 
Behaviour is unchanged for max_skip == 0

For max_skip > 0, use a slightly different calculation to ensure
we can pass LL/DDI/ADV/BV-28-C

Signed-off-by: Troels Nilsson <trnn@demant.com>
This commit is contained in:
Troels Nilsson 2024-08-29 16:36:07 +02:00 • committed by Carles Cufí
commit 63da4963a0
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
subsys/bluetooth/controller/ll_sw/ull_adv.c
View file

@ -339,6 +339,7 @@ uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
is_new_set = !adv->is_created; is_new_set = !adv->is_created;
adv->is_created = 1; adv->is_created = 1;
adv->is_ad_data_cmplt = 1U; adv->is_ad_data_cmplt = 1U;
adv->max_skip = skip;
#endif /* CONFIG_BT_CTLR_ADV_EXT */ #endif /* CONFIG_BT_CTLR_ADV_EXT */
/* remember parameters so that set adv/scan data and adv enable /* remember parameters so that set adv/scan data and adv enable
@ -1391,6 +1392,7 @@ uint8_t ll_adv_enable(uint8_t enable)
struct lll_adv_aux *lll_aux = lll->aux; struct lll_adv_aux *lll_aux = lll->aux;
uint32_t ticks_slot_overhead_aux; uint32_t ticks_slot_overhead_aux;
uint32_t ticks_anchor_aux; uint32_t ticks_anchor_aux;
uint64_t interval_us;
aux = HDR_LLL2ULL(lll_aux); aux = HDR_LLL2ULL(lll_aux);
@ -1487,20 +1489,29 @@ uint8_t ll_adv_enable(uint8_t enable)
} }
#endif /* CONFIG_BT_CTLR_ADV_PERIODIC */ #endif /* CONFIG_BT_CTLR_ADV_PERIODIC */
/* Keep aux interval equal or higher than primary PDU /* Keep aux interval equal or lower than primary PDU
* interval. * interval * (max_skip + 1).
* Use periodic interval units to represent the * Use periodic interval units to represent the
* periodic behavior of scheduling of AUX_ADV_IND PDUs * periodic behavior of scheduling of AUX_ADV_IND PDUs
* so that it is grouped with similar interval units * so that it is grouped with similar interval units
* used for ACL Connections, Periodic Advertising and * used for ACL Connections, Periodic Advertising and
* BIG radio events. * BIG radio events.
*/ */
aux->interval = interval_us = (uint64_t)adv->interval * ADV_INT_UNIT_US;
DIV_ROUND_UP(((uint64_t)adv->interval *
ADV_INT_UNIT_US) + if (adv->max_skip == 0U) {
HAL_TICKER_TICKS_TO_US( /* Special case to keep behaviour unchanged from
ULL_ADV_RANDOM_DELAY), * before max_skip was implemented; In this case
PERIODIC_INT_UNIT_US); * add ULL_ADV_RANDOM_DELAY and round up for a
* aux interval equal or higher instead
*/
aux->interval = DIV_ROUND_UP(interval_us +
HAL_TICKER_TICKS_TO_US(ULL_ADV_RANDOM_DELAY),
PERIODIC_INT_UNIT_US);
} else {
aux->interval = (interval_us * (adv->max_skip + 1))
/ PERIODIC_INT_UNIT_US;
}
ret = ull_adv_aux_start(aux, ticks_anchor_aux, ret = ull_adv_aux_start(aux, ticks_anchor_aux,
ticks_slot_overhead_aux); ticks_slot_overhead_aux);

1
subsys/bluetooth/controller/ll_sw/ull_adv_types.h
View file

@ -36,6 +36,7 @@ struct ll_adv_set {
#if defined(CONFIG_BT_CTLR_HCI_ADV_HANDLE_MAPPING) #if defined(CONFIG_BT_CTLR_HCI_ADV_HANDLE_MAPPING)
uint8_t hci_handle; uint8_t hci_handle;
#endif #endif
uint8_t max_skip;
uint16_t event_counter; uint16_t event_counter;
uint16_t max_events; uint16_t max_events;
uint32_t remain_duration_us; uint32_t remain_duration_us;