michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Rename to BT_CTLR_SYNC_PERIODIC

Browse source 
Rename Kconfig option BT_CTLR_SCAN_PERIODIC to
BT_CTLR_SYNC_PERIODIC.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-10-05 10:42:39 +05:30 • committed by Carles Cufí
commit cb67f36029
11 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/controller/CMakeLists.txt
View file

@ -44,7 +44,7 @@ if(CONFIG_BT_LL_SW_SPLIT)
ll_sw/ull_scan_aux.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_SCAN_PERIODIC
CONFIG_BT_CTLR_SYNC_PERIODIC
ll_sw/ull_sync.c
)
endif()
@ -70,7 +70,7 @@ if(CONFIG_BT_LL_SW_SPLIT)
endif()
if(CONFIG_BT_CONN OR
CONFIG_BT_CTLR_ADV_PERIODIC OR
CONFIG_BT_CTLR_SCAN_PERIODIC)
CONFIG_BT_CTLR_SYNC_PERIODIC)
zephyr_library_sources(
ll_sw/ull_chan.c
ll_sw/lll_chan.c

8
subsys/bluetooth/controller/Kconfig
View file

@ -45,7 +45,7 @@ config BT_CTLR_ADV_PERIODIC_SUPPORT
depends on BT_CTLR_ADV_EXT_SUPPORT
bool
config BT_CTLR_SCAN_PERIODIC_SUPPORT
config BT_CTLR_SYNC_PERIODIC_SUPPORT
depends on BT_CTLR_ADV_EXT_SUPPORT
bool
@ -375,7 +375,7 @@ config BT_CTLR_PHY_CODED
config BT_CTLR_CHAN_SEL_2
bool "Channel Selection Algorithm #2"
depends on (BT_CONN || BT_CTLR_ADV_PERIODIC || BT_CTLR_SCAN_PERIODIC) && BT_CTLR_CHAN_SEL_2_SUPPORT
depends on (BT_CONN || BT_CTLR_ADV_PERIODIC || BT_CTLR_SYNC_PERIODIC) && BT_CTLR_CHAN_SEL_2_SUPPORT
default y
help
Enable support for Bluetooth 5.0 LE Channel Selection Algorithm #2 in
@ -413,9 +413,9 @@ config BT_CTLR_ADV_PERIODIC
Enable support for Bluetooth 5.0 LE Periodic Advertising in the
Controller.
config BT_CTLR_SCAN_PERIODIC
config BT_CTLR_SYNC_PERIODIC
bool "LE Periodic Advertising Sync"
depends on BT_OBSERVER && BT_CTLR_SCAN_PERIODIC_SUPPORT
depends on BT_OBSERVER && BT_CTLR_SYNC_PERIODIC_SUPPORT
select BT_CTLR_CHAN_SEL_2
default y if BT_PER_ADV_SYNC
help

4
subsys/bluetooth/controller/Kconfig.ll_sw_split
View file

@ -28,7 +28,7 @@ config BT_LLL_VENDOR_NORDIC
BT_CTLR_PHY_CODED_SUPPORT
select BT_CTLR_ADV_EXT_SUPPORT
select BT_CTLR_ADV_PERIODIC_SUPPORT
select BT_CTLR_SCAN_PERIODIC_SUPPORT
select BT_CTLR_SYNC_PERIODIC_SUPPORT
select BT_CTLR_CHAN_SEL_2_SUPPORT
select BT_CTLR_MIN_USED_CHAN_SUPPORT
select BT_CTLR_DTM_HCI_SUPPORT
@ -179,7 +179,7 @@ config BT_CTLR_SCAN_AUX_SET
config BT_CTLR_SCAN_SYNC_SET
int "LE Periodic Sync Sets"
depends on BT_CTLR_SCAN_PERIODIC
depends on BT_CTLR_SYNC_PERIODIC
range 1 64
default 1
help

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

@ -2058,7 +2058,7 @@ static void le_set_ext_scan_enable(struct net_buf *buf, struct net_buf **evt)
*evt = cmd_complete_status(status);
}
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
static void le_per_adv_create_sync(struct net_buf *buf, struct net_buf **evt)
{
struct bt_hci_cp_le_per_adv_create_sync *cmd = (void *)buf->data;
@ -2117,7 +2117,7 @@ static void le_per_adv_recv_enable(struct net_buf *buf, struct net_buf **evt)
ccst = hci_cmd_complete(evt, sizeof(*ccst));
ccst->status = status;
}
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_CENTRAL)
@ -2434,7 +2434,7 @@ static int controller_cmd_handle(uint16_t ocf, struct net_buf *cmd,
le_set_ext_scan_enable(cmd, evt);
break;
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
case BT_OCF(BT_HCI_OP_LE_PER_ADV_CREATE_SYNC):
le_per_adv_create_sync(cmd, evt);
break;
@ -2450,7 +2450,7 @@ static int controller_cmd_handle(uint16_t ocf, struct net_buf *cmd,
case BT_OCF(BT_HCI_OP_LE_SET_PER_ADV_RECV_ENABLE):
le_per_adv_recv_enable(cmd, evt);
break;
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_CONN)
@ -3802,7 +3802,7 @@ static void le_adv_ext_coded_report(struct pdu_data *pdu_data,
le_adv_ext_report(pdu_data, node_rx, buf, BIT(2));
}
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
static void le_per_adv_sync_established(struct pdu_data *pdu_data,
struct node_rx_pdu *node_rx,
struct net_buf *buf)
@ -3852,7 +3852,7 @@ static void le_per_adv_sync_lost(struct pdu_data *pdu_data,
sep = meta_evt(buf, BT_HCI_EVT_LE_PER_ADV_SYNC_LOST, sizeof(*sep));
sep->handle = sys_cpu_to_le16(node_rx->hdr.handle);
}
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_CTLR_ADV_EXT */
#endif /* CONFIG_BT_OBSERVER */
@ -4208,14 +4208,14 @@ static void encode_control(struct node_rx_pdu *node_rx,
le_adv_ext_coded_report(pdu_data, node_rx, buf);
break;
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
case NODE_RX_TYPE_SYNC:
le_per_adv_sync_established(pdu_data, node_rx, buf);
break;
case NODE_RX_TYPE_SYNC_LOST:
le_per_adv_sync_lost(pdu_data, node_rx, buf);
break;
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_CTLR_ADV_EXT */
#endif /* CONFIG_BT_OBSERVER */
@ -4652,11 +4652,11 @@ uint8_t hci_get_class(struct node_rx_pdu *node_rx)
#endif /* CONFIG_BT_HCI_MESH_EXT */
#if defined(CONFIG_BT_CTLR_ADV_EXT)
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
__fallthrough;
case NODE_RX_TYPE_SYNC:
case NODE_RX_TYPE_SYNC_LOST:
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#if defined(CONFIG_BT_BROADCASTER)
case NODE_RX_TYPE_EXT_ADV_TERMINATE:

6
subsys/bluetooth/controller/include/ll_feat.h
View file

@ -108,11 +108,11 @@
#endif /* !CONFIG_BT_CTLR_ADV_EXT */
#if defined(CONFIG_BT_CTLR_ADV_PERIODIC) || \
defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
#define LL_FEAT_BIT_PER_ADV BIT64(BT_LE_FEAT_BIT_PER_ADV)
#else /* !CONFIG_BT_CTLR_ADV_PERIODIC && !CONFIG_BT_CTLR_SCAN_PERIODIC */
#else /* !CONFIG_BT_CTLR_ADV_PERIODIC && !CONFIG_BT_CTLR_SYNC_PERIODIC */
#define LL_FEAT_BIT_PER_ADV 0
#endif /* !CONFIG_BT_CTLR_ADV_PERIODIC && !CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* !CONFIG_BT_CTLR_ADV_PERIODIC && !CONFIG_BT_CTLR_SYNC_PERIODIC */
#define LL_FEAT_BIT_MASK 0x1FFFF
#define LL_FEAT_BIT_MASK_VALID 0x1CF2F

14
subsys/bluetooth/controller/ll_sw/lll.h
View file

@ -71,7 +71,7 @@ enum {
TICKER_ID_SCAN_AUX_BASE,
TICKER_ID_SCAN_AUX_LAST = ((TICKER_ID_SCAN_AUX_BASE) +
(CONFIG_BT_CTLR_SCAN_AUX_SET) - 1),
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
TICKER_ID_SCAN_SYNC_BASE,
TICKER_ID_SCAN_SYNC_LAST = ((TICKER_ID_SCAN_SYNC_BASE) +
(CONFIG_BT_CTLR_SCAN_SYNC_SET) - 1),
@ -171,10 +171,10 @@ enum node_rx_type {
NODE_RX_TYPE_EXT_1M_REPORT = 0x05,
NODE_RX_TYPE_EXT_2M_REPORT = 0x06,
NODE_RX_TYPE_EXT_CODED_REPORT = 0x07,
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
NODE_RX_TYPE_SYNC = 0x08,
NODE_RX_TYPE_SYNC_LOST = 0x09,
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_BROADCASTER)
NODE_RX_TYPE_EXT_ADV_TERMINATE = 0x0a,
@ -298,9 +298,9 @@ enum {
#if defined(CONFIG_BT_OBSERVER)
#if defined(CONFIG_BT_CTLR_ADV_EXT)
EVENT_DONE_EXTRA_TYPE_SCAN_AUX,
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
EVENT_DONE_EXTRA_TYPE_SYNC,
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_CTLR_ADV_EXT */
#endif /* CONFIG_BT_OBSERVER */
@ -328,11 +328,11 @@ struct event_done_extra {
#if defined(CONFIG_BT_CTLR_LE_ENC)
uint8_t mic_state;
#endif /* CONFIG_BT_CTLR_LE_ENC */
#if defined(CONFIG_BT_PERIPHERAL) || defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_PERIPHERAL) || defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
union {
struct event_done_extra_drift drift;
};
#endif /* CONFIG_BT_PERIPHERAL || CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_PERIPHERAL || CONFIG_BT_CTLR_SYNC_PERIODIC */
};
};
};

2
subsys/bluetooth/controller/ll_sw/nrf.cmake
View file

@ -27,7 +27,7 @@ if(CONFIG_BT_LL_SW_SPLIT)
ll_sw/nordic/lll/lll_scan_aux.c
)
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR_SCAN_PERIODIC
CONFIG_BT_CTLR_SYNC_PERIODIC
ll_sw/nordic/lll/lll_sync.c
)
endif()

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

@ -100,7 +100,7 @@
#if defined(CONFIG_BT_CTLR_ADV_EXT)
#define BT_SCAN_AUX_TICKER_NODES ((TICKER_ID_SCAN_AUX_LAST) - \
(TICKER_ID_SCAN_AUX_BASE) + 1)
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
#define BT_SCAN_SYNC_TICKER_NODES ((TICKER_ID_SCAN_SYNC_LAST) - \
(TICKER_ID_SCAN_SYNC_BASE) + 1)
#endif /* CONFIG_BT_CTLR_ADV_PERIODIC */
@ -365,7 +365,7 @@ int ll_init(struct k_sem *sem_rx)
}
#endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
err = lll_sync_init();
if (err) {
return err;
@ -375,7 +375,7 @@ int ll_init(struct k_sem *sem_rx)
if (err) {
return err;
}
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#if defined(CONFIG_BT_CONN)
err = lll_conn_init();
@ -420,11 +420,11 @@ void ll_reset(void)
LL_ASSERT(!err);
#endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
/* Reset periodic sync sets */
err = ull_sync_reset();
LL_ASSERT(!err);
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#if defined(CONFIG_BT_CONN)
#if defined(CONFIG_BT_CENTRAL)
@ -749,11 +749,11 @@ void ll_rx_dequeue(void)
#if defined(CONFIG_BT_OBSERVER)
case NODE_RX_TYPE_REPORT:
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
/* fall through */
case NODE_RX_TYPE_SYNC:
case NODE_RX_TYPE_SYNC_LOST:
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
@ -975,7 +975,7 @@ void ll_rx_mem_release(void **node_rx)
mem_release(rx_free, &mem_pdu_rx.free);
break;
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
case NODE_RX_TYPE_SYNC:
{
struct node_rx_sync *se =
@ -999,7 +999,7 @@ void ll_rx_mem_release(void **node_rx)
ull_sync_release(sync);
}
break;
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#if defined(CONFIG_BT_CONN)
case NODE_RX_TYPE_TERMINATE:
@ -1345,7 +1345,7 @@ void *ull_event_done(void *param)
return evdone;
}
#if defined(CONFIG_BT_PERIPHERAL) || defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_PERIPHERAL) || defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
/**
* @brief Extract timing from completed event
*
@ -1389,7 +1389,7 @@ void ull_drift_ticks_get(struct node_rx_event_done *done,
preamble_to_addr_us);
}
}
#endif /* CONFIG_BT_PERIPHERAL || CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_PERIPHERAL || CONFIG_BT_CTLR_SYNC_PERIODIC */
static inline int init_reset(void)
{
@ -1910,11 +1910,11 @@ static inline void rx_demux_event_done(memq_link_t *link,
case EVENT_DONE_EXTRA_TYPE_SCAN_AUX:
ull_scan_aux_done(done);
break;
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
case EVENT_DONE_EXTRA_TYPE_SYNC:
ull_sync_done(done);
break;
#endif /* CONFIG_BT_CTLR_SCAN_PERIODIC */
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
#endif /* CONFIG_BT_OBSERVER */
#endif /* CONFIG_BT_CTLR_ADV_EXT */

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

@ -107,7 +107,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx, uint8_t phy)
scan = NULL;
sync = NULL;
if (IS_ENABLED(CONFIG_BT_CTLR_SCAN_PERIODIC)) {
if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC)) {
if (aux) {
struct lll_scan *lll_scan;
@ -137,7 +137,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx, uint8_t phy)
ptr = (uint8_t *)h + sizeof(*h);
if (h->adv_addr) {
if (IS_ENABLED(CONFIG_BT_CTLR_SCAN_PERIODIC) && sync &&
if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) && sync &&
(pdu->tx_addr == scan->per_scan.adv_addr_type) &&
!memcmp(ptr, scan->per_scan.adv_addr, BDADDR_SIZE)) {
scan->per_scan.state = LL_SYNC_STATE_ADDR_MATCH;
@ -168,7 +168,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx, uint8_t phy)
si = (void *)ptr;
ptr += sizeof(*si);
if (IS_ENABLED(CONFIG_BT_CTLR_SCAN_PERIODIC) && sync &&
if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) && sync &&
adi && (adi->sid == scan->per_scan.sid) &&
(scan->per_scan.state == LL_SYNC_STATE_ADDR_MATCH)) {
ull_sync_setup(scan, aux, rx, si);
@ -271,7 +271,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx, uint8_t phy)
return;
ull_scan_aux_rx_flush:
if (IS_ENABLED(CONFIG_BT_CTLR_SCAN_PERIODIC) && sync) {
if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) && sync) {
scan->per_scan.state = LL_SYNC_STATE_IDLE;
}

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

@ -12,7 +12,7 @@ struct ll_scan_set {
uint8_t is_enabled:1;
uint8_t own_addr_type:2;
#if defined(CONFIG_BT_CTLR_SCAN_PERIODIC)
#if defined(CONFIG_BT_CTLR_SYNC_PERIODIC)
struct {
uint8_t sid;

2
tests/bluetooth/bsim_bt/bsim_test_advx/prj.conf
View file

@ -10,4 +10,4 @@ CONFIG_BT_PER_ADV_SYNC=y
CONFIG_BT_CTLR_ADV_EXT=y
CONFIG_BT_CTLR_ADV_PERIODIC=y
CONFIG_BT_CTLR_SCAN_PERIODIC=y
CONFIG_BT_CTLR_SYNC_PERIODIC=y