From d5c13a75304223f3d068bcaa33e4fec7e137e598 Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Mon, 14 Aug 2017 13:45:13 +0200 Subject: [PATCH] Bluetooth: controller: Rename Kconfig prefix Rename the BT_CONTROLLER prefix used in all of the Kconfig variables related to the Bluetooth controller to BT_CTLR. Signed-off-by: Carles Cufi --- .../96b_carbon_nrf51_defconfig | 2 +- .../arm/96b_nitrogen/96b_nitrogen_defconfig | 2 +- .../arduino_101_ble/arduino_101_ble_defconfig | 2 +- .../arm/bbc_microbit/bbc_microbit_defconfig | 2 +- boards/arm/curie_ble/curie_ble_defconfig | 2 +- .../arm/nrf51_blenano/nrf51_blenano_defconfig | 2 +- .../nrf51_pca10028/nrf51_pca10028_defconfig | 2 +- .../nrf51_vbluno51/nrf51_vbluno51_defconfig | 2 +- .../nrf52840_pca10056_defconfig | 2 +- .../nrf52_blenano2/nrf52_blenano2_defconfig | 2 +- .../nrf52_pca10040/nrf52_pca10040_defconfig | 2 +- .../nrf52_vbluno52/nrf52_vbluno52_defconfig | 2 +- .../quark_se_c1000_ble_defconfig | 2 +- drivers/bluetooth/Kconfig | 4 +- drivers/flash/Kconfig | 2 +- samples/bluetooth/hci_uart/nrf5.conf | 2 +- samples/bluetooth/hci_uart/src/main.c | 19 +- samples/bluetooth/mesh/microbit.conf | 16 +- samples/bluetooth/mesh/microbit_gatt.conf | 16 +- samples/bluetooth/mesh/nrf51-16k.conf | 16 +- samples/bluetooth/mesh/prj.conf | 16 +- samples/bluetooth/mesh_demo/microbit.conf | 2 +- samples/bluetooth/mesh_demo/nrf51-16k.conf | 2 +- subsys/bluetooth/Kconfig | 4 +- subsys/bluetooth/Makefile | 2 +- subsys/bluetooth/common/dummy.c | 6 +- subsys/bluetooth/common/rpa.c | 4 +- subsys/bluetooth/controller/Kconfig | 116 +-- subsys/bluetooth/controller/Makefile | 2 +- subsys/bluetooth/controller/hal/debug.h | 8 +- subsys/bluetooth/controller/hal/nrf5/debug.h | 4 +- subsys/bluetooth/controller/hal/nrf5/radio.c | 72 +- subsys/bluetooth/controller/hci/hci.c | 214 ++--- subsys/bluetooth/controller/hci/hci_driver.c | 8 +- subsys/bluetooth/controller/include/ll.h | 18 +- subsys/bluetooth/controller/ll_sw/ctrl.c | 841 +++++++++--------- subsys/bluetooth/controller/ll_sw/ctrl.h | 108 +-- .../controller/ll_sw/ctrl_internal.h | 52 +- subsys/bluetooth/controller/ll_sw/ll.c | 9 +- subsys/bluetooth/controller/ll_sw/ll_adv.c | 38 +- subsys/bluetooth/controller/ll_sw/ll_adv.h | 10 +- subsys/bluetooth/controller/ll_sw/ll_filter.c | 60 +- subsys/bluetooth/controller/ll_sw/ll_master.c | 2 +- subsys/bluetooth/controller/ll_sw/ll_scan.c | 8 +- subsys/bluetooth/controller/ll_sw/pdu.h | 24 +- subsys/bluetooth/host/Kconfig | 8 +- subsys/bluetooth/shell/Makefile | 4 +- subsys/bluetooth/shell/bt.c | 4 +- subsys/bluetooth/shell/ll.c | 4 +- tests/bluetooth/init/prj_controller.conf | 10 +- tests/bluetooth/init/prj_controller_4_0.conf | 40 +- tests/bluetooth/init/prj_controller_dbg.conf | 46 +- tests/bluetooth/init/prj_controller_tiny.conf | 40 +- tests/bluetooth/mesh/dbg.conf | 16 +- tests/bluetooth/mesh/friend.conf | 16 +- tests/bluetooth/mesh/gatt.conf | 16 +- tests/bluetooth/mesh/lpn.conf | 16 +- tests/bluetooth/mesh/microbit.conf | 16 +- tests/bluetooth/mesh/microbit_gatt.conf | 16 +- tests/bluetooth/mesh/nrf51-16k.conf | 2 +- tests/bluetooth/mesh/pb_gatt.conf | 16 +- tests/bluetooth/mesh/prj.conf | 16 +- tests/bluetooth/mesh/proxy.conf | 16 +- 63 files changed, 1014 insertions(+), 1019 deletions(-) diff --git a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig index 398a80702d2..28b28c2a6ca 100644 --- a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig +++ b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig @@ -16,7 +16,7 @@ CONFIG_UART_CONSOLE=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y # spi CONFIG_SPI=y diff --git a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig index 92bbac2dede..00d66e89c66 100644 --- a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig +++ b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig @@ -19,4 +19,4 @@ CONFIG_GPIO_AS_PINRESET=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/arduino_101_ble/arduino_101_ble_defconfig b/boards/arm/arduino_101_ble/arduino_101_ble_defconfig index a9870739f54..688a1659e39 100644 --- a/boards/arm/arduino_101_ble/arduino_101_ble_defconfig +++ b/boards/arm/arduino_101_ble/arduino_101_ble_defconfig @@ -10,4 +10,4 @@ CONFIG_UART_NRF5=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/bbc_microbit/bbc_microbit_defconfig b/boards/arm/bbc_microbit/bbc_microbit_defconfig index 9f46bbdafaa..2db169aaf66 100644 --- a/boards/arm/bbc_microbit/bbc_microbit_defconfig +++ b/boards/arm/bbc_microbit/bbc_microbit_defconfig @@ -18,4 +18,4 @@ CONFIG_UART_CONSOLE=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/curie_ble/curie_ble_defconfig b/boards/arm/curie_ble/curie_ble_defconfig index 83eb00f8043..2a237790fee 100644 --- a/boards/arm/curie_ble/curie_ble_defconfig +++ b/boards/arm/curie_ble/curie_ble_defconfig @@ -10,4 +10,4 @@ CONFIG_UART_NRF5=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig index d4bbe59f511..1f7563631cc 100644 --- a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig +++ b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig @@ -14,4 +14,4 @@ CONFIG_UART_CONSOLE=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig b/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig index 40dc7644d7a..8bfad76a7a4 100644 --- a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig +++ b/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig @@ -14,4 +14,4 @@ CONFIG_UART_CONSOLE=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig index cd7d49832c1..eb95d9406b9 100644 --- a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig +++ b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig @@ -14,4 +14,4 @@ CONFIG_UART_CONSOLE=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig index 58e4deb9aa5..d1b2f5c88dd 100644 --- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig +++ b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig @@ -20,4 +20,4 @@ CONFIG_GPIO_AS_PINRESET=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig index 86102b57215..1c5f54e2699 100644 --- a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig +++ b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig @@ -17,4 +17,4 @@ CONFIG_UART_CONSOLE=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig index 365ef1c0c5b..dfd111d08c8 100644 --- a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig +++ b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig @@ -20,4 +20,4 @@ CONFIG_GPIO_AS_PINRESET=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig index ad89d93d1b2..ac1733dfe00 100644 --- a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig +++ b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig @@ -20,4 +20,4 @@ CONFIG_GPIO_AS_PINRESET=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig b/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig index 80448f7c0d4..cd3458fb2d1 100644 --- a/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig +++ b/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig @@ -10,4 +10,4 @@ CONFIG_UART_NRF5=y # bluetooth CONFIG_BT=y -CONFIG_BT_CONTROLLER=y +CONFIG_BT_CTLR=y diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 39cdcf08004..f71c8bc1dbb 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -12,7 +12,7 @@ # Controller support is an HCI driver in itself, so these HCI driver # options are only applicable if controller support hasn't been enabled. -if BT && ! BT_CONTROLLER +if BT && ! BT_CTLR menu "Bluetooth Drivers" @@ -33,4 +33,4 @@ config BT_NRF51_PM endmenu -endif # BT && ! BT_CONTROLLER +endif # BT && ! BT_CTLR diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig index d88e50bffb8..0812f9925dd 100644 --- a/drivers/flash/Kconfig +++ b/drivers/flash/Kconfig @@ -132,7 +132,7 @@ config SOC_FLASH_NRF5_DEV_NAME config SOC_FLASH_NRF5_RADIO_SYNC bool "Nordic nRF5x flash driver synchronized with radio" - depends on SOC_FLASH_NRF5 && BT_CONTROLLER + depends on SOC_FLASH_NRF5 && BT_CTLR default y help Enable synchronization between flash memory driver and radio. diff --git a/samples/bluetooth/hci_uart/nrf5.conf b/samples/bluetooth/hci_uart/nrf5.conf index a5b6f768b24..8b268bc73d4 100644 --- a/samples/bluetooth/hci_uart/nrf5.conf +++ b/samples/bluetooth/hci_uart/nrf5.conf @@ -11,5 +11,5 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=16 -CONFIG_BT_CONTROLLER_ASSERT_HANDLER=y +CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_TINYCRYPT_ECC=n diff --git a/samples/bluetooth/hci_uart/src/main.c b/samples/bluetooth/hci_uart/src/main.c index 004507b1f4a..c21d7621516 100644 --- a/samples/bluetooth/hci_uart/src/main.c +++ b/samples/bluetooth/hci_uart/src/main.c @@ -38,17 +38,17 @@ static struct k_thread tx_thread_data; NET_BUF_POOL_DEFINE(cmd_tx_pool, CONFIG_BT_HCI_CMD_COUNT, CMD_BUF_SIZE, BT_BUF_USER_DATA_MIN, NULL); -#if defined(CONFIG_BT_CONTROLLER) -#define BT_L2CAP_MTU (CONFIG_BT_CONTROLLER_TX_BUFFER_SIZE - BT_L2CAP_HDR_SIZE) +#if defined(CONFIG_BT_CTLR) +#define BT_L2CAP_MTU (CONFIG_BT_CTLR_TX_BUFFER_SIZE - BT_L2CAP_HDR_SIZE) #else #define BT_L2CAP_MTU 65 /* 64-byte public key + opcode */ -#endif /* CONFIG_BT_CONTROLLER */ +#endif /* CONFIG_BT_CTLR */ /** Data size needed for ACL buffers */ #define BT_BUF_ACL_SIZE BT_L2CAP_BUF_SIZE(BT_L2CAP_MTU) -#if defined(CONFIG_BT_CONTROLLER_TX_BUFFERS) -#define TX_BUF_COUNT CONFIG_BT_CONTROLLER_TX_BUFFERS +#if defined(CONFIG_BT_CTLR_TX_BUFFERS) +#define TX_BUF_COUNT CONFIG_BT_CTLR_TX_BUFFERS #else #define TX_BUF_COUNT 6 #endif @@ -272,8 +272,8 @@ static int h4_send(struct net_buf *buf) return 0; } -#if defined(CONFIG_BT_CONTROLLER_ASSERT_HANDLER) -void bt_controller_assert_handle(char *file, u32_t line) +#if defined(CONFIG_BT_CTLR_ASSERT_HANDLER) +void bt_ctlr_assert_handle(char *file, u32_t line) { u32_t len = 0, pos = 0; @@ -317,14 +317,13 @@ void bt_controller_assert_handle(char *file, u32_t line) while (1) { } } -#endif /* CONFIG_BT_CONTROLLER_ASSERT_HANDLER */ +#endif /* CONFIG_BT_CTLR_ASSERT_HANDLER */ static int hci_uart_init(struct device *unused) { SYS_LOG_DBG(""); - hci_uart_dev = - device_get_binding(CONFIG_BT_CONTROLLER_TO_HOST_UART_DEV_NAME); + hci_uart_dev = device_get_binding(CONFIG_BT_CTLR_TO_HOST_UART_DEV_NAME); if (!hci_uart_dev) { return -EINVAL; } diff --git a/samples/bluetooth/mesh/microbit.conf b/samples/bluetooth/mesh/microbit.conf index 1baffd6ad73..e233886d1a6 100644 --- a/samples/bluetooth/mesh/microbit.conf +++ b/samples/bluetooth/mesh/microbit.conf @@ -8,17 +8,17 @@ CONFIG_BT=y CONFIG_BT_TINYCRYPT_ECC=y CONFIG_BT_RX_STACK_SIZE=1100 -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_MESH=y CONFIG_BT_MESH_RX_SDU_MAX=36 diff --git a/samples/bluetooth/mesh/microbit_gatt.conf b/samples/bluetooth/mesh/microbit_gatt.conf index b5d8cd851f5..4c621f93a96 100644 --- a/samples/bluetooth/mesh/microbit_gatt.conf +++ b/samples/bluetooth/mesh/microbit_gatt.conf @@ -18,17 +18,17 @@ CONFIG_BT_L2CAP_RX_MTU=69 CONFIG_BT_L2CAP_TX_MTU=69 CONFIG_BT_L2CAP_TX_BUF_COUNT=5 -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_MESH=y CONFIG_BT_MESH_RX_SDU_MAX=36 diff --git a/samples/bluetooth/mesh/nrf51-16k.conf b/samples/bluetooth/mesh/nrf51-16k.conf index 238dc1a992e..41766ec205c 100644 --- a/samples/bluetooth/mesh/nrf51-16k.conf +++ b/samples/bluetooth/mesh/nrf51-16k.conf @@ -7,15 +7,15 @@ CONFIG_BT_RX_STACK_SIZE=1100 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_MESH=y CONFIG_BT_MESH_LOW_POWER=y diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf index 9d8fa59d6b3..d2ea902d644 100644 --- a/samples/bluetooth/mesh/prj.conf +++ b/samples/bluetooth/mesh/prj.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y diff --git a/samples/bluetooth/mesh_demo/microbit.conf b/samples/bluetooth/mesh_demo/microbit.conf index ea8d7d06f5a..0ab974261c3 100644 --- a/samples/bluetooth/mesh_demo/microbit.conf +++ b/samples/bluetooth/mesh_demo/microbit.conf @@ -12,7 +12,7 @@ CONFIG_PWM_NRF5_SW=y CONFIG_BT=y CONFIG_BT_RX_STACK_SIZE=1280 -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y diff --git a/samples/bluetooth/mesh_demo/nrf51-16k.conf b/samples/bluetooth/mesh_demo/nrf51-16k.conf index 8113dbe6334..3e5fe067c9e 100644 --- a/samples/bluetooth/mesh_demo/nrf51-16k.conf +++ b/samples/bluetooth/mesh_demo/nrf51-16k.conf @@ -4,7 +4,7 @@ CONFIG_MAIN_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_TINYCRYPT_ECC=y CONFIG_BT_RX_STACK_SIZE=1100 -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig index 358400db02b..dd60bb4edb3 100644 --- a/subsys/bluetooth/Kconfig +++ b/subsys/bluetooth/Kconfig @@ -98,7 +98,7 @@ config BT_HCI_ACL_FLOW_CONTROL bool "Controller to Host ACL flow control support" default n # Enable if building a Host-only build - default y if !BT_CONTROLLER + default y if !BT_CTLR # Enable if building a Controller-only build default y if BT_HCI_RAW select POLL @@ -109,7 +109,7 @@ config BT_HCI_ACL_FLOW_CONTROL not run out of incoming ACL buffers. endif # BT_CONN -config BT_CONTROLLER_TO_HOST_UART_DEV_NAME +config BT_CTLR_TO_HOST_UART_DEV_NAME string "Device Name of UART Device to an external Bluetooth Host" default "UART_0" depends on BT_HCI_RAW diff --git a/subsys/bluetooth/Makefile b/subsys/bluetooth/Makefile index e56b7cd92ee..af3640eea69 100644 --- a/subsys/bluetooth/Makefile +++ b/subsys/bluetooth/Makefile @@ -1,4 +1,4 @@ obj-y += common/ obj-$(CONFIG_BT_SHELL) += shell/ obj-$(CONFIG_BT_HCI) += host/ -obj-$(CONFIG_BT_CONTROLLER) += controller/ +obj-$(CONFIG_BT_CTLR) += controller/ diff --git a/subsys/bluetooth/common/dummy.c b/subsys/bluetooth/common/dummy.c index c65c81c6069..a0d6c815509 100644 --- a/subsys/bluetooth/common/dummy.c +++ b/subsys/bluetooth/common/dummy.c @@ -25,11 +25,11 @@ BUILD_ASSERT(CONFIG_SYSTEM_WORKQUEUE_PRIORITY < 0); */ BUILD_ASSERT(CONFIG_BT_HCI_TX_PRIO < CONFIG_BT_RX_PRIO); -#if defined(CONFIG_BT_CONTROLLER) +#if defined(CONFIG_BT_CTLR) /* The Bluetooth Controller's priority receive thread priority shall be higher * than the Bluetooth Host's Tx and the Controller's receive thread priority. * This is required in order to dispatch Number of Completed Packets event * before any new data arrives on a connection to the Host threads. */ -BUILD_ASSERT(CONFIG_BT_CONTROLLER_RX_PRIO < CONFIG_BT_HCI_TX_PRIO); -#endif /* CONFIG_BT_CONTROLLER */ +BUILD_ASSERT(CONFIG_BT_CTLR_RX_PRIO < CONFIG_BT_HCI_TX_PRIO); +#endif /* CONFIG_BT_CTLR */ diff --git a/subsys/bluetooth/common/rpa.c b/subsys/bluetooth/common/rpa.c index 4484ff47955..f150212ed35 100644 --- a/subsys/bluetooth/common/rpa.c +++ b/subsys/bluetooth/common/rpa.c @@ -54,7 +54,7 @@ static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3]) return 0; } -#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_CTLR_PRIVACY) bool bt_rpa_irk_matches(const u8_t irk[16], const bt_addr_t *addr) { u8_t hash[3]; @@ -71,7 +71,7 @@ bool bt_rpa_irk_matches(const u8_t irk[16], const bt_addr_t *addr) } #endif -#if defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_CTLR_PRIVACY) int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa) { int err; diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 98fc56cb991..d423d49814e 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -7,13 +7,13 @@ comment "BLE Controller support" -config BT_CONTROLLER +config BT_CTLR bool "Bluetooth Controller" select BT_RECV_IS_RX_THREAD help Enables support for SoC native controller implementations. -if BT_CONTROLLER +if BT_CTLR choice prompt "Bluetooth Link Layer Selection" @@ -30,7 +30,7 @@ endchoice comment "BLE Controller configuration" -config BT_CONTROLLER_DUP_FILTER_LEN +config BT_CTLR_DUP_FILTER_LEN prompt "Number of addresses in the scan duplicate filter" int depends on BT_OBSERVER @@ -39,7 +39,7 @@ config BT_CONTROLLER_DUP_FILTER_LEN Set the number of unique BLE addresses that can be filtered as duplicates while scanning. -config BT_CONTROLLER_RX_BUFFERS +config BT_CTLR_RX_BUFFERS prompt "Number of Rx buffers" int default 1 @@ -50,7 +50,7 @@ config BT_CONTROLLER_RX_BUFFERS connection interval and 2M PHY, maximum 18 packets with L2CAP payload size of 1 byte can be received. -config BT_CONTROLLER_TX_BUFFERS +config BT_CTLR_TX_BUFFERS prompt "Number of Tx buffers" int default 2 @@ -62,7 +62,7 @@ config BT_CONTROLLER_TX_BUFFERS packets can be enqueued, with 18 packets with L2CAP payload size of 1 byte can be acknowledged. -config BT_CONTROLLER_TX_BUFFER_SIZE +config BT_CTLR_TX_BUFFER_SIZE prompt "Tx buffer size" int range 27 16384 @@ -75,7 +75,7 @@ config BT_CONTROLLER_TX_BUFFER_SIZE Maximum is set to 16384 due to implementation limitations (use of u16_t for size/length variables). -config BT_CONTROLLER_COMPANY_ID +config BT_CTLR_COMPANY_ID prompt "Company Id" hex default 0xFFFF @@ -83,7 +83,7 @@ config BT_CONTROLLER_COMPANY_ID help Set the Company Id that will be used in VERSION_IND PDU. -config BT_CONTROLLER_SUBVERSION_NUMBER +config BT_CTLR_SUBVERSION_NUMBER prompt "Subversion Number" hex default 0xFFFF @@ -91,11 +91,11 @@ config BT_CONTROLLER_SUBVERSION_NUMBER help Set the Subversion Number that will be used in VERSION_IND PDU. -config BT_CONTROLLER_RX_PRIO_STACK_SIZE +config BT_CTLR_RX_PRIO_STACK_SIZE int default 448 -config BT_CONTROLLER_RX_PRIO +config BT_CTLR_RX_PRIO # Hidden option for Controller's Co-Operative high priority Rx thread # priority. int @@ -105,29 +105,29 @@ comment "BLE Controller features" if BT_CONN -config BT_CONTROLLER_LE_ENC +config BT_CTLR_LE_ENC bool - depends on !BT_CONTROLLER_DATA_LENGTH_CLEAR && !BT_CONTROLLER_PHY_2M_NRF + depends on !BT_CTLR_DATA_LENGTH_CLEAR && !BT_CTLR_PHY_2M_NRF default y # Enable support for Bluetooth v4.0 LE Encryption feature in the # Controller. -config BT_CONTROLLER_LE_PING +config BT_CTLR_LE_PING bool "LE Ping" default y help Enable support for Bluetooth v4.1 LE Ping feature in the Controller. -config BT_CONTROLLER_PRIVACY +config BT_CTLR_PRIVACY bool "LE Controller-based Privacy" default y select BT_RPA help Enable support for Bluetooth v4.2 LE Controller-based Privacy feature in the Controller. -config BT_CONTROLLER_RL_SIZE +config BT_CTLR_RL_SIZE prompt "LE Controller-based Privacy Resolving List size" - depends on BT_CONTROLLER_PRIVACY + depends on BT_CTLR_PRIVACY int default 8 range 1 8 if SOC_FAMILY_NRF5 @@ -135,24 +135,24 @@ config BT_CONTROLLER_RL_SIZE Set the size of the Resolving List for LE Controller-based Privacy. On nRF5x-based controllers, the hardware imposes a limit of 8 devices. -config BT_CONTROLLER_DATA_LENGTH +config BT_CTLR_DATA_LENGTH bool "Data Length Update" default y help Enable support for Bluetooth v4.2 LE Data Length Update procedure in the Controller. -config BT_CONTROLLER_DATA_LENGTH_MAX +config BT_CTLR_DATA_LENGTH_MAX prompt "Maximum data length supported" - depends on BT_CONTROLLER_DATA_LENGTH + depends on BT_CTLR_DATA_LENGTH int default 27 - range 27 251 if SOC_SERIES_NRF52X || BT_CONTROLLER_DATA_LENGTH_CLEAR + range 27 251 if SOC_SERIES_NRF52X || BT_CTLR_DATA_LENGTH_CLEAR range 27 27 help Set the maximum data length of PDU supported in the Controller. -config BT_CONTROLLER_PHY +config BT_CTLR_PHY bool "PHY Update" default y help @@ -161,65 +161,65 @@ config BT_CONTROLLER_PHY endif # BT_CONN -config BT_CONTROLLER_CHAN_SEL_2 +config BT_CTLR_CHAN_SEL_2 bool "Channel Selection Algorithm #2" default y help Enable support for Bluetooth 5.0 LE Channel Selection Algorithm #2 in the Controller. -config BT_CONTROLLER_ADV_EXT +config BT_CTLR_ADV_EXT bool "LE Advertising Extensions" - select BT_CONTROLLER_SCAN_REQ_NOTIFY - select BT_CONTROLLER_CHAN_SEL_2 + select BT_CTLR_SCAN_REQ_NOTIFY + select BT_CTLR_CHAN_SEL_2 default y help Enable support for Bluetooth 5.0 LE Advertising Extensions in the Controller. -config BT_CONTROLLER_ADVANCED_FEATURES +config BT_CTLR_ADVANCED_FEATURES bool "Show advanced features" help Makes advanced features visible to controller developers. menu "Advanced features" - visible if BT_CONTROLLER_ADVANCED_FEATURES + visible if BT_CTLR_ADVANCED_FEATURES -config BT_CONTROLLER_DATA_LENGTH_CLEAR +config BT_CTLR_DATA_LENGTH_CLEAR bool "Data Length Support (Cleartext only)" - depends on BT_CONTROLLER_DATA_LENGTH && SOC_SERIES_NRF51X + depends on BT_CTLR_DATA_LENGTH && SOC_SERIES_NRF51X help Enable support for Bluetooth v4.2 LE Data Length Update procedure, up to 251 byte cleartext payloads in the Controller. Encrypted connections are not supported. -if BT_CONTROLLER_PHY +if BT_CTLR_PHY -config BT_CONTROLLER_PHY_2M +config BT_CTLR_PHY_2M bool "2Mbps PHY Support" - depends on !SOC_SERIES_NRF51X || BT_CONTROLLER_PHY_2M_NRF + depends on !SOC_SERIES_NRF51X || BT_CTLR_PHY_2M_NRF default y help Enable support for Bluetooth 5.0 2Mbps PHY in the Controller. -config BT_CONTROLLER_PHY_2M_NRF +config BT_CTLR_PHY_2M_NRF bool "2Mbps Nordic Semiconductor PHY Support (Cleartext only)" depends on SOC_SERIES_NRF51X - select BT_CONTROLLER_PHY_2M + select BT_CTLR_PHY_2M help Enable support for Nordic Semiconductor proprietary 2Mbps PHY in the Controller. Encrypted connections are not supported. -config BT_CONTROLLER_PHY_CODED +config BT_CTLR_PHY_CODED bool "Coded PHY Support" depends on SOC_NRF52840 default y help Enable support for Bluetooth 5.0 Coded PHY in the Controller. -endif # BT_CONTROLLER_PHY +endif # BT_CTLR_PHY -config BT_CONTROLLER_WORKER_PRIO +config BT_CTLR_WORKER_PRIO prompt "Radio and Ticker's Worker IRQ priority" int range 0 3 if SOC_SERIES_NRF51X @@ -229,17 +229,17 @@ config BT_CONTROLLER_WORKER_PRIO The interrupt priority for event preparation and radio IRQ. This value shall be less than or equal to the Ticker's Job priority value. -config BT_CONTROLLER_JOB_PRIO +config BT_CTLR_JOB_PRIO prompt "Ticker's JOB IRQ priority" int - range BT_CONTROLLER_WORKER_PRIO 3 if SOC_SERIES_NRF51X - range BT_CONTROLLER_WORKER_PRIO 6 if SOC_SERIES_NRF52X + range BT_CTLR_WORKER_PRIO 3 if SOC_SERIES_NRF51X + range BT_CTLR_WORKER_PRIO 6 if SOC_SERIES_NRF52X default 0 help The interrupt priority for Ticker's Job (SWI4) IRQ. This value shall be greater than or equal to the Ticker's Worker IRQ priority value. -config BT_CONTROLLER_XTAL_ADVANCED +config BT_CTLR_XTAL_ADVANCED bool "Advanced event preparation" default y help @@ -260,9 +260,9 @@ config BT_CONTROLLER_XTAL_ADVANCED higher average current due to increased number of crystal settling current consumptions. -config BT_CONTROLLER_XTAL_THRESHOLD +config BT_CTLR_XTAL_THRESHOLD prompt "Crystal shutdown threshold in uS" - depends on BT_CONTROLLER_XTAL_ADVANCED + depends on BT_CTLR_XTAL_ADVANCED int default 5168 help @@ -271,7 +271,7 @@ config BT_CONTROLLER_XTAL_THRESHOLD value is board dependent. The value 5168 is based on crude calculation for nRF51 current versus startup time of high frequency crystal. -config BT_CONTROLLER_SCHED_ADVANCED +config BT_CTLR_SCHED_ADVANCED bool "Advanced scheduling" depends on (BT_MAX_CONN != 0) default y @@ -290,25 +290,25 @@ config BT_CONTROLLER_SCHED_ADVANCED Disabling this feature will lead to overlapping role in timespace leading to skipped events amongst active roles. -config BT_CONTROLLER_RADIO_ENABLE_FAST +config BT_CTLR_RADIO_ENABLE_FAST bool "Use tTXEN/RXEN,FAST ramp-up" depends on SOC_SERIES_NRF52X default y if SOC_NRF52840 help Enable use of fast radio ramp-up mode. -config BT_CONTROLLER_TIFS_HW +config BT_CTLR_TIFS_HW bool "H/w Accelerated tIFS Trx switching" - depends on !BT_CONTROLLER_RADIO_ENABLE_FAST + depends on !BT_CTLR_RADIO_ENABLE_FAST default y help Enable use of hardware accelerated tIFS Trx switching. if BT_CONN -config BT_CONTROLLER_FAST_ENC +config BT_CTLR_FAST_ENC bool "Fast Encryption Setup" - depends on BT_CONTROLLER_LE_ENC + depends on BT_CTLR_LE_ENC help Enable connection encryption setup in 3 connection intervals. Peripheral will respond to Encryption Request with Encryption Response @@ -320,26 +320,26 @@ config BT_CONTROLLER_FAST_ENC Maximum CPU time in Radio ISR will increase if this feature is selected. -config BT_CONTROLLER_CONN_RSSI +config BT_CTLR_CONN_RSSI bool "Connection RSSI" help Enable connection RSSI measurement. endif # BT_CONN -config BT_CONTROLLER_ADV_INDICATION +config BT_CTLR_ADV_INDICATION bool "Advertisement indications" help Generate events indicating on air advertisement events. -config BT_CONTROLLER_SCAN_REQ_NOTIFY +config BT_CTLR_SCAN_REQ_NOTIFY bool "Scan Request Notifications" help Generate events notifying the on air scan requests received. -config BT_CONTROLLER_SCAN_REQ_RSSI +config BT_CTLR_SCAN_REQ_RSSI bool "Measure Scan Request RSSI" - depends on BT_CONTROLLER_SCAN_REQ_NOTIFY + depends on BT_CTLR_SCAN_REQ_NOTIFY help Measure RSSI of the on air scan requests received. @@ -347,7 +347,7 @@ endmenu comment "BLE Controller debug configuration" -config BT_CONTROLLER_ASSERT_HANDLER +config BT_CTLR_ASSERT_HANDLER bool "Bluetooth Controller Assertion Handler" depends on BT_HCI_RAW help @@ -357,7 +357,7 @@ config BT_CONTROLLER_ASSERT_HANDLER and will be invoked whenever the controller code encounters an unrecoverable error. -config BT_CONTROLLER_PROFILE_ISR +config BT_CTLR_PROFILE_ISR bool "Profile radio ISR" help Turn on measurement of radio ISR latency, CPU usage and generation of @@ -365,7 +365,7 @@ config BT_CONTROLLER_PROFILE_ISR contains current, minimum and maximum ISR entry latencies; and current, minimum and maximum ISR CPU use in micro-seconds. -config BT_CONTROLLER_DEBUG_PINS +config BT_CTLR_DEBUG_PINS bool "Bluetooth Controller Debug Pins" help Turn on debug GPIO toggling for the BLE Controller. This is useful @@ -373,4 +373,4 @@ config BT_CONTROLLER_DEBUG_PINS the code. When enabled, pins P0.16 to P0.25 are taken over exclusively by the controller and cannot be used outside of it. -endif # BT_CONTROLLER +endif # BT_CTLR diff --git a/subsys/bluetooth/controller/Makefile b/subsys/bluetooth/controller/Makefile index 40da5eaf39b..33e89edc2f1 100644 --- a/subsys/bluetooth/controller/Makefile +++ b/subsys/bluetooth/controller/Makefile @@ -1,4 +1,4 @@ -obj-$(CONFIG_BT_CONTROLLER) += hci/ +obj-$(CONFIG_BT_CTLR) += hci/ obj-$(CONFIG_BT_LL_SW) += util/ obj-$(CONFIG_BT_LL_SW) += hal/ diff --git a/subsys/bluetooth/controller/hal/debug.h b/subsys/bluetooth/controller/hal/debug.h index 9ffed4133a4..6b7af40c44f 100644 --- a/subsys/bluetooth/controller/hal/debug.h +++ b/subsys/bluetooth/controller/hal/debug.h @@ -8,11 +8,11 @@ #ifndef _HAL_DEBUG_H_ #define _HAL_DEBUG_H_ -#ifdef CONFIG_BT_CONTROLLER_ASSERT_HANDLER -void bt_controller_assert_handle(char *file, u32_t line); +#ifdef CONFIG_BT_CTLR_ASSERT_HANDLER +void bt_ctlr_assert_handle(char *file, u32_t line); #define LL_ASSERT(cond) if (!(cond)) { \ - bt_controller_assert_handle(__FILE__, \ - __LINE__); \ + bt_ctlr_assert_handle(__FILE__, \ + __LINE__); \ } #else #define LL_ASSERT(cond) BT_ASSERT(cond) diff --git a/subsys/bluetooth/controller/hal/nrf5/debug.h b/subsys/bluetooth/controller/hal/nrf5/debug.h index 0ea4e930955..d8178a9ea26 100644 --- a/subsys/bluetooth/controller/hal/nrf5/debug.h +++ b/subsys/bluetooth/controller/hal/nrf5/debug.h @@ -12,7 +12,7 @@ * which can be defined to SoC's GPIO toggle to observe/debug the * controller's runtime behavior. */ -#ifdef CONFIG_BT_CONTROLLER_DEBUG_PINS +#ifdef CONFIG_BT_CTLR_DEBUG_PINS #define DEBUG_INIT() do { \ NRF_GPIO->DIRSET = 0x03FF0000; \ NRF_GPIO->OUTCLR = 0x03FF0000; } \ @@ -199,6 +199,6 @@ #define DEBUG_RADIO_START_M(flag) -#endif /* CONFIG_BT_CONTROLLER_DEBUG_PINS */ +#endif /* CONFIG_BT_CTLR_DEBUG_PINS */ #endif /* _DEBUG_H_ */ diff --git a/subsys/bluetooth/controller/hal/nrf5/radio.c b/subsys/bluetooth/controller/hal/nrf5/radio.c index 9e295656a18..ddbbf24cf63 100644 --- a/subsys/bluetooth/controller/hal/nrf5/radio.c +++ b/subsys/bluetooth/controller/hal/nrf5/radio.c @@ -94,11 +94,11 @@ void radio_phy_set(u8_t phy, u8_t flags) NRF_RADIO->MODE = (mode << RADIO_MODE_MODE_Pos) & RADIO_MODE_MODE_Msk; -#if defined(CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST) +#if defined(CONFIG_BT_CTLR_RADIO_ENABLE_FAST) NRF_RADIO->MODECNF0 |= (RADIO_MODECNF0_RU_Fast << RADIO_MODECNF0_RU_Pos) & RADIO_MODECNF0_RU_Msk; -#endif /* CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST */ +#endif /* CONFIG_BT_CTLR_RADIO_ENABLE_FAST */ } void radio_tx_power_set(u32_t power) @@ -140,7 +140,7 @@ void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags) extra = 0; /* nRF51 supports only 27 byte PDU when using h/w CCM for encryption. */ - if (!IS_ENABLED(CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR) && dc) { + if (!IS_ENABLED(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR) && dc) { bits_len = 5; } #elif defined(CONFIG_SOC_SERIES_NRF52X) @@ -217,21 +217,21 @@ u32_t radio_tx_ready_delay_get(u8_t phy, u8_t flags) #if defined(CONFIG_SOC_SERIES_NRF51X) return 140; #elif defined(CONFIG_SOC_SERIES_NRF52X) -#if defined(CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST) +#if defined(CONFIG_BT_CTLR_RADIO_ENABLE_FAST) return 40; #elif defined(CONFIG_SOC_NRF52840) switch (phy) { default: -#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CTLR_TIFS_HW) case BIT(0): return 141; /* floor(140.1 + 1.6) */ case BIT(1): return 146; /* floor(145 + 1) */ -#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CTLR_TIFS_HW */ case BIT(0): case BIT(1): return 131; /* floor(129.5 + 1.6) */ -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ case BIT(2): if (flags & 0x01) { return 121; /* floor(119.6 + 2.2) */ @@ -240,11 +240,11 @@ u32_t radio_tx_ready_delay_get(u8_t phy, u8_t flags) } } #else /* !CONFIG_SOC_NRF52840 */ -#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CTLR_TIFS_HW) return 140; -#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CTLR_TIFS_HW */ return 131; /* floor(129.5 + 1.6) */ -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ #endif /* !CONFIG_SOC_NRF52840 */ #endif /* CONFIG_SOC_SERIES_NRF52X */ } @@ -280,30 +280,30 @@ u32_t radio_rx_ready_delay_get(u8_t phy) #if defined(CONFIG_SOC_SERIES_NRF51X) return 138; #elif defined(CONFIG_SOC_SERIES_NRF52X) -#if defined(CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST) +#if defined(CONFIG_BT_CTLR_RADIO_ENABLE_FAST) return 40; #elif defined(CONFIG_SOC_NRF52840) switch (phy) { default: -#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CTLR_TIFS_HW) case BIT(0): return 141; /* ceil(140.1 + 0.2) */ case BIT(1): return 145; /* ceil(144.6 + 0.2) */ -#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CTLR_TIFS_HW */ case BIT(0): case BIT(1): return 130; /* ceil(129.5 + 0.2) */ -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ case BIT(2): return 121; /* ceil(120 + 0.2) */ } #else /* !CONFIG_SOC_NRF52840 */ -#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CTLR_TIFS_HW) return 140; -#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CTLR_TIFS_HW */ return 130; /* ceil(129.5 + 0.2) */ -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ #endif /* !CONFIG_SOC_NRF52840 */ #endif /* CONFIG_SOC_SERIES_NRF52X */ } @@ -351,11 +351,11 @@ void radio_tx_enable(void) void radio_disable(void) { -#if !defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CTLR_TIFS_HW) NRF_PPI->CHENCLR = PPI_CHEN_CH8_Msk | PPI_CHEN_CH11_Msk; NRF_PPI->TASKS_CHG[0].DIS = 1; NRF_PPI->TASKS_CHG[1].DIS = 1; -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ NRF_RADIO->SHORTS = 0; NRF_RADIO->TASKS_DISABLE = 1; @@ -421,7 +421,7 @@ void *radio_pkt_scratch_get(void) return _pkt_scratch; } -#if !defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CTLR_TIFS_HW) static u8_t sw_tifs_toggle; static void sw_switch(u8_t dir, u8_t phy_curr, u8_t flags_curr, u8_t phy_next, @@ -461,33 +461,33 @@ static void sw_switch(u8_t dir, u8_t phy_curr, u8_t flags_curr, u8_t phy_next, sw_tifs_toggle += 1; sw_tifs_toggle &= 1; } -#endif /* CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* CONFIG_BT_CTLR_TIFS_HW */ void radio_switch_complete_and_rx(u8_t phy_rx) { -#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CTLR_TIFS_HW) NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk | RADIO_SHORTS_DISABLED_RXEN_Msk; -#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CTLR_TIFS_HW */ NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk; sw_switch(0, 0, 0, phy_rx, 0); -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ } void radio_switch_complete_and_tx(u8_t phy_rx, u8_t flags_rx, u8_t phy_tx, u8_t flags_tx) { -#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CTLR_TIFS_HW) NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk | RADIO_SHORTS_DISABLED_TXEN_Msk; -#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CTLR_TIFS_HW */ NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk; sw_switch(1, phy_rx, flags_rx, phy_tx, flags_tx); -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ } void radio_switch_complete_and_disable(void) @@ -495,9 +495,9 @@ void radio_switch_complete_and_disable(void) NRF_RADIO->SHORTS = (RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk); -#if !defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CTLR_TIFS_HW) NRF_PPI->CHENCLR = PPI_CHEN_CH8_Msk | PPI_CHEN_CH11_Msk; -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ } void radio_rssi_measure(void) @@ -587,11 +587,11 @@ void radio_tmr_status_reset(void) void radio_tmr_tifs_set(u32_t tifs) { -#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CTLR_TIFS_HW) NRF_RADIO->TIFS = tifs; -#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CTLR_TIFS_HW */ NRF_TIMER1->CC[sw_tifs_toggle] = tifs; -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ } u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder) @@ -632,7 +632,7 @@ u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder) NRF_PPI->CHENSET = PPI_CHEN_CH0_Msk; } -#if !defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CTLR_TIFS_HW) NRF_TIMER1->TASKS_CLEAR = 1; NRF_TIMER1->MODE = 0; NRF_TIMER1->PRESCALER = 4; @@ -652,7 +652,7 @@ u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder) NRF_PPI->CHG[0] = PPI_CHG_CH9_Msk | PPI_CHG_CH12_Msk; NRF_PPI->CHG[1] = PPI_CHG_CH10_Msk | PPI_CHG_CH13_Msk; -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ return remainder; } @@ -662,10 +662,10 @@ void radio_tmr_stop(void) NRF_TIMER0->TASKS_STOP = 1; NRF_TIMER0->TASKS_SHUTDOWN = 1; -#if !defined(CONFIG_BT_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CTLR_TIFS_HW) NRF_TIMER1->TASKS_STOP = 1; NRF_TIMER1->TASKS_SHUTDOWN = 1; -#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CTLR_TIFS_HW */ } void radio_tmr_hcto_configure(u32_t hcto) diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c index 8d40ecd6660..cf689709e19 100644 --- a/subsys/bluetooth/controller/hci/hci.c +++ b/subsys/bluetooth/controller/hci/hci.c @@ -37,13 +37,13 @@ */ static u16_t _opcode; -#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CTLR_DUP_FILTER_LEN > 0 /* Scan duplicate filter */ struct dup { u8_t mask; bt_addr_le_t addr; }; -static struct dup dup_filter[CONFIG_BT_CONTROLLER_DUP_FILTER_LEN]; +static struct dup dup_filter[CONFIG_BT_CTLR_DUP_FILTER_LEN]; static s32_t dup_count; static u32_t dup_curr; #endif @@ -192,7 +192,7 @@ static void reset(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_evt_cc_status *ccst; -#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CTLR_DUP_FILTER_LEN > 0 dup_count = -1; #endif /* reset event masks */ @@ -314,7 +314,7 @@ static void host_num_completed_packets(struct net_buf *buf, } #endif -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) static void read_auth_payload_timeout(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_read_auth_payload_timeout *cmd = (void *)buf->data; @@ -351,7 +351,7 @@ static void write_auth_payload_timeout(struct net_buf *buf, rp->status = (!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED; rp->handle = sys_cpu_to_le16(handle); } -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ static int ctrl_bb_cmd_handle(u16_t ocf, struct net_buf *cmd, struct net_buf **evt) @@ -383,7 +383,7 @@ static int ctrl_bb_cmd_handle(u16_t ocf, struct net_buf *cmd, break; #endif -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case BT_OCF(BT_HCI_OP_READ_AUTH_PAYLOAD_TIMEOUT): read_auth_payload_timeout(cmd, evt); break; @@ -391,7 +391,7 @@ static int ctrl_bb_cmd_handle(u16_t ocf, struct net_buf *cmd, case BT_OCF(BT_HCI_OP_WRITE_AUTH_PAYLOAD_TIMEOUT): write_auth_payload_timeout(cmd, evt); break; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ default: return -EINVAL; @@ -463,16 +463,16 @@ static void read_supported_commands(struct net_buf *buf, struct net_buf **evt) rp->commands[26] |= BIT(4) | BIT(5); /* Set Host Channel Classification */ rp->commands[27] |= BIT(3); -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) /* LE Start Encryption */ rp->commands[28] |= BIT(0); -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif /* CONFIG_BT_CENTRAL */ #if defined(CONFIG_BT_PERIPHERAL) -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) /* LE LTK Request Reply, LE LTK Request Negative Reply */ rp->commands[28] |= BIT(1) | BIT(2); -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif #if defined(CONFIG_BT_CONN) /* Disconnect. */ @@ -481,28 +481,28 @@ static void read_supported_commands(struct net_buf *buf, struct net_buf **evt) rp->commands[27] |= BIT(2) | BIT(5); /* LE Remote Conn Param Req and Neg Reply */ rp->commands[33] |= BIT(4) | BIT(5); -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) /* Read and Write authenticated payload timeout */ rp->commands[32] |= BIT(4) | BIT(5); #endif #endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) /* LE resolving list commands, LE Read Peer RPA */ rp->commands[34] |= BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7); /* LE Read Local RPA, LE Set AR Enable, Set RPA Timeout */ rp->commands[35] |= BIT(0) | BIT(1) | BIT(2); /* LE Set Privacy Mode */ rp->commands[39] |= BIT(2); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) /* LE Set Data Length, and LE Read Suggested Data Length. */ rp->commands[33] |= BIT(6) | BIT(7); /* LE Write Suggested Data Length. */ rp->commands[34] |= BIT(0); /* LE Read Maximum Data Length. */ rp->commands[35] |= BIT(3); -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ #if defined(CONFIG_BT_HCI_RAW) && defined(CONFIG_BT_TINYCRYPT_ECC) /* LE Read Local P256 Public Key and LE Generate DH Key*/ @@ -742,17 +742,17 @@ static void le_set_adv_param(struct net_buf *buf, struct net_buf **evt) min_interval = sys_le16_to_cpu(cmd->min_interval); -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) status = ll_adv_params_set(0, 0, min_interval, cmd->type, cmd->own_addr_type, cmd->direct_addr.type, &cmd->direct_addr.a.val[0], cmd->channel_map, cmd->filter_policy, 0, 0, 0, 0, 0, 0); -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ status = ll_adv_params_set(min_interval, cmd->type, cmd->own_addr_type, cmd->direct_addr.type, &cmd->direct_addr.a.val[0], cmd->channel_map, cmd->filter_policy); -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ ccst = cmd_complete(evt, sizeof(*ccst)); ccst->status = status; @@ -829,7 +829,7 @@ static void le_set_scan_enable(struct net_buf *buf, struct net_buf **evt) struct bt_hci_evt_cc_status *ccst; u32_t status; -#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CTLR_DUP_FILTER_LEN > 0 /* initialize duplicate filtering */ if (cmd->enable && cmd->filter_dup) { dup_count = 0; @@ -896,7 +896,7 @@ static void le_set_host_chan_classif(struct net_buf *buf, struct net_buf **evt) ccst->status = (!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED; } -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) static void le_start_encryption(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_start_encryption *cmd = (void *)buf->data; @@ -911,11 +911,11 @@ static void le_start_encryption(struct net_buf *buf, struct net_buf **evt) *evt = cmd_status((!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED); } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif /* CONFIG_BT_CENTRAL */ #if defined(CONFIG_BT_PERIPHERAL) -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) static void le_ltk_req_reply(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_ltk_req_reply *cmd = (void *)buf->data; @@ -946,7 +946,7 @@ static void le_ltk_req_neg_reply(struct net_buf *buf, struct net_buf **evt) rp->status = (!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED; rp->handle = sys_le16_to_cpu(handle); } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif /* CONFIG_BT_PERIPHERAL */ static void le_read_remote_features(struct net_buf *buf, struct net_buf **evt) @@ -1023,7 +1023,7 @@ static void le_conn_param_req_neg_reply(struct net_buf *buf, rp->handle = sys_cpu_to_le16(handle); } -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) static void le_set_data_len(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_set_data_len *cmd = (void *)buf->data; @@ -1076,9 +1076,9 @@ static void le_read_max_data_len(struct net_buf *buf, struct net_buf **evt) &rp->max_rx_octets, &rp->max_rx_time); rp->status = 0x00; } -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static void le_read_phy(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_read_phy *cmd = (void *) buf->data; @@ -1145,10 +1145,10 @@ static void le_set_phy(struct net_buf *buf, struct net_buf **evt) *evt = cmd_status((!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED); } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ #endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) static void le_add_dev_to_rl(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_add_dev_to_rl *cmd = (void *)buf->data; @@ -1248,7 +1248,7 @@ static void le_set_privacy_mode(struct net_buf *buf, struct net_buf **evt) ccst = cmd_complete(evt, sizeof(*ccst)); ccst->status = status; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, struct net_buf **evt) @@ -1344,15 +1344,15 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, le_set_host_chan_classif(cmd, evt); break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case BT_OCF(BT_HCI_OP_LE_START_ENCRYPTION): le_start_encryption(cmd, evt); break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif /* CONFIG_BT_CENTRAL */ #if defined(CONFIG_BT_PERIPHERAL) -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case BT_OCF(BT_HCI_OP_LE_LTK_REQ_REPLY): le_ltk_req_reply(cmd, evt); break; @@ -1360,7 +1360,7 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, case BT_OCF(BT_HCI_OP_LE_LTK_REQ_NEG_REPLY): le_ltk_req_neg_reply(cmd, evt); break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif /* CONFIG_BT_PERIPHERAL */ case BT_OCF(BT_HCI_OP_LE_READ_REMOTE_FEATURES): @@ -1379,7 +1379,7 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, le_conn_param_req_neg_reply(cmd, evt); break; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) case BT_OCF(BT_HCI_OP_LE_SET_DATA_LEN): le_set_data_len(cmd, evt); break; @@ -1395,9 +1395,9 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, case BT_OCF(BT_HCI_OP_LE_READ_MAX_DATA_LEN): le_read_max_data_len(cmd, evt); break; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case BT_OCF(BT_HCI_OP_LE_READ_PHY): le_read_phy(cmd, evt); break; @@ -1409,10 +1409,10 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, case BT_OCF(BT_HCI_OP_LE_SET_PHY): le_set_phy(cmd, evt); break; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ #endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) case BT_OCF(BT_HCI_OP_LE_ADD_DEV_TO_RL): le_add_dev_to_rl(cmd, evt); break; @@ -1440,7 +1440,7 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, case BT_OCF(BT_HCI_OP_LE_SET_PRIVACY_MODE): le_set_privacy_mode(cmd, evt); break; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ default: @@ -1620,7 +1620,7 @@ int hci_acl_handle(struct net_buf *buf) return 0; } -#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CTLR_DUP_FILTER_LEN > 0 static inline bool dup_found(struct pdu_adv *adv) { /* check for duplicate filtering */ @@ -1649,21 +1649,21 @@ static inline bool dup_found(struct pdu_adv *adv) dup_filter[dup_curr].addr.type = adv->tx_addr; dup_filter[dup_curr].mask = BIT(adv->type); - if (dup_count < CONFIG_BT_CONTROLLER_DUP_FILTER_LEN) { + if (dup_count < CONFIG_BT_CTLR_DUP_FILTER_LEN) { dup_count++; dup_curr = dup_count; } else { dup_curr++; } - if (dup_curr == CONFIG_BT_CONTROLLER_DUP_FILTER_LEN) { + if (dup_curr == CONFIG_BT_CTLR_DUP_FILTER_LEN) { dup_curr = 0; } } return false; } -#endif /* CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 */ +#endif /* CONFIG_BT_CTLR_DUP_FILTER_LEN > 0 */ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, struct net_buf *buf) @@ -1676,16 +1676,16 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, u8_t data_len; u8_t info_len; u8_t rssi; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) u8_t rl_idx, direct; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ u8_t *prssi; if (!(event_mask & BT_EVT_MASK_LE_META_EVENT)) { return; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) direct = b[offsetof(struct radio_pdu_node_rx, pdu_data) + offsetof(struct pdu_adv, payload) + adv->len + 2]; @@ -1697,14 +1697,14 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, if (!(le_event_mask & BT_EVT_MASK_LE_ADVERTISING_REPORT)) { return; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ -#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CTLR_DUP_FILTER_LEN > 0 if (dup_found(adv)) { return; } -#endif /* CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 */ +#endif /* CONFIG_BT_CTLR_DUP_FILTER_LEN > 0 */ if (adv->type != PDU_ADV_TYPE_DIRECT_IND) { data_len = (adv->len - BDADDR_SIZE); @@ -1715,7 +1715,7 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, rssi = b[offsetof(struct radio_pdu_node_rx, pdu_data) + offsetof(struct pdu_adv, payload) + adv->len]; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) rl_idx = b[offsetof(struct radio_pdu_node_rx, pdu_data) + offsetof(struct pdu_adv, payload) + adv->len + 1]; @@ -1753,7 +1753,7 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, return; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ info_len = sizeof(struct bt_hci_evt_le_advertising_info) + data_len + sizeof(*prssi); @@ -1765,7 +1765,7 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, adv_info->evt_type = c_adv_type[adv->type]; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (rl_idx < ll_rl_size_get()) { /* Store identity address */ ll_rl_id_addr_get(rl_idx, &adv_info->addr.type, @@ -1775,7 +1775,7 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, } else { #else if (1) { -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ adv_info->addr.type = adv->tx_addr; memcpy(&adv_info->addr.a.val[0], &adv->payload.adv_ind.addr[0], @@ -1789,7 +1789,7 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, *prssi = rssi; } -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) static void le_adv_ext_report(struct pdu_data *pdu_data, u8_t *b, struct net_buf *buf, u8_t phy) { @@ -1859,9 +1859,9 @@ static void le_adv_ext_coded_report(struct pdu_data *pdu_data, u8_t *b, { le_adv_ext_report(pdu_data, b, buf, BIT(2)); } -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) static void le_scan_req_received(struct pdu_data *pdu_data, u8_t *b, struct net_buf *buf) { @@ -1898,7 +1898,7 @@ static void le_scan_req_received(struct pdu_data *pdu_data, u8_t *b, memcpy(&sep->addr.a.val[0], &adv->payload.scan_req.scan_addr[0], sizeof(bt_addr_t)); } -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ #if defined(CONFIG_BT_CONN) static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle, @@ -1909,11 +1909,11 @@ static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle, if (!(event_mask & BT_EVT_MASK_LE_META_EVENT) || (!(le_event_mask & BT_EVT_MASK_LE_CONN_COMPLETE) && -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) !(le_event_mask & BT_EVT_MASK_LE_ENH_CONN_COMPLETE))) { #else 1)) { -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ return; } @@ -1923,7 +1923,7 @@ static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle, conn_count++; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (le_event_mask & BT_EVT_MASK_LE_ENH_CONN_COMPLETE) { struct bt_hci_evt_le_enh_conn_complete *leecc; @@ -1958,7 +1958,7 @@ static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle, leecc->clock_accuracy = radio_cc->mca; return; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ lecc = meta_evt(buf, BT_HCI_EVT_LE_CONN_COMPLETE, sizeof(*lecc)); @@ -2015,7 +2015,7 @@ static void le_conn_update_complete(struct pdu_data *pdu_data, u16_t handle, sep->supv_timeout = sys_cpu_to_le16(radio_cu->timeout); } -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) static void enc_refresh_complete(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2031,9 +2031,9 @@ static void enc_refresh_complete(struct pdu_data *pdu_data, u16_t handle, ep->status = 0x00; ep->handle = sys_cpu_to_le16(handle); } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) static void auth_payload_timeout_exp(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2048,9 +2048,9 @@ static void auth_payload_timeout_exp(struct pdu_data *pdu_data, u16_t handle, ep->handle = sys_cpu_to_le16(handle); } -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CTLR_CHAN_SEL_2) static void le_chan_sel_algo(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2070,9 +2070,9 @@ static void le_chan_sel_algo(struct pdu_data *pdu_data, u16_t handle, sep->handle = sys_cpu_to_le16(handle); sep->chan_sel_algo = radio_le_chan_sel_algo->chan_sel_algo; } -#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static void le_phy_upd_complete(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2098,7 +2098,7 @@ static void le_phy_upd_complete(struct pdu_data *pdu_data, u16_t handle, sep->tx_phy = find_lsb_set(radio_le_phy_upd_cmplt->tx); sep->rx_phy = find_lsb_set(radio_le_phy_upd_cmplt->rx); } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ #endif /* CONFIG_BT_CONN */ static void encode_control(struct radio_pdu_node_rx *node_rx, @@ -2114,7 +2114,7 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, le_advertising_report(pdu_data, b, buf); break; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: le_adv_ext_1M_report(pdu_data, b, buf); break; @@ -2122,13 +2122,13 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, case NODE_RX_TYPE_EXT_CODED_REPORT: le_adv_ext_coded_report(pdu_data, b, buf); break; -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: le_scan_req_received(pdu_data, b, buf); break; -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ #if defined(CONFIG_BT_CONN) case NODE_RX_TYPE_CONNECTION: @@ -2143,45 +2143,45 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, le_conn_update_complete(pdu_data, handle, buf); break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case NODE_RX_TYPE_ENC_REFRESH: enc_refresh_complete(pdu_data, handle, buf); break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case NODE_RX_TYPE_APTO: auth_payload_timeout_exp(pdu_data, handle, buf); break; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CTLR_CHAN_SEL_2) case NODE_RX_TYPE_CHAN_SEL_ALGO: le_chan_sel_algo(pdu_data, handle, buf); break; -#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case NODE_RX_TYPE_PHY_UPDATE: le_phy_upd_complete(pdu_data, handle, buf); return; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) case NODE_RX_TYPE_RSSI: BT_INFO("handle: 0x%04x, rssi: -%d dB.", handle, pdu_data->payload.rssi); return; -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ #endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CTLR_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: BT_INFO("Advertised."); return; -#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CTLR_ADV_INDICATION */ -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: BT_INFO("l: %d, %d, %d; t: %d, %d, %d.", pdu_data->payload.profile.lcur, @@ -2191,7 +2191,7 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, pdu_data->payload.profile.min, pdu_data->payload.profile.max); return; -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ default: LL_ASSERT(0); @@ -2199,7 +2199,7 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, } } -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) static void le_ltk_request(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2235,7 +2235,7 @@ static void encrypt_change(u8_t err, u16_t handle, ep->handle = sys_cpu_to_le16(handle); ep->encrypt = !err ? 1 : 0; } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ static void le_remote_feat_complete(u8_t status, struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) @@ -2349,7 +2349,7 @@ static void encode_data_ctrl(struct radio_pdu_node_rx *node_rx, switch (pdu_data->payload.llctrl.opcode) { -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case PDU_DATA_LLCTRL_TYPE_ENC_REQ: le_ltk_request(pdu_data, handle, buf); break; @@ -2357,7 +2357,7 @@ static void encode_data_ctrl(struct radio_pdu_node_rx *node_rx, case PDU_DATA_LLCTRL_TYPE_START_ENC_RSP: encrypt_change(0x00, handle, buf); break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_FEATURE_RSP: le_remote_feat_complete(0x00, pdu_data, handle, buf); @@ -2367,13 +2367,13 @@ static void encode_data_ctrl(struct radio_pdu_node_rx *node_rx, remote_version_info(pdu_data, handle, buf); break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case PDU_DATA_LLCTRL_TYPE_REJECT_IND: encrypt_change(pdu_data->payload.llctrl.ctrldata.reject_ind. error_code, handle, buf); break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_CONN_PARAM_REQ: le_conn_param_req(pdu_data, handle, buf); @@ -2478,17 +2478,17 @@ s8_t hci_get_class(struct radio_pdu_node_rx *node_rx) switch (node_rx->hdr.type) { case NODE_RX_TYPE_REPORT: -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: case NODE_RX_TYPE_EXT_CODED_REPORT: -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) +#endif /* CONFIG_BT_CTLR_ADV_EXT */ +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ -#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ +#if defined(CONFIG_BT_CTLR_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: #endif -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: #endif return HCI_CLASS_EVT_DISCARDABLE; @@ -2497,22 +2497,22 @@ s8_t hci_get_class(struct radio_pdu_node_rx *node_rx) case NODE_RX_TYPE_TERMINATE: case NODE_RX_TYPE_CONN_UPDATE: -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case NODE_RX_TYPE_ENC_REFRESH: -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) case NODE_RX_TYPE_RSSI: #endif -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case NODE_RX_TYPE_APTO: #endif -#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CTLR_CHAN_SEL_2) case NODE_RX_TYPE_CHAN_SEL_ALGO: #endif -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case NODE_RX_TYPE_PHY_UPDATE: -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ return HCI_CLASS_EVT_CONNECTION; default: return -1; diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c index b83ccc3b022..2c653dde157 100644 --- a/subsys/bluetooth/controller/hci/hci_driver.c +++ b/subsys/bluetooth/controller/hci/hci_driver.c @@ -49,7 +49,7 @@ static K_FIFO_DEFINE(recv_fifo); struct k_thread prio_recv_thread_data; static BT_STACK_NOINIT(prio_recv_thread_stack, - CONFIG_BT_CONTROLLER_RX_PRIO_STACK_SIZE); + CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE); struct k_thread recv_thread_data; static BT_STACK_NOINIT(recv_thread_stack, CONFIG_BT_RX_STACK_SIZE); @@ -403,14 +403,12 @@ static int hci_driver_open(void) k_thread_create(&prio_recv_thread_data, prio_recv_thread_stack, K_THREAD_STACK_SIZEOF(prio_recv_thread_stack), prio_recv_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BT_CONTROLLER_RX_PRIO), - 0, K_NO_WAIT); + K_PRIO_COOP(CONFIG_BT_CTLR_RX_PRIO), 0, K_NO_WAIT); k_thread_create(&recv_thread_data, recv_thread_stack, K_THREAD_STACK_SIZEOF(recv_thread_stack), recv_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BT_RX_PRIO), - 0, K_NO_WAIT); + K_PRIO_COOP(CONFIG_BT_RX_PRIO), 0, K_NO_WAIT); BT_DBG("Success."); diff --git a/subsys/bluetooth/controller/include/ll.h b/subsys/bluetooth/controller/include/ll.h index 969c9468923..b6a0ba56c1e 100644 --- a/subsys/bluetooth/controller/include/ll.h +++ b/subsys/bluetooth/controller/include/ll.h @@ -15,18 +15,18 @@ u32_t ll_radio_state_is_idle(void); u8_t *ll_addr_get(u8_t addr_type, u8_t *p_bdaddr); void ll_addr_set(u8_t addr_type, u8_t const *const p_bdaddr); -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u32_t ll_adv_params_set(u8_t handle, u16_t evt_prop, u32_t interval, u8_t adv_type, u8_t own_addr_type, u8_t direct_addr_type, u8_t const *const direct_addr, u8_t chan_map, u8_t filter_policy, u8_t *tx_pwr, u8_t phy_p, u8_t skip, u8_t phy_s, u8_t sid, u8_t sreq); -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, u8_t own_addr_type, u8_t direct_addr_type, u8_t const *const direct_addr, u8_t chan_map, u8_t filter_policy); -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ void ll_adv_data_set(u8_t len, u8_t const *const p_data); void ll_scan_data_set(u8_t len, u8_t const *const p_data); @@ -72,23 +72,23 @@ u32_t ll_version_ind_send(u16_t handle); u32_t ll_terminate_ind_send(u16_t handle, u8_t reason); void ll_timeslice_ticker_id_get(u8_t * const instance_index, u8_t * const user_id); -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) u32_t ll_apto_get(u16_t handle, u16_t *apto); u32_t ll_apto_set(u16_t handle, u16_t apto); -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) u32_t ll_length_req_send(u16_t handle, u16_t tx_octets, u16_t tx_time); void ll_length_default_get(u16_t *max_tx_octets, u16_t *max_tx_time); u32_t ll_length_default_set(u16_t max_tx_octets, u16_t max_tx_time); void ll_length_max_get(u16_t *max_tx_octets, u16_t *max_tx_time, u16_t *max_rx_octets, u16_t *max_rx_time); -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) u32_t ll_phy_get(u16_t handle, u8_t *tx, u8_t *rx); u32_t ll_phy_default_set(u8_t tx, u8_t rx); u32_t ll_phy_req_send(u16_t handle, u8_t tx, u8_t flags, u8_t rx); -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ #endif /* _LL_H_ */ diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 0843c581f4b..56c425c3ec0 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -55,10 +55,10 @@ #define RADIO_TICKER_PREEMPT_PART_MIN_US 0 #define RADIO_TICKER_PREEMPT_PART_MAX_US RADIO_TICKER_XTAL_OFFSET_US -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) #define RADIO_RSSI_SAMPLE_COUNT 10 #define RADIO_RSSI_THRESHOLD 4 -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ #define RADIO_IRK_COUNT_MAX 8 @@ -88,14 +88,14 @@ struct advertiser { u8_t chan_map_current:3; u8_t rfu:4; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u8_t phy_p:3; -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ u8_t chan_map:3; u8_t filter_policy:2; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) u8_t rl_idx; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ struct radio_adv_data adv_data; struct radio_adv_data scan_data; @@ -111,19 +111,19 @@ struct scanner { u8_t chan:2; u8_t rfu:4; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u8_t phy:3; -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ u8_t type:1; u8_t filter_policy:2; u8_t adv_addr_type:1; u8_t init_addr_type:1; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) u8_t rpa_gen:1; /* initiator only */ u8_t rl_idx; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ u8_t init_addr[BDADDR_SIZE]; u8_t adv_addr[BDADDR_SIZE]; @@ -166,16 +166,16 @@ static struct { u8_t data_chan_count; u8_t sca; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) /* DLE global settings */ u16_t default_tx_octets; u16_t default_tx_time; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) u16_t default_phy_tx; u16_t default_phy_rx; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /** @todo below members to be made role specific and quota managed for * Rx-es. @@ -239,9 +239,9 @@ static void event_inactive(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, void *context); #if defined(RADIO_UNIT_TEST) && \ - defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) + defined(CONFIG_BT_CTLR_CHAN_SEL_2) static void chan_sel_2_ut(void); -#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */ static void adv_setup(void); static void event_adv(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, @@ -282,45 +282,45 @@ static u32_t conn_update_req(struct connection *conn); static u32_t chan_map_update(struct connection *conn, struct pdu_data *pdu_data_rx); -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static inline u32_t phy_upd_ind(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue); -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) static void enc_req_reused_send(struct connection *conn, struct radio_pdu_node_tx *node_tx); static void enc_rsp_send(struct connection *conn); static void start_enc_rsp_send(struct connection *conn, struct pdu_data *pdu_ctrl_tx); static void pause_enc_rsp_send(struct connection *conn); -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ static void unknown_rsp_send(struct connection *conn, u8_t type); static void feature_rsp_send(struct connection *conn); static void version_ind_send(struct connection *conn); -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) static void ping_resp_send(struct connection *conn); -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ static void reject_ind_ext_send(struct connection *conn, u8_t reject_opcode, u8_t error_code); -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) +#if !defined(CONFIG_BT_CTLR_PHY) static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, u16_t eff_tx_octets); -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, u16_t eff_rx_time, u16_t eff_tx_octets, u16_t eff_tx_time); -#endif /* CONFIG_BT_CONTROLLER_PHY */ -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_PHY */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static void phy_rsp_send(struct connection *conn); -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ static u32_t role_disable(u8_t ticker_id_primary, u8_t ticker_id_stop); static void rx_fc_lock(u16_t handle); @@ -436,10 +436,9 @@ u32_t radio_init(void *hf_clock, u8_t sca, u8_t connection_count_max, /* memory allocations */ common_init(); -#if defined(RADIO_UNIT_TEST) && \ - defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(RADIO_UNIT_TEST) && defined(CONFIG_BT_CTLR_CHAN_SEL_2) chan_sel_2_ut(); -#endif /* RADIO_UNIT_TEST && CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* RADIO_UNIT_TEST && CONFIG_BT_CTLR_CHAN_SEL_2 */ return retcode; } @@ -531,27 +530,27 @@ static void common_init(void) _radio.data_chan_map[4] = 0x1F; _radio.data_chan_count = 37; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) /* Initialize the DLE defaults */ _radio.default_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; _radio.default_tx_time = RADIO_LL_LENGTH_TIME_RX_MIN; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) /* Initialize the PHY defaults */ _radio.default_phy_tx = BIT(0); _radio.default_phy_rx = BIT(0); -#if defined(CONFIG_BT_CONTROLLER_PHY_2M) +#if defined(CONFIG_BT_CTLR_PHY_2M) _radio.default_phy_tx |= BIT(1); _radio.default_phy_rx |= BIT(1); -#endif /* CONFIG_BT_CONTROLLER_PHY_2M */ +#endif /* CONFIG_BT_CTLR_PHY_2M */ -#if defined(CONFIG_BT_CONTROLLER_PHY_CODED) +#if defined(CONFIG_BT_CTLR_PHY_CODED) _radio.default_phy_tx |= BIT(2); _radio.default_phy_rx |= BIT(2); -#endif /* CONFIG_BT_CONTROLLER_PHY_CODED */ -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY_CODED */ +#endif /* CONFIG_BT_CTLR_PHY */ /* allocate the rx queue */ packet_rx_allocate(0xFF); @@ -603,13 +602,13 @@ static inline void isr_radio_state_tx(void) /* assert if radio packet ptr is not set and radio started rx */ LL_ASSERT(!radio_is_ready()); -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (ctrl_rl_enabled()) { u8_t count, *irks = ctrl_irks_get(&count); radio_ar_configure(count, irks); } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ hcto += radio_rx_chain_delay_get(0, 0); hcto += addr_us_get(0); @@ -618,9 +617,9 @@ static inline void isr_radio_state_tx(void) radio_tmr_hcto_configure(hcto); radio_tmr_end_capture(); -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_RSSI) +#if defined(CONFIG_BT_CTLR_SCAN_REQ_RSSI) radio_rssi_measure(); -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_RSSI */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_RSSI */ break; @@ -632,13 +631,13 @@ static inline void isr_radio_state_tx(void) /* assert if radio packet ptr is not set and radio started rx */ LL_ASSERT(!radio_is_ready()); -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (ctrl_rl_enabled()) { u8_t count, *irks = ctrl_irks_get(&count); radio_ar_configure(count, irks); } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ hcto += radio_rx_chain_delay_get(0, 0); hcto += addr_us_get(0); @@ -651,23 +650,23 @@ static inline void isr_radio_state_tx(void) case ROLE_MASTER: -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) if (_radio.packet_counter == 0) { radio_rssi_measure(); } -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ /* fall thru */ case ROLE_SLAVE: -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) radio_switch_complete_and_tx(_radio.conn_curr->phy_rx, 0, _radio.conn_curr->phy_tx, _radio.conn_curr->phy_flags); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ radio_switch_complete_and_tx(0, 0, 0, 0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ rx_packet_set(_radio.conn_curr, (struct pdu_data *)_radio. packet_rx[_radio.packet_rx_last]->pdu_data); @@ -675,17 +674,17 @@ static inline void isr_radio_state_tx(void) /* assert if radio packet ptr is not set and radio started rx */ LL_ASSERT(!radio_is_ready()); -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) hcto += radio_rx_chain_delay_get(_radio.conn_curr->phy_rx, _radio.conn_curr->phy_flags); hcto += addr_us_get(_radio.conn_curr->phy_rx); hcto -= radio_tx_chain_delay_get(_radio.conn_curr->phy_rx, _radio.conn_curr->phy_flags); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ hcto += radio_rx_chain_delay_get(0, 0); hcto += addr_us_get(0); hcto -= radio_tx_chain_delay_get(0, 0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ radio_tmr_hcto_configure(hcto); radio_tmr_end_capture(); @@ -707,7 +706,7 @@ static inline void isr_radio_state_tx(void) } } -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) static u32_t isr_rx_adv_sr_report(struct pdu_adv *pdu_adv_rx, u8_t rssi_ready) { struct radio_pdu_node_rx *radio_pdu_node_rx; @@ -736,7 +735,7 @@ static u32_t isr_rx_adv_sr_report(struct pdu_adv *pdu_adv_rx, u8_t rssi_ready) return 0; } -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ static inline bool isr_adv_sr_adva_check(struct pdu_adv *adv, struct pdu_adv *sr) @@ -749,7 +748,7 @@ static inline bool isr_adv_sr_adva_check(struct pdu_adv *adv, static inline bool isr_adv_sr_check(struct pdu_adv *adv, struct pdu_adv *sr, u8_t devmatch_ok, u8_t *rl_idx) { -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) return ((((_radio.advertiser.filter_policy & 0x01) == 0) && ctrl_rl_addr_allowed(sr->tx_addr, sr->payload.scan_req.scan_addr, @@ -761,17 +760,17 @@ static inline bool isr_adv_sr_check(struct pdu_adv *adv, struct pdu_adv *sr, return (((_radio.advertiser.filter_policy & 0x01) == 0) || (devmatch_ok)) && isr_adv_sr_adva_check(adv, sr); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ } static inline bool isr_adv_ci_tgta_check(struct pdu_adv *adv, struct pdu_adv *ci, u8_t rl_idx) { -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (rl_idx != FILTER_IDX_NONE) { return rl_idx == _radio.advertiser.rl_idx; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ return (adv->rx_addr == ci->tx_addr) && !memcmp(adv->payload.direct_ind.tgt_addr, ci->payload.connect_ind.init_addr, BDADDR_SIZE); @@ -793,7 +792,7 @@ static inline bool isr_adv_ci_check(struct pdu_adv *adv, struct pdu_adv *ci, { /* LL 4.3.2: filter policy shall be ignored for directed adv */ if (adv->type == PDU_ADV_TYPE_DIRECT_IND) { -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) return ctrl_rl_addr_allowed(ci->tx_addr, ci->payload.connect_ind.init_addr, rl_idx) && @@ -804,7 +803,7 @@ static inline bool isr_adv_ci_check(struct pdu_adv *adv, struct pdu_adv *ci, isr_adv_ci_tgta_check(adv, ci, *rl_idx); } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) return ((((_radio.advertiser.filter_policy & 0x02) == 0) && ctrl_rl_addr_allowed(ci->tx_addr, ci->payload.connect_ind.init_addr, @@ -816,7 +815,7 @@ static inline bool isr_adv_ci_check(struct pdu_adv *adv, struct pdu_adv *ci, return (((_radio.advertiser.filter_policy & 0x02) == 0) || (devmatch_ok)) && isr_adv_ci_adva_check(adv, ci); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ } static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, @@ -825,13 +824,13 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, { struct pdu_adv *pdu_adv, *_pdu_adv; struct radio_pdu_node_rx *radio_pdu_node_rx; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) /* An IRK match implies address resolution enabled */ u8_t rl_idx = irkmatch_ok ? ctrl_rl_irk_idx(irkmatch_id) : FILTER_IDX_NONE; #else u8_t rl_idx = FILTER_IDX_NONE; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ pdu_adv = (struct pdu_adv *)radio_pkt_scratch_get(); _pdu_adv = (struct pdu_adv *)&_radio.advertiser.adv_data.data @@ -841,8 +840,8 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, (pdu_adv->len == sizeof(struct pdu_adv_payload_scan_req)) && isr_adv_sr_check(_pdu_adv, pdu_adv, devmatch_ok, &rl_idx)) { -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) - if (!IS_ENABLED(CONFIG_BT_CONTROLLER_ADV_EXT) || +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) + if (!IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT) || 0 /* TODO: extended adv. scan req notification enabled */) { u32_t err; @@ -853,7 +852,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, return err; } } -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ _radio.state = STATE_CLOSE; @@ -877,7 +876,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, u32_t rx_ready_delay; u32_t ticker_status; - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2)) { radio_pdu_node_rx = packet_rx_reserve_get(4); } else { radio_pdu_node_rx = packet_rx_reserve_get(3); @@ -923,7 +922,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, conn->procedure_reload = RADIO_CONN_EVENTS((40 * 1000 * 1000), conn_interval_us); -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) /* APTO in no. of connection events */ conn->apto_reload = RADIO_CONN_EVENTS((30 * 1000 * 1000), conn_interval_us); @@ -934,7 +933,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, conn->appto_reload = (conn->apto_reload > (conn->latency + 6)) ? (conn->apto_reload - (conn->latency + 6)) : conn->apto_reload; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ /* Prepare the rx packet structure */ radio_pdu_node_rx->hdr.handle = conn->handle; @@ -946,7 +945,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, (struct radio_le_conn_cmplt *)&pdu_data->payload; radio_le_conn_cmplt->status = 0x00; radio_le_conn_cmplt->role = 0x01; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) radio_le_conn_cmplt->own_addr_type = pdu_adv->rx_addr; memcpy(&radio_le_conn_cmplt->own_addr[0], &pdu_adv->payload.connect_ind.adv_addr[0], BDADDR_SIZE); @@ -968,7 +967,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, BDADDR_SIZE); #else if (1) { -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ radio_le_conn_cmplt->peer_addr_type = pdu_adv->tx_addr; memcpy(&radio_le_conn_cmplt->peer_addr[0], &pdu_adv->payload.connect_ind.init_addr[0], @@ -989,7 +988,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, packet_rx_enqueue(); /* Use Channel Selection Algorithm #2 if peer too supports it */ - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2)) { struct radio_le_chan_sel_algo *le_chan_sel_algo; /* Generate LE Channel Selection Algorithm event */ @@ -1117,7 +1116,7 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx, bool dir_report) /* Prepare the report (adv or scan resp) */ radio_pdu_node_rx->hdr.handle = 0xffff; if (0) { -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) } else if (_radio.scanner.phy) { switch (_radio.scanner.phy) { case BIT(0): @@ -1134,7 +1133,7 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx, bool dir_report) LL_ASSERT(0); break; } -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ } else { radio_pdu_node_rx->hdr.type = NODE_RX_TYPE_REPORT; } @@ -1145,14 +1144,14 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx, bool dir_report) pdu_adv_rx->len] = (rssi_ready) ? (radio_rssi_get() & 0x7f) : 0x7f; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) /* save the resolving list index */ ((u8_t *)pdu_adv_rx)[offsetof(struct pdu_adv, payload) + pdu_adv_rx->len + 1] = rl_idx; /* save the directed adv report flag */ ((u8_t *)pdu_adv_rx)[offsetof(struct pdu_adv, payload) + pdu_adv_rx->len + 2] = dir_report ? 1 : 0; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ packet_rx_enqueue(); @@ -1162,7 +1161,7 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx, bool dir_report) static inline bool isr_rx_scan_check(u8_t irkmatch_ok, u8_t devmatch_ok, u8_t rl_idx) { -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) return (((_radio.scanner.filter_policy & 0x01) == 0) && (!devmatch_ok || ctrl_rl_idx_allowed(irkmatch_ok, rl_idx))) || (((_radio.scanner.filter_policy & 0x01) != 0) && @@ -1170,7 +1169,7 @@ static inline bool isr_rx_scan_check(u8_t irkmatch_ok, u8_t devmatch_ok, #else return ((_radio.scanner.filter_policy & 0x01) == 0) || devmatch_ok; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ } static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp) @@ -1185,12 +1184,12 @@ static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp) static inline bool isr_scan_init_adva_check(struct pdu_adv *pdu, u8_t rl_idx) { -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) /* Only applies to initiator with no whitelist */ if (rl_idx != FILTER_IDX_NONE) { return (rl_idx == _radio.scanner.rl_idx); } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ return ((_radio.scanner.adv_addr_type == pdu->tx_addr) && (memcmp(&_radio.scanner.adv_addr[0], &pdu->payload.adv_ind.addr[0], BDADDR_SIZE) == 0)); @@ -1216,7 +1215,7 @@ static inline bool isr_scan_tgta_rpa_check(struct pdu_adv *pdu, static inline bool isr_scan_tgta_check(bool init, struct pdu_adv *pdu, u8_t rl_idx, bool *dir_report) { -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (ctrl_rl_addr_resolve(pdu->rx_addr, pdu->payload.direct_ind.tgt_addr, rl_idx)) { return true; @@ -1226,7 +1225,7 @@ static inline bool isr_scan_tgta_check(bool init, struct pdu_adv *pdu, */ return false; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ return (((_radio.scanner.init_addr_type == pdu->rx_addr) && (memcmp(&_radio.scanner.init_addr[0], @@ -1276,11 +1275,11 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, u32_t conn_offset_us; u32_t ticker_status; u32_t conn_space_us; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) bt_addr_t *lrpa; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2)) { radio_pdu_node_rx = packet_rx_reserve_get(4); } else { radio_pdu_node_rx = packet_rx_reserve_get(3); @@ -1300,7 +1299,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, pdu_adv_tx = (struct pdu_adv *)radio_pkt_scratch_get(); pdu_adv_tx->type = PDU_ADV_TYPE_CONNECT_IND; - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2)) { pdu_adv_tx->chan_sel = 1; } else { pdu_adv_tx->chan_sel = 0; @@ -1308,7 +1307,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr; pdu_adv_tx->len = sizeof(struct pdu_adv_payload_connect_ind); -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) lrpa = ctrl_lrpa_get(rl_idx); if (_radio.scanner.rpa_gen && lrpa) { pdu_adv_tx->tx_addr = 1; @@ -1317,7 +1316,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, } else { #else if (1) { -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ pdu_adv_tx->tx_addr = _radio.scanner.init_addr_type; memcpy(&pdu_adv_tx->payload.connect_ind.init_addr[0], &_radio.scanner.init_addr[0], BDADDR_SIZE); @@ -1400,7 +1399,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, (struct radio_le_conn_cmplt *)&pdu_data->payload; radio_le_conn_cmplt->status = 0x00; radio_le_conn_cmplt->role = 0x00; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) radio_le_conn_cmplt->own_addr_type = pdu_adv_tx->tx_addr; memcpy(&radio_le_conn_cmplt->own_addr[0], &pdu_adv_tx->payload.connect_ind.init_addr[0], @@ -1424,7 +1423,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, BDADDR_SIZE); #else if (1) { -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ radio_le_conn_cmplt->peer_addr_type = pdu_adv_tx->rx_addr; memcpy(&radio_le_conn_cmplt->peer_addr[0], @@ -1443,7 +1442,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, packet_rx_enqueue(); /* Use Channel Selection Algorithm #2 if peer too supports it */ - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2)) { struct radio_le_chan_sel_algo *le_chan_sel_algo; /* Generate LE Channel Selection Algorithm event */ @@ -1533,9 +1532,9 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, (_radio.scanner.type != 0) && (_radio.scanner.conn == 0)) { struct pdu_adv *pdu_adv_tx; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) bt_addr_t *lrpa; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ u32_t err; /* save the adv packet */ @@ -1552,7 +1551,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, pdu_adv_tx->type = PDU_ADV_TYPE_SCAN_REQ; pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr; pdu_adv_tx->len = sizeof(struct pdu_adv_payload_scan_req); -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) lrpa = ctrl_lrpa_get(rl_idx); if (_radio.scanner.rpa_gen && lrpa) { pdu_adv_tx->tx_addr = 1; @@ -1561,7 +1560,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, } else { #else if (1) { -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ pdu_adv_tx->tx_addr = _radio.scanner.init_addr_type; memcpy(&pdu_adv_tx->payload.scan_req.scan_addr[0], &_radio.scanner.init_addr[0], BDADDR_SIZE); @@ -1588,10 +1587,10 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, &dir_report))) || (pdu_adv_rx->type == PDU_ADV_TYPE_NONCONN_IND) || (pdu_adv_rx->type == PDU_ADV_TYPE_SCAN_IND) || -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) ((pdu_adv_rx->type == PDU_ADV_TYPE_EXT_IND) && (_radio.scanner.phy)) || -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ ((pdu_adv_rx->type == PDU_ADV_TYPE_SCAN_RSP) && (_radio.scanner.state != 0) && isr_scan_rsp_adva_matches(pdu_adv_rx))) && @@ -1616,7 +1615,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, return 1; } -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static inline void isr_rx_conn_phy_tx_time_set(void) { /* select the probable PHY with longest Tx time, which will be @@ -1629,7 +1628,7 @@ static inline void isr_rx_conn_phy_tx_time_set(void) conn->phy_tx_time = phy_tx_time[phys]; } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, struct radio_pdu_node_tx **node_tx) @@ -1654,7 +1653,7 @@ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, terminate = 1; break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case PDU_DATA_LLCTRL_TYPE_ENC_REQ: /* things from master stored for session key calculation */ memcpy(&_radio.conn_curr->llcp.encryption.skd[0], @@ -1723,9 +1722,9 @@ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, /* Procedure complete */ _radio.conn_curr->procedure_expire = 0; break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) case PDU_DATA_LLCTRL_TYPE_LENGTH_REQ: if ((_radio.conn_curr->llcp_length.req != _radio.conn_curr->llcp_length.ack) && @@ -1739,9 +1738,9 @@ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, LLCP_LENGTH_STATE_RSP_WAIT; } break; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case PDU_DATA_LLCTRL_TYPE_PHY_REQ: _radio.conn_curr->llcp_phy.state = LLCP_PHY_STATE_RSP_WAIT; /* fall through */ @@ -1756,7 +1755,7 @@ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, _radio.conn_curr->phy_tx_time = _radio.conn_curr->llcp.phy_upd_ind.tx; break; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ default: /* Do nothing for other ctrl packet ack */ @@ -1856,7 +1855,7 @@ isr_rx_conn_pkt_ctrl_rej_conn_upd(struct radio_pdu_node_rx *radio_pdu_node_rx, } } -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) static inline void isr_rx_conn_pkt_ctrl_rej_dle(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) @@ -1888,21 +1887,21 @@ isr_rx_conn_pkt_ctrl_rej_dle(struct radio_pdu_node_rx *radio_pdu_node_rx, lr = (void *)&pdu_data_rx->payload.llctrl.ctrldata.length_req; lr->max_rx_octets = conn->max_rx_octets; lr->max_tx_octets = conn->max_tx_octets; -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if !defined(CONFIG_BT_CTLR_PHY) lr->max_rx_time = RADIO_PKT_TIME(conn->max_rx_octets); lr->max_tx_time = RADIO_PKT_TIME(conn->max_tx_octets); -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ lr->max_rx_time = conn->max_rx_time; lr->max_tx_time = conn->max_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /* enqueue a length rsp */ *rx_enqueue = 1; } } -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static inline void isr_rx_conn_pkt_ctrl_rej_phy_upd(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) @@ -1951,19 +1950,19 @@ isr_rx_conn_pkt_ctrl_rej_phy_upd(struct radio_pdu_node_rx *radio_pdu_node_rx, *rx_enqueue = 1; } } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ static inline void isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) { if (0) { -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) } else if (_radio.conn_curr->llcp_phy.ack != _radio.conn_curr->llcp_phy.req) { isr_rx_conn_pkt_ctrl_rej_phy_upd(radio_pdu_node_rx, rx_enqueue); -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ } else if (_radio.conn_curr->llcp_ack != _radio.conn_curr->llcp_req) { /* reset ctrl procedure */ _radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req; @@ -1979,14 +1978,14 @@ isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *radio_pdu_node_rx, break; } -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) } else if (_radio.conn_curr->llcp_length.ack != _radio.conn_curr->llcp_length.req) { isr_rx_conn_pkt_ctrl_rej_dle(radio_pdu_node_rx, rx_enqueue); -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) } else { struct pdu_data_llctrl_reject_ext_ind *rej_ext_ind; struct pdu_data *pdu_rx; @@ -2016,29 +2015,29 @@ isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *radio_pdu_node_rx, /* Ignore */ break; } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ } } -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, u8_t *rx_enqueue) { u16_t eff_rx_octets; u16_t eff_tx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) u16_t eff_rx_time; u16_t eff_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ u8_t nack = 0; eff_rx_octets = _radio.conn_curr->max_rx_octets; eff_tx_octets = _radio.conn_curr->max_tx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) eff_rx_time = _radio.conn_curr->max_rx_time; eff_tx_time = _radio.conn_curr->max_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ if (/* Local idle, and Peer request then complete the Peer procedure * with response. @@ -2090,7 +2089,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, RADIO_LL_LENGTH_OCTETS_RX_MAX); } -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) /* use the minimal of our default_tx_time and * peer max_rx_time */ @@ -2106,7 +2105,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, eff_rx_time = min(lr->max_tx_time, RADIO_LL_LENGTH_TIME_RX_MAX); } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /* check if change in rx octets */ if (eff_rx_octets != _radio.conn_curr->max_rx_octets) { @@ -2129,7 +2128,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, _radio.conn_curr->llcp_length.tx_octets = eff_tx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) /* accept the effective tx time */ _radio.conn_curr->max_tx_time = eff_tx_time; @@ -2137,7 +2136,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, eff_rx_time; _radio.conn_curr->llcp_length.tx_time = eff_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ _radio.conn_curr->llcp_length.ack = (_radio.conn_curr->llcp_length.req - 1); @@ -2158,13 +2157,13 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, /* accept the effective tx */ _radio.conn_curr->max_tx_octets = eff_tx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) /* accept the effective rx time */ _radio.conn_curr->max_rx_time = eff_rx_time; /* accept the effective tx time */ _radio.conn_curr->max_tx_time = eff_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /* Procedure complete */ _radio.conn_curr->llcp_length.ack = @@ -2175,13 +2174,13 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, lr->max_rx_octets = eff_rx_octets; lr->max_tx_octets = eff_tx_octets; -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if !defined(CONFIG_BT_CTLR_PHY) lr->max_rx_time = RADIO_PKT_TIME(eff_rx_octets); lr->max_tx_time = RADIO_PKT_TIME(eff_tx_octets); -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ lr->max_rx_time = eff_rx_time; lr->max_tx_time = eff_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /* Enqueue data length change event (with no change in * rx length happened), safe to enqueue rx. @@ -2196,18 +2195,18 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, if ((PDU_DATA_LLCTRL_TYPE_LENGTH_REQ == pdu_data_rx->payload.llctrl.opcode) && !nack) { -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if !defined(CONFIG_BT_CTLR_PHY) length_resp_send(_radio.conn_curr, eff_rx_octets, eff_tx_octets); -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ length_resp_send(_radio.conn_curr, eff_rx_octets, eff_rx_time, eff_tx_octets, eff_tx_time); -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ } return nack; } -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ static inline u8_t isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, @@ -2273,7 +2272,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, pdu_data_rx->payload.llctrl.ctrldata.terminate_ind.error_code; break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case PDU_DATA_LLCTRL_TYPE_ENC_REQ: /* things from master stored for session key calculation */ memcpy(&_radio.conn_curr->llcp.encryption.skd[0], @@ -2302,12 +2301,12 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, } #endif -#if defined(CONFIG_BT_CONTROLLER_FAST_ENC) +#if defined(CONFIG_BT_CTLR_FAST_ENC) /* TODO BT Spec. text: may finalize the sending of additional * data channel PDUs queued in the controller. */ enc_rsp_send(_radio.conn_curr); -#endif /* CONFIG_BT_CONTROLLER_FAST_ENC */ +#endif /* CONFIG_BT_CTLR_FAST_ENC */ /* enqueue the enc req */ *rx_enqueue = 1; @@ -2338,14 +2337,14 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, case PDU_DATA_LLCTRL_TYPE_START_ENC_RSP: if (_radio.role == ROLE_SLAVE) { -#if !defined(CONFIG_BT_CONTROLLER_FAST_ENC) +#if !defined(CONFIG_BT_CTLR_FAST_ENC) LL_ASSERT(_radio.conn_curr->llcp_req == _radio.conn_curr->llcp_ack); /* start enc rsp to be scheduled in slave prepare */ _radio.conn_curr->llcp_type = LLCP_ENCRYPTION; _radio.conn_curr->llcp_ack--; -#else /* CONFIG_BT_CONTROLLER_FAST_ENC */ +#else /* CONFIG_BT_CTLR_FAST_ENC */ /* enable transmit encryption */ _radio.conn_curr->enc_tx = 1; @@ -2354,7 +2353,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* resume data packet rx and tx */ _radio.conn_curr->pause_rx = 0; _radio.conn_curr->pause_tx = 0; -#endif /* CONFIG_BT_CONTROLLER_FAST_ENC */ +#endif /* CONFIG_BT_CTLR_FAST_ENC */ } else { /* resume data packet rx and tx */ @@ -2374,7 +2373,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* Procedure complete */ _radio.conn_curr->procedure_expire = 0; break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_FEATURE_REQ: case PDU_DATA_LLCTRL_TYPE_SLAVE_FEATURE_REQ: @@ -2413,7 +2412,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, } break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case PDU_DATA_LLCTRL_TYPE_PAUSE_ENC_REQ: pause_enc_rsp_send(_radio.conn_curr); @@ -2442,7 +2441,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* disable transmit encryption */ _radio.conn_curr->enc_tx = 0; break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_VERSION_IND: _radio.conn_curr->llcp_version.version_number = @@ -2471,7 +2470,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, } break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case PDU_DATA_LLCTRL_TYPE_REJECT_IND: /* resume data packet rx and tx */ _radio.conn_curr->pause_rx = 0; @@ -2483,7 +2482,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* enqueue the reject ind */ *rx_enqueue = 1; break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_CONN_PARAM_REQ: /* connection update or params req in progress @@ -2612,7 +2611,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, isr_rx_conn_pkt_ctrl_rej(radio_pdu_node_rx, rx_enqueue); break; -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case PDU_DATA_LLCTRL_TYPE_PING_REQ: ping_resp_send(_radio.conn_curr); break; @@ -2621,7 +2620,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* Procedure complete */ _radio.conn_curr->procedure_expire = 0; break; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ case PDU_DATA_LLCTRL_TYPE_UNKNOWN_RSP: if (_radio.conn_curr->llcp_req != _radio.conn_curr->llcp_ack) { @@ -2634,7 +2633,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, break; } -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) } else if (_radio.conn_curr->llcp_length.req != _radio.conn_curr->llcp_length.ack) { /* Procedure complete */ @@ -2648,9 +2647,9 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, * host */ *rx_enqueue = 1; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) } else if (_radio.conn_curr->llcp_phy.req != _radio.conn_curr->llcp_phy.ack) { struct radio_le_phy_upd_cmplt *p; @@ -2678,7 +2677,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* enqueue the phy update complete */ *rx_enqueue = 1; } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ } else { struct pdu_data_llctrl *llctrl; @@ -2687,13 +2686,13 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, &pdu_data_rx->payload.llctrl; switch (llctrl->ctrldata.unknown_rsp.type) { -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case PDU_DATA_LLCTRL_TYPE_PING_REQ: /* unknown rsp to LE Ping Req completes the * procedure; nothing to do here. */ break; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ default: /* enqueue the error and let HCI handle it */ @@ -2706,14 +2705,14 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, _radio.conn_curr->procedure_expire = 0; break; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) case PDU_DATA_LLCTRL_TYPE_LENGTH_RSP: case PDU_DATA_LLCTRL_TYPE_LENGTH_REQ: nack = isr_rx_conn_pkt_ctrl_dle(pdu_data_rx, rx_enqueue); break; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case PDU_DATA_LLCTRL_TYPE_PHY_REQ: if (_radio.role == ROLE_MASTER) { if ((_radio.conn_curr->llcp_phy.ack != @@ -2793,7 +2792,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, _radio.conn_curr->llcp_terminate.reason_peer = 0x28; } break; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ default: unknown_rsp_send(_radio.conn_curr, @@ -2960,11 +2959,11 @@ isr_rx_conn_pkt(struct radio_pdu_node_rx *radio_pdu_node_rx, return 1; /* terminated */ } -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) /* stop authenticated payload (pre) timeout */ _radio.conn_curr->appto_expire = 0; _radio.conn_curr->apto_expire = 0; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ switch (pdu_data_rx->ll_id) { case PDU_DATA_LLID_DATA_CONTINUE: @@ -2983,7 +2982,7 @@ isr_rx_conn_pkt(struct radio_pdu_node_rx *radio_pdu_node_rx, break; } -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) } else if ((_radio.conn_curr->enc_rx) || (_radio.conn_curr->pause_rx)) { struct connection *conn = _radio.conn_curr; @@ -3005,7 +3004,7 @@ isr_rx_conn_pkt(struct radio_pdu_node_rx *radio_pdu_node_rx, conn->appto_expire = conn->appto_reload; conn->apto_expire = conn->apto_reload; } -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ } @@ -3032,7 +3031,7 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, u8_t rx_enqueue = 0; u8_t crc_close = 0; -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) static u8_t s_lmax; static u8_t s_lmin = (u8_t) -1; static u8_t s_lprv; @@ -3042,9 +3041,9 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, u32_t sample; u8_t latency, elapsed, prv; u8_t chg = 0; -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) /* Collect RSSI for connection */ if (_radio.packet_counter == 0) { if (rssi_ready) { @@ -3063,9 +3062,9 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, } } } -#else /* !CONFIG_BT_CONTROLLER_CONN_RSSI */ +#else /* !CONFIG_BT_CTLR_CONN_RSSI */ ARG_UNUSED(rssi_ready); -#endif /* !CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* !CONFIG_BT_CTLR_CONN_RSSI */ /* Increment packet counter for this connection event */ _radio.packet_counter++; @@ -3162,11 +3161,11 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, } else { /* if (_radio.state == STATE_TX) */ radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) radio_switch_complete_and_rx(_radio.conn_curr->phy_rx); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ radio_switch_complete_and_rx(0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ radio_tmr_end_capture(); } @@ -3180,7 +3179,7 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, isr_rx_conn_exit: -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) /* get the ISR latency sample */ sample = radio_tmr_sample_get(); @@ -3189,7 +3188,7 @@ isr_rx_conn_exit: */ radio_tmr_sample(); -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ /* release tx node and generate event for num complete */ if (tx_release) { @@ -3206,7 +3205,7 @@ isr_rx_conn_exit: packet_rx_enqueue(); } -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) /* calculate the elapsed time in us since on-air radio packet end * to ISR entry */ @@ -3268,7 +3267,7 @@ isr_rx_conn_exit: packet_rx_enqueue(); } } -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ return; } @@ -3304,7 +3303,7 @@ static inline void isr_radio_state_rx(u8_t trx_done, u8_t crc_ok, break; case ROLE_SCAN: -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) rl_idx = devmatch_ok ? ctrl_rl_idx(!!(_radio.scanner.filter_policy & 0x01), devmatch_id) : @@ -3406,13 +3405,13 @@ static inline u32_t isr_close_scan(void) radio_pkt_rx_set(_radio.packet_rx[_radio.packet_rx_last]-> pdu_data); radio_rssi_measure(); -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (ctrl_rl_enabled()) { u8_t count, *irks = ctrl_irks_get(&count); radio_ar_configure(count, irks); } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ _radio.state = STATE_RX; radio_rx_enable(); @@ -3482,12 +3481,12 @@ static inline void isr_close_conn(void) start_to_address_actual_us = radio_tmr_aa_get(); window_widening_event_us = _radio.conn_curr->slave.window_widening_event_us; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) preamble_to_addr_us = addr_us_get(_radio.conn_curr->phy_rx); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ preamble_to_addr_us = addr_us_get(0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ start_to_address_expected_us = RADIO_TICKER_JITTER_US + (RADIO_TICKER_JITTER_US << 1) + preamble_to_addr_us + @@ -3615,7 +3614,7 @@ static inline void isr_close_conn(void) } } -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) /* check apto */ if (_radio.conn_curr->apto_expire != 0) { if (_radio.conn_curr->apto_expire > elapsed_event) { @@ -3652,9 +3651,9 @@ static inline void isr_close_conn(void) } } } -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) /* generate RSSI event */ if (_radio.conn_curr->rssi_sample_count == 0) { struct radio_pdu_node_rx *radio_pdu_node_rx; @@ -3682,7 +3681,7 @@ static inline void isr_close_conn(void) packet_rx_enqueue(); } } -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ /* break latency based on ctrl procedure pending */ if ((_radio.conn_curr->llcp_ack != _radio.conn_curr->llcp_req) && @@ -3730,7 +3729,7 @@ static inline void isr_radio_state_close(void) case ROLE_ADV: dont_close = isr_close_adv(); -#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CTLR_ADV_INDICATION) if (!dont_close) { struct radio_pdu_node_rx *radio_pdu_node_rx; @@ -3746,7 +3745,7 @@ static inline void isr_radio_state_close(void) packet_rx_enqueue(); } } -#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CTLR_ADV_INDICATION */ break; @@ -3814,12 +3813,12 @@ static void isr(void) trx_done = radio_is_done(); if (trx_done) { -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) /* sample the packet timer here, use it to calculate ISR latency * and generate the profiling event at the end of the ISR. */ radio_tmr_sample(); -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ crc_ok = radio_crc_is_valid(); devmatch_ok = radio_filter_has_match(); @@ -4068,7 +4067,7 @@ static void mayfly_xtal_stop(void *params) DEBUG_RADIO_CLOSE(0); } -#if defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) +#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED) static void mayfly_xtal_retain(u8_t caller_id, u8_t retain) { static u8_t s_xtal_retained; @@ -4238,14 +4237,14 @@ static void mayfly_xtal_stop_calc(void *params) if ((ticker_id != 0xff) && (ticks_to_expire < - TICKER_US_TO_TICKS(CONFIG_BT_CONTROLLER_XTAL_THRESHOLD))) { + TICKER_US_TO_TICKS(CONFIG_BT_CTLR_XTAL_THRESHOLD))) { mayfly_xtal_retain(RADIO_TICKER_USER_ID_JOB, 1); if (ticker_id >= RADIO_TICKER_ID_ADV) { -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) u8_t ticker_id_current = ((u32_t)params & 0xff); struct connection *conn_curr = NULL; -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ u32_t ticks_prepare_to_start; struct connection *conn = NULL; struct shdr *hdr = NULL; @@ -4305,7 +4304,7 @@ static void mayfly_xtal_stop_calc(void *params) } } -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) if (ticker_id_current >= RADIO_TICKER_ID_FIRST_CONNECTION) { /* compensate the current ticker for reduced * prepare. @@ -4373,7 +4372,7 @@ static void mayfly_xtal_stop_calc(void *params) } } } -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ } } else { mayfly_xtal_retain(RADIO_TICKER_USER_ID_JOB, 0); @@ -4404,9 +4403,9 @@ static void mayfly_xtal_stop_calc(void *params) } } } -#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */ -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) static void sched_after_mstr_free_slot_get(u8_t user_id, u32_t ticks_slot_abs, u32_t *ticks_anchor, @@ -4824,7 +4823,7 @@ static void mayfly_sched_win_offset_select(void *params) error_code = 0x20; /* Unsupported parameter value */ } } -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ static void mayfly_radio_stop(void *params) { @@ -5010,7 +5009,7 @@ static void event_common_prepare(u32_t ticks_at_expire, /* route all packets queued for connections */ packet_tx_enqueue(0xFF); -#if defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) +#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED) /* calc whether xtal needs to be retained after this event */ { static void *s_link[2]; @@ -5025,7 +5024,7 @@ static void event_common_prepare(u32_t ticks_at_expire, &s_mfy_xtal_stop_calc); LL_ASSERT(!retval); } -#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */ } static u8_t chan_sel_remap(u8_t *chan_map, u8_t chan_index) @@ -5083,7 +5082,7 @@ static u8_t chan_sel_1(u8_t *chan_use, u8_t hop, u16_t latency, u8_t *chan_map, return chan_next; } -#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CTLR_CHAN_SEL_2) static u8_t chan_rev_8(u8_t i) { u8_t iterate; @@ -5174,7 +5173,7 @@ static void chan_sel_2_ut(void) LL_ASSERT(m == 34); } #endif /* RADIO_UNIT_TEST */ -#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */ static void chan_set(u32_t chan) { @@ -5381,7 +5380,7 @@ static void adv_setup(void) pdu = (struct pdu_adv *) _radio.advertiser.adv_data.data[ _radio.advertiser.adv_data.first]; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (upd) { struct pdu_adv *scan_pdu = (struct pdu_adv *) _radio.advertiser.scan_data.data[ @@ -5395,10 +5394,10 @@ static void adv_setup(void) } #else ARG_UNUSED(upd); -#endif /* !CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* !CONFIG_BT_CTLR_PRIVACY */ radio_pkt_tx_set(pdu); if ((pdu->type != PDU_ADV_TYPE_NONCONN_IND) && - (!IS_ENABLED(CONFIG_BT_CONTROLLER_ADV_EXT) || + (!IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT) || (pdu->type != PDU_ADV_TYPE_EXT_IND))) { _radio.state = STATE_TX; radio_tmr_tifs_set(RADIO_TIFS); @@ -5442,17 +5441,17 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, _radio.ticker_id_event = RADIO_TICKER_ID_ADV; _radio.ticks_anchor = ticks_at_expire; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) /* TODO: if coded we use S8? */ adv_scan_configure(_radio.advertiser.phy_p, 1); -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ adv_scan_configure(0, 0); -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ _radio.advertiser.chan_map_current = _radio.advertiser.chan_map; adv_setup(); -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (ctrl_rl_enabled()) { struct ll_filter *filter = ctrl_filter_get(!!(_radio.advertiser.filter_policy)); @@ -5461,7 +5460,7 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, filter->addr_type_bitmask, (u8_t *)filter->bdaddr); } else -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ /* Setup Radio Filter */ if (_radio.advertiser.filter_policy) { @@ -5478,7 +5477,7 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, _radio.remainder_anchor); radio_tmr_end_capture(); -#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CTLR_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (preempt_calc(&_radio.advertiser.hdr, RADIO_TICKER_ID_ADV, @@ -5486,7 +5485,7 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */ { /* Ticker Job Silence */ @@ -5567,7 +5566,7 @@ static void event_scan_prepare(u32_t ticks_at_expire, u32_t remainder, _radio.scanner.hdr.ticks_preempt_to_start, RADIO_TICKER_ID_SCAN, event_scan, NULL); -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) /* calc next group in us for the anchor where first connection event * to be placed */ @@ -5600,7 +5599,7 @@ static void event_scan_prepare(u32_t ticks_at_expire, u32_t remainder, &s_mfy_sched_after_mstr_free_offset_get); LL_ASSERT(!retval); } -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ DEBUG_RADIO_PREPARE_O(0); } @@ -5629,11 +5628,11 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.ticks_anchor = ticks_at_expire; _radio.scanner.state = 0; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) adv_scan_configure(_radio.scanner.phy, 1); /* if coded then use S8. */ -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ adv_scan_configure(0, 0); -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ chan_set(37 + _radio.scanner.chan++); if (_radio.scanner.chan == 3) { @@ -5645,7 +5644,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_pkt_rx_set(_radio.packet_rx[_radio.packet_rx_last]->pdu_data); radio_rssi_measure(); -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (ctrl_rl_enabled()) { struct ll_filter *filter = ctrl_filter_get(!!(_radio.scanner.filter_policy & 0x1)); @@ -5657,7 +5656,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_ar_configure(count, irks); } else -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ /* Setup Radio Filter */ if (_radio.scanner.filter_policy) { @@ -5674,7 +5673,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.remainder_anchor); radio_tmr_end_capture(); -#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CTLR_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (preempt_calc(&_radio.scanner.hdr, RADIO_TICKER_ID_SCAN, @@ -5682,7 +5681,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */ { /* start window close timeout */ ticker_status = @@ -5752,7 +5751,7 @@ event_conn_update_st_init(struct connection *conn, pdu_ctrl_tx->payload.llctrl.ctrldata.conn_update_ind.instant = conn->llcp.connection_update.instant; -#if CONFIG_BT_CONTROLLER_SCHED_ADVANCED +#if CONFIG_BT_CTLR_SCHED_ADVANCED { u32_t retval; @@ -5784,11 +5783,11 @@ event_conn_update_st_init(struct connection *conn, mayfly_sched_offset); LL_ASSERT(!retval); } -#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ ARG_UNUSED(ticks_at_expire); ARG_UNUSED(mayfly_sched_offset); ARG_UNUSED(fp_mayfly_select_or_use); -#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ } static inline void event_conn_update_st_req(struct connection *conn, @@ -5828,7 +5827,7 @@ static inline void event_conn_update_st_req(struct connection *conn, */ conn->procedure_expire = conn->procedure_reload; -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) { u32_t retval; @@ -5857,10 +5856,10 @@ static inline void event_conn_update_st_req(struct connection *conn, mayfly_sched_offset); LL_ASSERT(!retval); } -#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ ARG_UNUSED(ticks_at_expire); ARG_UNUSED(mayfly_sched_offset); -#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ } static inline void event_conn_update_st_rsp(struct connection *conn, @@ -5929,12 +5928,12 @@ static inline u32_t event_conn_update_prep(struct connection *conn, LLCP_CONN_STATE_APP_WAIT) && (conn->llcp.connection_update.state != LLCP_CONN_STATE_RSP_WAIT)) { -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) static void *s_link[2]; static struct mayfly s_mfy_sched_offset = {0, 0, s_link, NULL, NULL }; void (*fp_mayfly_select_or_use)(void *); -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ struct radio_pdu_node_tx *node_tx; struct pdu_data *pdu_ctrl_tx; u8_t state; @@ -5946,54 +5945,54 @@ static inline u32_t event_conn_update_prep(struct connection *conn, pdu_ctrl_tx = (struct pdu_data *)node_tx->pdu_data; -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) fp_mayfly_select_or_use = mayfly_sched_win_offset_use; -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ state = conn->llcp.connection_update.state; if ((state == LLCP_CONN_STATE_RSP) && !conn->role) { state = LLCP_CONN_STATE_INITIATE; -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) fp_mayfly_select_or_use = mayfly_sched_win_offset_select; -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ } switch (state) { case LLCP_CONN_STATE_INITIATE: if (!conn->role) { -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) event_conn_update_st_init(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, &s_mfy_sched_offset, fp_mayfly_select_or_use); -#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ event_conn_update_st_init(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, NULL, NULL); -#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ break; } /* fall thru if slave */ case LLCP_CONN_STATE_REQ: -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) event_conn_update_st_req(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, &s_mfy_sched_offset); -#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ event_conn_update_st_req(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, NULL); -#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CTLR_SCHED_ADVANCED */ break; case LLCP_CONN_STATE_RSP: @@ -6159,7 +6158,7 @@ static inline u32_t event_conn_update_prep(struct connection *conn, conn->procedure_reload = RADIO_CONN_EVENTS((40 * 1000 * 1000), conn_interval_us); -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) /* APTO in no. of connection events */ conn->apto_reload = RADIO_CONN_EVENTS((30 * 1000 * 1000), conn_interval_us); @@ -6170,7 +6169,7 @@ static inline u32_t event_conn_update_prep(struct connection *conn, conn->appto_reload = (conn->apto_reload > (conn->latency + 6)) ? (conn->apto_reload - (conn->latency + 6)) : conn->apto_reload; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ if (!conn->llcp.connection_update.is_internal) { conn->supervision_expire = 0; @@ -6276,7 +6275,7 @@ static inline void event_ch_map_prep(struct connection *conn, } -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) static inline void event_enc_reject_prep(struct connection *conn, struct pdu_data *pdu) { @@ -6355,11 +6354,11 @@ static inline void event_enc_prep(struct connection *conn) /* slave send reject ind or start enc req at control priority */ -#if defined(CONFIG_BT_CONTROLLER_FAST_ENC) +#if defined(CONFIG_BT_CTLR_FAST_ENC) else { -#else /* !CONFIG_BT_CONTROLLER_FAST_ENC */ +#else /* !CONFIG_BT_CTLR_FAST_ENC */ else if (!conn->pause_tx || conn->refresh) { -#endif /* !CONFIG_BT_CONTROLLER_FAST_ENC */ +#endif /* !CONFIG_BT_CTLR_FAST_ENC */ /* ll ctrl packet */ pdu_ctrl_tx->ll_id = PDU_DATA_LLID_CTRL; @@ -6371,13 +6370,13 @@ static inline void event_enc_prep(struct connection *conn) /* place the start enc req packet as next in tx queue */ else { -#if !defined(CONFIG_BT_CONTROLLER_FAST_ENC) +#if !defined(CONFIG_BT_CTLR_FAST_ENC) /* TODO BT Spec. text: may finalize the sending * of additional data channel PDUs queued in the * controller. */ enc_rsp_send(conn); -#endif /* !CONFIG_BT_CONTROLLER_FAST_ENC */ +#endif /* !CONFIG_BT_CTLR_FAST_ENC */ /* calc the Session Key */ ecb_encrypt(&conn->llcp.encryption.ltk[0], @@ -6417,7 +6416,7 @@ static inline void event_enc_prep(struct connection *conn) PDU_DATA_LLCTRL_TYPE_START_ENC_REQ; } -#if !defined(CONFIG_BT_CONTROLLER_FAST_ENC) +#if !defined(CONFIG_BT_CTLR_FAST_ENC) } else { /* enable transmit encryption */ _radio.conn_curr->enc_tx = 1; @@ -6427,14 +6426,14 @@ static inline void event_enc_prep(struct connection *conn) /* resume data packet rx and tx */ _radio.conn_curr->pause_rx = 0; _radio.conn_curr->pause_tx = 0; -#endif /* !CONFIG_BT_CONTROLLER_FAST_ENC */ +#endif /* !CONFIG_BT_CTLR_FAST_ENC */ } ctrl_tx_enqueue(conn, node_tx); } } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ static inline void event_fex_prep(struct connection *conn) { @@ -6554,7 +6553,7 @@ static inline void event_vex_prep(struct connection *conn) } -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) static inline void event_ping_prep(struct connection *conn) { struct radio_pdu_node_tx *node_tx; @@ -6582,9 +6581,9 @@ static inline void event_ping_prep(struct connection *conn) } } -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) static inline void event_len_prep(struct connection *conn) { switch (conn->llcp_length.state) { @@ -6614,9 +6613,9 @@ static inline void event_len_prep(struct connection *conn) /* set the default tx octets/time to requested value */ conn->default_tx_octets = conn->llcp_length.tx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->default_tx_time = conn->llcp_length.tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /* place the length req packet as next in tx queue */ pdu_ctrl_tx = (struct pdu_data *) node_tx->pdu_data; @@ -6631,11 +6630,11 @@ static inline void event_len_prep(struct connection *conn) lr->max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MAX; lr->max_tx_octets = conn->default_tx_octets; lr->max_rx_time = RADIO_PKT_TIME(RADIO_LL_LENGTH_OCTETS_RX_MAX); -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if !defined(CONFIG_BT_CTLR_PHY) lr->max_tx_time = RADIO_PKT_TIME(conn->default_tx_octets); -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ lr->max_tx_time = conn->default_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ ctrl_tx_enqueue(conn, node_tx); @@ -6681,9 +6680,9 @@ static inline void event_len_prep(struct connection *conn) /* Use the new rx octets/time in the connection */ conn->max_rx_octets = conn->llcp_length.rx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->max_rx_time = conn->llcp_length.rx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /** TODO This design is exception as memory initialization * and allocation is done in radio context here, breaking the @@ -6787,13 +6786,13 @@ static inline void event_len_prep(struct connection *conn) &pdu_ctrl_rx->payload.llctrl.ctrldata.length_req; lr->max_rx_octets = conn->max_rx_octets; lr->max_tx_octets = conn->max_tx_octets; -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if !defined(CONFIG_BT_CTLR_PHY) lr->max_rx_time = RADIO_PKT_TIME(conn->max_rx_octets); lr->max_tx_time = RADIO_PKT_TIME(conn->max_tx_octets); -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ lr->max_rx_time = conn->max_rx_time; lr->max_tx_time = conn->max_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /* enqueue version ind structure into rx queue */ packet_rx_enqueue(); @@ -6810,9 +6809,9 @@ static inline void event_len_prep(struct connection *conn) break; } } -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static inline void event_phy_req_prep(struct connection *conn) { switch (conn->llcp_phy.state) { @@ -7024,7 +7023,7 @@ static inline void event_phy_upd_ind_prep(struct connection *conn, packet_rx_enqueue(); } } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ static void event_connection_prepare(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, @@ -7053,7 +7052,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, /* calc current event counter value */ event_counter = conn->event_counter + conn->latency_prepare; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) /* check if PHY Req procedure is requested and no other procedure * using instant is active. */ @@ -7067,7 +7066,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, /* handle PHY Upd state machine */ event_phy_req_prep(conn); } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ /* check if procedure is requested */ if (conn->llcp_ack != conn->llcp_req) { @@ -7087,11 +7086,11 @@ static void event_connection_prepare(u32_t ticks_at_expire, event_ch_map_prep(conn, event_counter); break; -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) case LLCP_ENCRYPTION: event_enc_prep(conn); break; -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ case LLCP_FEATURE_EXCHANGE: event_fex_prep(conn); @@ -7101,17 +7100,17 @@ static void event_connection_prepare(u32_t ticks_at_expire, event_vex_prep(conn); break; -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case LLCP_PING: event_ping_prep(conn); break; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case LLCP_PHY_UPD: event_phy_upd_ind_prep(conn, event_counter); break; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ default: LL_ASSERT(0); @@ -7162,7 +7161,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, } } -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) /* check if procedure is requested */ if (conn->llcp_length.ack != conn->llcp_length.req) { /* Stop previous event, to avoid Radio DMA corrupting the @@ -7173,7 +7172,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, /* handle DLU state machine */ event_len_prep(conn); } -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ /* Setup XTAL startup and radio active events */ event_common_prepare(ticks_at_expire, remainder, @@ -7245,26 +7244,26 @@ static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) radio_switch_complete_and_tx(conn->phy_rx, 0, conn->phy_tx, conn->phy_flags); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ radio_switch_complete_and_tx(0, 0, 0, 0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ rx_packet_set(conn, (struct pdu_data *) _radio.packet_rx[_radio.packet_rx_last]->pdu_data); /* Setup Radio Channel */ if (conn->data_chan_sel) { -#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CTLR_CHAN_SEL_2) data_chan_use = chan_sel_2(conn->event_counter - 1, conn->data_chan_id, &conn->data_chan_map[0], conn->data_chan_count); -#else /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ LL_ASSERT(0); -#endif /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ } else { data_chan_use = chan_sel_1(&conn->data_chan_use, conn->data_chan_hop, @@ -7299,22 +7298,22 @@ static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, (conn->slave.window_widening_event_us << 1) + conn->slave.window_size_event_us; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) hcto += radio_rx_ready_delay_get(conn->phy_rx); hcto += addr_us_get(conn->phy_rx); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ hcto += radio_rx_ready_delay_get(0); hcto += addr_us_get(0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ radio_tmr_hcto_configure(hcto); radio_tmr_end_capture(); -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) radio_rssi_measure(); -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ -#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CTLR_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (preempt_calc(&conn->hdr, (RADIO_TICKER_ID_FIRST_CONNECTION + @@ -7322,7 +7321,7 @@ static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */ { /* Ticker Job Silence */ @@ -7399,24 +7398,24 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) radio_switch_complete_and_rx(conn->phy_rx); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ radio_switch_complete_and_rx(0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ tx_packet_set(conn, pdu_data_tx); /* Setup Radio Channel */ if (conn->data_chan_sel) { -#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CTLR_CHAN_SEL_2) data_chan_use = chan_sel_2(conn->event_counter - 1, conn->data_chan_id, &conn->data_chan_map[0], conn->data_chan_count); -#else /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ LL_ASSERT(0); -#endif /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ } else { data_chan_use = chan_sel_1(&conn->data_chan_use, conn->data_chan_hop, @@ -7448,12 +7447,12 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) radio_switch_complete_and_tx(conn->phy_rx, 0, conn->phy_tx, conn->phy_flags); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ radio_switch_complete_and_tx(0, 0, 0, 0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ rx_packet_set(conn, (struct pdu_data *)_radio. packet_rx[_radio.packet_rx_last]->pdu_data); @@ -7466,15 +7465,15 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_aa_capture(); hcto = remainder_us + RADIO_TIFS; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) hcto += radio_tx_ready_delay_get(conn->phy_tx, conn->phy_flags); hcto += empty_pkt_us_get(conn->phy_rx); hcto += addr_us_get(conn->phy_rx); -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ hcto += radio_tx_ready_delay_get(0, 0); hcto += empty_pkt_us_get(0); hcto += addr_us_get(0); -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ /* TODO: account for slave window widening */ hcto += 256; @@ -7483,7 +7482,7 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, } #endif -#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CTLR_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (0 != @@ -7492,7 +7491,7 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */ { /* Ticker Job Silence */ @@ -7516,17 +7515,17 @@ static void rx_packet_set(struct connection *conn, struct pdu_data *pdu_data_rx) u16_t max_rx_octets; u8_t phy; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) max_rx_octets = conn->max_rx_octets; -#else /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#else /* !CONFIG_BT_CTLR_DATA_LENGTH */ max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* !CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) phy = conn->phy_rx; -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ phy = 0; -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ radio_phy_set(phy, 0); @@ -7547,19 +7546,19 @@ static void tx_packet_set(struct connection *conn, struct pdu_data *pdu_data_tx) u16_t max_tx_octets; u8_t phy, flags; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) max_tx_octets = conn->max_tx_octets; -#else /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#else /* !CONFIG_BT_CTLR_DATA_LENGTH */ max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* !CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) phy = conn->phy_tx; flags = conn->phy_flags; -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ phy = 0; flags = 0; -#endif /* !CONFIG_BT_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CTLR_PHY */ radio_phy_set(phy, flags); @@ -7605,8 +7604,8 @@ static void prepare_pdu_data_tx(struct connection *conn, conn->packet_tx_head_offset; _pdu_data_tx->md = 0; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_PHY) switch (conn->phy_tx_time) { default: case BIT(0): @@ -7635,12 +7634,12 @@ static void prepare_pdu_data_tx(struct connection *conn, if (max_tx_octets > conn->max_tx_octets) { max_tx_octets = conn->max_tx_octets; } -#else /* !CONFIG_BT_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CTLR_PHY */ max_tx_octets = conn->max_tx_octets; -#endif /* !CONFIG_BT_CONTROLLER_PHY */ -#else /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* !CONFIG_BT_CTLR_PHY */ +#else /* !CONFIG_BT_CTLR_DATA_LENGTH */ max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* !CONFIG_BT_CTLR_DATA_LENGTH */ if (_pdu_data_tx->len > max_tx_octets) { _pdu_data_tx->len = max_tx_octets; @@ -7660,9 +7659,9 @@ static void prepare_pdu_data_tx(struct connection *conn, _pdu_data_tx->rfu = 0; -#if !defined(CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR) +#if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR) _pdu_data_tx->resv = 0; -#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR */ +#endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */ *pdu_data_tx = _pdu_data_tx; } @@ -8196,7 +8195,7 @@ static u32_t chan_map_update(struct connection *conn, return 0; } -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static inline u32_t phy_upd_ind(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) { @@ -8266,9 +8265,9 @@ static inline u32_t phy_upd_ind(struct radio_pdu_node_rx *radio_pdu_node_rx, return 0; } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) static void enc_req_reused_send(struct connection *conn, struct radio_pdu_node_tx *node_tx) { @@ -8362,7 +8361,7 @@ static void pause_enc_rsp_send(struct connection *conn) ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ static void unknown_rsp_send(struct connection *conn, u8_t type) { @@ -8437,7 +8436,7 @@ static void version_ind_send(struct connection *conn) empty_tx_enqueue(conn); } -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) static void ping_resp_send(struct connection *conn) { struct radio_pdu_node_tx *node_tx; @@ -8454,7 +8453,7 @@ static void ping_resp_send(struct connection *conn) ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ static void reject_ind_ext_send(struct connection *conn, u8_t reject_opcode, u8_t error_code) @@ -8480,15 +8479,15 @@ static void reject_ind_ext_send(struct connection *conn, ctrl_tx_enqueue(conn, node_tx); } -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) +#if !defined(CONFIG_BT_CTLR_PHY) static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, u16_t eff_tx_octets) -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, u16_t eff_rx_time, u16_t eff_tx_octets, u16_t eff_tx_time) -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ { struct radio_pdu_node_tx *node_tx; struct pdu_data *pdu_ctrl_tx; @@ -8507,23 +8506,23 @@ static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, pdu_ctrl_tx->payload.llctrl.ctrldata.length_rsp.max_tx_octets = eff_tx_octets; -#if !defined(CONFIG_BT_CONTROLLER_PHY) +#if !defined(CONFIG_BT_CTLR_PHY) pdu_ctrl_tx->payload.llctrl.ctrldata.length_rsp.max_rx_time = RADIO_PKT_TIME(eff_rx_octets); pdu_ctrl_tx->payload.llctrl.ctrldata.length_rsp.max_tx_time = RADIO_PKT_TIME(eff_tx_octets); -#else /* CONFIG_BT_CONTROLLER_PHY */ +#else /* CONFIG_BT_CTLR_PHY */ pdu_ctrl_tx->payload.llctrl.ctrldata.length_rsp.max_rx_time = eff_rx_time; pdu_ctrl_tx->payload.llctrl.ctrldata.length_rsp.max_tx_time = eff_tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) static void phy_rsp_send(struct connection *conn) { struct radio_pdu_node_tx *node_tx; @@ -8545,7 +8544,7 @@ static void phy_rsp_send(struct connection *conn) ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ void ll_radio_state_abort(void) { @@ -8833,13 +8832,13 @@ role_disable_cleanup: return ret_cb; } -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u32_t radio_adv_enable(u8_t phy_p, u16_t interval, u8_t chan_map, u8_t filter_policy, u8_t rl_idx) -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, u8_t rl_idx) -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ { u32_t volatile ret_cb = TICKER_STATUS_BUSY; u32_t ticks_slot_offset; @@ -8884,19 +8883,19 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->latency_prepare = 0; conn->latency_event = 0; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) conn->default_tx_octets = _radio.default_tx_octets; conn->max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; conn->max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->default_tx_time = _radio.default_tx_time; conn->max_tx_time = RADIO_LL_LENGTH_TIME_RX_MIN; conn->max_rx_time = RADIO_LL_LENGTH_TIME_RX_MIN; -#endif /* CONFIG_BT_CONTROLLER_PHY */ -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_PHY */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->phy_pref_tx = _radio.default_phy_tx; conn->phy_tx = BIT(0); conn->phy_pref_flags = 0; @@ -8904,7 +8903,7 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->phy_tx_time = BIT(0); conn->phy_pref_rx = _radio.default_phy_rx; conn->phy_rx = BIT(0); -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ conn->role = 1; conn->connect_expire = 6; @@ -8917,10 +8916,10 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->supervision_expire = 0; conn->procedure_expire = 0; -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) conn->apto_expire = 0; conn->appto_expire = 0; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ conn->llcp_req = 0; conn->llcp_ack = 0; @@ -8931,15 +8930,15 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->llcp_terminate.reason_peer = 0; conn->llcp_terminate.radio_pdu_node_rx.hdr.onion.link = link; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) conn->llcp_length.req = 0; conn->llcp_length.ack = 0; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->llcp_phy.req = 0; conn->llcp_phy.ack = 0; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ conn->sn = 0; conn->nesn = 0; @@ -8957,28 +8956,28 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->packet_tx_head_len = 0; conn->packet_tx_head_offset = 0; -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) conn->rssi_latest = 0x7F; conn->rssi_reported = 0x7F; conn->rssi_sample_count = 0; -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ _radio.advertiser.conn = conn; } else { conn = NULL; } -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) _radio.advertiser.phy_p = phy_p; -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ _radio.advertiser.chan_map = chan_map; _radio.advertiser.filter_policy = filter_policy; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) _radio.advertiser.rl_idx = rl_idx; #else ARG_UNUSED(rl_idx); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ _radio.advertiser.hdr.ticks_active_to_start = _radio.ticks_active_to_start; @@ -9150,14 +9149,14 @@ u32_t radio_scan_enable(u8_t type, u8_t init_addr_type, u8_t *init_addr, _radio.scanner.type = type; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) _radio.scanner.phy = type >> 1; -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) _radio.scanner.rpa_gen = rpa_gen; _radio.scanner.rl_idx = rl_idx; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ _radio.scanner.init_addr_type = init_addr_type; memcpy(&_radio.scanner.init_addr[0], init_addr, BDADDR_SIZE); @@ -9193,10 +9192,10 @@ u32_t radio_scan_enable(u8_t type, u8_t init_addr_type, u8_t *init_addr, ticks_anchor = ticker_ticks_now_get(); if ((_radio.scanner.conn) || - !IS_ENABLED(CONFIG_BT_CONTROLLER_SCHED_ADVANCED)) { + !IS_ENABLED(CONFIG_BT_CTLR_SCHED_ADVANCED)) { us_offset = 0; } -#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CTLR_SCHED_ADVANCED) else { u32_t ticks_ref = 0; @@ -9212,7 +9211,7 @@ u32_t radio_scan_enable(u8_t type, u8_t init_addr_type, u8_t *init_addr, ticks_anchor = ticks_ref; } } -#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CTLR_SCHED_ADVANCED */ ret = ticker_start(RADIO_TICKER_INSTANCE_ID_RADIO, RADIO_TICKER_USER_ID_APP, RADIO_TICKER_ID_SCAN, @@ -9342,19 +9341,19 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->latency_event = 0; conn->latency = _radio.scanner.conn_latency; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) conn->default_tx_octets = _radio.default_tx_octets; conn->max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; conn->max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->default_tx_time = _radio.default_tx_time; conn->max_tx_time = RADIO_LL_LENGTH_TIME_RX_MIN; conn->max_rx_time = RADIO_LL_LENGTH_TIME_RX_MIN; -#endif /* CONFIG_BT_CONTROLLER_PHY */ -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_PHY */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->phy_pref_tx = _radio.default_phy_tx; conn->phy_tx = BIT(0); conn->phy_pref_flags = 0; @@ -9362,7 +9361,7 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->phy_tx_time = BIT(0); conn->phy_pref_rx = _radio.default_phy_rx; conn->phy_rx = BIT(0); -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ conn->role = 0; conn->connect_expire = 6; @@ -9378,7 +9377,7 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, RADIO_CONN_EVENTS((40 * 1000 * 1000), conn_interval_us); conn->procedure_expire = 0; -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) /* APTO in no. of connection events */ conn->apto_reload = RADIO_CONN_EVENTS((30 * 1000 * 1000), conn_interval_us); @@ -9391,7 +9390,7 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->apto_reload; conn->apto_expire = 0; conn->appto_expire = 0; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ conn->llcp_req = 0; conn->llcp_ack = 0; @@ -9402,15 +9401,15 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->llcp_terminate.reason_peer = 0; conn->llcp_terminate.radio_pdu_node_rx.hdr.onion.link = link; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) conn->llcp_length.req = 0; conn->llcp_length.ack = 0; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->llcp_phy.req = 0; conn->llcp_phy.ack = 0; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ conn->sn = 0; conn->nesn = 0; @@ -9428,11 +9427,11 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->packet_tx_head_len = 0; conn->packet_tx_head_offset = 0; -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) conn->rssi_latest = 0x7F; conn->rssi_reported = 0x7F; conn->rssi_sample_count = 0; -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ _radio.scanner.conn = conn; @@ -9538,7 +9537,7 @@ u32_t ll_chm_get(u16_t handle, u8_t *chm) return 0; } -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) u32_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv, u8_t *ltk) { struct connection *conn; @@ -9650,7 +9649,7 @@ u32_t ll_start_enc_req_send(u16_t handle, u8_t error_code, return 0; } -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ u32_t ll_feature_req_send(u16_t handle) { @@ -9698,7 +9697,7 @@ u32_t ll_terminate_ind_send(u16_t handle, u8_t reason) return 0; } -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) u32_t ll_apto_get(u16_t handle, u16_t *apto) { struct connection *conn; @@ -9727,9 +9726,9 @@ u32_t ll_apto_set(u16_t handle, u16_t apto) return 0; } -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) u32_t ll_length_req_send(u16_t handle, u16_t tx_octets, u16_t tx_time) { struct connection *conn; @@ -9745,9 +9744,9 @@ u32_t ll_length_req_send(u16_t handle, u16_t tx_octets, u16_t tx_time) conn->llcp_length.state = LLCP_LENGTH_STATE_REQ; conn->llcp_length.tx_octets = tx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) conn->llcp_length.tx_time = tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ conn->llcp_length.req++; @@ -9778,9 +9777,9 @@ void ll_length_max_get(u16_t *max_tx_octets, u16_t *max_tx_time, *max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MAX; *max_rx_time = RADIO_LL_LENGTH_TIME_RX_MAX; } -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) u32_t ll_phy_get(u16_t handle, u8_t *tx, u8_t *rx) { struct connection *conn; @@ -9826,7 +9825,7 @@ u32_t ll_phy_req_send(u16_t handle, u8_t tx, u8_t flags, u8_t rx) return 0; } -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last) { @@ -9940,40 +9939,40 @@ void radio_rx_dequeue(void) case NODE_RX_TYPE_DC_PDU: case NODE_RX_TYPE_REPORT: -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: case NODE_RX_TYPE_EXT_CODED_REPORT: -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ case NODE_RX_TYPE_CONNECTION: case NODE_RX_TYPE_CONN_UPDATE: case NODE_RX_TYPE_ENC_REFRESH: -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case NODE_RX_TYPE_APTO: -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ case NODE_RX_TYPE_CHAN_SEL_ALGO: -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case NODE_RX_TYPE_PHY_UPDATE: -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) case NODE_RX_TYPE_RSSI: -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ -#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CTLR_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: -#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CTLR_ADV_INDICATION */ /* release data link credit quota */ LL_ASSERT(_radio.link_rx_data_quota < @@ -10047,40 +10046,40 @@ void radio_rx_mem_release(struct radio_pdu_node_rx **radio_pdu_node_rx) case NODE_RX_TYPE_DC_PDU: case NODE_RX_TYPE_REPORT: -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: case NODE_RX_TYPE_EXT_CODED_REPORT: -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ case NODE_RX_TYPE_CONNECTION: case NODE_RX_TYPE_CONN_UPDATE: case NODE_RX_TYPE_ENC_REFRESH: -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) case NODE_RX_TYPE_APTO: -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ case NODE_RX_TYPE_CHAN_SEL_ALGO: -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) case NODE_RX_TYPE_PHY_UPDATE: -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) case NODE_RX_TYPE_RSSI: -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ -#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CTLR_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: -#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CTLR_ADV_INDICATION */ mem_release(_radio_pdu_node_rx_free, &_radio.pkt_rx_data_free); diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.h b/subsys/bluetooth/controller/ll_sw/ctrl.h index af0ee006ccb..0fc991f9421 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.h +++ b/subsys/bluetooth/controller/ll_sw/ctrl.h @@ -17,63 +17,63 @@ #define RADIO_CONNECTION_CONTEXT_MAX 0 #endif -#ifdef CONFIG_BT_CONTROLLER_RX_BUFFERS -#define RADIO_PACKET_COUNT_RX_MAX CONFIG_BT_CONTROLLER_RX_BUFFERS +#ifdef CONFIG_BT_CTLR_RX_BUFFERS +#define RADIO_PACKET_COUNT_RX_MAX CONFIG_BT_CTLR_RX_BUFFERS #endif -#ifdef CONFIG_BT_CONTROLLER_TX_BUFFERS -#define RADIO_PACKET_COUNT_TX_MAX CONFIG_BT_CONTROLLER_TX_BUFFERS +#ifdef CONFIG_BT_CTLR_TX_BUFFERS +#define RADIO_PACKET_COUNT_TX_MAX CONFIG_BT_CTLR_TX_BUFFERS #endif -#ifdef CONFIG_BT_CONTROLLER_TX_BUFFER_SIZE -#define RADIO_PACKET_TX_DATA_SIZE CONFIG_BT_CONTROLLER_TX_BUFFER_SIZE +#ifdef CONFIG_BT_CTLR_TX_BUFFER_SIZE +#define RADIO_PACKET_TX_DATA_SIZE CONFIG_BT_CTLR_TX_BUFFER_SIZE #endif #define BIT64(n) (1ULL << (n)) -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) #define RADIO_BLE_FEAT_BIT_ENC BIT64(BT_LE_FEAT_BIT_ENC) -#else /* !CONFIG_BT_CONTROLLER_LE_ENC */ +#else /* !CONFIG_BT_CTLR_LE_ENC */ #define RADIO_BLE_FEAT_BIT_ENC 0 -#endif /* !CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* !CONFIG_BT_CTLR_LE_ENC */ -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) #define RADIO_BLE_FEAT_BIT_PING BIT64(BT_LE_FEAT_BIT_PING) -#else /* !CONFIG_BT_CONTROLLER_LE_PING */ +#else /* !CONFIG_BT_CTLR_LE_PING */ #define RADIO_BLE_FEAT_BIT_PING 0 -#endif /* !CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* !CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH_MAX) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) #define RADIO_BLE_FEAT_BIT_DLE BIT64(BT_LE_FEAT_BIT_DLE) -#define RADIO_LL_LENGTH_OCTETS_RX_MAX CONFIG_BT_CONTROLLER_DATA_LENGTH_MAX +#define RADIO_LL_LENGTH_OCTETS_RX_MAX CONFIG_BT_CTLR_DATA_LENGTH_MAX #else #define RADIO_BLE_FEAT_BIT_DLE 0 #define RADIO_LL_LENGTH_OCTETS_RX_MAX 27 -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH_MAX */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH_MAX */ -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) #define RADIO_BLE_FEAT_BIT_PRIVACY BIT64(BT_LE_FEAT_BIT_PRIVACY) -#else /* !CONFIG_BT_CONTROLLER_PRIVACY */ +#else /* !CONFIG_BT_CTLR_PRIVACY */ #define RADIO_BLE_FEAT_BIT_PRIVACY 0 -#endif /* !CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* !CONFIG_BT_CTLR_PRIVACY */ -#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CTLR_CHAN_SEL_2) #define RADIO_BLE_FEAT_BIT_CHAN_SEL_2 BIT64(BT_LE_FEAT_BIT_CHAN_SEL_ALGO_2) -#else /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ #define RADIO_BLE_FEAT_BIT_CHAN_SEL_2 0 -#endif /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ +#endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */ -#if defined(CONFIG_BT_CONTROLLER_PHY_2M) +#if defined(CONFIG_BT_CTLR_PHY_2M) #define RADIO_BLE_FEAT_BIT_PHY_2M BIT64(BT_LE_FEAT_BIT_PHY_2M) -#else /* !CONFIG_BT_CONTROLLER_PHY_2M */ +#else /* !CONFIG_BT_CTLR_PHY_2M */ #define RADIO_BLE_FEAT_BIT_PHY_2M 0 -#endif /* !CONFIG_BT_CONTROLLER_PHY_2M */ +#endif /* !CONFIG_BT_CTLR_PHY_2M */ -#if defined(CONFIG_BT_CONTROLLER_PHY_CODED) +#if defined(CONFIG_BT_CTLR_PHY_CODED) #define RADIO_BLE_FEAT_BIT_PHY_CODED BIT64(BT_LE_FEAT_BIT_PHY_CODED) -#else /* !CONFIG_BT_CONTROLLER_PHY_CODED */ +#else /* !CONFIG_BT_CTLR_PHY_CODED */ #define RADIO_BLE_FEAT_BIT_PHY_CODED 0 -#endif /* !CONFIG_BT_CONTROLLER_PHY_CODED */ +#endif /* !CONFIG_BT_CTLR_PHY_CODED */ /***************************************************************************** * Timer Resources (Controller defined) @@ -112,14 +112,14 @@ * Controller Interface Defines ****************************************************************************/ #define RADIO_BLE_VERSION_NUMBER BT_HCI_VERSION_5_0 -#if defined(CONFIG_BT_CONTROLLER_COMPANY_ID) -#define RADIO_BLE_COMPANY_ID CONFIG_BT_CONTROLLER_COMPANY_ID +#if defined(CONFIG_BT_CTLR_COMPANY_ID) +#define RADIO_BLE_COMPANY_ID CONFIG_BT_CTLR_COMPANY_ID #else #define RADIO_BLE_COMPANY_ID 0xFFFF #endif -#if defined(CONFIG_BT_CONTROLLER_SUBVERSION_NUMBER) +#if defined(CONFIG_BT_CTLR_SUBVERSION_NUMBER) #define RADIO_BLE_SUB_VERSION_NUMBER \ - CONFIG_BT_CONTROLLER_SUBVERSION_NUMBER + CONFIG_BT_CTLR_SUBVERSION_NUMBER #else #define RADIO_BLE_SUB_VERSION_NUMBER 0xFFFF #endif @@ -137,14 +137,14 @@ RADIO_BLE_FEAT_BIT_PHY_CODED | \ RADIO_BLE_FEAT_BIT_CHAN_SEL_2) -#if defined(CONFIG_BT_CONTROLLER_WORKER_PRIO) -#define RADIO_TICKER_USER_ID_WORKER_PRIO CONFIG_BT_CONTROLLER_WORKER_PRIO +#if defined(CONFIG_BT_CTLR_WORKER_PRIO) +#define RADIO_TICKER_USER_ID_WORKER_PRIO CONFIG_BT_CTLR_WORKER_PRIO #else #define RADIO_TICKER_USER_ID_WORKER_PRIO 0 #endif -#if defined(CONFIG_BT_CONTROLLER_JOB_PRIO) -#define RADIO_TICKER_USER_ID_JOB_PRIO CONFIG_BT_CONTROLLER_JOB_PRIO +#if defined(CONFIG_BT_CTLR_JOB_PRIO) +#define RADIO_TICKER_USER_ID_JOB_PRIO CONFIG_BT_CTLR_JOB_PRIO #else #define RADIO_TICKER_USER_ID_JOB_PRIO 0 #endif @@ -225,41 +225,41 @@ enum radio_pdu_node_rx_type { NODE_RX_TYPE_DC_PDU, NODE_RX_TYPE_REPORT, -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) NODE_RX_TYPE_EXT_1M_REPORT, NODE_RX_TYPE_EXT_CODED_REPORT, -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ -#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY) NODE_RX_TYPE_SCAN_REQ, -#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */ NODE_RX_TYPE_CONNECTION, NODE_RX_TYPE_TERMINATE, NODE_RX_TYPE_CONN_UPDATE, NODE_RX_TYPE_ENC_REFRESH, -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) NODE_RX_TYPE_APTO, -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ NODE_RX_TYPE_CHAN_SEL_ALGO, -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) NODE_RX_TYPE_PHY_UPDATE, -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) NODE_RX_TYPE_RSSI, -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) NODE_RX_TYPE_PROFILE, -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ -#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CTLR_ADV_INDICATION) NODE_RX_TYPE_ADV_INDICATION, -#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CTLR_ADV_INDICATION */ }; struct radio_le_conn_cmplt { @@ -267,11 +267,11 @@ struct radio_le_conn_cmplt { u8_t role; u8_t peer_addr_type; u8_t peer_addr[BDADDR_SIZE]; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) u8_t peer_rpa[BDADDR_SIZE]; u8_t own_addr_type; u8_t own_addr[BDADDR_SIZE]; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ u16_t interval; u16_t latency; u16_t timeout; @@ -326,13 +326,13 @@ void radio_ticks_active_to_start_set(u32_t ticks_active_to_start); struct radio_adv_data *radio_adv_data_get(void); struct radio_adv_data *radio_scan_data_get(void); -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u32_t radio_adv_enable(u8_t phy_p, u16_t interval, u8_t chan_map, u8_t filter_policy, u8_t rl_idx); -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, u8_t rl_idx); -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ u32_t radio_adv_disable(void); u32_t radio_adv_is_enabled(void); diff --git a/subsys/bluetooth/controller/ll_sw/ctrl_internal.h b/subsys/bluetooth/controller/ll_sw/ctrl_internal.h index 9e16a5e7334..ca03f2292ee 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl_internal.h +++ b/subsys/bluetooth/controller/ll_sw/ctrl_internal.h @@ -10,21 +10,21 @@ enum llcp { LLCP_CONNECTION_UPDATE, LLCP_CHAN_MAP, -#if defined(CONFIG_BT_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CTLR_LE_ENC) LLCP_ENCRYPTION, -#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CTLR_LE_ENC */ LLCP_FEATURE_EXCHANGE, LLCP_VERSION_EXCHANGE, /* LLCP_TERMINATE, */ -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) LLCP_PING, -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) LLCP_PHY_UPD, -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ }; @@ -62,19 +62,19 @@ struct connection { u16_t latency_prepare; u16_t latency_event; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) u16_t default_tx_octets; u16_t max_tx_octets; u16_t max_rx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) u16_t default_tx_time; u16_t max_tx_time; u16_t max_rx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_PHY */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) u8_t phy_pref_tx:3; u8_t phy_tx:3; u8_t phy_pref_flags:1; @@ -83,7 +83,7 @@ struct connection { u8_t phy_pref_rx:3; u8_t phy_rx:3; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ u16_t connect_expire; u16_t supervision_reload; @@ -91,12 +91,12 @@ struct connection { u16_t procedure_reload; u16_t procedure_expire; -#if defined(CONFIG_BT_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CTLR_LE_PING) u16_t appto_reload; u16_t appto_expire; u16_t apto_reload; u16_t apto_expire; -#endif /* CONFIG_BT_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CTLR_LE_PING */ union { struct { @@ -166,7 +166,7 @@ struct connection { u16_t instant; } chan_map; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) struct { u8_t initiate:1; u8_t cmd:1; @@ -174,7 +174,7 @@ struct connection { u8_t rx:3; u16_t instant; } phy_upd_ind; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ struct { u8_t error_code; @@ -206,7 +206,7 @@ struct connection { } radio_pdu_node_rx; } llcp_terminate; -#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CTLR_DATA_LENGTH) struct { u8_t req; u8_t ack; @@ -217,14 +217,14 @@ struct connection { #define LLCP_LENGTH_STATE_RESIZE 3 u16_t rx_octets; u16_t tx_octets; -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) u16_t rx_time; u16_t tx_time; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ } llcp_length; -#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CTLR_DATA_LENGTH */ -#if defined(CONFIG_BT_CONTROLLER_PHY) +#if defined(CONFIG_BT_CTLR_PHY) struct { u8_t req; u8_t ack; @@ -238,7 +238,7 @@ struct connection { u8_t flags:1; u8_t cmd:1; } llcp_phy; -#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CTLR_PHY */ u8_t sn:1; u8_t nesn:1; @@ -260,11 +260,11 @@ struct connection { u8_t packet_tx_head_len; u8_t packet_tx_head_offset; -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) u8_t rssi_latest; u8_t rssi_reported; u8_t rssi_sample_count; -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ }; #define CONNECTION_T_SIZE MROUND(sizeof(struct connection)) @@ -276,11 +276,11 @@ struct pdu_data_q_tx { /* Extra bytes for enqueued rx_node metadata: rssi (always) and resolving * index and directed adv report (with privacy enabled). */ -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) #define PDU_AC_SIZE_EXTRA 3 #else #define PDU_AC_SIZE_EXTRA 1 -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ /* Minimum Rx Data allocation size */ #define PACKET_RX_DATA_SIZE_MIN \ diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c index d1192ab3177..7f577544dea 100644 --- a/subsys/bluetooth/controller/ll_sw/ll.c +++ b/subsys/bluetooth/controller/ll_sw/ll.c @@ -245,13 +245,12 @@ int ll_init(struct k_sem *sem_rx) ll_filter_reset(true); - IRQ_DIRECT_CONNECT(NRF5_IRQ_RADIO_IRQn, - CONFIG_BT_CONTROLLER_WORKER_PRIO, + IRQ_DIRECT_CONNECT(NRF5_IRQ_RADIO_IRQn, CONFIG_BT_CTLR_WORKER_PRIO, radio_nrf5_isr, 0); - IRQ_CONNECT(NRF5_IRQ_RTC0_IRQn, CONFIG_BT_CONTROLLER_WORKER_PRIO, + IRQ_CONNECT(NRF5_IRQ_RTC0_IRQn, CONFIG_BT_CTLR_WORKER_PRIO, rtc0_nrf5_isr, NULL, 0); - IRQ_CONNECT(NRF5_IRQ_SWI4_IRQn, CONFIG_BT_CONTROLLER_JOB_PRIO, - swi4_nrf5_isr, NULL, 0); + IRQ_CONNECT(NRF5_IRQ_SWI4_IRQn, CONFIG_BT_CTLR_JOB_PRIO, swi4_nrf5_isr, + NULL, 0); IRQ_CONNECT(NRF5_IRQ_RNG_IRQn, 1, rng_nrf5_isr, NULL, 0); irq_enable(NRF5_IRQ_RADIO_IRQn); diff --git a/subsys/bluetooth/controller/ll_sw/ll_adv.c b/subsys/bluetooth/controller/ll_sw/ll_adv.c index b5f2dbf5a7e..7bc8f800247 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_adv.c +++ b/subsys/bluetooth/controller/ll_sw/ll_adv.c @@ -28,7 +28,7 @@ struct ll_adv_set *ll_adv_set_get(void) return &ll_adv; } -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u32_t ll_adv_params_set(u8_t handle, u16_t evt_prop, u32_t interval, u8_t adv_type, u8_t own_addr_type, u8_t direct_addr_type, u8_t const *const direct_addr, @@ -41,7 +41,7 @@ u32_t ll_adv_params_set(u8_t handle, u16_t evt_prop, u32_t interval, PDU_ADV_TYPE_NONCONN_IND, PDU_ADV_TYPE_DIRECT_IND, PDU_ADV_TYPE_EXT_IND}; -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, u8_t own_addr_type, u8_t direct_addr_type, u8_t const *const direct_addr, u8_t chan_map, @@ -52,7 +52,7 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, PDU_ADV_TYPE_SCAN_IND, PDU_ADV_TYPE_NONCONN_IND, PDU_ADV_TYPE_DIRECT_IND}; -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ struct radio_adv_data *radio_adv_data; struct pdu_adv *pdu; @@ -61,7 +61,7 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, return BT_HCI_ERR_CMD_DISALLOWED; } -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) /* TODO: check and fail (0x12, invalid HCI cmd param) if invalid * evt_prop bits. */ @@ -94,7 +94,7 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, ll_adv.phy_p = phy_p; } } -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ /* remember params so that set adv/scan data and adv enable * interface can correctly update adv/scan data in the @@ -115,7 +115,7 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, pdu->type = pdu_adv_type[adv_type]; pdu->rfu = 0; - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2) && + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2) && ((pdu->type == PDU_ADV_TYPE_ADV_IND) || (pdu->type == PDU_ADV_TYPE_DIRECT_IND))) { pdu->chan_sel = 1; @@ -123,14 +123,14 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, pdu->chan_sel = 0; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) ll_adv.own_addr_type = own_addr_type; if (ll_adv.own_addr_type == BT_ADDR_LE_PUBLIC_ID || ll_adv.own_addr_type == BT_ADDR_LE_RANDOM_ID) { ll_adv.id_addr_type = direct_addr_type; memcpy(&ll_adv.id_addr, direct_addr, BDADDR_SIZE); } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ pdu->tx_addr = own_addr_type & 0x1; pdu->rx_addr = 0; if (pdu->type == PDU_ADV_TYPE_DIRECT_IND) { @@ -139,7 +139,7 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, BDADDR_SIZE); pdu->len = sizeof(struct pdu_adv_payload_direct_ind); -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) } else if (pdu->type == PDU_ADV_TYPE_EXT_IND) { struct pdu_adv_payload_com_ext_adv *p; struct ext_adv_hdr *h; @@ -225,7 +225,7 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type, /* NOTE: TargetA, filled at enable and RPA timeout */ /* NOTE: AdvA, filled at enable and RPA timeout */ -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ } else if (pdu->len == 0) { pdu->len = BDADDR_SIZE; @@ -257,7 +257,7 @@ void ll_adv_data_set(u8_t len, u8_t const *const data) radio_adv_data = radio_adv_data_get(); prev = (struct pdu_adv *)&radio_adv_data->data[radio_adv_data->last][0]; if ((prev->type == PDU_ADV_TYPE_DIRECT_IND) || - (IS_ENABLED(CONFIG_BT_CONTROLLER_ADV_EXT) && + (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT) && (prev->type == PDU_ADV_TYPE_EXT_IND))) { /* TODO: remember data, to be used if type is changed using * parameter set function ll_adv_params_set afterwards. @@ -280,7 +280,7 @@ void ll_adv_data_set(u8_t len, u8_t const *const data) pdu->type = prev->type; pdu->rfu = 0; - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2)) { pdu->chan_sel = prev->chan_sel; } else { pdu->chan_sel = 0; @@ -365,7 +365,7 @@ u32_t ll_adv_enable(u8_t enable) if (0) { -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) } else if (pdu_adv->type == PDU_ADV_TYPE_EXT_IND) { struct pdu_adv_payload_com_ext_adv *p; struct ext_adv_hdr *h; @@ -382,10 +382,10 @@ u32_t ll_adv_enable(u8_t enable) } /* TODO: TargetA, fill here at enable */ -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ } else { bool priv = false; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) /* Prepare whitelist and optionally resolving list */ ll_filters_adv_update(ll_adv.filter_policy); @@ -404,7 +404,7 @@ u32_t ll_adv_enable(u8_t enable) ll_rl_pdu_adv_update(rl_idx, pdu_scan); priv = true; } -#endif /* !CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* !CONFIG_BT_CTLR_PRIVACY */ if (!priv) { memcpy(&pdu_adv->payload.adv_ind.addr[0], ll_addr_get(pdu_adv->tx_addr, NULL), BDADDR_SIZE); @@ -412,14 +412,14 @@ u32_t ll_adv_enable(u8_t enable) ll_addr_get(pdu_adv->tx_addr, NULL), BDADDR_SIZE); } } -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) status = radio_adv_enable(ll_adv.phy_p, ll_adv.interval, ll_adv.chan_map, ll_adv.filter_policy, rl_idx); -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ status = radio_adv_enable(ll_adv.interval, ll_adv.chan_map, ll_adv.filter_policy, rl_idx); -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ return status; } diff --git a/subsys/bluetooth/controller/ll_sw/ll_adv.h b/subsys/bluetooth/controller/ll_sw/ll_adv.h index 19ef6cd20f5..7860414eecc 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_adv.h +++ b/subsys/bluetooth/controller/ll_sw/ll_adv.h @@ -7,19 +7,19 @@ struct ll_adv_set { u8_t chan_map:3; u8_t filter_policy:2; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) u8_t own_addr_type:2; u8_t id_addr_type:1; u8_t rl_idx; u8_t id_addr[BDADDR_SIZE]; -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u8_t phy_p:3; u32_t interval; -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ u16_t interval; -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ }; struct ll_adv_set *ll_adv_set_get(void); diff --git a/subsys/bluetooth/controller/ll_sw/ll_filter.c b/subsys/bluetooth/controller/ll_sw/ll_filter.c index df8da96f398..cfefec7db09 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_filter.c +++ b/subsys/bluetooth/controller/ll_sw/ll_filter.c @@ -31,7 +31,7 @@ static struct ll_filter wl_filter; u8_t wl_anon; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) #include "common/rpa.h" /* Whitelist peer list */ @@ -59,13 +59,13 @@ static struct rl_dev { bt_addr_t peer_rpa; bt_addr_t *local_rpa; -} rl[CONFIG_BT_CONTROLLER_RL_SIZE]; +} rl[CONFIG_BT_CTLR_RL_SIZE]; -static u8_t peer_irks[CONFIG_BT_CONTROLLER_RL_SIZE][16]; -static u8_t peer_irk_rl_ids[CONFIG_BT_CONTROLLER_RL_SIZE]; +static u8_t peer_irks[CONFIG_BT_CTLR_RL_SIZE][16]; +static u8_t peer_irk_rl_ids[CONFIG_BT_CTLR_RL_SIZE]; static u8_t peer_irk_count; -static bt_addr_t local_rpas[CONFIG_BT_CONTROLLER_RL_SIZE]; +static bt_addr_t local_rpas[CONFIG_BT_CTLR_RL_SIZE]; BUILD_ASSERT(ARRAY_SIZE(wl) < FILTER_IDX_NONE); BUILD_ASSERT(ARRAY_SIZE(rl) < FILTER_IDX_NONE); @@ -157,7 +157,7 @@ static u32_t wl_remove(bt_addr_le_t *id_addr) return BT_HCI_ERR_UNKNOWN_CONN_ID; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ static void filter_clear(struct ll_filter *filter) { @@ -173,7 +173,7 @@ static void filter_insert(struct ll_filter *filter, int index, u8_t addr_type, memcpy(&filter->bdaddr[index][0], bdaddr, BDADDR_SIZE); } -#if !defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if !defined(CONFIG_BT_CTLR_PRIVACY) static u32_t filter_add(struct ll_filter *filter, u8_t addr_type, u8_t *bdaddr) { int index; @@ -216,7 +216,7 @@ static u32_t filter_remove(struct ll_filter *filter, u8_t addr_type, } #endif -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) bt_addr_t *ctrl_lrpa_get(u8_t rl_idx) { if ((rl_idx >= ARRAY_SIZE(rl)) || !rl[rl_idx].lirk || @@ -256,7 +256,7 @@ u8_t ctrl_rl_irk_idx(u8_t irkmatch_id) LL_ASSERT(irkmatch_id < peer_irk_count); i = peer_irk_rl_ids[irkmatch_id]; - LL_ASSERT(i < CONFIG_BT_CONTROLLER_RL_SIZE); + LL_ASSERT(i < CONFIG_BT_CTLR_RL_SIZE); LL_ASSERT(rl[i].taken); return i; @@ -276,7 +276,7 @@ bool ctrl_irk_whitelisted(u8_t rl_idx) struct ll_filter *ctrl_filter_get(bool whitelist) { -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) if (whitelist) { return &wl_filter; } @@ -298,11 +298,11 @@ u32_t ll_wl_clear(void) return BT_HCI_ERR_CMD_DISALLOWED; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) wl_clear(); #else filter_clear(&wl_filter); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ wl_anon = 0; return 0; @@ -319,11 +319,11 @@ u32_t ll_wl_add(bt_addr_le_t *addr) return 0; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) return wl_add(addr); #else return filter_add(&wl_filter, addr->type, addr->a.val); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ } u32_t ll_wl_remove(bt_addr_le_t *addr) @@ -337,14 +337,14 @@ u32_t ll_wl_remove(bt_addr_le_t *addr) return 0; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) return wl_remove(addr); #else return filter_remove(&wl_filter, addr->type, addr->a.val); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) static void filter_wl_update(void) { @@ -377,7 +377,7 @@ static void filter_rl_update(void) /* No whitelist: populate filter from rl peers */ filter_clear(&rl_filter); - for (i = 0; i < CONFIG_BT_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CTLR_RL_SIZE; i++) { if (rl[i].taken) { filter_insert(&rl_filter, i, rl[i].id_addr_type, rl[i].id_addr.val); @@ -421,7 +421,7 @@ u8_t ll_rl_find(u8_t id_addr_type, u8_t *id_addr, u8_t *free) *free = FILTER_IDX_NONE; } - for (i = 0; i < CONFIG_BT_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CTLR_RL_SIZE; i++) { if (LIST_MATCH(rl, i, id_addr_type, id_addr)) { return i; } else if (free && !rl[i].taken && (*free == FILTER_IDX_NONE)) { @@ -441,7 +441,7 @@ bool ctrl_rl_idx_allowed(u8_t irkmatch_ok, u8_t rl_idx) return true; } - LL_ASSERT(rl_idx < CONFIG_BT_CONTROLLER_RL_SIZE); + LL_ASSERT(rl_idx < CONFIG_BT_CTLR_RL_SIZE); LL_ASSERT(rl[rl_idx].taken); return !rl[rl_idx].pirk || rl[rl_idx].dev; @@ -449,7 +449,7 @@ bool ctrl_rl_idx_allowed(u8_t irkmatch_ok, u8_t rl_idx) void ll_rl_id_addr_get(u8_t rl_idx, u8_t *id_addr_type, u8_t *id_addr) { - LL_ASSERT(rl_idx < CONFIG_BT_CONTROLLER_RL_SIZE); + LL_ASSERT(rl_idx < CONFIG_BT_CTLR_RL_SIZE); LL_ASSERT(rl[rl_idx].taken); *id_addr_type = rl[rl_idx].id_addr_type; @@ -467,7 +467,7 @@ bool ctrl_rl_addr_allowed(u8_t id_addr_type, u8_t *id_addr, u8_t *rl_idx) return true; } - for (i = 0; i < CONFIG_BT_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CTLR_RL_SIZE; i++) { if (rl[i].taken && (rl[i].id_addr_type == id_addr_type)) { u8_t *addr = rl[i].id_addr.val; for (j = 0; j < BDADDR_SIZE; j++) { @@ -572,7 +572,7 @@ static void rpa_adv_refresh(void) pdu->type = prev->type; pdu->rfu = 0; - if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CTLR_CHAN_SEL_2)) { pdu->chan_sel = prev->chan_sel; } else { pdu->chan_sel = 0; @@ -593,7 +593,7 @@ static void rpa_adv_refresh(void) static void rl_clear(void) { - for (int i = 0; i < CONFIG_BT_CONTROLLER_RL_SIZE; i++) { + for (int i = 0; i < CONFIG_BT_CTLR_RL_SIZE; i++) { rl[i].taken = 0; } @@ -620,7 +620,7 @@ void ll_rl_rpa_update(bool timeout) (now - rpa_last_ms >= rpa_timeout_ms); BT_DBG(""); - for (i = 0; i < CONFIG_BT_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CTLR_RL_SIZE; i++) { if ((rl[i].taken) && (all || !rl[i].rpas_ready)) { if (rl[i].pirk) { @@ -700,7 +700,7 @@ void ll_adv_scan_state_cb(u8_t bm) u32_t ll_rl_size_get(void) { - return CONFIG_BT_CONTROLLER_RL_SIZE; + return CONFIG_BT_CTLR_RL_SIZE; } u32_t ll_rl_clear(void) @@ -786,7 +786,7 @@ u32_t ll_rl_remove(bt_addr_le_t *id_addr) if (pj && pi != pj) { memcpy(peer_irks[pi], peer_irks[pj], 16); for (k = 0; - k < CONFIG_BT_CONTROLLER_RL_SIZE; + k < CONFIG_BT_CTLR_RL_SIZE; k++) { if (rl[k].taken && rl[k].pirk && @@ -894,13 +894,13 @@ u32_t ll_priv_mode_set(bt_addr_le_t *id_addr, u8_t mode) return 0; } -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ void ll_filter_reset(bool init) { wl_anon = 0; -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) wl_clear(); rl_enable = 0; @@ -914,6 +914,6 @@ void ll_filter_reset(bool init) } #else filter_clear(&wl_filter); -#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CTLR_PRIVACY */ } diff --git a/subsys/bluetooth/controller/ll_sw/ll_master.c b/subsys/bluetooth/controller/ll_sw/ll_master.c index b1dc51547e5..0adc269e8f1 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_master.c +++ b/subsys/bluetooth/controller/ll_sw/ll_master.c @@ -36,7 +36,7 @@ u32_t ll_create_connection(u16_t scan_interval, u16_t scan_window, return status; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) ll_filters_scan_update(filter_policy); if (!filter_policy && ctrl_rl_enabled()) { diff --git a/subsys/bluetooth/controller/ll_sw/ll_scan.c b/subsys/bluetooth/controller/ll_sw/ll_scan.c index dbce5d47479..054245bb10a 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_scan.c +++ b/subsys/bluetooth/controller/ll_sw/ll_scan.c @@ -19,11 +19,11 @@ static struct { u16_t interval; u16_t window; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) u8_t type:4; -#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CTLR_ADV_EXT */ u8_t type:1; -#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT */ u8_t own_addr_type:2; u8_t filter_policy:2; @@ -69,7 +69,7 @@ u32_t ll_scan_enable(u8_t enable) return 0; } -#if defined(CONFIG_BT_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CTLR_PRIVACY) ll_filters_scan_update(ll_scan.filter_policy); if ((ll_scan.type & 0x1) && diff --git a/subsys/bluetooth/controller/ll_sw/pdu.h b/subsys/bluetooth/controller/ll_sw/pdu.h index f1059360544..2f2d674b566 100644 --- a/subsys/bluetooth/controller/ll_sw/pdu.h +++ b/subsys/bluetooth/controller/ll_sw/pdu.h @@ -53,7 +53,7 @@ struct pdu_adv_payload_connect_ind { } __packed lldata; } __packed; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) struct pdu_adv_payload_com_ext_adv { u8_t ext_hdr_len:6; u8_t adv_mode:2; @@ -116,7 +116,7 @@ struct ext_adv_sync_info { u8_t crc_init[3]; u16_t evt_cntr; } __packed; -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ enum pdu_adv_type { PDU_ADV_TYPE_ADV_IND = 0x00, @@ -152,9 +152,9 @@ struct pdu_adv { struct pdu_adv_payload_scan_rsp scan_rsp; struct pdu_adv_payload_connect_ind connect_ind; -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) struct pdu_adv_payload_com_ext_adv adv_ext_ind; -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ } __packed payload; } __packed; @@ -330,7 +330,7 @@ struct pdu_data_llctrl { } __packed ctrldata; } __packed; -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) struct profile { u8_t lcur; u8_t lmin; @@ -339,7 +339,7 @@ struct profile { u8_t min; u8_t max; } __packed; -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ struct pdu_data { u8_t ll_id:2; @@ -350,21 +350,21 @@ struct pdu_data { u8_t len:8; -#if !defined(CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR) +#if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR) u8_t resv:8; /* TODO: remove nRF specific code */ -#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR */ +#endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */ union { u8_t lldata[1]; struct pdu_data_llctrl llctrl; -#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CTLR_CONN_RSSI) u8_t rssi; -#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CTLR_CONN_RSSI */ -#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CTLR_PROFILE_ISR) struct profile profile; -#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CTLR_PROFILE_ISR */ } __packed payload; } __packed; diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig index 268496f252a..a9c6190c68c 100644 --- a/subsys/bluetooth/host/Kconfig +++ b/subsys/bluetooth/host/Kconfig @@ -56,7 +56,7 @@ config BT_HCI_TX_STACK_SIZE default 256 if BT_H4 default 256 if BT_H5 default 256 if BT_SPI - default 640 if BT_CONTROLLER + default 640 if BT_CTLR config BT_HCI_TX_PRIO # Hidden option for Co-Operative Tx thread priority @@ -123,7 +123,7 @@ config BT_HOST_CRYPTO # encryption support using TinyCrypt library if software-based # controller is disabled. bool - default y if !BT_CONTROLLER + default y if !BT_CTLR select TINYCRYPT select TINYCRYPT_AES select TINYCRYPT_SHA256 @@ -145,7 +145,7 @@ if BT_HCI_ACL_FLOW_CONTROL config BT_ACL_RX_COUNT int "Number of incoming ACL data buffers" default 6 - default BT_CONTROLLER_RX_BUFFERS if BT_CONTROLLER + default BT_CTLR_RX_BUFFERS if BT_CTLR range 2 64 help Number of buffers available for incoming ACL data. @@ -181,7 +181,7 @@ config BT_L2CAP_TX_MTU config BT_CONN_TX_MAX int "Maximum number of pending TX buffers" default 7 - default BT_CONTROLLER_TX_BUFFERS if BT_CONTROLLER + default BT_CTLR_TX_BUFFERS if BT_CTLR range 1 128 help Maximum number of pending TX buffers that have not yet diff --git a/subsys/bluetooth/shell/Makefile b/subsys/bluetooth/shell/Makefile index 612d1d6c5b6..da0973a9f16 100644 --- a/subsys/bluetooth/shell/Makefile +++ b/subsys/bluetooth/shell/Makefile @@ -1,5 +1,5 @@ obj-y += bt.o obj-y += gatt.o -obj-$(CONFIG_BT_CONTROLLER) += ll.o -obj-$(CONFIG_BT_CONTROLLER) += ticker.o +obj-$(CONFIG_BT_CTLR) += ll.o +obj-$(CONFIG_BT_CTLR) += ticker.o obj-$(CONFIG_SOC_FLASH_NRF5) += flash.o diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c index a0d9b248466..d4e7e044187 100644 --- a/subsys/bluetooth/shell/bt.c +++ b/subsys/bluetooth/shell/bt.c @@ -2044,10 +2044,10 @@ static const struct shell_cmd bt_commands[] = { { "br-rfcomm-disconnect", cmd_rfcomm_disconnect, HELP_NONE }, #endif /* CONFIG_BT_RFCOMM */ #endif -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) { "advx", cmd_advx, " [coded] [anon] [txp]" }, { "scanx", cmd_scanx, " [coded]" }, -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ { NULL, NULL, NULL } }; diff --git a/subsys/bluetooth/shell/ll.c b/subsys/bluetooth/shell/ll.c index fef39b006eb..97613ca63e5 100644 --- a/subsys/bluetooth/shell/ll.c +++ b/subsys/bluetooth/shell/ll.c @@ -18,7 +18,7 @@ #include "../controller/include/ll.h" -#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CTLR_ADV_EXT) #define ADV_INTERVAL 0x000020 #define ADV_TYPE 0x05 /* Adv. Ext. */ #define OWN_ADDR_TYPE 1 @@ -170,4 +170,4 @@ exit: return 0; } -#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ diff --git a/tests/bluetooth/init/prj_controller.conf b/tests/bluetooth/init/prj_controller.conf index 9596169fba1..d3e6e280743 100644 --- a/tests/bluetooth/init/prj_controller.conf +++ b/tests/bluetooth/init/prj_controller.conf @@ -1,9 +1,9 @@ CONFIG_BT=y -CONFIG_BT_CONTROLLER=y -CONFIG_BT_CONTROLLER_WORKER_PRIO=0 -CONFIG_BT_CONTROLLER_JOB_PRIO=0 -CONFIG_BT_CONTROLLER_XTAL_ADVANCED=y -CONFIG_BT_CONTROLLER_SCHED_ADVANCED=y +CONFIG_BT_CTLR=y +CONFIG_BT_CTLR_WORKER_PRIO=0 +CONFIG_BT_CTLR_JOB_PRIO=0 +CONFIG_BT_CTLR_XTAL_ADVANCED=y +CONFIG_BT_CTLR_SCHED_ADVANCED=y CONFIG_BT_HCI_ACL_FLOW_CONTROL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y diff --git a/tests/bluetooth/init/prj_controller_4_0.conf b/tests/bluetooth/init/prj_controller_4_0.conf index 58bb6a4f656..827e1ef7a02 100644 --- a/tests/bluetooth/init/prj_controller_4_0.conf +++ b/tests/bluetooth/init/prj_controller_4_0.conf @@ -1,24 +1,24 @@ CONFIG_BT=y -CONFIG_BT_CONTROLLER=y -CONFIG_BT_CONTROLLER_WORKER_PRIO=0 -CONFIG_BT_CONTROLLER_JOB_PRIO=0 -CONFIG_BT_CONTROLLER_XTAL_ADVANCED=y -CONFIG_BT_CONTROLLER_SCHED_ADVANCED=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=16 -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_PRIVACY=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_TIFS_HW=y -CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST=n -CONFIG_BT_CONTROLLER_FAST_ENC=n -CONFIG_BT_CONTROLLER_CONN_RSSI=n -CONFIG_BT_CONTROLLER_ADV_INDICATION=n -CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY=n -CONFIG_BT_CONTROLLER_SCAN_REQ_RSSI=n -CONFIG_BT_CONTROLLER_PROFILE_ISR=n +CONFIG_BT_CTLR=y +CONFIG_BT_CTLR_WORKER_PRIO=0 +CONFIG_BT_CTLR_JOB_PRIO=0 +CONFIG_BT_CTLR_XTAL_ADVANCED=y +CONFIG_BT_CTLR_SCHED_ADVANCED=y +CONFIG_BT_CTLR_DUP_FILTER_LEN=16 +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_PRIVACY=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_TIFS_HW=y +CONFIG_BT_CTLR_RADIO_ENABLE_FAST=n +CONFIG_BT_CTLR_FAST_ENC=n +CONFIG_BT_CTLR_CONN_RSSI=n +CONFIG_BT_CTLR_ADV_INDICATION=n +CONFIG_BT_CTLR_SCAN_REQ_NOTIFY=n +CONFIG_BT_CTLR_SCAN_REQ_RSSI=n +CONFIG_BT_CTLR_PROFILE_ISR=n CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y diff --git a/tests/bluetooth/init/prj_controller_dbg.conf b/tests/bluetooth/init/prj_controller_dbg.conf index 06e2ffeb34b..ebe9977757c 100644 --- a/tests/bluetooth/init/prj_controller_dbg.conf +++ b/tests/bluetooth/init/prj_controller_dbg.conf @@ -1,27 +1,27 @@ CONFIG_BT=y -CONFIG_BT_CONTROLLER=y -CONFIG_BT_CONTROLLER_WORKER_PRIO=0 -CONFIG_BT_CONTROLLER_JOB_PRIO=1 -CONFIG_BT_CONTROLLER_XTAL_ADVANCED=n -CONFIG_BT_CONTROLLER_SCHED_ADVANCED=n -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=16 -CONFIG_BT_CONTROLLER_LE_PING=y -CONFIG_BT_CONTROLLER_PRIVACY=y -CONFIG_BT_CONTROLLER_DATA_LENGTH=y -CONFIG_BT_CONTROLLER_PHY=y -CONFIG_BT_CONTROLLER_PHY_2M=y -CONFIG_BT_CONTROLLER_PHY_2M_NRF=y -CONFIG_BT_CONTROLLER_PHY_CODED=y -CONFIG_BT_CONTROLLER_CHAN_SEL_2=y -CONFIG_BT_CONTROLLER_ADV_EXT=y -CONFIG_BT_CONTROLLER_TIFS_HW=n -CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST=y -CONFIG_BT_CONTROLLER_FAST_ENC=y -CONFIG_BT_CONTROLLER_CONN_RSSI=y -CONFIG_BT_CONTROLLER_ADV_INDICATION=y -CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY=y -CONFIG_BT_CONTROLLER_SCAN_REQ_RSSI=y -CONFIG_BT_CONTROLLER_PROFILE_ISR=y +CONFIG_BT_CTLR=y +CONFIG_BT_CTLR_WORKER_PRIO=0 +CONFIG_BT_CTLR_JOB_PRIO=1 +CONFIG_BT_CTLR_XTAL_ADVANCED=n +CONFIG_BT_CTLR_SCHED_ADVANCED=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=16 +CONFIG_BT_CTLR_LE_PING=y +CONFIG_BT_CTLR_PRIVACY=y +CONFIG_BT_CTLR_DATA_LENGTH=y +CONFIG_BT_CTLR_PHY=y +CONFIG_BT_CTLR_PHY_2M=y +CONFIG_BT_CTLR_PHY_2M_NRF=y +CONFIG_BT_CTLR_PHY_CODED=y +CONFIG_BT_CTLR_CHAN_SEL_2=y +CONFIG_BT_CTLR_ADV_EXT=y +CONFIG_BT_CTLR_TIFS_HW=n +CONFIG_BT_CTLR_RADIO_ENABLE_FAST=y +CONFIG_BT_CTLR_FAST_ENC=y +CONFIG_BT_CTLR_CONN_RSSI=y +CONFIG_BT_CTLR_ADV_INDICATION=y +CONFIG_BT_CTLR_SCAN_REQ_NOTIFY=y +CONFIG_BT_CTLR_SCAN_REQ_RSSI=y +CONFIG_BT_CTLR_PROFILE_ISR=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y diff --git a/tests/bluetooth/init/prj_controller_tiny.conf b/tests/bluetooth/init/prj_controller_tiny.conf index 332af8bf18c..e0519eba79d 100644 --- a/tests/bluetooth/init/prj_controller_tiny.conf +++ b/tests/bluetooth/init/prj_controller_tiny.conf @@ -1,24 +1,24 @@ CONFIG_BT=y -CONFIG_BT_CONTROLLER=y -CONFIG_BT_CONTROLLER_WORKER_PRIO=0 -CONFIG_BT_CONTROLLER_JOB_PRIO=0 -CONFIG_BT_CONTROLLER_XTAL_ADVANCED=n -CONFIG_BT_CONTROLLER_SCHED_ADVANCED=n -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_PRIVACY=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_TIFS_HW=y -CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST=n -CONFIG_BT_CONTROLLER_FAST_ENC=n -CONFIG_BT_CONTROLLER_CONN_RSSI=n -CONFIG_BT_CONTROLLER_ADV_INDICATION=n -CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY=n -CONFIG_BT_CONTROLLER_SCAN_REQ_RSSI=n -CONFIG_BT_CONTROLLER_PROFILE_ISR=n +CONFIG_BT_CTLR=y +CONFIG_BT_CTLR_WORKER_PRIO=0 +CONFIG_BT_CTLR_JOB_PRIO=0 +CONFIG_BT_CTLR_XTAL_ADVANCED=n +CONFIG_BT_CTLR_SCHED_ADVANCED=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_PRIVACY=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_TIFS_HW=y +CONFIG_BT_CTLR_RADIO_ENABLE_FAST=n +CONFIG_BT_CTLR_FAST_ENC=n +CONFIG_BT_CTLR_CONN_RSSI=n +CONFIG_BT_CTLR_ADV_INDICATION=n +CONFIG_BT_CTLR_SCAN_REQ_NOTIFY=n +CONFIG_BT_CTLR_SCAN_REQ_RSSI=n +CONFIG_BT_CTLR_PROFILE_ISR=n CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y diff --git a/tests/bluetooth/mesh/dbg.conf b/tests/bluetooth/mesh/dbg.conf index 6be65c69dbb..ee1ffed913f 100644 --- a/tests/bluetooth/mesh/dbg.conf +++ b/tests/bluetooth/mesh/dbg.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y diff --git a/tests/bluetooth/mesh/friend.conf b/tests/bluetooth/mesh/friend.conf index 6883d8e04c1..298b05b4e11 100644 --- a/tests/bluetooth/mesh/friend.conf +++ b/tests/bluetooth/mesh/friend.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT=y CONFIG_BT_TINYCRYPT_ECC=y diff --git a/tests/bluetooth/mesh/gatt.conf b/tests/bluetooth/mesh/gatt.conf index b1348a0f85d..0f3144c6812 100644 --- a/tests/bluetooth/mesh/gatt.conf +++ b/tests/bluetooth/mesh/gatt.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y diff --git a/tests/bluetooth/mesh/lpn.conf b/tests/bluetooth/mesh/lpn.conf index 8219532a0aa..43f594ae727 100644 --- a/tests/bluetooth/mesh/lpn.conf +++ b/tests/bluetooth/mesh/lpn.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y diff --git a/tests/bluetooth/mesh/microbit.conf b/tests/bluetooth/mesh/microbit.conf index ce36d811f96..2efbff27352 100644 --- a/tests/bluetooth/mesh/microbit.conf +++ b/tests/bluetooth/mesh/microbit.conf @@ -8,17 +8,17 @@ CONFIG_BT=y CONFIG_BT_TINYCRYPT_ECC=y CONFIG_BT_RX_STACK_SIZE=1100 -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_MESH=y CONFIG_BT_MESH_RX_SDU_MAX=36 diff --git a/tests/bluetooth/mesh/microbit_gatt.conf b/tests/bluetooth/mesh/microbit_gatt.conf index 7a10646a28d..17052034255 100644 --- a/tests/bluetooth/mesh/microbit_gatt.conf +++ b/tests/bluetooth/mesh/microbit_gatt.conf @@ -16,17 +16,17 @@ CONFIG_BT_L2CAP_RX_MTU=69 CONFIG_BT_L2CAP_TX_MTU=69 CONFIG_BT_L2CAP_TX_BUF_COUNT=4 -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_MESH=y CONFIG_BT_MESH_RX_SDU_MAX=36 diff --git a/tests/bluetooth/mesh/nrf51-16k.conf b/tests/bluetooth/mesh/nrf51-16k.conf index 743d81bd7e6..8fdab329403 100644 --- a/tests/bluetooth/mesh/nrf51-16k.conf +++ b/tests/bluetooth/mesh/nrf51-16k.conf @@ -7,7 +7,7 @@ CONFIG_BT_RX_STACK_SIZE=1100 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_MESH=y CONFIG_BT_MESH_LOW_POWER=y diff --git a/tests/bluetooth/mesh/pb_gatt.conf b/tests/bluetooth/mesh/pb_gatt.conf index b6e04dcb17d..435d50799ae 100644 --- a/tests/bluetooth/mesh/pb_gatt.conf +++ b/tests/bluetooth/mesh/pb_gatt.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y diff --git a/tests/bluetooth/mesh/prj.conf b/tests/bluetooth/mesh/prj.conf index 3187dbcaeda..922eb685c1b 100644 --- a/tests/bluetooth/mesh/prj.conf +++ b/tests/bluetooth/mesh/prj.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y diff --git a/tests/bluetooth/mesh/proxy.conf b/tests/bluetooth/mesh/proxy.conf index 2b53bc8029d..cdc455e0e73 100644 --- a/tests/bluetooth/mesh/proxy.conf +++ b/tests/bluetooth/mesh/proxy.conf @@ -4,14 +4,14 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT_OBSERVER=y CONFIG_BT_BROADCASTER=y -CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BT_CONTROLLER_LE_ENC=n -CONFIG_BT_CONTROLLER_LE_PING=n -CONFIG_BT_CONTROLLER_DATA_LENGTH=n -CONFIG_BT_CONTROLLER_PHY=n -CONFIG_BT_CONTROLLER_CHAN_SEL_2=n -CONFIG_BT_CONTROLLER_ADV_EXT=n -CONFIG_BT_CONTROLLER_PRIVACY=n +CONFIG_BT_CTLR_DUP_FILTER_LEN=0 +CONFIG_BT_CTLR_LE_ENC=n +CONFIG_BT_CTLR_LE_PING=n +CONFIG_BT_CTLR_DATA_LENGTH=n +CONFIG_BT_CTLR_PHY=n +CONFIG_BT_CTLR_CHAN_SEL_2=n +CONFIG_BT_CTLR_ADV_EXT=n +CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_PERIPHERAL=y