michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Rename Kconfig prefix

Browse source 
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 <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2017-08-14 13:45:13 +02:00 • committed by Johan Hedberg
commit d5c13a7530
63 changed files with 1014 additions and 1019 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig
View file

@ -16,7 +16,7 @@ CONFIG_UART_CONSOLE=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y
# spi
CONFIG_SPI=y

2
boards/arm/96b_nitrogen/96b_nitrogen_defconfig
View file

@ -19,4 +19,4 @@ CONFIG_GPIO_AS_PINRESET=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/arduino_101_ble/arduino_101_ble_defconfig
View file

@ -10,4 +10,4 @@ CONFIG_UART_NRF5=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/bbc_microbit/bbc_microbit_defconfig
View file

@ -18,4 +18,4 @@ CONFIG_UART_CONSOLE=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/curie_ble/curie_ble_defconfig
View file

@ -10,4 +10,4 @@ CONFIG_UART_NRF5=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/nrf51_blenano/nrf51_blenano_defconfig
View file

@ -14,4 +14,4 @@ CONFIG_UART_CONSOLE=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig
View file

@ -14,4 +14,4 @@ CONFIG_UART_CONSOLE=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig
View file

@ -14,4 +14,4 @@ CONFIG_UART_CONSOLE=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig
View file

@ -20,4 +20,4 @@ CONFIG_GPIO_AS_PINRESET=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig
View file

@ -17,4 +17,4 @@ CONFIG_UART_CONSOLE=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
View file

@ -20,4 +20,4 @@ CONFIG_GPIO_AS_PINRESET=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig
View file

@ -20,4 +20,4 @@ CONFIG_GPIO_AS_PINRESET=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

2
boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig
View file

@ -10,4 +10,4 @@ CONFIG_UART_NRF5=y
# bluetooth
CONFIG_BT=y
CONFIG_BT_CONTROLLER=y
CONFIG_BT_CTLR=y

4
drivers/bluetooth/Kconfig
View file

@ -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

2
drivers/flash/Kconfig
View file

@ -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.

2
samples/bluetooth/hci_uart/nrf5.conf
View file

@ -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

19
samples/bluetooth/hci_uart/src/main.c
View file

@ -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;
}

16
samples/bluetooth/mesh/microbit.conf
View file

@ -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

16
samples/bluetooth/mesh/microbit_gatt.conf
View file

@ -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

16
samples/bluetooth/mesh/nrf51-16k.conf
View file

@ -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

16
samples/bluetooth/mesh/prj.conf
View file

@ -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

2
samples/bluetooth/mesh_demo/microbit.conf
View file

@ -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

2
samples/bluetooth/mesh_demo/nrf51-16k.conf
View file

@ -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

4
subsys/bluetooth/Kconfig
View file

@ -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

2
subsys/bluetooth/Makefile
View file

@ -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/

6
subsys/bluetooth/common/dummy.c
View file

@ -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 */

4
subsys/bluetooth/common/rpa.c
View file

@ -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;

116
subsys/bluetooth/controller/Kconfig
View file

@ -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

2
subsys/bluetooth/controller/Makefile
View file

@ -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/

6
subsys/bluetooth/controller/hal/debug.h
View file

@ -8,10 +8,10 @@
#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__, \
bt_ctlr_assert_handle(__FILE__, \
__LINE__); \
}
#else

4
subsys/bluetooth/controller/hal/nrf5/debug.h
View file

@ -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_ */

72
subsys/bluetooth/controller/hal/nrf5/radio.c
View file

@ -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)

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

@ -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;

8
subsys/bluetooth/controller/hci/hci_driver.c
View file

@ -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.");

18
subsys/bluetooth/controller/include/ll.h
View file

@ -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_ */

841
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

File diff suppressed because it is too large Load diff

108
subsys/bluetooth/controller/ll_sw/ctrl.h
View file

@ -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);

52
subsys/bluetooth/controller/ll_sw/ctrl_internal.h
View file

@ -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 \

9
subsys/bluetooth/controller/ll_sw/ll.c
View file

@ -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);

38
subsys/bluetooth/controller/ll_sw/ll_adv.c
View file

@ -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;
}

10
subsys/bluetooth/controller/ll_sw/ll_adv.h
View file

@ -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);

60
subsys/bluetooth/controller/ll_sw/ll_filter.c
View file

@ -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 */
}

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

@ -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()) {

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

@ -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) &&

24
subsys/bluetooth/controller/ll_sw/pdu.h
View file

@ -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;

8
subsys/bluetooth/host/Kconfig
View file

@ -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

4
subsys/bluetooth/shell/Makefile
View file

@ -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

4
subsys/bluetooth/shell/bt.c
View file

@ -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, "<on off> [coded] [anon] [txp]" },
{ "scanx", cmd_scanx, "<on passive off> [coded]" },
#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */
#endif /* CONFIG_BT_CTLR_ADV_EXT */
{ NULL, NULL, NULL }
};

4
subsys/bluetooth/shell/ll.c
View file

@ -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 */

10
tests/bluetooth/init/prj_controller.conf
View file

@ -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

40
tests/bluetooth/init/prj_controller_4_0.conf
View file

@ -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

46
tests/bluetooth/init/prj_controller_dbg.conf
View file

@ -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

40
tests/bluetooth/init/prj_controller_tiny.conf
View file

@ -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

16
tests/bluetooth/mesh/dbg.conf
View file

@ -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

16
tests/bluetooth/mesh/friend.conf
View file

@ -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

16
tests/bluetooth/mesh/gatt.conf
View file

@ -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

16
tests/bluetooth/mesh/lpn.conf
View file

@ -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

16
tests/bluetooth/mesh/microbit.conf
View file

@ -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

16
tests/bluetooth/mesh/microbit_gatt.conf
View file

@ -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

2
tests/bluetooth/mesh/nrf51-16k.conf
View file

@ -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

16
tests/bluetooth/mesh/pb_gatt.conf
View file

@ -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

16
tests/bluetooth/mesh/prj.conf
View file

@ -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

16
tests/bluetooth/mesh/proxy.conf
View file

@ -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