bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Controller: Legacy advertising time reservation

Browse Source 
Implementation to update legacy advertising time
reservations when advertising and scan response data are
updated.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-06-30 13:33:03 +05:30 committed by Carles Cufí
parent e50e4f97e0
commit ee04896ca9
1 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
subsys/bluetooth/controller/ll_sw/ull_adv.c
View File

@ -62,6 +62,8 @@ static int init_reset(void);
static inline struct ll_adv_set *is_disabled_get(uint8_t handle);
static uint16_t adv_time_get(struct pdu_adv *pdu, struct pdu_adv *pdu_scan,
uint8_t adv_chn_cnt, uint8_t phy);
static uint8_t adv_time_update(struct ll_adv_set *adv, struct pdu_adv *pdu,
struct pdu_adv *pdu_scan);
static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
uint16_t lazy, uint8_t force, void *param);
static void ticker_op_update_cb(uint32_t status, void *param);
@ -1567,6 +1569,21 @@ uint8_t ull_adv_data_set(struct ll_adv_set *adv, uint8_t len,
memcpy(&pdu->adv_ind.data[0], data, len);
pdu->len = BDADDR_SIZE + len;
/* Update time reservation */
if (adv->is_enabled) {
struct pdu_adv *pdu_scan;
struct lll_adv *lll;
uint8_t err;
lll = &adv->lll;
pdu_scan = lll_adv_scan_rsp_peek(lll);
err = adv_time_update(adv, pdu, pdu_scan);
if (err) {
return err;
}
}
lll_adv_data_enqueue(&adv->lll, idx);
return 0;
@ -1595,6 +1612,24 @@ uint8_t ull_scan_rsp_set(struct ll_adv_set *adv, uint8_t len,
memcpy(&pdu->scan_rsp.addr[0], &prev->scan_rsp.addr[0], BDADDR_SIZE);
memcpy(&pdu->scan_rsp.data[0], data, len);
/* Update time reservation */
if (adv->is_enabled) {
struct pdu_adv *pdu_adv_scan;
struct lll_adv *lll;
uint8_t err;
lll = &adv->lll;
pdu_adv_scan = lll_adv_data_peek(lll);
if ((pdu_adv_scan->type == PDU_ADV_TYPE_ADV_IND) ||
(pdu_adv_scan->type == PDU_ADV_TYPE_SCAN_IND)) {
err = adv_time_update(adv, pdu_adv_scan, pdu);
if (err) {
return err;
}
}
}
lll_adv_scan_rsp_enqueue(&adv->lll, idx);
return 0;
@ -1790,6 +1825,51 @@ static uint16_t adv_time_get(struct pdu_adv *pdu, struct pdu_adv *pdu_scan,
return time_us;
}
static uint8_t adv_time_update(struct ll_adv_set *adv, struct pdu_adv *pdu,
struct pdu_adv *pdu_scan)
{
uint32_t volatile ret_cb;
uint32_t ticks_minus;
uint32_t ticks_plus;
struct lll_adv *lll;
uint32_t time_ticks;
uint16_t time_us;
uint8_t chan_map;
uint8_t chan_cnt;
uint32_t ret;
lll = &adv->lll;
chan_map = lll->chan_map;
chan_cnt = util_ones_count_get(&chan_map, sizeof(chan_map));
time_us = adv_time_get(pdu, pdu_scan, chan_cnt, PHY_1M);
time_ticks = HAL_TICKER_US_TO_TICKS(time_us);
if (adv->ull.ticks_slot > time_ticks) {
ticks_minus = adv->ull.ticks_slot - time_ticks;
ticks_plus = 0U;
} else if (adv->ull.ticks_slot < time_ticks) {
ticks_minus = 0U;
ticks_plus = time_ticks - adv->ull.ticks_slot;
} else {
return 0;
}
ret_cb = TICKER_STATUS_BUSY;
ret = ticker_update(TICKER_INSTANCE_ID_CTLR,
TICKER_USER_ID_THREAD,
(TICKER_ID_ADV_BASE +
ull_adv_handle_get(adv)),
0, 0, ticks_plus, ticks_minus, 0, 0,
ull_ticker_status_give, (void *)&ret_cb);
ret = ull_ticker_status_take(ret, &ret_cb);
if (ret != TICKER_STATUS_SUCCESS) {
return BT_HCI_ERR_CMD_DISALLOWED;
}
adv->ull.ticks_slot = time_ticks;
return 0;
}
static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
uint8_t force, void *param)
{