michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Remove +1 magic ticks and microseconds

Browse source 
Remove use of magic numbers to adjust ticks offset, replace with
vendor defines.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-05-12 15:26:43 +05:30 • committed by Carles Cufí
commit 15d3711a75
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
View file

@ -478,7 +478,7 @@ static void isr_done(void *param)
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
if (lll->aux) { if (lll->aux) {
lll_adv_aux_offset_fill(lll->aux->ticks_offset, lll_adv_aux_offset_fill(lll->aux->ticks_offset,
start_us + 1, pdu); start_us, pdu);
} }
#else /* !CONFIG_BT_CTLR_ADV_EXT */ #else /* !CONFIG_BT_CTLR_ADV_EXT */
ARG_UNUSED(pdu); ARG_UNUSED(pdu);

15
subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
View file

@ -710,11 +710,20 @@ static void mfy_aux_offset_get(void *param)
LL_ASSERT(id != TICKER_NULL); LL_ASSERT(id != TICKER_NULL);
} while (id != ticker_id); } while (id != ticker_id);
/* NOTE: as remainder not used in scheduling primary PDU /* Store the ticks offset for population in other advertising primary
* packet timer starts transmission after 1 tick hence the +1. * channel PDUs.
*/ */
aux->lll.ticks_offset = ticks_to_expire + 1; aux->lll.ticks_offset = ticks_to_expire;
/* NOTE: as remainder used in scheduling primary PDU not available,
* compensate with a probable jitter of one ticker resolution unit that
* would be included in the packet timer capture when scheduling next
* advertising primary channel PDU.
*/
aux->lll.ticks_offset +=
HAL_TICKER_US_TO_TICKS(EVENT_TICKER_RES_MARGIN_US);
/* FIXME: we are in ULL_LOW context, fill offset in LLL context */
pdu = lll_adv_data_curr_get(&adv->lll); pdu = lll_adv_data_curr_get(&adv->lll);
lll_adv_aux_offset_fill(ticks_to_expire, 0, pdu); lll_adv_aux_offset_fill(ticks_to_expire, 0, pdu);
} }