michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Rename per_scan field to periodic

Browse source 
Rename per_scan field in scan context to periodic field to
avoid confusing with abbreviation for peripheral.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-12-09 06:08:30 +05:30 • committed by Anas Nashif
commit 3c1277b49d
6 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/controller/hci/hci.c
View file

@ -6338,17 +6338,17 @@ static void le_per_adv_sync_established(struct pdu_data *pdu_data,
scan = node_rx->hdr.rx_ftr.param; scan = node_rx->hdr.rx_ftr.param;
dup_periodic_adv_reset(scan->per_scan.adv_addr_type, dup_periodic_adv_reset(scan->periodic.adv_addr_type,
scan->per_scan.adv_addr, scan->periodic.adv_addr,
scan->per_scan.sid); scan->periodic.sid);
sep->handle = sys_cpu_to_le16(node_rx->hdr.handle); sep->handle = sys_cpu_to_le16(node_rx->hdr.handle);
/* Resolved address, if private, has been populated in ULL */ /* Resolved address, if private, has been populated in ULL */
sep->adv_addr.type = scan->per_scan.adv_addr_type; sep->adv_addr.type = scan->periodic.adv_addr_type;
memcpy(&sep->adv_addr.a.val[0], scan->per_scan.adv_addr, BDADDR_SIZE); (void)memcpy(sep->adv_addr.a.val, scan->periodic.adv_addr, BDADDR_SIZE);
sep->sid = scan->per_scan.sid; sep->sid = scan->periodic.sid;
sep->phy = find_lsb_set(se->phy); sep->phy = find_lsb_set(se->phy);
sep->interval = sys_cpu_to_le16(se->interval); sep->interval = sys_cpu_to_le16(se->interval);
sep->clock_accuracy = se->sca; sep->clock_accuracy = se->sca;

2
subsys/bluetooth/controller/ll_sw/ull.c
View file

@ -1434,7 +1434,7 @@ void ll_rx_mem_release(void **node_rx)
/* pick the sync context before scan context /* pick the sync context before scan context
* is cleanup of sync context association. * is cleanup of sync context association.
*/ */
sync = scan->per_scan.sync; sync = scan->periodic.sync;
ull_sync_setup_complete(scan); ull_sync_setup_complete(scan);

4
subsys/bluetooth/controller/ll_sw/ull_scan.c
View file

@ -621,7 +621,7 @@ uint32_t ull_scan_is_enabled(uint8_t handle)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
scan = ull_scan_set_get(handle); scan = ull_scan_set_get(handle);
return scan->per_scan.sync ? ULL_SCAN_IS_SYNC : 0U; return scan->periodic.sync ? ULL_SCAN_IS_SYNC : 0U;
#else #else
return 0U; return 0U;
#endif #endif
@ -632,7 +632,7 @@ uint32_t ull_scan_is_enabled(uint8_t handle)
(scan->lll.conn ? ULL_SCAN_IS_INITIATOR : 0U) | (scan->lll.conn ? ULL_SCAN_IS_INITIATOR : 0U) |
#endif #endif
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
(scan->per_scan.sync ? ULL_SCAN_IS_SYNC : 0U) | (scan->periodic.sync ? ULL_SCAN_IS_SYNC : 0U) |
#endif #endif
0U); 0U);
} }

8
subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
View file

@ -290,7 +290,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
/* Check if Periodic Advertising Synchronization to be created /* Check if Periodic Advertising Synchronization to be created
*/ */
if (sync && (scan->per_scan.state != LL_SYNC_STATE_CREATED)) { if (sync && (scan->periodic.state != LL_SYNC_STATE_CREATED)) {
/* Check address and update internal state */ /* Check address and update internal state */
#if defined(CONFIG_BT_CTLR_PRIVACY) #if defined(CONFIG_BT_CTLR_PRIVACY)
ull_sync_setup_addr_check(scan, pdu->tx_addr, ptr, ull_sync_setup_addr_check(scan, pdu->tx_addr, ptr,
@ -553,8 +553,8 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
ull_scan_aux_rx_flush: ull_scan_aux_rx_flush:
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
if (sync && (scan->per_scan.state != LL_SYNC_STATE_CREATED)) { if (sync && (scan->periodic.state != LL_SYNC_STATE_CREATED)) {
scan->per_scan.state = LL_SYNC_STATE_IDLE; scan->periodic.state = LL_SYNC_STATE_IDLE;
} }
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */ #endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
@ -794,7 +794,7 @@ static inline uint8_t aux_handle_get(struct ll_scan_aux_set *aux)
static inline struct ll_sync_set *sync_create_get(struct ll_scan_set *scan) static inline struct ll_sync_set *sync_create_get(struct ll_scan_set *scan)
{ {
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC) #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
return scan->per_scan.sync; return scan->periodic.sync;
#else /* !CONFIG_BT_CTLR_SYNC_PERIODIC */ #else /* !CONFIG_BT_CTLR_SYNC_PERIODIC */
return NULL; return NULL;
#endif /* !CONFIG_BT_CTLR_SYNC_PERIODIC */ #endif /* !CONFIG_BT_CTLR_SYNC_PERIODIC */

2
subsys/bluetooth/controller/ll_sw/ull_scan_types.h
View file

@ -31,7 +31,7 @@ struct ll_scan_set {
* cancelling sync create, hence the volatile keyword. * cancelling sync create, hence the volatile keyword.
*/ */
struct ll_sync_set *volatile sync; struct ll_sync_set *volatile sync;
} per_scan; } periodic;
#endif #endif
}; };

108
subsys/bluetooth/controller/ll_sw/ull_sync.c
View file

@ -102,7 +102,7 @@ uint8_t ll_sync_create(uint8_t options, uint8_t sid, uint8_t adv_addr_type,
struct ll_sync_set *sync; struct ll_sync_set *sync;
scan = ull_scan_set_get(SCAN_HANDLE_1M); scan = ull_scan_set_get(SCAN_HANDLE_1M);
if (!scan || scan->per_scan.sync) { if (!scan || scan->periodic.sync) {
return BT_HCI_ERR_CMD_DISALLOWED; return BT_HCI_ERR_CMD_DISALLOWED;
} }
@ -116,7 +116,7 @@ uint8_t ll_sync_create(uint8_t options, uint8_t sid, uint8_t adv_addr_type,
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED); scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED);
if (!scan_coded || scan_coded->per_scan.sync) { if (!scan_coded || scan_coded->periodic.sync) {
return BT_HCI_ERR_CMD_DISALLOWED; return BT_HCI_ERR_CMD_DISALLOWED;
} }
} }
@ -152,26 +152,26 @@ uint8_t ll_sync_create(uint8_t options, uint8_t sid, uint8_t adv_addr_type,
return BT_HCI_ERR_MEM_CAPACITY_EXCEEDED; return BT_HCI_ERR_MEM_CAPACITY_EXCEEDED;
} }
scan->per_scan.state = LL_SYNC_STATE_IDLE; scan->periodic.state = LL_SYNC_STATE_IDLE;
scan->per_scan.filter_policy = scan->periodic.filter_policy =
options & BT_HCI_LE_PER_ADV_CREATE_SYNC_FP_USE_LIST; options & BT_HCI_LE_PER_ADV_CREATE_SYNC_FP_USE_LIST;
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
scan_coded->per_scan.state = LL_SYNC_STATE_IDLE; scan_coded->periodic.state = LL_SYNC_STATE_IDLE;
scan_coded->per_scan.filter_policy = scan_coded->periodic.filter_policy =
scan->per_scan.filter_policy; scan->periodic.filter_policy;
} }
if (!scan->per_scan.filter_policy) { if (!scan->periodic.filter_policy) {
scan->per_scan.sid = sid; scan->periodic.sid = sid;
scan->per_scan.adv_addr_type = adv_addr_type; scan->periodic.adv_addr_type = adv_addr_type;
memcpy(scan->per_scan.adv_addr, adv_addr, BDADDR_SIZE); (void)memcpy(scan->periodic.adv_addr, adv_addr, BDADDR_SIZE);
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
scan_coded->per_scan.sid = scan->per_scan.sid; scan_coded->periodic.sid = scan->periodic.sid;
scan_coded->per_scan.adv_addr_type = scan_coded->periodic.adv_addr_type =
scan->per_scan.adv_addr_type; scan->periodic.adv_addr_type;
memcpy(scan_coded->per_scan.adv_addr, (void)memcpy(scan_coded->periodic.adv_addr,
scan->per_scan.adv_addr, BDADDR_SIZE); scan->periodic.adv_addr, BDADDR_SIZE);
} }
} }
@ -230,7 +230,7 @@ uint8_t ll_sync_create(uint8_t options, uint8_t sid, uint8_t adv_addr_type,
lll_sync->window_widening_event_us = 0U; lll_sync->window_widening_event_us = 0U;
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC_CTE_TYPE_FILTERING) #if defined(CONFIG_BT_CTLR_SYNC_PERIODIC_CTE_TYPE_FILTERING)
lll_sync->cte_type = sync_cte_type; lll_sync->cte_type = sync_cte_type;
lll_sync->filter_policy = scan->per_scan.filter_policy; lll_sync->filter_policy = scan->periodic.filter_policy;
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC_CTE_TYPE_FILTERING */ #endif /* CONFIG_BT_CTLR_SYNC_PERIODIC_CTE_TYPE_FILTERING */
#if defined(CONFIG_BT_CTLR_DF_SCAN_CTE_RX) #if defined(CONFIG_BT_CTLR_DF_SCAN_CTE_RX)
@ -242,9 +242,9 @@ uint8_t ll_sync_create(uint8_t options, uint8_t sid, uint8_t adv_addr_type,
lll_hdr_init(lll_sync, sync); lll_hdr_init(lll_sync, sync);
/* Enable scanner to create sync */ /* Enable scanner to create sync */
scan->per_scan.sync = sync; scan->periodic.sync = sync;
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
scan_coded->per_scan.sync = sync; scan_coded->periodic.sync = sync;
} }
return 0; return 0;
@ -261,13 +261,13 @@ uint8_t ll_sync_create_cancel(void **rx)
struct node_rx_sync *se; struct node_rx_sync *se;
scan = ull_scan_set_get(SCAN_HANDLE_1M); scan = ull_scan_set_get(SCAN_HANDLE_1M);
if (!scan || !scan->per_scan.sync) { if (!scan || !scan->periodic.sync) {
return BT_HCI_ERR_CMD_DISALLOWED; return BT_HCI_ERR_CMD_DISALLOWED;
} }
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED); scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED);
if (!scan_coded || !scan_coded->per_scan.sync) { if (!scan_coded || !scan_coded->periodic.sync) {
return BT_HCI_ERR_CMD_DISALLOWED; return BT_HCI_ERR_CMD_DISALLOWED;
} }
} }
@ -275,15 +275,15 @@ uint8_t ll_sync_create_cancel(void **rx)
/* Check for race condition where in sync is established when sync /* Check for race condition where in sync is established when sync
* context was set to NULL. * context was set to NULL.
* *
* Setting `scan->per_scan.sync` to NULL represents cancellation * Setting `scan->periodic.sync` to NULL represents cancellation
* requested in the thread context. Checking `sync->timeout_reload` * requested in the thread context. Checking `sync->timeout_reload`
* confirms if synchronization was established before * confirms if synchronization was established before
* `scan->per_scan.sync` was set to NULL. * `scan->periodic.sync` was set to NULL.
*/ */
sync = scan->per_scan.sync; sync = scan->periodic.sync;
scan->per_scan.sync = NULL; scan->periodic.sync = NULL;
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
scan_coded->per_scan.sync = NULL; scan_coded->periodic.sync = NULL;
} }
cpu_dmb(); cpu_dmb();
if (!sync || sync->timeout_reload) { if (!sync || sync->timeout_reload) {
@ -485,59 +485,59 @@ void ull_sync_setup_addr_check(struct ll_scan_set *scan, uint8_t addr_type,
{ {
/* Check if Periodic Advertiser list to be used */ /* Check if Periodic Advertiser list to be used */
if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC_ADV_LIST) && if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC_ADV_LIST) &&
scan->per_scan.filter_policy) { scan->periodic.filter_policy) {
/* Check in Periodic Advertiser List */ /* Check in Periodic Advertiser List */
if (ull_filter_ull_pal_addr_match(addr_type, addr)) { if (ull_filter_ull_pal_addr_match(addr_type, addr)) {
/* Remember the address, to check with /* Remember the address, to check with
* SID in Sync Info * SID in Sync Info
*/ */
scan->per_scan.adv_addr_type = addr_type; scan->periodic.adv_addr_type = addr_type;
(void)memcpy(scan->per_scan.adv_addr, addr, (void)memcpy(scan->periodic.adv_addr, addr,
BDADDR_SIZE); BDADDR_SIZE);
/* Address matched */ /* Address matched */
scan->per_scan.state = LL_SYNC_STATE_ADDR_MATCH; scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
/* Check in Resolving List */ /* Check in Resolving List */
} else if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY) && } else if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY) &&
ull_filter_ull_pal_listed(rl_idx, &addr_type, ull_filter_ull_pal_listed(rl_idx, &addr_type,
scan->per_scan.adv_addr)) { scan->periodic.adv_addr)) {
/* Remember the address, to check with the /* Remember the address, to check with the
* SID in Sync Info * SID in Sync Info
*/ */
scan->per_scan.adv_addr_type = addr_type; scan->periodic.adv_addr_type = addr_type;
/* Address matched */ /* Address matched */
scan->per_scan.state = LL_SYNC_STATE_ADDR_MATCH; scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
} }
/* Check with explicitly supplied address */ /* Check with explicitly supplied address */
} else if ((addr_type == scan->per_scan.adv_addr_type) && } else if ((addr_type == scan->periodic.adv_addr_type) &&
!memcmp(addr, scan->per_scan.adv_addr, BDADDR_SIZE)) { !memcmp(addr, scan->periodic.adv_addr, BDADDR_SIZE)) {
/* Address matched */ /* Address matched */
scan->per_scan.state = LL_SYNC_STATE_ADDR_MATCH; scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
/* Check identity address with explicitly supplied address */ /* Check identity address with explicitly supplied address */
} else if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY) && } else if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY) &&
(rl_idx < ll_rl_size_get())) { (rl_idx < ll_rl_size_get())) {
ll_rl_id_addr_get(rl_idx, &addr_type, addr); ll_rl_id_addr_get(rl_idx, &addr_type, addr);
if ((addr_type == scan->per_scan.adv_addr_type) && if ((addr_type == scan->periodic.adv_addr_type) &&
!memcmp(addr, scan->per_scan.adv_addr, BDADDR_SIZE)) { !memcmp(addr, scan->periodic.adv_addr, BDADDR_SIZE)) {
/* Identity address matched */ /* Identity address matched */
scan->per_scan.state = LL_SYNC_STATE_ADDR_MATCH; scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;
} }
} }
} }
bool ull_sync_setup_sid_match(struct ll_scan_set *scan, uint8_t sid) bool ull_sync_setup_sid_match(struct ll_scan_set *scan, uint8_t sid)
{ {
return (scan->per_scan.state == LL_SYNC_STATE_ADDR_MATCH) && return (scan->periodic.state == LL_SYNC_STATE_ADDR_MATCH) &&
((IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC_ADV_LIST) && ((IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC_ADV_LIST) &&
scan->per_scan.filter_policy && scan->periodic.filter_policy &&
ull_filter_ull_pal_match(scan->per_scan.adv_addr_type, ull_filter_ull_pal_match(scan->periodic.adv_addr_type,
scan->per_scan.adv_addr, sid)) || scan->periodic.adv_addr, sid)) ||
(!scan->per_scan.filter_policy && (!scan->periodic.filter_policy &&
(sid == scan->per_scan.sid))); (sid == scan->periodic.sid)));
} }
void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux, void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux,
@ -562,7 +562,7 @@ void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux,
uint8_t sca; uint8_t sca;
/* Populate the LLL context */ /* Populate the LLL context */
sync = scan->per_scan.sync; sync = scan->periodic.sync;
lll = &sync->lll; lll = &sync->lll;
/* Copy channel map from sca_chm field in sync_info structure, and /* Copy channel map from sca_chm field in sync_info structure, and
@ -588,8 +588,8 @@ void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux,
/* Remember the peer address. /* Remember the peer address.
* NOTE: Peer identity address is copied here when privacy is enable. * NOTE: Peer identity address is copied here when privacy is enable.
*/ */
sync->peer_id_addr_type = scan->per_scan.adv_addr_type; sync->peer_id_addr_type = scan->periodic.adv_addr_type;
(void)memcpy(sync->peer_id_addr, scan->per_scan.adv_addr, (void)memcpy(sync->peer_id_addr, scan->periodic.adv_addr,
sizeof(sync->peer_id_addr)); sizeof(sync->peer_id_addr));
#endif /* CONFIG_BT_CTLR_CHECK_SAME_PEER_SYNC || #endif /* CONFIG_BT_CTLR_CHECK_SAME_PEER_SYNC ||
* CONFIG_BT_CTLR_SYNC_PERIODIC_ADI_SUPPORT * CONFIG_BT_CTLR_SYNC_PERIODIC_ADI_SUPPORT
@ -633,7 +633,7 @@ void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux,
} }
/* Set the state to sync create */ /* Set the state to sync create */
scan->per_scan.state = LL_SYNC_STATE_CREATED; scan->periodic.state = LL_SYNC_STATE_CREATED;
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
struct ll_scan_set *scan_1m; struct ll_scan_set *scan_1m;
@ -642,9 +642,9 @@ void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux,
struct ll_scan_set *scan_coded; struct ll_scan_set *scan_coded;
scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED); scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED);
scan_coded->per_scan.state = LL_SYNC_STATE_CREATED; scan_coded->periodic.state = LL_SYNC_STATE_CREATED;
} else { } else {
scan_1m->per_scan.state = LL_SYNC_STATE_CREATED; scan_1m->periodic.state = LL_SYNC_STATE_CREATED;
} }
} }
@ -719,7 +719,7 @@ void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux,
void ull_sync_setup_complete(struct ll_scan_set *scan) void ull_sync_setup_complete(struct ll_scan_set *scan)
{ {
/* Remove the sync context from being associated with scan contexts */ /* Remove the sync context from being associated with scan contexts */
scan->per_scan.sync = NULL; scan->periodic.sync = NULL;
if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) { if (IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED)) {
struct ll_scan_set *scan_1m; struct ll_scan_set *scan_1m;
@ -728,9 +728,9 @@ void ull_sync_setup_complete(struct ll_scan_set *scan)
struct ll_scan_set *scan_coded; struct ll_scan_set *scan_coded;
scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED); scan_coded = ull_scan_set_get(SCAN_HANDLE_PHY_CODED);
scan_coded->per_scan.sync = NULL; scan_coded->periodic.sync = NULL;
} else { } else {
scan_1m->per_scan.sync = NULL; scan_1m->periodic.sync = NULL;
} }
} }
} }