From 2975ca07543a648ed23b2db3fa8fdb7c6c86d32b Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 9 Aug 2017 09:21:11 +0300 Subject: [PATCH] Bluetooth: Kconfig: Rename CONFIG_BLUETOOTH_* to CONFIG_BT_* The API name space for Bluetooth is bt_* and BT_* so it makes sense to align the Kconfig name space with this. The additional benefit is that this also makes the names shorter. It is also in line with what Linux uses for Bluetooth Kconfig entries. Some Bluetooth-related Networking Kconfig defines are renamed as well in order to be consistent, such as NET_L2_BLUETOOTH. Signed-off-by: Johan Hedberg --- .../soc/quark_se_c1000_ss/Kconfig.defconfig | 6 +- arch/x86/soc/atom/Kconfig.defconfig | 8 +- arch/x86/soc/ia32/Kconfig.defconfig | 8 +- .../quark_se/Kconfig.defconfig.series | 6 +- .../quark_x1000/Kconfig.defconfig.series | 4 +- .../96b_carbon_nrf51_defconfig | 4 +- .../arm/96b_nitrogen/96b_nitrogen_defconfig | 4 +- .../arduino_101_ble/arduino_101_ble_defconfig | 4 +- .../arm/bbc_microbit/bbc_microbit_defconfig | 4 +- boards/arm/curie_ble/curie_ble_defconfig | 4 +- boards/arm/frdm_k64f/Kconfig.defconfig | 2 +- boards/arm/hexiwear_k64/Kconfig.defconfig | 2 +- .../arm/nrf51_blenano/nrf51_blenano_defconfig | 4 +- .../nrf51_pca10028/nrf51_pca10028_defconfig | 4 +- .../nrf51_vbluno51/nrf51_vbluno51_defconfig | 4 +- .../nrf52840_pca10056_defconfig | 4 +- .../nrf52_blenano2/nrf52_blenano2_defconfig | 4 +- .../nrf52_pca10040/nrf52_pca10040_defconfig | 4 +- .../nrf52_vbluno52/nrf52_vbluno52_defconfig | 4 +- .../quark_se_c1000_ble_defconfig | 4 +- boards/x86/arduino_101/doc/board.rst | 4 +- boards/x86/panther/Kconfig.defconfig | 8 +- .../quark_se_c1000_devboard/Kconfig.defconfig | 8 +- doc/api/bluetooth.rst | 4 +- doc/subsystems/test/sanitycheck.rst | 2 +- doc/zephyr.doxyfile | 4 +- drivers/Makefile | 2 +- drivers/bluetooth/Kconfig | 16 +- drivers/bluetooth/Makefile | 2 +- drivers/bluetooth/hci/Kconfig | 54 +- drivers/bluetooth/hci/Makefile | 6 +- drivers/bluetooth/hci/h4.c | 14 +- drivers/bluetooth/hci/h5.c | 20 +- drivers/bluetooth/hci/spi.c | 66 +- drivers/bluetooth/nrf51_pm.c | 2 +- drivers/flash/Kconfig | 2 +- dts/arm/frdm_k64f.dts | 4 +- dts/arm/hexiwear_k64.dts | 4 +- include/bluetooth/att.h | 4 +- include/bluetooth/bluetooth.h | 2 +- include/bluetooth/buf.h | 3 +- include/bluetooth/conn.h | 10 +- include/bluetooth/gatt.h | 3 +- include/bluetooth/l2cap.h | 8 +- include/bluetooth/mesh.h | 12 +- include/bluetooth/uuid.h | 4 +- include/drivers/bluetooth/hci_driver.h | 4 +- include/net/net_ip.h | 4 +- include/net/net_l2.h | 4 +- samples/bluetooth/beacon/prj.conf | 6 +- samples/bluetooth/beacon/src/main.c | 2 +- samples/bluetooth/bluetooth.rst | 4 +- samples/bluetooth/central/prj.conf | 4 +- samples/bluetooth/central_hr/prj.conf | 10 +- samples/bluetooth/eddystone/prj.conf | 8 +- samples/bluetooth/eddystone/src/main.c | 2 +- samples/bluetooth/gatt/ipss.c | 2 +- samples/bluetooth/handsfree/prj.conf | 16 +- samples/bluetooth/hci_uart/generic.conf | 4 +- samples/bluetooth/hci_uart/microbit.conf | 6 +- samples/bluetooth/hci_uart/nrf5.conf | 10 +- samples/bluetooth/hci_uart/src/main.c | 21 +- samples/bluetooth/hci_usb/prj.conf | 4 +- samples/bluetooth/hci_usb/prj_tinytile.conf | 4 +- samples/bluetooth/hci_usb/src/main.c | 2 +- samples/bluetooth/ipsp/prj.conf | 18 +- samples/bluetooth/ipsp/prj_dbg.conf | 20 +- samples/bluetooth/mesh/microbit.conf | 64 +- samples/bluetooth/mesh/microbit_gatt.conf | 86 +- samples/bluetooth/mesh/nrf51-16k.conf | 66 +- samples/bluetooth/mesh/prj.conf | 98 +-- samples/bluetooth/mesh/src/main.c | 2 +- samples/bluetooth/mesh_demo/microbit.conf | 52 +- samples/bluetooth/mesh_demo/nrf51-16k.conf | 54 +- samples/bluetooth/mesh_demo/prj.conf | 44 +- samples/bluetooth/peripheral/prj.conf | 18 +- samples/bluetooth/peripheral/src/main.c | 2 +- samples/bluetooth/peripheral_csc/prj.conf | 8 +- samples/bluetooth/peripheral_csc/src/main.c | 2 +- samples/bluetooth/peripheral_dis/prj.conf | 6 +- samples/bluetooth/peripheral_dis/src/main.c | 2 +- samples/bluetooth/peripheral_esp/prj.conf | 10 +- samples/bluetooth/peripheral_esp/src/main.c | 2 +- samples/bluetooth/peripheral_hids/prj.conf | 12 +- samples/bluetooth/peripheral_hids/src/main.c | 2 +- samples/bluetooth/peripheral_hr/prj.conf | 12 +- samples/bluetooth/peripheral_hr/src/main.c | 2 +- samples/bluetooth/peripheral_sc_only/prj.conf | 14 +- .../bluetooth/peripheral_sc_only/src/main.c | 2 +- samples/bluetooth/scan_adv/prj.conf | 8 +- .../environmental_sensing/ap/prj.conf | 8 +- samples/boards/microbit/pong/prj.conf | 10 +- samples/boards/microbit/pong/src/ble.c | 2 +- samples/hello_world/sample.yaml | 2 +- samples/net/common/Makefile.common | 2 +- samples/net/echo_client/Makefile | 2 +- samples/net/echo_client/prj_bt.conf | 20 +- samples/net/echo_client/prj_nrf5.conf | 2 +- samples/net/echo_server/Makefile | 2 +- samples/net/echo_server/prj_bt.conf | 22 +- samples/net/echo_server/prj_nrf5.conf | 2 +- samples/net/http_client/Makefile | 2 +- samples/net/http_client/prj_bt.conf | 18 +- samples/net/http_client/src/main.c | 4 +- samples/net/http_server/Makefile | 2 +- samples/net/http_server/prj_bt.conf | 20 +- samples/net/http_server/src/main.c | 4 +- samples/net/https_client/Makefile | 2 +- samples/net/https_client/prj_bt.conf | 18 +- samples/net/https_client/src/main.c | 4 +- samples/net/leds_demo/src/Makefile | 2 +- .../net/mqtt_publisher/prj_96b_nitrogen.conf | 42 +- samples/net/mqtt_publisher/src/main.c | 6 +- samples/net/sockets/echo/Makefile | 2 +- samples/net/sockets/echo_async/Makefile | 2 +- samples/net/zoap_client/Makefile | 2 +- samples/net/zoap_client/prj_bt.conf | 8 +- samples/net/zoap_server/Makefile | 2 +- samples/net/zoap_server/prj_bt.conf | 22 +- samples/net/zperf/Makefile | 2 +- samples/net/zperf/prj_bt.conf | 6 +- scripts/extract_dts_includes.py | 4 +- subsys/Makefile | 2 +- subsys/bluetooth/Kconfig | 64 +- subsys/bluetooth/Makefile | 6 +- subsys/bluetooth/common/Kconfig | 42 +- subsys/bluetooth/common/Makefile | 4 +- subsys/bluetooth/common/dummy.c | 9 +- subsys/bluetooth/common/log.c | 4 +- subsys/bluetooth/common/log.h | 6 +- subsys/bluetooth/common/rpa.c | 10 +- subsys/bluetooth/controller/Kconfig | 144 ++-- subsys/bluetooth/controller/Makefile | 10 +- subsys/bluetooth/controller/hal/debug.h | 2 +- subsys/bluetooth/controller/hal/nrf5/debug.h | 4 +- subsys/bluetooth/controller/hal/nrf5/radio.c | 72 +- subsys/bluetooth/controller/hci/Makefile | 4 +- subsys/bluetooth/controller/hci/hci.c | 302 +++---- subsys/bluetooth/controller/hci/hci_driver.c | 28 +- .../bluetooth/controller/hci/hci_internal.h | 4 +- subsys/bluetooth/controller/include/ll.h | 18 +- subsys/bluetooth/controller/ll_sw/Makefile | 6 +- subsys/bluetooth/controller/ll_sw/crypto.c | 2 +- subsys/bluetooth/controller/ll_sw/ctrl.c | 744 +++++++++--------- subsys/bluetooth/controller/ll_sw/ctrl.h | 116 ++- .../controller/ll_sw/ctrl_internal.h | 44 +- subsys/bluetooth/controller/ll_sw/ll.c | 8 +- subsys/bluetooth/controller/ll_sw/ll_adv.c | 38 +- subsys/bluetooth/controller/ll_sw/ll_adv.h | 10 +- subsys/bluetooth/controller/ll_sw/ll_filter.c | 66 +- subsys/bluetooth/controller/ll_sw/ll_master.c | 2 +- subsys/bluetooth/controller/ll_sw/ll_scan.c | 8 +- subsys/bluetooth/controller/ll_sw/pdu.h | 24 +- subsys/bluetooth/host/Kconfig | 252 +++--- subsys/bluetooth/host/Makefile | 28 +- subsys/bluetooth/host/a2dp.c | 6 +- subsys/bluetooth/host/att.c | 72 +- subsys/bluetooth/host/att_internal.h | 4 +- subsys/bluetooth/host/avdtp.c | 2 +- subsys/bluetooth/host/conn.c | 126 ++- subsys/bluetooth/host/conn_internal.h | 16 +- subsys/bluetooth/host/crypto.c | 2 +- subsys/bluetooth/host/gatt.c | 24 +- subsys/bluetooth/host/gatt_internal.h | 4 +- subsys/bluetooth/host/hci_core.c | 260 +++--- subsys/bluetooth/host/hci_core.h | 22 +- subsys/bluetooth/host/hci_ecc.c | 8 +- subsys/bluetooth/host/hci_raw.c | 8 +- subsys/bluetooth/host/hfp_hf.c | 10 +- subsys/bluetooth/host/hfp_internal.h | 6 +- subsys/bluetooth/host/keys.c | 4 +- subsys/bluetooth/host/keys.h | 8 +- subsys/bluetooth/host/keys_br.c | 4 +- subsys/bluetooth/host/l2cap.c | 80 +- subsys/bluetooth/host/l2cap_br.c | 12 +- subsys/bluetooth/host/l2cap_internal.h | 10 +- subsys/bluetooth/host/mesh/Kconfig | 136 ++-- subsys/bluetooth/host/mesh/Makefile | 12 +- subsys/bluetooth/host/mesh/access.c | 2 +- subsys/bluetooth/host/mesh/adv.c | 10 +- subsys/bluetooth/host/mesh/beacon.c | 10 +- subsys/bluetooth/host/mesh/cfg.c | 69 +- subsys/bluetooth/host/mesh/crypto.c | 8 +- subsys/bluetooth/host/mesh/friend.c | 6 +- subsys/bluetooth/host/mesh/friend.h | 2 +- subsys/bluetooth/host/mesh/health.c | 2 +- subsys/bluetooth/host/mesh/lpn.c | 32 +- subsys/bluetooth/host/mesh/lpn.h | 4 +- subsys/bluetooth/host/mesh/main.c | 30 +- subsys/bluetooth/host/mesh/net.c | 68 +- subsys/bluetooth/host/mesh/net.h | 18 +- subsys/bluetooth/host/mesh/prov.c | 46 +- subsys/bluetooth/host/mesh/proxy.c | 50 +- subsys/bluetooth/host/mesh/test.h | 2 +- subsys/bluetooth/host/mesh/transport.c | 28 +- subsys/bluetooth/host/mesh/transport.h | 2 +- subsys/bluetooth/host/monitor.c | 12 +- subsys/bluetooth/host/monitor.h | 6 +- subsys/bluetooth/host/rfcomm.c | 14 +- subsys/bluetooth/host/rfcomm_internal.h | 2 +- subsys/bluetooth/host/sdp.c | 8 +- subsys/bluetooth/host/smp.c | 259 +++--- subsys/bluetooth/host/smp_null.c | 4 +- subsys/bluetooth/host/storage.c | 2 +- subsys/bluetooth/host/uuid.c | 4 +- subsys/bluetooth/shell/Kconfig | 2 +- subsys/bluetooth/shell/Makefile | 4 +- subsys/bluetooth/shell/bt.c | 80 +- subsys/bluetooth/shell/gatt.c | 4 +- subsys/bluetooth/shell/ll.c | 4 +- subsys/bluetooth/shell/ticker.c | 4 +- subsys/net/TODO | 2 +- subsys/net/ip/Kconfig | 4 +- subsys/net/ip/l2/Kconfig | 32 +- subsys/net/ip/l2/Makefile | 4 +- subsys/net/ip/l2/bluetooth.c | 34 +- subsys/net/ip/tcp.c | 2 +- subsys/net/lib/app/Kconfig | 8 +- subsys/net/lib/app/Makefile | 2 +- subsys/net/lib/app/bt_settings.c | 4 +- subsys/net/lib/app/bt_settings.h | 2 +- tests/benchmarks/latency_measure/prj.conf | 2 +- tests/bluetooth/bluetooth/prj.conf | 6 +- tests/bluetooth/init/prj.conf | 4 +- tests/bluetooth/init/prj_0.conf | 2 +- tests/bluetooth/init/prj_1.conf | 4 +- tests/bluetooth/init/prj_10.conf | 16 +- tests/bluetooth/init/prj_11.conf | 20 +- tests/bluetooth/init/prj_12.conf | 18 +- tests/bluetooth/init/prj_13.conf | 18 +- tests/bluetooth/init/prj_14.conf | 12 +- tests/bluetooth/init/prj_15.conf | 12 +- tests/bluetooth/init/prj_16.conf | 12 +- tests/bluetooth/init/prj_17.conf | 42 +- tests/bluetooth/init/prj_18.conf | 6 +- tests/bluetooth/init/prj_19.conf | 6 +- tests/bluetooth/init/prj_2.conf | 4 +- tests/bluetooth/init/prj_20.conf | 54 +- tests/bluetooth/init/prj_21.conf | 42 +- tests/bluetooth/init/prj_22.conf | 8 +- tests/bluetooth/init/prj_3.conf | 6 +- tests/bluetooth/init/prj_4.conf | 6 +- tests/bluetooth/init/prj_5.conf | 6 +- tests/bluetooth/init/prj_6.conf | 8 +- tests/bluetooth/init/prj_7.conf | 10 +- tests/bluetooth/init/prj_8.conf | 12 +- tests/bluetooth/init/prj_9.conf | 14 +- tests/bluetooth/init/prj_controller.conf | 32 +- tests/bluetooth/init/prj_controller_4_0.conf | 58 +- tests/bluetooth/init/prj_controller_dbg.conf | 88 +-- tests/bluetooth/init/prj_controller_tiny.conf | 60 +- tests/bluetooth/init/prj_h5.conf | 4 +- tests/bluetooth/init/prj_h5_dbg.conf | 8 +- tests/bluetooth/mesh/dbg.conf | 96 +-- tests/bluetooth/mesh/friend.conf | 86 +- tests/bluetooth/mesh/gatt.conf | 96 +-- tests/bluetooth/mesh/lpn.conf | 96 +-- tests/bluetooth/mesh/microbit.conf | 62 +- tests/bluetooth/mesh/microbit_gatt.conf | 80 +- tests/bluetooth/mesh/nrf51-16k.conf | 52 +- tests/bluetooth/mesh/pb_gatt.conf | 96 +-- tests/bluetooth/mesh/prj.conf | 96 +-- tests/bluetooth/mesh/proxy.conf | 96 +-- tests/bluetooth/mesh/src/main.c | 10 +- tests/bluetooth/shell/arduino_101.conf | 28 +- tests/bluetooth/shell/prj.conf | 28 +- tests/bluetooth/shell/prj_br.conf | 30 +- tests/bluetooth/shell/src/main.c | 2 +- tests/bluetooth/tester/default.conf | 18 +- tests/bluetooth/tester/qemu.conf | 34 +- tests/bluetooth/tester/src/Makefile | 2 +- tests/bluetooth/tester/src/bttester.c | 12 +- tests/bluetooth/tester/src/bttester.h | 4 +- tests/bluetooth/tester/src/gap.c | 8 +- tests/kernel/mem_slab/mslab/prj.conf | 2 +- tests/kernel/test_build/newlib.conf | 2 +- tests/net/all/prj.conf | 14 +- tests/net/arp/testcase.yaml | 4 +- tests/net/context/testcase.yaml | 4 +- tests/net/icmpv6/testcase.yaml | 4 +- tests/net/ip-addr/testcase.yaml | 4 +- .../net/lib/http_header_fields/testcase.yaml | 4 +- tests/net/mgmt/testcase.yaml | 4 +- tests/net/neighbor/testcase.yaml | 4 +- tests/net/route/testcase.yaml | 4 +- tests/unit/bluetooth/at/prj.conf | 6 +- 286 files changed, 3405 insertions(+), 3421 deletions(-) diff --git a/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig b/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig index 3c711b210b5..1dda3bd1514 100644 --- a/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig +++ b/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig @@ -229,9 +229,9 @@ config ADC_QMSI_SS def_bool y endif -if BLUETOOTH_H4 +if BT_H4 -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME default UART_QMSI_0_NAME config UART_QMSI_0 @@ -243,7 +243,7 @@ config UART_QMSI_0_BAUDRATE config UART_QMSI_0_HW_FC def_bool y -endif # BLUETOOTH_H4 +endif # BT_H4 if UART_QMSI diff --git a/arch/x86/soc/atom/Kconfig.defconfig b/arch/x86/soc/atom/Kconfig.defconfig index 3eeccbaba41..2702fe48a18 100644 --- a/arch/x86/soc/atom/Kconfig.defconfig +++ b/arch/x86/soc/atom/Kconfig.defconfig @@ -70,9 +70,9 @@ endif # UART_NS16550_PORT_1 endif # UART_NS16550 -if BLUETOOTH_UART +if BT_UART -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME default "UART_1" endif @@ -84,7 +84,7 @@ config UART_PIPE_ON_DEV_NAME endif -config BLUETOOTH_MONITOR_ON_DEV_NAME - default "UART_1" if BLUETOOTH_DEBUG_MONITOR +config BT_MONITOR_ON_DEV_NAME + default "UART_1" if BT_DEBUG_MONITOR endif diff --git a/arch/x86/soc/ia32/Kconfig.defconfig b/arch/x86/soc/ia32/Kconfig.defconfig index 7b24e2d9267..96cfa90c38c 100644 --- a/arch/x86/soc/ia32/Kconfig.defconfig +++ b/arch/x86/soc/ia32/Kconfig.defconfig @@ -70,9 +70,9 @@ endif # UART_NS16550_PORT_1 endif # UART_NS16550 -if BLUETOOTH_UART +if BT_UART -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME default "UART_1" endif @@ -84,7 +84,7 @@ config UART_PIPE_ON_DEV_NAME endif -config BLUETOOTH_MONITOR_ON_DEV_NAME - default "UART_1" if BLUETOOTH_DEBUG_MONITOR +config BT_MONITOR_ON_DEV_NAME + default "UART_1" if BT_DEBUG_MONITOR endif diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series b/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series index e09b3dbb2d6..328e1730c5f 100644 --- a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series +++ b/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series @@ -196,10 +196,10 @@ config RTC_0_IRQ_PRI default 2 endif # RTC -if BLUETOOTH_H4 +if BT_H4 if !HAS_DTS -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME default UART_QMSI_0_NAME endif @@ -214,7 +214,7 @@ endif config UART_QMSI_0_HW_FC def_bool y -endif # BLUETOOTH_H4 +endif # BT_H4 if UART_QMSI diff --git a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series b/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series index 0f3245d36c5..db9a4e3f54b 100644 --- a/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series +++ b/arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series @@ -265,9 +265,9 @@ config UART_CONSOLE_ON_DEV_NAME endif -if BLUETOOTH_UART +if BT_UART -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME default "UART_1" endif diff --git a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig index aaa165a2931..398a80702d2 100644 --- a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig +++ b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig @@ -15,8 +15,8 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y # spi CONFIG_SPI=y diff --git a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig index fb027a1d692..92bbac2dede 100644 --- a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig +++ b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig @@ -18,5 +18,5 @@ CONFIG_UART_CONSOLE=y CONFIG_GPIO_AS_PINRESET=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/arduino_101_ble/arduino_101_ble_defconfig b/boards/arm/arduino_101_ble/arduino_101_ble_defconfig index 95291a95c1f..a9870739f54 100644 --- a/boards/arm/arduino_101_ble/arduino_101_ble_defconfig +++ b/boards/arm/arduino_101_ble/arduino_101_ble_defconfig @@ -9,5 +9,5 @@ CONFIG_SERIAL=y CONFIG_UART_NRF5=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/bbc_microbit/bbc_microbit_defconfig b/boards/arm/bbc_microbit/bbc_microbit_defconfig index da7eef89a77..9f46bbdafaa 100644 --- a/boards/arm/bbc_microbit/bbc_microbit_defconfig +++ b/boards/arm/bbc_microbit/bbc_microbit_defconfig @@ -17,5 +17,5 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/curie_ble/curie_ble_defconfig b/boards/arm/curie_ble/curie_ble_defconfig index 2ebcb393c03..83eb00f8043 100644 --- a/boards/arm/curie_ble/curie_ble_defconfig +++ b/boards/arm/curie_ble/curie_ble_defconfig @@ -9,5 +9,5 @@ CONFIG_SERIAL=y CONFIG_UART_NRF5=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/frdm_k64f/Kconfig.defconfig b/boards/arm/frdm_k64f/Kconfig.defconfig index 5fe7489fc47..b16d6a658ea 100644 --- a/boards/arm/frdm_k64f/Kconfig.defconfig +++ b/boards/arm/frdm_k64f/Kconfig.defconfig @@ -28,7 +28,7 @@ config UART_MCUX_0 def_bool y if UART_CONSOLE config UART_MCUX_3 - def_bool y if BLUETOOTH_UART + def_bool y if BT_UART endif # UART_MCUX diff --git a/boards/arm/hexiwear_k64/Kconfig.defconfig b/boards/arm/hexiwear_k64/Kconfig.defconfig index ada55e66a38..27fe427094c 100644 --- a/boards/arm/hexiwear_k64/Kconfig.defconfig +++ b/boards/arm/hexiwear_k64/Kconfig.defconfig @@ -28,7 +28,7 @@ config UART_MCUX_0 def_bool y if UART_CONSOLE config UART_MCUX_4 - def_bool y if BLUETOOTH_UART + def_bool y if BT_UART endif # UART_MCUX diff --git a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig index c7af5b93bdb..d4bbe59f511 100644 --- a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig +++ b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig @@ -13,5 +13,5 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig b/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig index 147a800f298..40dc7644d7a 100644 --- a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig +++ b/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig @@ -13,5 +13,5 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig index bb550e1e535..cd7d49832c1 100644 --- a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig +++ b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig @@ -13,5 +13,5 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig index 3578fe73ed8..58e4deb9aa5 100644 --- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig +++ b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig @@ -19,5 +19,5 @@ CONFIG_UART_CONSOLE=y CONFIG_GPIO_AS_PINRESET=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig index aed60ff7080..86102b57215 100644 --- a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig +++ b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig @@ -16,5 +16,5 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig index 1a87f5654f0..365ef1c0c5b 100644 --- a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig +++ b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig @@ -19,5 +19,5 @@ CONFIG_UART_CONSOLE=y CONFIG_GPIO_AS_PINRESET=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig index befd581dc80..ad89d93d1b2 100644 --- a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig +++ b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig @@ -19,5 +19,5 @@ CONFIG_UART_CONSOLE=y CONFIG_GPIO_AS_PINRESET=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig b/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig index 0f3a6e6510e..80448f7c0d4 100644 --- a/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig +++ b/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig @@ -9,5 +9,5 @@ CONFIG_SERIAL=y CONFIG_UART_NRF5=y # bluetooth -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y +CONFIG_BT=y +CONFIG_BT_CONTROLLER=y diff --git a/boards/x86/arduino_101/doc/board.rst b/boards/x86/arduino_101/doc/board.rst index b67d85798fa..6cd5b0d0e32 100644 --- a/boards/x86/arduino_101/doc/board.rst +++ b/boards/x86/arduino_101/doc/board.rst @@ -495,11 +495,11 @@ building your application: .. code-block:: console - CONFIG_BLUETOOTH_DEBUG_MONITOR=y + CONFIG_BT_DEBUG_MONITOR=y CONFIG_UART_CONSOLE=n CONFIG_UART_QMSI_1_BAUDRATE=1000000 -The first item replaces the BLUETOOTH_DEBUG_LOG option, the second one +The first item replaces the BT_DEBUG_LOG option, the second one disables the default printk/printf hooks, and the third one matches the console baudrate with what's used to communicate with the nRF51, in order not to create a bottleneck. diff --git a/boards/x86/panther/Kconfig.defconfig b/boards/x86/panther/Kconfig.defconfig index 4e31fe33237..19f072c02da 100644 --- a/boards/x86/panther/Kconfig.defconfig +++ b/boards/x86/panther/Kconfig.defconfig @@ -4,9 +4,9 @@ if BOARD_PANTHER config BOARD default "panther" -if BLUETOOTH_H4 +if BT_H4 -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME default UART_QMSI_0_NAME config UART_QMSI_0_BAUDRATE @@ -24,7 +24,7 @@ config UART_PIPE_ON_DEV_NAME endif -config BLUETOOTH_MONITOR_ON_DEV_NAME - default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR +config BT_MONITOR_ON_DEV_NAME + default UART_QMSI_1_NAME if BT_DEBUG_MONITOR endif # BOARD_PANTHER diff --git a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig index fb2e2012999..ab32021799f 100644 --- a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig +++ b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig @@ -4,9 +4,9 @@ if BOARD_QUARK_SE_C1000_DEVBOARD config BOARD default "quark_se_c1000_devboard" -if BLUETOOTH_H4 +if BT_H4 -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME default UART_QMSI_0_NAME config UART_QMSI_0_BAUDRATE @@ -31,8 +31,8 @@ config BUSY_WAIT_USES_ALTERNATE_CLOCK endif -config BLUETOOTH_MONITOR_ON_DEV_NAME - default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR +config BT_MONITOR_ON_DEV_NAME + default UART_QMSI_1_NAME if BT_DEBUG_MONITOR if IEEE802154_CC2520 diff --git a/doc/api/bluetooth.rst b/doc/api/bluetooth.rst index 421a43f0420..a4241f278de 100644 --- a/doc/api/bluetooth.rst +++ b/doc/api/bluetooth.rst @@ -12,8 +12,8 @@ This is the full set of available Bluetooth APIs. It's important to note that the set that will in practice be available for the application depends on the exact Kconfig options that have been chosen, since most of the Bluetooth functionality is build-time selectable. E.g. any -connection-related APIs require :option:`CONFIG_BLUETOOTH_CONN` and any -BR/EDR (Bluetooth Classic) APIs require :option:`CONFIG_BLUETOOTH_BREDR`. +connection-related APIs require :option:`CONFIG_BT_CONN` and any +BR/EDR (Bluetooth Classic) APIs require :option:`CONFIG_BT_BREDR`. Generic Access Profile (GAP) **************************** diff --git a/doc/subsystems/test/sanitycheck.rst b/doc/subsystems/test/sanitycheck.rst index 513ddbd0e02..dac59f35ee6 100644 --- a/doc/subsystems/test/sanitycheck.rst +++ b/doc/subsystems/test/sanitycheck.rst @@ -284,7 +284,7 @@ related to the sample and what is being demonstrated: - singlethread: build_only: true extra_args: CONF_FILE=prj_single.conf - filter: not CONFIG_BLUETOOTH and not CONFIG_GPIO_SCH + filter: not CONFIG_BT and not CONFIG_GPIO_SCH tags: samples tests min_ram: 16 diff --git a/doc/zephyr.doxyfile b/doc/zephyr.doxyfile index 06c018dcb6a..a993b8c240a 100644 --- a/doc/zephyr.doxyfile +++ b/doc/zephyr.doxyfile @@ -277,8 +277,8 @@ PREDEFINED = "CONFIG_SYS_CLOCK_EXISTS=y" \ "CONFIG_UART_DRV_CMD=y" \ "CONFIG_SYS_POWER_MANAGEMENT=y" \ "CONFIG_DEVICE_POWER_MANAGEMENT=y" \ - "CONFIG_BLUETOOTH_SMP=y" \ - "CONFIG_BLUETOOTH_BREDR=y" \ + "CONFIG_BT_SMP=y" \ + "CONFIG_BT_BREDR=y" \ "__deprecated=" \ "__printf_like(x, y)=" \ "__attribute(x)__=" diff --git a/drivers/Makefile b/drivers/Makefile index 8fe8bbcfefe..43a02828089 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_SYS_CLOCK_EXISTS) += timer/ obj-y += interrupt_controller/ obj-$(CONFIG_GROVE) += grove/ obj-$(CONFIG_PCI) += pci/ -obj-$(CONFIG_BLUETOOTH) += bluetooth/ +obj-$(CONFIG_BT) += bluetooth/ obj-$(CONFIG_SHARED_IRQ) += shared_irq/ obj-$(CONFIG_SPI) += spi/ obj-$(CONFIG_FLASH) += flash/ diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 4c0697a44bc..cf0c7bad626 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -10,28 +10,28 @@ # Bluetooth options # -if BLUETOOTH +if BT menu "Bluetooth Drivers" -if BLUETOOTH_HCI +if BT_HCI source "drivers/bluetooth/hci/Kconfig" endif -if BLUETOOTH_CUSTOM +if BT_CUSTOM # Insert here any custom (non-HCI) offload drives endif -config BLUETOOTH_NRF51_PM +config BT_NRF51_PM bool "nRF51 Power Management [EXPERIMENTAL]" - depends on BLUETOOTH_H4 + depends on BT_H4 help Power Management support for Nordic BLE nRF51 chip. Allows to enable, disable the chip and handle wakeups. -config BLUETOOTH_WAIT_NOP +config BT_WAIT_NOP bool "Wait for \"NOP\" Command Complete event during init" - depends on BLUETOOTH_HCI + depends on BT_HCI help Some controllers emit a Command Complete event for the NOP opcode to indicate that they're ready to receive commands. @@ -40,4 +40,4 @@ config BLUETOOTH_WAIT_NOP endmenu -endif # BLUETOOTH +endif # BT diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index df408816eca..205304bfd85 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -1,4 +1,4 @@ ccflags-y += -I$(srctree)/subsys/bluetooth obj-y += hci/ -obj-$(CONFIG_BLUETOOTH_NRF51_PM) += nrf51_pm.o +obj-$(CONFIG_BT_NRF51_PM) += nrf51_pm.o diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig index 3391b97d275..480c9b45575 100644 --- a/drivers/bluetooth/hci/Kconfig +++ b/drivers/bluetooth/hci/Kconfig @@ -10,35 +10,35 @@ comment "Bluetooth HCI Driver Options" # Controller support is an HCI driver in itself, so these HCI driver # options are only applicable if controller support hasn't been enabled. -if !BLUETOOTH_CONTROLLER +if !BT_CONTROLLER -config BLUETOOTH_UART +config BT_UART bool choice prompt "Bluetooth HCI driver" - default BLUETOOTH_H4 + default BT_H4 -config BLUETOOTH_H4 +config BT_H4 bool "H:4 UART" select UART_INTERRUPT_DRIVEN - select BLUETOOTH_UART - select BLUETOOTH_RECV_IS_RX_THREAD + select BT_UART + select BT_RECV_IS_RX_THREAD depends on SERIAL help Bluetooth H:4 UART driver. Requires hardware flow control lines to be available. -config BLUETOOTH_H5 +config BT_H5 bool "H:5 UART [EXPERIMENTAL]" select UART_INTERRUPT_DRIVEN - select BLUETOOTH_UART + select BT_UART depends on SERIAL help Bluetooth three-wire (H:5) UART driver. Implementation of HCI Three-Wire UART Transport Layer. -config BLUETOOTH_SPI +config BT_SPI bool "SPI HCI" depends on SPI help @@ -48,7 +48,7 @@ config BLUETOOTH_SPI additional platform specific knowledge may need to be added as devices are. -config BLUETOOTH_NO_DRIVER +config BT_NO_DRIVER bool "No default HCI driver" help This is intended for unit tests where no internal driver @@ -56,22 +56,22 @@ config BLUETOOTH_NO_DRIVER endchoice -endif # !BLUETOOTH_CONTROLLER +endif # !BT_CONTROLLER if !HAS_DTS -config BLUETOOTH_UART_ON_DEV_NAME +config BT_UART_ON_DEV_NAME string "Device Name of UART Device for Bluetooth" default "UART_0" - depends on BLUETOOTH_UART + depends on BT_UART help This option specifies the name of UART device to be used for Bluetooth. endif -config BLUETOOTH_SPI_DEV_NAME +config BT_SPI_DEV_NAME string "Device Name of SPI Device for Bluetooth" default "SPI_0" - depends on BLUETOOTH_SPI + depends on BT_SPI help This option specifies the name of SPI device to be used for Bluetooth. On the controller side, this SPI device is used to encapsulate the @@ -79,56 +79,56 @@ config BLUETOOTH_SPI_DEV_NAME this device is used to reply back with HCI frames that are sent over the air. -if BLUETOOTH_SPI +if BT_SPI -config BLUETOOTH_SPI_BLUENRG +config BT_SPI_BLUENRG bool "Enable compatibility with BlueNRG-based devices" default n help Enable support for devices compatible with the BlueNRG Bluetooth Stack. Current driver supports: ST X-NUCLEO BLE series. -config BLUETOOTH_SPI_CHIP_SELECT_DEV_NAME +config BT_SPI_CHIP_SELECT_DEV_NAME string "Chip Select (CS) line driver name" - depends on BLUETOOTH_SPI_BLUENRG + depends on BT_SPI_BLUENRG help This option specifies the name of GPIO driver controlling the Chip Select (CS) line. -config BLUETOOTH_SPI_IRQ_DEV_NAME +config BT_SPI_IRQ_DEV_NAME string "IRQ line driver name" help This option specifies the name of GPIO driver controlling the chip's IRQ line. -config BLUETOOTH_SPI_RESET_DEV_NAME +config BT_SPI_RESET_DEV_NAME string "Reset line driver name" help This option specifies the name of GPIO driver controlling the chip's Reset line. -config BLUETOOTH_SPI_CHIP_SELECT_PIN +config BT_SPI_CHIP_SELECT_PIN int "SPI Chip Select (CS) line number" - depends on BLUETOOTH_SPI_BLUENRG + depends on BT_SPI_BLUENRG help This option specifies the Chip Select (CS) line number on the SPI device -config BLUETOOTH_SPI_IRQ_PIN +config BT_SPI_IRQ_PIN int "SPI IRQ line number" help This option specifies the IRQ line number on the SPI device -config BLUETOOTH_SPI_RESET_PIN +config BT_SPI_RESET_PIN int "SPI Reset line number" help This option specifies the Reset line number on the SPI device -config BLUETOOTH_SPI_MAX_CLK_FREQ +config BT_SPI_MAX_CLK_FREQ int "Maximum clock frequency for the HCI SPI interface" default 5000000 help This option specifies the maximum clock rate the HCI SPI interface is capable of running at. -endif # BLUETOOTH_SPI +endif # BT_SPI diff --git a/drivers/bluetooth/hci/Makefile b/drivers/bluetooth/hci/Makefile index 5472828e1f8..d1761b2ba29 100644 --- a/drivers/bluetooth/hci/Makefile +++ b/drivers/bluetooth/hci/Makefile @@ -1,5 +1,5 @@ ccflags-y += -I$(srctree)/subsys/bluetooth -obj-$(CONFIG_BLUETOOTH_H4) += h4.o -obj-$(CONFIG_BLUETOOTH_H5) += h5.o -obj-$(CONFIG_BLUETOOTH_SPI) += spi.o +obj-$(CONFIG_BT_H4) += h4.o +obj-$(CONFIG_BT_H5) += h5.o +obj-$(CONFIG_BT_SPI) += spi.o diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c index e9b7673cee7..242a2c5431b 100644 --- a/drivers/bluetooth/hci/h4.c +++ b/drivers/bluetooth/hci/h4.c @@ -22,12 +22,12 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #include "../util.h" -#if defined(CONFIG_BLUETOOTH_NRF51_PM) +#if defined(CONFIG_BT_NRF51_PM) #include "../nrf51_pm.h" #endif @@ -37,7 +37,7 @@ #define H4_SCO 0x03 #define H4_EVT 0x04 -static BT_STACK_NOINIT(rx_thread_stack, CONFIG_BLUETOOTH_RX_STACK_SIZE); +static BT_STACK_NOINIT(rx_thread_stack, CONFIG_BT_RX_STACK_SIZE); static struct k_thread rx_thread_data; static struct { @@ -123,7 +123,7 @@ static inline void get_evt_hdr(void) rx.remaining++; rx.hdr_len++; break; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) case BT_HCI_EVT_INQUIRY_RESULT_WITH_RSSI: case BT_HCI_EVT_EXTENDED_INQUIRY_RESULT: rx.discardable = true; @@ -429,7 +429,7 @@ static int h4_open(void) uart_irq_rx_disable(h4_dev); uart_irq_tx_disable(h4_dev); -#if defined(CONFIG_BLUETOOTH_NRF51_PM) +#if defined(CONFIG_BT_NRF51_PM) if (nrf51_init(h4_dev) < 0) { return -EIO; } @@ -442,7 +442,7 @@ static int h4_open(void) k_thread_create(&rx_thread_data, rx_thread_stack, K_THREAD_STACK_SIZEOF(rx_thread_stack), rx_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO), + K_PRIO_COOP(CONFIG_BT_RX_PRIO), 0, K_NO_WAIT); return 0; @@ -459,7 +459,7 @@ static int _bt_uart_init(struct device *unused) { ARG_UNUSED(unused); - h4_dev = device_get_binding(CONFIG_BLUETOOTH_UART_ON_DEV_NAME); + h4_dev = device_get_binding(CONFIG_BT_UART_ON_DEV_NAME); if (!h4_dev) { return -EINVAL; } diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c index 82c1ee36f77..55b00c175e4 100644 --- a/drivers/bluetooth/hci/h5.c +++ b/drivers/bluetooth/hci/h5.c @@ -24,7 +24,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #include "../util.h" @@ -120,12 +120,10 @@ static u8_t conf_req[3] = { 0x03, 0xfc }; static const u8_t conf_rsp[] = { 0x04, 0x7b }; /* H5 signal buffers pool */ -#define CONFIG_BLUETOOTH_MAX_SIG_LEN 3 -#define CONFIG_BLUETOOTH_SIGNAL_COUNT 2 -#define SIG_BUF_SIZE (CONFIG_BLUETOOTH_HCI_RESERVE + \ - CONFIG_BLUETOOTH_MAX_SIG_LEN) -NET_BUF_POOL_DEFINE(h5_pool, CONFIG_BLUETOOTH_SIGNAL_COUNT, SIG_BUF_SIZE, 0, - NULL); +#define MAX_SIG_LEN 3 +#define SIGNAL_COUNT 2 +#define SIG_BUF_SIZE (CONFIG_BT_HCI_RESERVE + MAX_SIG_LEN) +NET_BUF_POOL_DEFINE(h5_pool, SIGNAL_COUNT, SIG_BUF_SIZE, 0, NULL); static struct device *h5_dev; @@ -229,7 +227,7 @@ static void h5_print_header(const u8_t *hdr, const char *str) } } -#if defined(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#if defined(CONFIG_BT_DEBUG_HCI_DRIVER) static void hexdump(const char *str, const u8_t *packet, size_t length) { int n = 0; @@ -720,14 +718,14 @@ static void h5_init(void) k_thread_create(&tx_thread_data, tx_stack, K_THREAD_STACK_SIZEOF(tx_stack), (k_thread_entry_t)tx_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BLUETOOTH_HCI_TX_PRIO), + K_PRIO_COOP(CONFIG_BT_HCI_TX_PRIO), 0, K_NO_WAIT); k_fifo_init(&h5.rx_queue); k_thread_create(&rx_thread_data, rx_stack, K_THREAD_STACK_SIZEOF(rx_stack), (k_thread_entry_t)rx_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO), + K_PRIO_COOP(CONFIG_BT_RX_PRIO), 0, K_NO_WAIT); /* Unack queue */ @@ -767,7 +765,7 @@ static int _bt_uart_init(struct device *unused) { ARG_UNUSED(unused); - h5_dev = device_get_binding(CONFIG_BLUETOOTH_UART_ON_DEV_NAME); + h5_dev = device_get_binding(CONFIG_BT_UART_ON_DEV_NAME); if (h5_dev == NULL) { return -EINVAL; diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c index 5ddeb5ebe05..3033f8eb1ff 100644 --- a/drivers/bluetooth/hci/spi.c +++ b/drivers/bluetooth/hci/spi.c @@ -14,7 +14,7 @@ #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #define HCI_CMD 0x01 @@ -43,11 +43,11 @@ #define CMD_OGF 1 #define CMD_OCF 2 -#define GPIO_IRQ_PIN CONFIG_BLUETOOTH_SPI_IRQ_PIN -#define GPIO_RESET_PIN CONFIG_BLUETOOTH_SPI_RESET_PIN -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) -#define GPIO_CS_PIN CONFIG_BLUETOOTH_SPI_CHIP_SELECT_PIN -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#define GPIO_IRQ_PIN CONFIG_BT_SPI_IRQ_PIN +#define GPIO_RESET_PIN CONFIG_BT_SPI_RESET_PIN +#if defined(CONFIG_BT_SPI_BLUENRG) +#define GPIO_CS_PIN CONFIG_BT_SPI_CHIP_SELECT_PIN +#endif /* CONFIG_BT_SPI_BLUENRG */ /* Max SPI buffer length for transceive operations. * @@ -62,9 +62,9 @@ static u8_t rxmsg[SPI_MAX_MSG_LEN]; static u8_t txmsg[SPI_MAX_MSG_LEN]; static struct device *spi_dev; -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) +#if defined(CONFIG_BT_SPI_BLUENRG) static struct device *cs_dev; -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ static struct device *irq_dev; static struct device *rst_dev; @@ -79,10 +79,10 @@ static struct k_thread rx_thread_data; static struct spi_config spi_conf = { .config = SPI_WORD(8), - .max_sys_freq = CONFIG_BLUETOOTH_SPI_MAX_CLK_FREQ, + .max_sys_freq = CONFIG_BT_SPI_MAX_CLK_FREQ, }; -#if defined(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#if defined(CONFIG_BT_DEBUG_HCI_DRIVER) #include static inline void spi_dump_message(const u8_t *pre, u8_t *buf, u8_t size) @@ -149,10 +149,10 @@ static void bt_spi_rx_thread(void) k_sem_take(&sem_busy, K_FOREVER); do { -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) +#if defined(CONFIG_BT_SPI_BLUENRG) gpio_pin_write(cs_dev, GPIO_CS_PIN, 1); gpio_pin_write(cs_dev, GPIO_CS_PIN, 0); -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ spi_transceive(spi_dev, header_master, 5, header_slave, 5); } while (header_slave[STATUS_HEADER_TOREAD] == 0 || @@ -164,9 +164,9 @@ static void bt_spi_rx_thread(void) } while (rxmsg[0] == 0); gpio_pin_enable_callback(irq_dev, GPIO_IRQ_PIN); -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) +#if defined(CONFIG_BT_SPI_BLUENRG) gpio_pin_write(cs_dev, GPIO_CS_PIN, 1); -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ k_sem_give(&sem_busy); spi_dump_message("RX:ed", rxmsg, size); @@ -248,10 +248,10 @@ static int bt_spi_send(struct net_buf *buf) /* Poll sanity values until device has woken-up */ do { -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) +#if defined(CONFIG_BT_SPI_BLUENRG) gpio_pin_write(cs_dev, GPIO_CS_PIN, 1); gpio_pin_write(cs_dev, GPIO_CS_PIN, 0); -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ spi_transceive(spi_dev, header, 5, rxmsg, 5); /* @@ -267,15 +267,15 @@ static int bt_spi_send(struct net_buf *buf) spi_transceive(spi_dev, buf->data, buf->len, rxmsg, buf->len); } while (rxmsg[0] == 0); -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) +#if defined(CONFIG_BT_SPI_BLUENRG) /* Deselect chip */ gpio_pin_write(cs_dev, GPIO_CS_PIN, 1); -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ k_sem_give(&sem_busy); spi_dump_message("TX:ed", buf->data, buf->len); -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) +#if defined(CONFIG_BT_SPI_BLUENRG) /* * Since a RESET has been requested, the chip will now restart. * Unfortunately the BlueNRG will reply with "reset received" but @@ -286,7 +286,7 @@ static int bt_spi_send(struct net_buf *buf) if (bt_spi_get_cmd(buf->data) == BT_HCI_OP_RESET) { k_sem_take(&sem_initialised, K_FOREVER); } -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ net_buf_unref(buf); @@ -302,12 +302,12 @@ static int bt_spi_open(void) spi_configure(spi_dev, &spi_conf); -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) +#if defined(CONFIG_BT_SPI_BLUENRG) /* Configure the CS (Chip Select) pin */ gpio_pin_configure(cs_dev, GPIO_CS_PIN, GPIO_DIR_OUT | GPIO_PUD_PULL_UP); gpio_pin_write(cs_dev, GPIO_CS_PIN, 1); -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ /* Configure IRQ pin and the IRQ call-back/handler */ gpio_pin_configure(irq_dev, GPIO_IRQ_PIN, @@ -328,7 +328,7 @@ static int bt_spi_open(void) k_thread_create(&rx_thread_data, rx_stack, K_THREAD_STACK_SIZEOF(rx_stack), (k_thread_entry_t)bt_spi_rx_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO), + K_PRIO_COOP(CONFIG_BT_RX_PRIO), 0, K_NO_WAIT); /* Take BLE out of reset */ @@ -351,33 +351,33 @@ static int _bt_spi_init(struct device *unused) { ARG_UNUSED(unused); - spi_dev = device_get_binding(CONFIG_BLUETOOTH_SPI_DEV_NAME); + spi_dev = device_get_binding(CONFIG_BT_SPI_DEV_NAME); if (!spi_dev) { BT_ERR("Failed to initialize SPI driver: %s", - CONFIG_BLUETOOTH_SPI_DEV_NAME); + CONFIG_BT_SPI_DEV_NAME); return -EIO; } -#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) - cs_dev = device_get_binding(CONFIG_BLUETOOTH_SPI_CHIP_SELECT_DEV_NAME); +#if defined(CONFIG_BT_SPI_BLUENRG) + cs_dev = device_get_binding(CONFIG_BT_SPI_CHIP_SELECT_DEV_NAME); if (!cs_dev) { BT_ERR("Failed to initialize GPIO driver: %s", - CONFIG_BLUETOOTH_SPI_CHIP_SELECT_DEV_NAME); + CONFIG_BT_SPI_CHIP_SELECT_DEV_NAME); return -EIO; } -#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ +#endif /* CONFIG_BT_SPI_BLUENRG */ - irq_dev = device_get_binding(CONFIG_BLUETOOTH_SPI_IRQ_DEV_NAME); + irq_dev = device_get_binding(CONFIG_BT_SPI_IRQ_DEV_NAME); if (!irq_dev) { BT_ERR("Failed to initialize GPIO driver: %s", - CONFIG_BLUETOOTH_SPI_IRQ_DEV_NAME); + CONFIG_BT_SPI_IRQ_DEV_NAME); return -EIO; } - rst_dev = device_get_binding(CONFIG_BLUETOOTH_SPI_RESET_DEV_NAME); + rst_dev = device_get_binding(CONFIG_BT_SPI_RESET_DEV_NAME); if (!rst_dev) { BT_ERR("Failed to initialize GPIO driver: %s", - CONFIG_BLUETOOTH_SPI_RESET_DEV_NAME); + CONFIG_BT_SPI_RESET_DEV_NAME); return -EIO; } diff --git a/drivers/bluetooth/nrf51_pm.c b/drivers/bluetooth/nrf51_pm.c index f9b766e75c9..806ded3ce04 100644 --- a/drivers/bluetooth/nrf51_pm.c +++ b/drivers/bluetooth/nrf51_pm.c @@ -12,7 +12,7 @@ #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #define NBLE_SWDIO_PIN 6 diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig index b6c24ee85a0..d88e50bffb8 100644 --- a/drivers/flash/Kconfig +++ b/drivers/flash/Kconfig @@ -132,7 +132,7 @@ config SOC_FLASH_NRF5_DEV_NAME config SOC_FLASH_NRF5_RADIO_SYNC bool "Nordic nRF5x flash driver synchronized with radio" - depends on SOC_FLASH_NRF5 && BLUETOOTH_CONTROLLER + depends on SOC_FLASH_NRF5 && BT_CONTROLLER default y help Enable synchronization between flash memory driver and radio. diff --git a/dts/arm/frdm_k64f.dts b/dts/arm/frdm_k64f.dts index f584d4c293a..182e34d265a 100644 --- a/dts/arm/frdm_k64f.dts +++ b/dts/arm/frdm_k64f.dts @@ -30,7 +30,7 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,console = &uart0; -#ifdef CONFIG_BLUETOOTH +#ifdef CONFIG_BT zephyr,bt-uart = &uart3; #endif zephyr,uart-pipe = &uart0; @@ -54,7 +54,7 @@ current-speed = <115200>; }; -#ifdef CONFIG_BLUETOOTH +#ifdef CONFIG_BT &uart3 { status = "ok"; current-speed = <115200>; diff --git a/dts/arm/hexiwear_k64.dts b/dts/arm/hexiwear_k64.dts index c9a7fba6666..401e526690e 100644 --- a/dts/arm/hexiwear_k64.dts +++ b/dts/arm/hexiwear_k64.dts @@ -30,7 +30,7 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,console = &uart0; -#ifdef CONFIG_BLUETOOTH +#ifdef CONFIG_BT zephyr,bt-uart = &uart4; #endif }; @@ -58,7 +58,7 @@ current-speed = <115200>; }; -#ifdef CONFIG_BLUETOOTH +#ifdef CONFIG_BT &uart4 { status = "ok"; current-speed = <115200>; diff --git a/include/bluetooth/att.h b/include/bluetooth/att.h index d321c5cf68e..38ca3bbcdf5 100644 --- a/include/bluetooth/att.h +++ b/include/bluetooth/att.h @@ -53,9 +53,9 @@ struct bt_att_req { bt_att_destroy_t destroy; struct net_buf_simple_state state; struct net_buf *buf; -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) bool retrying; -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ }; #ifdef __cplusplus diff --git a/include/bluetooth/bluetooth.h b/include/bluetooth/bluetooth.h index 54dd976e882..f4a3a46eda9 100644 --- a/include/bluetooth/bluetooth.h +++ b/include/bluetooth/bluetooth.h @@ -278,7 +278,7 @@ struct bt_le_oob { * pairing or connection creation process. * * If privacy is enabled this will result in generating new Resolvable Private - * Address that is valid for CONFIG_BLUETOOTH_RPA_TIMEOUT seconds. This address + * Address that is valid for CONFIG_BT_RPA_TIMEOUT seconds. This address * will be used for advertising, active scanning and connection creation. * * @param oob LE related information diff --git a/include/bluetooth/buf.h b/include/bluetooth/buf.h index b049eaeb134..d02cf69914c 100644 --- a/include/bluetooth/buf.h +++ b/include/bluetooth/buf.h @@ -38,8 +38,7 @@ enum bt_buf_type { #define BT_BUF_USER_DATA_MIN 4 /** Data size neeed for HCI RX buffers */ -#define BT_BUF_RX_SIZE (CONFIG_BLUETOOTH_HCI_RESERVE + \ - CONFIG_BLUETOOTH_RX_BUF_LEN) +#define BT_BUF_RX_SIZE (CONFIG_BT_HCI_RESERVE + CONFIG_BT_RX_BUF_LEN) /** Allocate a buffer for incoming data * diff --git a/include/bluetooth/conn.h b/include/bluetooth/conn.h index 500870ae865..8df8f361c30 100644 --- a/include/bluetooth/conn.h +++ b/include/bluetooth/conn.h @@ -346,7 +346,7 @@ struct bt_conn_cb { */ void (*le_param_updated)(struct bt_conn *conn, u16_t interval, u16_t latency, u16_t timeout); -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) /** @brief Remote Identity Address has been resolved. * * This callback notifies the application that a remote @@ -359,8 +359,8 @@ struct bt_conn_cb { void (*identity_resolved)(struct bt_conn *conn, const bt_addr_le_t *rpa, const bt_addr_le_t *identity); -#endif /* CONFIG_BLUETOOTH_SMP */ -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#endif /* CONFIG_BT_SMP */ +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) /** @brief The security level of a connection has changed. * * This callback notifies the application that the security level @@ -370,7 +370,7 @@ struct bt_conn_cb { * @param level New security level of the connection. */ void (*security_changed)(struct bt_conn *conn, bt_security_t level); -#endif /* defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) */ +#endif /* defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) */ struct bt_conn_cb *_next; }; @@ -389,7 +389,7 @@ struct bt_conn_auth_cb { void (*passkey_confirm)(struct bt_conn *conn, unsigned int passkey); void (*cancel)(struct bt_conn *conn); void (*pairing_confirm)(struct bt_conn *conn); -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) void (*pincode_entry)(struct bt_conn *conn, bool highsec); #endif }; diff --git a/include/bluetooth/gatt.h b/include/bluetooth/gatt.h index ac7578461c1..62fc49617b5 100644 --- a/include/bluetooth/gatt.h +++ b/include/bluetooth/gatt.h @@ -485,8 +485,7 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn, .properties = _props, }),\ } -#define BT_GATT_CCC_MAX (CONFIG_BLUETOOTH_MAX_PAIRED + \ - CONFIG_BLUETOOTH_MAX_CONN) +#define BT_GATT_CCC_MAX (CONFIG_BT_MAX_PAIRED + CONFIG_BT_MAX_CONN) /** @brief GATT CCC configuration entry. * @param valid Valid flag diff --git a/include/bluetooth/l2cap.h b/include/bluetooth/l2cap.h index 823d5d60e01..63d12085aec 100644 --- a/include/bluetooth/l2cap.h +++ b/include/bluetooth/l2cap.h @@ -38,7 +38,7 @@ extern "C" { * * @return Needed buffer size to match the requested L2CAP MTU. */ -#define BT_L2CAP_BUF_SIZE(mtu) (CONFIG_BLUETOOTH_HCI_RESERVE + \ +#define BT_L2CAP_BUF_SIZE(mtu) (CONFIG_BT_HCI_RESERVE + \ BT_HCI_ACL_HDR_SIZE + BT_L2CAP_HDR_SIZE + \ (mtu)) @@ -78,14 +78,14 @@ struct bt_l2cap_chan { bt_l2cap_chan_destroy_t destroy; /* Response Timeout eXpired (RTX) timer */ struct k_delayed_work rtx_work; -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) bt_l2cap_chan_state_t state; /** Remote PSM to be connected */ u16_t psm; /** Helps match request context during CoC */ u8_t ident; bt_security_t required_sec_level; -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ }; /** @brief LE L2CAP Endpoint structure. */ @@ -210,7 +210,7 @@ struct bt_l2cap_chan_ops { /** @def BT_L2CAP_CHAN_SEND_RESERVE * @brief Headroom needed for outgoing buffers */ -#define BT_L2CAP_CHAN_SEND_RESERVE (CONFIG_BLUETOOTH_HCI_RESERVE + 4 + 4) +#define BT_L2CAP_CHAN_SEND_RESERVE (CONFIG_BT_HCI_RESERVE + 4 + 4) /** @brief L2CAP Server structure. */ struct bt_l2cap_server { diff --git a/include/bluetooth/mesh.h b/include/bluetooth/mesh.h index 8b93c2fb8e4..e20a4a23e1c 100644 --- a/include/bluetooth/mesh.h +++ b/include/bluetooth/mesh.h @@ -209,10 +209,10 @@ struct bt_mesh_model_op { { \ .id = (_id), \ .op = _op, \ - .keys = { [0 ... (CONFIG_BLUETOOTH_MESH_MODEL_KEY_COUNT - 1)] = \ + .keys = { [0 ... (CONFIG_BT_MESH_MODEL_KEY_COUNT - 1)] = \ BT_MESH_KEY_UNUSED }, \ .pub = _pub, \ - .groups = { [0 ... (CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT - 1)] = \ + .groups = { [0 ... (CONFIG_BT_MESH_MODEL_GROUP_COUNT - 1)] = \ BT_MESH_ADDR_UNASSIGNED }, \ .user_data = _user_data, \ } @@ -223,9 +223,9 @@ struct bt_mesh_model_op { .vnd.id = (_id), \ .op = _op, \ .pub = _pub, \ - .keys = { [0 ... (CONFIG_BLUETOOTH_MESH_MODEL_KEY_COUNT - 1)] = \ + .keys = { [0 ... (CONFIG_BT_MESH_MODEL_KEY_COUNT - 1)] = \ BT_MESH_KEY_UNUSED }, \ - .groups = { [0 ... (CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT - 1)] = \ + .groups = { [0 ... (CONFIG_BT_MESH_MODEL_GROUP_COUNT - 1)] = \ BT_MESH_ADDR_UNASSIGNED }, \ .user_data = _user_data, \ } @@ -367,10 +367,10 @@ struct bt_mesh_model { struct bt_mesh_model_pub * const pub; /* AppKey List */ - u16_t keys[CONFIG_BLUETOOTH_MESH_MODEL_KEY_COUNT]; + u16_t keys[CONFIG_BT_MESH_MODEL_KEY_COUNT]; /* Subscription List (group or virtual addresses) */ - u16_t groups[CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT]; + u16_t groups[CONFIG_BT_MESH_MODEL_GROUP_COUNT]; const struct bt_mesh_model_op * const op; diff --git a/include/bluetooth/uuid.h b/include/bluetooth/uuid.h index d5aa60d616d..f9943ea0c78 100644 --- a/include/bluetooth/uuid.h +++ b/include/bluetooth/uuid.h @@ -530,7 +530,7 @@ struct bt_uuid_128 { */ int bt_uuid_cmp(const struct bt_uuid *u1, const struct bt_uuid *u2); -#if defined(CONFIG_BLUETOOTH_DEBUG) +#if defined(CONFIG_BT_DEBUG) /** @brief Convert Bluetooth UUID to string. * * Converts Bluetooth UUID to string. UUID has to be in 16 bits or 128 bits @@ -567,7 +567,7 @@ static inline const char *bt_uuid_str(const struct bt_uuid *uuid) { return ""; } -#endif /* CONFIG_BLUETOOTH_DEBUG */ +#endif /* CONFIG_BT_DEBUG */ #ifdef __cplusplus } diff --git a/include/drivers/bluetooth/hci_driver.h b/include/drivers/bluetooth/hci_driver.h index da1bc6ae0ce..e9db966db9e 100644 --- a/include/drivers/bluetooth/hci_driver.h +++ b/include/drivers/bluetooth/hci_driver.h @@ -44,7 +44,7 @@ static inline bool bt_hci_evt_is_prio(u8_t evt) switch (evt) { case BT_HCI_EVT_CMD_COMPLETE: case BT_HCI_EVT_CMD_STATUS: -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_HCI_EVT_NUM_COMPLETED_PACKETS: #endif return true; @@ -121,7 +121,7 @@ struct bt_hci_driver { * is safe to start calling the send() handler. * * If the driver uses its own RX thread, i.e. - * CONFIG_BLUETOOTH_RECV_IS_RX_THREAD is set, then this + * CONFIG_BT_RECV_IS_RX_THREAD is set, then this * function is expected to start that thread. * * @return 0 on success or negative error number on failure. diff --git a/include/net/net_ip.h b/include/net/net_ip.h index 39118ac51ce..da25d749aa9 100644 --- a/include/net/net_ip.h +++ b/include/net/net_ip.h @@ -696,7 +696,7 @@ static inline void net_ipv6_addr_create_iid(struct in6_addr *addr, addr->s6_addr[12] = 0xfe; memcpy(&addr->s6_addr[13], lladdr->addr + 3, 3); -#if defined(CONFIG_NET_L2_BLUETOOTH_ZEP1656) +#if defined(CONFIG_NET_L2_BT_ZEP1656) /* Workaround against older Linux kernel BT IPSP code. * This will be removed eventually. */ @@ -755,7 +755,7 @@ static inline bool net_ipv6_addr_based_on_ll(const struct in6_addr *addr, !memcmp(&addr->s6_addr[13], &lladdr->addr[3], 3) && addr->s6_addr[11] == 0xff && addr->s6_addr[12] == 0xfe -#if defined(CONFIG_NET_L2_BLUETOOTH_ZEP1656) +#if defined(CONFIG_NET_L2_BT_ZEP1656) /* Workaround against older Linux kernel BT IPSP * code. This will be removed eventually. */ diff --git a/include/net/net_l2.h b/include/net/net_l2.h index 23d65864567..a5f3369312f 100644 --- a/include/net/net_l2.h +++ b/include/net/net_l2.h @@ -80,10 +80,10 @@ NET_L2_DECLARE_PUBLIC(ETHERNET_L2); NET_L2_DECLARE_PUBLIC(IEEE802154_L2); #endif /* CONFIG_NET_L2_IEEE802154 */ -#ifdef CONFIG_NET_L2_BLUETOOTH +#ifdef CONFIG_NET_L2_BT #define BLUETOOTH_L2 BLUETOOTH #define BLUETOOTH_L2_CTX_TYPE void* -#endif /* CONFIG_NET_L2_BLUETOOTH */ +#endif /* CONFIG_NET_L2_BT */ #ifdef CONFIG_NET_OFFLOAD #define OFFLOAD_IP_L2 OFFLOAD_IP diff --git a/samples/bluetooth/beacon/prj.conf b/samples/bluetooth/beacon/prj.conf index 4421133cdd1..1d6745c7942 100644 --- a/samples/bluetooth/beacon/prj.conf +++ b/samples/bluetooth/beacon/prj.conf @@ -1,3 +1,3 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test beacon" +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEVICE_NAME="Test beacon" diff --git a/samples/bluetooth/beacon/src/main.c b/samples/bluetooth/beacon/src/main.c index f8fdce8067e..e1d25c82944 100644 --- a/samples/bluetooth/beacon/src/main.c +++ b/samples/bluetooth/beacon/src/main.c @@ -14,7 +14,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) /* diff --git a/samples/bluetooth/bluetooth.rst b/samples/bluetooth/bluetooth.rst index ee9bd4a8bef..6bdd0cd6b32 100644 --- a/samples/bluetooth/bluetooth.rst +++ b/samples/bluetooth/bluetooth.rst @@ -25,8 +25,8 @@ down. Listening on /tmp/bt-server-bredr Running the application in QEMU will connect the second serial line to -``bt-server-bredr`` Unix socket. When Bluetooth (CONFIG_BLUETOOTH) and Bluetooth -HCI UART driver (CONFIG_BLUETOOTH_H4) are enabled, the Bluetooth driver +``bt-server-bredr`` Unix socket. When Bluetooth (CONFIG_BT) and Bluetooth +HCI UART driver (CONFIG_BT_H4) are enabled, the Bluetooth driver registers with the system. From now on Bluetooth may be used by the application. To run applications in diff --git a/samples/bluetooth/central/prj.conf b/samples/bluetooth/central/prj.conf index 174407a4539..3e36a999385 100644 --- a/samples/bluetooth/central/prj.conf +++ b/samples/bluetooth/central/prj.conf @@ -1,2 +1,2 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y +CONFIG_BT=y +CONFIG_BT_CENTRAL=y diff --git a/samples/bluetooth/central_hr/prj.conf b/samples/bluetooth/central_hr/prj.conf index 49272b15bd3..e937bf405d3 100644 --- a/samples/bluetooth/central_hr/prj.conf +++ b/samples/bluetooth/central_hr/prj.conf @@ -1,5 +1,5 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_GATT_CLIENT=y +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_GATT_CLIENT=y diff --git a/samples/bluetooth/eddystone/prj.conf b/samples/bluetooth/eddystone/prj.conf index ce4fc7e4a74..2ae4f32a0f2 100644 --- a/samples/bluetooth/eddystone/prj.conf +++ b/samples/bluetooth/eddystone/prj.conf @@ -1,4 +1,4 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Eddystone" +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_DEVICE_NAME="Zephyr Eddystone" diff --git a/samples/bluetooth/eddystone/src/main.c b/samples/bluetooth/eddystone/src/main.c index 7484e183bec..52195088340 100644 --- a/samples/bluetooth/eddystone/src/main.c +++ b/samples/bluetooth/eddystone/src/main.c @@ -21,7 +21,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define NUMBER_OF_SLOTS 1 #define EDS_VERSION 0x00 diff --git a/samples/bluetooth/gatt/ipss.c b/samples/bluetooth/gatt/ipss.c index e53b4e8bb34..84811d88067 100644 --- a/samples/bluetooth/gatt/ipss.c +++ b/samples/bluetooth/gatt/ipss.c @@ -22,7 +22,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define UNKNOWN_APPEARANCE 0x0000 diff --git a/samples/bluetooth/handsfree/prj.conf b/samples/bluetooth/handsfree/prj.conf index cb6dc2e95af..00984b8c213 100644 --- a/samples/bluetooth/handsfree/prj.conf +++ b/samples/bluetooth/handsfree/prj.conf @@ -1,8 +1,8 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_BREDR=y -CONFIG_BLUETOOTH_RFCOMM=y -CONFIG_BLUETOOTH_HFP_HF=y -CONFIG_BLUETOOTH_MAX_HF_CONN=1 -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_RFCOMM_MTU=127 -CONFIG_BLUETOOTH_DEVICE_NAME="test-Handsfree" +CONFIG_BT=y +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_HFP_HF=y +CONFIG_BT_MAX_HF_CONN=1 +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_RFCOMM_MTU=127 +CONFIG_BT_DEVICE_NAME="test-Handsfree" diff --git a/samples/bluetooth/hci_uart/generic.conf b/samples/bluetooth/hci_uart/generic.conf index e0be5799943..389ffd834ce 100644 --- a/samples/bluetooth/hci_uart/generic.conf +++ b/samples/bluetooth/hci_uart/generic.conf @@ -3,5 +3,5 @@ CONFIG_STDOUT_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_HCI_RAW=y +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y diff --git a/samples/bluetooth/hci_uart/microbit.conf b/samples/bluetooth/hci_uart/microbit.conf index aa75ae4b024..2e074e449e9 100644 --- a/samples/bluetooth/hci_uart/microbit.conf +++ b/samples/bluetooth/hci_uart/microbit.conf @@ -9,6 +9,6 @@ CONFIG_UART_NRF5_FLOW_CONTROL=n CONFIG_MAIN_STACK_SIZE=512 CONFIG_IDLE_STACK_SIZE=256 CONFIG_ISR_STACK_SIZE=512 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_HCI_RAW=y -CONFIG_BLUETOOTH_MAX_CONN=20 +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=20 diff --git a/samples/bluetooth/hci_uart/nrf5.conf b/samples/bluetooth/hci_uart/nrf5.conf index 14389ab45d2..a5b6f768b24 100644 --- a/samples/bluetooth/hci_uart/nrf5.conf +++ b/samples/bluetooth/hci_uart/nrf5.conf @@ -8,8 +8,8 @@ CONFIG_UART_NRF5_BAUD_RATE=1000000 CONFIG_UART_NRF5_FLOW_CONTROL=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_HCI_RAW=y -CONFIG_BLUETOOTH_MAX_CONN=16 -CONFIG_BLUETOOTH_CONTROLLER_ASSERT_HANDLER=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=n +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y +CONFIG_BT_MAX_CONN=16 +CONFIG_BT_CONTROLLER_ASSERT_HANDLER=y +CONFIG_BT_TINYCRYPT_ECC=n diff --git a/samples/bluetooth/hci_uart/src/main.c b/samples/bluetooth/hci_uart/src/main.c index b64dbef2196..004507b1f4a 100644 --- a/samples/bluetooth/hci_uart/src/main.c +++ b/samples/bluetooth/hci_uart/src/main.c @@ -30,26 +30,25 @@ #include "common/log.h" static struct device *hci_uart_dev; -static BT_STACK_NOINIT(tx_thread_stack, CONFIG_BLUETOOTH_HCI_TX_STACK_SIZE); +static BT_STACK_NOINIT(tx_thread_stack, CONFIG_BT_HCI_TX_STACK_SIZE); static struct k_thread tx_thread_data; /* HCI command buffers */ #define CMD_BUF_SIZE BT_BUF_RX_SIZE -NET_BUF_POOL_DEFINE(cmd_tx_pool, CONFIG_BLUETOOTH_HCI_CMD_COUNT, CMD_BUF_SIZE, +NET_BUF_POOL_DEFINE(cmd_tx_pool, CONFIG_BT_HCI_CMD_COUNT, CMD_BUF_SIZE, BT_BUF_USER_DATA_MIN, NULL); -#if defined(CONFIG_BLUETOOTH_CONTROLLER) -#define BT_L2CAP_MTU (CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFER_SIZE - \ - BT_L2CAP_HDR_SIZE) +#if defined(CONFIG_BT_CONTROLLER) +#define BT_L2CAP_MTU (CONFIG_BT_CONTROLLER_TX_BUFFER_SIZE - BT_L2CAP_HDR_SIZE) #else #define BT_L2CAP_MTU 65 /* 64-byte public key + opcode */ -#endif /* CONFIG_BLUETOOTH_CONTROLLER */ +#endif /* CONFIG_BT_CONTROLLER */ /** Data size needed for ACL buffers */ #define BT_BUF_ACL_SIZE BT_L2CAP_BUF_SIZE(BT_L2CAP_MTU) -#if defined(CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFERS) -#define TX_BUF_COUNT CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFERS +#if defined(CONFIG_BT_CONTROLLER_TX_BUFFERS) +#define TX_BUF_COUNT CONFIG_BT_CONTROLLER_TX_BUFFERS #else #define TX_BUF_COUNT 6 #endif @@ -273,7 +272,7 @@ static int h4_send(struct net_buf *buf) return 0; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ASSERT_HANDLER) +#if defined(CONFIG_BT_CONTROLLER_ASSERT_HANDLER) void bt_controller_assert_handle(char *file, u32_t line) { u32_t len = 0, pos = 0; @@ -318,14 +317,14 @@ void bt_controller_assert_handle(char *file, u32_t line) while (1) { } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ASSERT_HANDLER */ +#endif /* CONFIG_BT_CONTROLLER_ASSERT_HANDLER */ static int hci_uart_init(struct device *unused) { SYS_LOG_DBG(""); hci_uart_dev = - device_get_binding(CONFIG_BLUETOOTH_CONTROLLER_TO_HOST_UART_DEV_NAME); + device_get_binding(CONFIG_BT_CONTROLLER_TO_HOST_UART_DEV_NAME); if (!hci_uart_dev) { return -EINVAL; } diff --git a/samples/bluetooth/hci_usb/prj.conf b/samples/bluetooth/hci_usb/prj.conf index 706fddb06a0..27b5d68eb4c 100644 --- a/samples/bluetooth/hci_usb/prj.conf +++ b/samples/bluetooth/hci_usb/prj.conf @@ -4,5 +4,5 @@ CONFIG_USB=y CONFIG_USB_DEVICE_STACK=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_HCI_RAW=y +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y diff --git a/samples/bluetooth/hci_usb/prj_tinytile.conf b/samples/bluetooth/hci_usb/prj_tinytile.conf index 70ba1497998..b0d4ba88cc8 100644 --- a/samples/bluetooth/hci_usb/prj_tinytile.conf +++ b/samples/bluetooth/hci_usb/prj_tinytile.conf @@ -3,8 +3,8 @@ CONFIG_USB=y CONFIG_USB_DEVICE_STACK=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_HCI_RAW=y +CONFIG_BT=y +CONFIG_BT_HCI_RAW=y # USB is used by Bluetooth CONFIG_CONSOLE=n diff --git a/samples/bluetooth/hci_usb/src/main.c b/samples/bluetooth/hci_usb/src/main.c index 10af7e1dd20..8106c508abd 100644 --- a/samples/bluetooth/hci_usb/src/main.c +++ b/samples/bluetooth/hci_usb/src/main.c @@ -76,7 +76,7 @@ static K_FIFO_DEFINE(rx_queue); /* HCI command buffers */ #define CMD_BUF_SIZE BT_BUF_RX_SIZE -NET_BUF_POOL_DEFINE(tx_pool, CONFIG_BLUETOOTH_HCI_CMD_COUNT, CMD_BUF_SIZE, +NET_BUF_POOL_DEFINE(tx_pool, CONFIG_BT_HCI_CMD_COUNT, CMD_BUF_SIZE, sizeof(u8_t), NULL); #define BT_L2CAP_MTU 64 diff --git a/samples/bluetooth/ipsp/prj.conf b/samples/bluetooth/ipsp/prj.conf index 63a76a4e589..8ae62b01154 100644 --- a/samples/bluetooth/ipsp/prj.conf +++ b/samples/bluetooth/ipsp/prj.conf @@ -1,17 +1,17 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test IPSP node" +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_DEVICE_NAME="Test IPSP node" CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_IPV4=n CONFIG_NET_UDP=y CONFIG_NET_TCP=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y CONFIG_INIT_STACKS=y CONFIG_NET_PKT_RX_COUNT=10 CONFIG_NET_PKT_TX_COUNT=10 @@ -24,4 +24,4 @@ CONFIG_NET_MAX_CONTEXTS=6 CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BLUETOOTH_NODE=y +CONFIG_NET_APP_BT_NODE=y diff --git a/samples/bluetooth/ipsp/prj_dbg.conf b/samples/bluetooth/ipsp/prj_dbg.conf index d8f76b20beb..5094bd6d42e 100644 --- a/samples/bluetooth/ipsp/prj_dbg.conf +++ b/samples/bluetooth/ipsp/prj_dbg.conf @@ -1,9 +1,9 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test IPSP node" +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_DEVICE_NAME="Test IPSP node" CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_IPV4=n @@ -11,9 +11,9 @@ CONFIG_NET_UDP=y CONFIG_NET_TCP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_DEBUG_L2_BT=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_NET_STATISTICS=y @@ -26,7 +26,7 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 CONFIG_NET_MAX_CONTEXTS=6 CONFIG_NET_SHELL=y -CONFIG_BLUETOOTH_SHELL=y +CONFIG_BT_SHELL=y CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" diff --git a/samples/bluetooth/mesh/microbit.conf b/samples/bluetooth/mesh/microbit.conf index 1a1265effc3..1baffd6ad73 100644 --- a/samples/bluetooth/mesh/microbit.conf +++ b/samples/bluetooth/mesh/microbit.conf @@ -4,43 +4,43 @@ CONFIG_MICROBIT_DISPLAY=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_GPIO=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_STACK_SIZE=1100 -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 -CONFIG_BLUETOOTH_MESH_RELAY=y +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RX_SDU_MAX=36 +CONFIG_BT_MESH_RELAY=y -#CONFIG_BLUETOOTH_MESH_LOW_POWER=y +#CONFIG_BT_MESH_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=1 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=1 +CONFIG_BT_MESH_LABEL_COUNT=0 -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y diff --git a/samples/bluetooth/mesh/microbit_gatt.conf b/samples/bluetooth/mesh/microbit_gatt.conf index 351f3484a41..b5d8cd851f5 100644 --- a/samples/bluetooth/mesh/microbit_gatt.conf +++ b/samples/bluetooth/mesh/microbit_gatt.conf @@ -5,56 +5,56 @@ CONFIG_MICROBIT_DISPLAY=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_GPIO=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_MESH_GATT_PROXY=y -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=n +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=n -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Mesh" -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1400 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=5 +CONFIG_BT=y +CONFIG_BT_DEVICE_NAME="Zephyr Mesh" +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_STACK_SIZE=1400 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 +CONFIG_BT_L2CAP_TX_BUF_COUNT=5 -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_MSG_CACHE_SIZE=2 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RX_SDU_MAX=36 +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_MSG_CACHE_SIZE=2 -#CONFIG_BLUETOOTH_MESH_LOW_POWER=y +#CONFIG_BT_MESH_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=1 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=1 +CONFIG_BT_MESH_LABEL_COUNT=0 #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y diff --git a/samples/bluetooth/mesh/nrf51-16k.conf b/samples/bluetooth/mesh/nrf51-16k.conf index e5d1840d4ed..238dc1a992e 100644 --- a/samples/bluetooth/mesh/nrf51-16k.conf +++ b/samples/bluetooth/mesh/nrf51-16k.conf @@ -1,44 +1,44 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_STACK_SIZE=1100 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 -CONFIG_BLUETOOTH_MESH_RELAY=y +CONFIG_BT_MESH=y +CONFIG_BT_MESH_LOW_POWER=y +CONFIG_BT_MESH_RX_SDU_MAX=36 +CONFIG_BT_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=1 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=1 +CONFIG_BT_MESH_LABEL_COUNT=0 #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf index 1d51bf5aae3..9d8fa59d6b3 100644 --- a/samples/bluetooth/mesh/prj.conf +++ b/samples/bluetooth/mesh/prj.conf @@ -2,62 +2,62 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_PERIPHERAL=y +CONFIG_BT_PERIPHERAL=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=5 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 +CONFIG_BT_L2CAP_TX_BUF_COUNT=5 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=n -CONFIG_BLUETOOTH_MESH_FRIEND=n -CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_LOW_POWER=n +CONFIG_BT_MESH_FRIEND=n +CONFIG_BT_MESH_LOCAL_INTERFACE=y +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=y -CONFIG_BLUETOOTH_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=y +CONFIG_BT_MESH_GATT_PROXY=y -CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_FRIEND=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_SELF_TEST=y diff --git a/samples/bluetooth/mesh/src/main.c b/samples/bluetooth/mesh/src/main.c index 021ef1344a2..b3cdca7e17f 100644 --- a/samples/bluetooth/mesh/src/main.c +++ b/samples/bluetooth/mesh/src/main.c @@ -19,7 +19,7 @@ static struct bt_mesh_cfg cfg_srv = { .relay = BT_MESH_RELAY_DISABLED, .beacon = BT_MESH_BEACON_ENABLED, .frnd = BT_MESH_FRIEND_NOT_SUPPORTED, -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) .gatt_proxy = BT_MESH_GATT_PROXY_ENABLED, #else .gatt_proxy = BT_MESH_GATT_PROXY_NOT_SUPPORTED, diff --git a/samples/bluetooth/mesh_demo/microbit.conf b/samples/bluetooth/mesh_demo/microbit.conf index c02b9be0336..ea8d7d06f5a 100644 --- a/samples/bluetooth/mesh_demo/microbit.conf +++ b/samples/bluetooth/mesh_demo/microbit.conf @@ -10,31 +10,31 @@ CONFIG_MICROBIT_DISPLAY=y CONFIG_PWM=y CONFIG_PWM_NRF5_SW=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1280 -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y +CONFIG_BT=y +CONFIG_BT_RX_STACK_SIZE=1280 +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 -CONFIG_BLUETOOTH_MESH_TX_SEG_COUNT=3 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=10 -CONFIG_BLUETOOTH_MESH_PB_ADV=n +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_RX_SDU_MAX=36 +CONFIG_BT_MESH_TX_SEG_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_ADV_BUF_COUNT=10 +CONFIG_BT_MESH_PB_ADV=n -#CONFIG_BLUETOOTH_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_DEBUG_LOG=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y diff --git a/samples/bluetooth/mesh_demo/nrf51-16k.conf b/samples/bluetooth/mesh_demo/nrf51-16k.conf index 66345b1ddf1..8113dbe6334 100644 --- a/samples/bluetooth/mesh_demo/nrf51-16k.conf +++ b/samples/bluetooth/mesh_demo/nrf51-16k.conf @@ -1,32 +1,32 @@ #CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_STACK_SIZE=1100 +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 -CONFIG_BLUETOOTH_MESH_TX_SEG_COUNT=3 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 -CONFIG_BLUETOOTH_MESH_PB_ADV=n +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_RX_SDU_MAX=36 +CONFIG_BT_MESH_TX_SEG_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=1 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_PB_ADV=n -#CONFIG_BLUETOOTH_MESH_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_MESH_LOW_POWER=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y +#CONFIG_BT_DEBUG_LOG=y diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf index 61b04af23a3..aa867a01635 100644 --- a/samples/bluetooth/mesh_demo/prj.conf +++ b/samples/bluetooth/mesh_demo/prj.conf @@ -2,28 +2,28 @@ CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +CONFIG_BT=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_TINYCRYPT_ECC=y +#CONFIG_BT_DEBUG_LOG=y -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 -CONFIG_BLUETOOTH_MESH_PB_ADV=n +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=1 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_PB_ADV=n -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y -#CONFIG_BLUETOOTH_MESH_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y diff --git a/samples/bluetooth/peripheral/prj.conf b/samples/bluetooth/peripheral/prj.conf index bcb34a4cf65..7973a614458 100644 --- a/samples/bluetooth/peripheral/prj.conf +++ b/samples/bluetooth/peripheral/prj.conf @@ -1,9 +1,9 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=2 -CONFIG_BLUETOOTH_PRIVACY=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test peripheral" -CONFIG_BLUETOOTH_DEVICE_APPEARANCE=833 +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_ATT_PREPARE_COUNT=2 +CONFIG_BT_PRIVACY=y +CONFIG_BT_DEVICE_NAME="Test peripheral" +CONFIG_BT_DEVICE_APPEARANCE=833 diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c index 9ab18f418f0..365c0312154 100644 --- a/samples/bluetooth/peripheral/src/main.c +++ b/samples/bluetooth/peripheral/src/main.c @@ -25,7 +25,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) /* Custom Service Variables */ diff --git a/samples/bluetooth/peripheral_csc/prj.conf b/samples/bluetooth/peripheral_csc/prj.conf index 9e1d821bcd6..4c954d3d269 100644 --- a/samples/bluetooth/peripheral_csc/prj.conf +++ b/samples/bluetooth/peripheral_csc/prj.conf @@ -1,6 +1,6 @@ CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_DEVICE_NAME="CSC peripheral" -CONFIG_BLUETOOTH_DEVICE_APPEARANCE=1157 +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_DEVICE_NAME="CSC peripheral" +CONFIG_BT_DEVICE_APPEARANCE=1157 diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c index d360b5d6744..2d748816b24 100644 --- a/samples/bluetooth/peripheral_csc/src/main.c +++ b/samples/bluetooth/peripheral_csc/src/main.c @@ -24,7 +24,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define CSC_SUPPORTED_LOCATIONS { CSC_LOC_OTHER, \ CSC_LOC_FRONT_WHEEL, \ diff --git a/samples/bluetooth/peripheral_dis/prj.conf b/samples/bluetooth/peripheral_dis/prj.conf index 72a1b5d4f76..01e1a97ce1f 100644 --- a/samples/bluetooth/peripheral_dis/prj.conf +++ b/samples/bluetooth/peripheral_dis/prj.conf @@ -1,3 +1,3 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_DEVICE_NAME="DIS peripheral" +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_DEVICE_NAME="DIS peripheral" diff --git a/samples/bluetooth/peripheral_dis/src/main.c b/samples/bluetooth/peripheral_dis/src/main.c index 92217affa2c..5bafcfe6b66 100644 --- a/samples/bluetooth/peripheral_dis/src/main.c +++ b/samples/bluetooth/peripheral_dis/src/main.c @@ -22,7 +22,7 @@ #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) static const struct bt_data ad[] = { diff --git a/samples/bluetooth/peripheral_esp/prj.conf b/samples/bluetooth/peripheral_esp/prj.conf index 796c7c33886..3aa6c75221e 100644 --- a/samples/bluetooth/peripheral_esp/prj.conf +++ b/samples/bluetooth/peripheral_esp/prj.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_SMP=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SMP=y CONFIG_TINYCRYPT=y -CONFIG_BLUETOOTH_DEVICE_NAME="ESP peripheral" -CONFIG_BLUETOOTH_DEVICE_APPEARANCE=768 +CONFIG_BT_DEVICE_NAME="ESP peripheral" +CONFIG_BT_DEVICE_APPEARANCE=768 diff --git a/samples/bluetooth/peripheral_esp/src/main.c b/samples/bluetooth/peripheral_esp/src/main.c index ead24595451..681cf9f88ec 100644 --- a/samples/bluetooth/peripheral_esp/src/main.c +++ b/samples/bluetooth/peripheral_esp/src/main.c @@ -24,7 +24,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define SENSOR_1_NAME "Temperature Sensor 1" #define SENSOR_2_NAME "Temperature Sensor 2" diff --git a/samples/bluetooth/peripheral_hids/prj.conf b/samples/bluetooth/peripheral_hids/prj.conf index 4869d7a2258..0524515a163 100644 --- a/samples/bluetooth/peripheral_hids/prj.conf +++ b/samples/bluetooth/peripheral_hids/prj.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test HoG mouse" -CONFIG_BLUETOOTH_DEVICE_APPEARANCE=962 +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_DEVICE_NAME="Test HoG mouse" +CONFIG_BT_DEVICE_APPEARANCE=962 diff --git a/samples/bluetooth/peripheral_hids/src/main.c b/samples/bluetooth/peripheral_hids/src/main.c index dcb025f02ab..74282fd232b 100644 --- a/samples/bluetooth/peripheral_hids/src/main.c +++ b/samples/bluetooth/peripheral_hids/src/main.c @@ -24,7 +24,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) static const struct bt_data ad[] = { diff --git a/samples/bluetooth/peripheral_hr/prj.conf b/samples/bluetooth/peripheral_hr/prj.conf index 454329ea725..08ebfd7e41d 100644 --- a/samples/bluetooth/peripheral_hr/prj.conf +++ b/samples/bluetooth/peripheral_hr/prj.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Heartrate Sensor" -CONFIG_BLUETOOTH_DEVICE_APPEARANCE=833 +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_DEVICE_NAME="Zephyr Heartrate Sensor" +CONFIG_BT_DEVICE_APPEARANCE=833 diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c index 63e6a2fb431..6f4f38862e1 100644 --- a/samples/bluetooth/peripheral_hr/src/main.c +++ b/samples/bluetooth/peripheral_hr/src/main.c @@ -24,7 +24,7 @@ #include #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) struct bt_conn *default_conn; diff --git a/samples/bluetooth/peripheral_sc_only/prj.conf b/samples/bluetooth/peripheral_sc_only/prj.conf index 03c24d0d229..4521db7d2ff 100644 --- a/samples/bluetooth/peripheral_sc_only/prj.conf +++ b/samples/bluetooth/peripheral_sc_only/prj.conf @@ -1,7 +1,7 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_MAX_PAIRED=2 -CONFIG_BLUETOOTH_DEVICE_NAME="SC only peripheral" +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_MAX_PAIRED=2 +CONFIG_BT_DEVICE_NAME="SC only peripheral" diff --git a/samples/bluetooth/peripheral_sc_only/src/main.c b/samples/bluetooth/peripheral_sc_only/src/main.c index dd4aea03d7c..6740a7e6532 100644 --- a/samples/bluetooth/peripheral_sc_only/src/main.c +++ b/samples/bluetooth/peripheral_sc_only/src/main.c @@ -21,7 +21,7 @@ #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) static const struct bt_data ad[] = { diff --git a/samples/bluetooth/scan_adv/prj.conf b/samples/bluetooth/scan_adv/prj.conf index b7fd393fca4..26db96e6334 100644 --- a/samples/bluetooth/scan_adv/prj.conf +++ b/samples/bluetooth/scan_adv/prj.conf @@ -1,4 +1,4 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_DEBUG_LOG=y +CONFIG_BT=y +CONFIG_BT_BROADCASTER=y +CONFIG_BT_OBSERVER=y +CONFIG_BT_DEBUG_LOG=y diff --git a/samples/boards/arduino_101/environmental_sensing/ap/prj.conf b/samples/boards/arduino_101/environmental_sensing/ap/prj.conf index 16e39aca568..b08ef67a939 100644 --- a/samples/boards/arduino_101/environmental_sensing/ap/prj.conf +++ b/samples/boards/arduino_101/environmental_sensing/ap/prj.conf @@ -5,8 +5,8 @@ CONFIG_IPM_QUARK_SE=y CONFIG_IPM_QUARK_SE_MASTER=y CONFIG_IPM_CONSOLE_SENDER=y CONFIG_TIMESLICE_SIZE=1 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y CONFIG_GPIO=y -CONFIG_BLUETOOTH_WAIT_NOP=y -CONFIG_BLUETOOTH_NRF51_PM=y +CONFIG_BT_WAIT_NOP=y +CONFIG_BT_NRF51_PM=y diff --git a/samples/boards/microbit/pong/prj.conf b/samples/boards/microbit/pong/prj.conf index 3afb7ce0f97..336b25ca66d 100644 --- a/samples/boards/microbit/pong/prj.conf +++ b/samples/boards/microbit/pong/prj.conf @@ -1,10 +1,10 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_ISR_STACK_SIZE=1024 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Pong" +CONFIG_BT=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_DEVICE_NAME="Zephyr Pong" CONFIG_GPIO=y CONFIG_MICROBIT_DISPLAY=y CONFIG_PWM=y diff --git a/samples/boards/microbit/pong/src/ble.c b/samples/boards/microbit/pong/src/ble.c index d1dc7b81681..a66742a6236 100644 --- a/samples/boards/microbit/pong/src/ble.c +++ b/samples/boards/microbit/pong/src/ble.c @@ -24,7 +24,7 @@ #define SCAN_TIMEOUT K_SECONDS(2) #define APPEARANCE 0 -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define PONG_SVC_UUID 0x90, 0x6c, 0x55, 0x0f, 0xee, 0x6f, 0x4d, 0x0d, \ diff --git a/samples/hello_world/sample.yaml b/samples/hello_world/sample.yaml index b5b0e2a071d..7113e95044e 100644 --- a/samples/hello_world/sample.yaml +++ b/samples/hello_world/sample.yaml @@ -9,5 +9,5 @@ tests: - singlethread: build_only: true extra_args: CONF_FILE=prj_single.conf - filter: not CONFIG_BLUETOOTH and not CONFIG_GPIO_SCH + filter: not CONFIG_BT and not CONFIG_GPIO_SCH tags: samples tests diff --git a/samples/net/common/Makefile.common b/samples/net/common/Makefile.common index 592f27fba9d..60e0ba17215 100644 --- a/samples/net/common/Makefile.common +++ b/samples/net/common/Makefile.common @@ -6,7 +6,7 @@ # Common routines used in net samples -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) ccflags-y += -I${ZEPHYR_BASE}/samples/bluetooth/ obj-y += ../../../bluetooth/gatt/ipss.o endif diff --git a/samples/net/echo_client/Makefile b/samples/net/echo_client/Makefile index 4761c03a6bc..dd0dc7568f9 100644 --- a/samples/net/echo_client/Makefile +++ b/samples/net/echo_client/Makefile @@ -11,7 +11,7 @@ CONF_FILE ?= prj_$(BOARD).conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/echo_client/prj_bt.conf b/samples/net/echo_client/prj_bt.conf index 501987e80c6..119157e46c5 100644 --- a/samples/net/echo_client/prj_bt.conf +++ b/samples/net/echo_client/prj_bt.conf @@ -1,10 +1,10 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_IPV4=n @@ -12,8 +12,8 @@ CONFIG_NET_UDP=y CONFIG_NET_TCP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_L2_BT=y +CONFIG_NET_DEBUG_L2_BT=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y @@ -29,7 +29,7 @@ CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y CONFIG_NET_SHELL=y -CONFIG_NET_L2_BLUETOOTH_SHELL=y +CONFIG_NET_L2_BT_SHELL=y CONFIG_NET_APP=y CONFIG_NET_APP_NEED_IPV6=y diff --git a/samples/net/echo_client/prj_nrf5.conf b/samples/net/echo_client/prj_nrf5.conf index cf35eb9ac47..6c5b4c603ff 100644 --- a/samples/net/echo_client/prj_nrf5.conf +++ b/samples/net/echo_client/prj_nrf5.conf @@ -1,5 +1,5 @@ CONFIG_ARC_INIT=n -CONFIG_BLUETOOTH=n +CONFIG_BT=n CONFIG_NETWORKING=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/net/echo_server/Makefile b/samples/net/echo_server/Makefile index 24d6defed38..9d56e9e3002 100644 --- a/samples/net/echo_server/Makefile +++ b/samples/net/echo_server/Makefile @@ -11,7 +11,7 @@ CONF_FILE ?= prj_$(BOARD).conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/echo_server/prj_bt.conf b/samples/net/echo_server/prj_bt.conf index 86696c20f4b..9d35151da56 100644 --- a/samples/net/echo_server/prj_bt.conf +++ b/samples/net/echo_server/prj_bt.conf @@ -1,10 +1,10 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_IPV4=n @@ -12,9 +12,9 @@ CONFIG_NET_UDP=y CONFIG_NET_TCP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_DEBUG_L2_BT=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y @@ -34,4 +34,4 @@ CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BLUETOOTH_NODE=y +CONFIG_NET_APP_BT_NODE=y diff --git a/samples/net/echo_server/prj_nrf5.conf b/samples/net/echo_server/prj_nrf5.conf index ebe26fa0dca..2b445501a84 100644 --- a/samples/net/echo_server/prj_nrf5.conf +++ b/samples/net/echo_server/prj_nrf5.conf @@ -1,5 +1,5 @@ CONFIG_ARC_INIT=n -CONFIG_BLUETOOTH=n +CONFIG_BT=n CONFIG_NETWORKING=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/net/http_client/Makefile b/samples/net/http_client/Makefile index ad7b27fe374..bb88b97aff7 100644 --- a/samples/net/http_client/Makefile +++ b/samples/net/http_client/Makefile @@ -9,7 +9,7 @@ CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH),y) +ifeq ($(CONFIG_NET_L2_BT),y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/http_client/prj_bt.conf b/samples/net/http_client/prj_bt.conf index 7a97601e218..9e11e485528 100644 --- a/samples/net/http_client/prj_bt.conf +++ b/samples/net/http_client/prj_bt.conf @@ -33,16 +33,16 @@ CONFIG_NET_SHELL=y CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test Http_Client" +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_DEVICE_NAME="Test Http_Client" CONFIG_NET_UDP=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_DEBUG_L2_BT=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_client/src/main.c b/samples/net/http_client/src/main.c index 25c814876cc..0a3b69995ba 100644 --- a/samples/net/http_client/src/main.c +++ b/samples/net/http_client/src/main.c @@ -48,10 +48,10 @@ static struct net_buf_pool *data_pool(void) return &http_cli_data; } #else -#if defined(CONFIG_NET_L2_BLUETOOTH) +#if defined(CONFIG_NET_L2_BT) #error "TCP connections over Bluetooth need CONFIG_NET_CONTEXT_NET_PKT_POOL "\ "defined." -#endif /* CONFIG_NET_L2_BLUETOOTH */ +#endif /* CONFIG_NET_L2_BT */ #define tx_slab NULL #define data_pool NULL diff --git a/samples/net/http_server/Makefile b/samples/net/http_server/Makefile index ad7b27fe374..bb88b97aff7 100644 --- a/samples/net/http_server/Makefile +++ b/samples/net/http_server/Makefile @@ -9,7 +9,7 @@ CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH),y) +ifeq ($(CONFIG_NET_L2_BT),y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/http_server/prj_bt.conf b/samples/net/http_server/prj_bt.conf index 49091165c41..7c5af5974ab 100644 --- a/samples/net/http_server/prj_bt.conf +++ b/samples/net/http_server/prj_bt.conf @@ -32,22 +32,22 @@ CONFIG_MBEDTLS_HEAP_SIZE=12000 CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_BLUETOOTH_NODE=y +CONFIG_NET_APP_BT_NODE=y CONFIG_NET_SHELL=y CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test Http_Server" +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_DEVICE_NAME="Test Http_Server" CONFIG_NET_UDP=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_DEBUG_L2_BT=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/http_server/src/main.c b/samples/net/http_server/src/main.c index b0ddef2f262..1f5c6547e72 100644 --- a/samples/net/http_server/src/main.c +++ b/samples/net/http_server/src/main.c @@ -45,10 +45,10 @@ static struct net_buf_pool *data_pool(void) return &http_srv_data; } #else -#if defined(CONFIG_NET_L2_BLUETOOTH) +#if defined(CONFIG_NET_L2_BT) #error "TCP connections over Bluetooth need CONFIG_NET_CONTEXT_NET_PKT_POOL "\ "defined." -#endif /* CONFIG_NET_L2_BLUETOOTH */ +#endif /* CONFIG_NET_L2_BT */ #define tx_slab NULL #define data_pool NULL diff --git a/samples/net/https_client/Makefile b/samples/net/https_client/Makefile index ad7b27fe374..bb88b97aff7 100644 --- a/samples/net/https_client/Makefile +++ b/samples/net/https_client/Makefile @@ -9,7 +9,7 @@ CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH),y) +ifeq ($(CONFIG_NET_L2_BT),y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/https_client/prj_bt.conf b/samples/net/https_client/prj_bt.conf index 77c017e11a3..96fb76b1dab 100644 --- a/samples/net/https_client/prj_bt.conf +++ b/samples/net/https_client/prj_bt.conf @@ -38,15 +38,15 @@ CONFIG_NET_SHELL=y CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_DEVICE_NAME="Test Http_Client" +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_SMP=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_DEVICE_NAME="Test Http_Client" CONFIG_NET_UDP=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_DEBUG_L2_BT=y CONFIG_NET_STATISTICS=y diff --git a/samples/net/https_client/src/main.c b/samples/net/https_client/src/main.c index 861a75457ef..12e4f47c770 100644 --- a/samples/net/https_client/src/main.c +++ b/samples/net/https_client/src/main.c @@ -59,10 +59,10 @@ static struct net_buf_pool *data_pool(void) return &http_cli_tls_data; } #else -#if defined(CONFIG_NET_L2_BLUETOOTH) +#if defined(CONFIG_NET_L2_BT) #error "TCP connections over Bluetooth need CONFIG_NET_CONTEXT_NET_PKT_POOL "\ "defined." -#endif /* CONFIG_NET_L2_BLUETOOTH */ +#endif /* CONFIG_NET_L2_BT */ #define tx_slab NULL #define data_pool NULL diff --git a/samples/net/leds_demo/src/Makefile b/samples/net/leds_demo/src/Makefile index d0690d95dfc..d7b1bafd88d 100644 --- a/samples/net/leds_demo/src/Makefile +++ b/samples/net/leds_demo/src/Makefile @@ -5,7 +5,7 @@ ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/ ccflags-y +=-DNET_TESTING_SERVER=1 endif -ccflags-$(CONFIG_NET_L2_BLUETOOTH) += -I${ZEPHYR_BASE}/samples/bluetooth/ +ccflags-$(CONFIG_NET_L2_BT) += -I${ZEPHYR_BASE}/samples/bluetooth/ obj-y = leds-demo.o diff --git a/samples/net/mqtt_publisher/prj_96b_nitrogen.conf b/samples/net/mqtt_publisher/prj_96b_nitrogen.conf index 817fb68b22b..c21a3be981a 100644 --- a/samples/net/mqtt_publisher/prj_96b_nitrogen.conf +++ b/samples/net/mqtt_publisher/prj_96b_nitrogen.conf @@ -4,8 +4,8 @@ CONFIG_NETWORKING=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_ARP=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_SEC_LEVEL=1 +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_SEC_LEVEL=1 CONFIG_NET_LOG=y CONFIG_NET_IPV6_RA_RDNSS=y CONFIG_NET_IPV4=n @@ -23,7 +23,7 @@ CONFIG_NET_BUF_TX_COUNT=15 CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_BLUETOOTH_NODE=y +CONFIG_NET_APP_BT_NODE=y CONFIG_NET_APP_MY_IPV4_ADDR="192.168.1.101" CONFIG_NET_APP_PEER_IPV4_ADDR="192.168.1.10" @@ -41,26 +41,26 @@ CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TIMER_RANDOM_GENERATOR=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1024 -CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr" +CONFIG_BT_RX_STACK_SIZE=1024 +CONFIG_BT_DEVICE_NAME="Zephyr" -CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=3 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=65 -CONFIG_BLUETOOTH_L2CAP_TX_USER_DATA_SIZE=4 +CONFIG_BT_L2CAP_TX_BUF_COUNT=3 +CONFIG_BT_L2CAP_TX_MTU=65 +CONFIG_BT_L2CAP_TX_USER_DATA_SIZE=4 -CONFIG_BLUETOOTH_HCI_TX_STACK_SIZE=640 -CONFIG_BLUETOOTH_HCI_HOST=y -CONFIG_BLUETOOTH_RECV_IS_RX_THREAD=y -CONFIG_BLUETOOTH_HCI_CMD_COUNT=2 -CONFIG_BLUETOOTH_MAX_CMD_LEN=64 -CONFIG_BLUETOOTH_RX_BUF_COUNT=20 -CONFIG_BLUETOOTH_RX_BUF_LEN=1024 -CONFIG_BLUETOOTH_CONN=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_DEBUG=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEBUG_COLOR=y +CONFIG_BT_HCI_TX_STACK_SIZE=640 +CONFIG_BT_HCI_HOST=y +CONFIG_BT_RECV_IS_RX_THREAD=y +CONFIG_BT_HCI_CMD_COUNT=2 +CONFIG_BT_MAX_CMD_LEN=64 +CONFIG_BT_RX_BUF_COUNT=20 +CONFIG_BT_RX_BUF_LEN=1024 +CONFIG_BT_CONN=y +CONFIG_BT_SIGNING=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_DEBUG=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEBUG_COLOR=y CONFIG_CONSOLE_SHELL=y CONFIG_CONSOLE_SHELL_STACKSIZE=2000 diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c index 2dfa46ef202..5f62bedb2b1 100644 --- a/samples/net/mqtt_publisher/src/main.c +++ b/samples/net/mqtt_publisher/src/main.c @@ -13,7 +13,7 @@ #include #include -#if defined(CONFIG_NET_L2_BLUETOOTH) +#if defined(CONFIG_NET_L2_BT) #include #include #endif @@ -403,7 +403,7 @@ exit_app: printk("\nBye!\n"); } -#if defined(CONFIG_NET_L2_BLUETOOTH) +#if defined(CONFIG_NET_L2_BT) static bool bt_connected; static @@ -429,7 +429,7 @@ struct bt_conn_cb bt_conn_cb = { static int network_setup(void) { -#if defined(CONFIG_NET_L2_BLUETOOTH) +#if defined(CONFIG_NET_L2_BT) const char *progress_mark = "/-\\|"; int i = 0; int rc; diff --git a/samples/net/sockets/echo/Makefile b/samples/net/sockets/echo/Makefile index 64e17b84c28..72b23fa5e01 100644 --- a/samples/net/sockets/echo/Makefile +++ b/samples/net/sockets/echo/Makefile @@ -11,7 +11,7 @@ CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/sockets/echo_async/Makefile b/samples/net/sockets/echo_async/Makefile index 76461fd4b73..68bcb00f342 100644 --- a/samples/net/sockets/echo_async/Makefile +++ b/samples/net/sockets/echo_async/Makefile @@ -11,7 +11,7 @@ CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/zoap_client/Makefile b/samples/net/zoap_client/Makefile index 5a318ecd83a..8848885e17f 100644 --- a/samples/net/zoap_client/Makefile +++ b/samples/net/zoap_client/Makefile @@ -11,7 +11,7 @@ CONF_FILE = prj.conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/zoap_client/prj_bt.conf b/samples/net/zoap_client/prj_bt.conf index 15b46789378..5911d18a580 100644 --- a/samples/net/zoap_client/prj_bt.conf +++ b/samples/net/zoap_client/prj_bt.conf @@ -7,15 +7,15 @@ CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_ZOAP=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_DEBUG_L2_BT=y CONFIG_INIT_STACKS=y CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y CONFIG_NET_SHELL=y -CONFIG_NET_L2_BLUETOOTH_SHELL=y +CONFIG_NET_L2_BT_SHELL=y CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" diff --git a/samples/net/zoap_server/Makefile b/samples/net/zoap_server/Makefile index 7943e26c859..2c77fca307f 100644 --- a/samples/net/zoap_server/Makefile +++ b/samples/net/zoap_server/Makefile @@ -11,7 +11,7 @@ CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/zoap_server/prj_bt.conf b/samples/net/zoap_server/prj_bt.conf index 665abe86c49..00817826a1b 100644 --- a/samples/net/zoap_server/prj_bt.conf +++ b/samples/net/zoap_server/prj_bt.conf @@ -1,18 +1,18 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_LOG=y CONFIG_NET_UDP=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y -CONFIG_NET_APP_BLUETOOTH_NODE=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_DEBUG_L2_BT=y +CONFIG_NET_APP_BT_NODE=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_RANDOM_GENERATOR=y diff --git a/samples/net/zperf/Makefile b/samples/net/zperf/Makefile index a41757f7774..bc4e43986c5 100644 --- a/samples/net/zperf/Makefile +++ b/samples/net/zperf/Makefile @@ -8,7 +8,7 @@ CONF_FILE ?= prj_${BOARD}${PROF}.conf include ${ZEPHYR_BASE}/Makefile.inc -ifeq ($(CONFIG_NET_L2_BLUETOOTH), y) +ifeq ($(CONFIG_NET_L2_BT), y) QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr else include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack diff --git a/samples/net/zperf/prj_bt.conf b/samples/net/zperf/prj_bt.conf index 6f7eaebe5f0..18618430808 100644 --- a/samples/net/zperf/prj_bt.conf +++ b/samples/net/zperf/prj_bt.conf @@ -20,10 +20,10 @@ CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y CONFIG_NET_SHELL=y -CONFIG_NET_L2_BLUETOOTH_SHELL=y +CONFIG_NET_L2_BT_SHELL=y CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_SHELL=y diff --git a/scripts/extract_dts_includes.py b/scripts/extract_dts_includes.py index ad46963ce9e..ddee0fb718d 100755 --- a/scripts/extract_dts_includes.py +++ b/scripts/extract_dts_includes.py @@ -780,9 +780,9 @@ def main(): name_dict = { "CONFIG_UART_CONSOLE_ON_DEV_NAME": "zephyr,console", - "CONFIG_BLUETOOTH_UART_ON_DEV_NAME": "zephyr,bt-uart", + "CONFIG_BT_UART_ON_DEV_NAME": "zephyr,bt-uart", "CONFIG_UART_PIPE_ON_DEV_NAME": "zephyr,uart-pipe", - "CONFIG_BLUETOOTH_MONITOR_ON_DEV_NAME": "zephyr,bt-mon-uart" + "CONFIG_BT_MONITOR_ON_DEV_NAME": "zephyr,bt-mon-uart" } for k, v in name_dict.items(): diff --git a/subsys/Makefile b/subsys/Makefile index 343b84ffd47..a9a2aa153d3 100644 --- a/subsys/Makefile +++ b/subsys/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_FILE_SYSTEM) += fs/ obj-$(CONFIG_USB) += usb/ -obj-$(CONFIG_BLUETOOTH) += bluetooth/ +obj-$(CONFIG_BT) += bluetooth/ obj-$(CONFIG_NET_BUF) += net/ obj-$(CONFIG_CONSOLE_SHELL) += shell/ obj-$(CONFIG_CONSOLE_PULL) += console/ diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig index b00ac16a9d0..358400db02b 100644 --- a/subsys/bluetooth/Kconfig +++ b/subsys/bluetooth/Kconfig @@ -7,27 +7,27 @@ menu "Bluetooth" -config BLUETOOTH +config BT bool "Bluetooth support" select NET_BUF help This option enables Bluetooth support. -if BLUETOOTH +if BT choice prompt "Bluetooth Stack Selection" - default BLUETOOTH_HCI + default BT_HCI help Select the Bluetooth stack to compile. -config BLUETOOTH_HCI +config BT_HCI bool "HCI-based" help HCI-based stack with optional host & controller parts and an HCI driver in between. -config BLUETOOTH_CUSTOM +config BT_CUSTOM bool "Custom" help Select a custom, non-HCI based stack. If you're not sure what @@ -35,84 +35,84 @@ config BLUETOOTH_CUSTOM endchoice -if BLUETOOTH_HCI +if BT_HCI -config BLUETOOTH_HCI_RAW +config BT_HCI_RAW bool "RAW HCI access" help This option allows to access Bluetooth controller from the application with the RAW HCI protocol. -config BLUETOOTH_PERIPHERAL +config BT_PERIPHERAL bool "Peripheral Role support" - select BLUETOOTH_BROADCASTER - select BLUETOOTH_CONN - default y if BLUETOOTH_HCI_RAW + select BT_BROADCASTER + select BT_CONN + default y if BT_HCI_RAW help Select this for LE Peripheral role support. -config BLUETOOTH_CENTRAL +config BT_CENTRAL bool "Central Role support" - select BLUETOOTH_OBSERVER - select BLUETOOTH_CONN - default y if BLUETOOTH_HCI_RAW + select BT_OBSERVER + select BT_CONN + default y if BT_HCI_RAW help Select this for LE Central role support. menu "Broadcaster" - visible if !BLUETOOTH_PERIPHERAL + visible if !BT_PERIPHERAL -config BLUETOOTH_BROADCASTER +config BT_BROADCASTER bool "Broadcaster Role support" - default y if !BLUETOOTH_OBSERVER + default y if !BT_OBSERVER help Select this for LE Broadcaster role support. endmenu menu "Observer" - visible if !BLUETOOTH_CENTRAL + visible if !BT_CENTRAL -config BLUETOOTH_OBSERVER +config BT_OBSERVER bool "Observer Role support" help Select this for LE Observer role support. endmenu -config BLUETOOTH_CONN +config BT_CONN # Virtual/hidden option bool -config BLUETOOTH_MAX_CONN +config BT_MAX_CONN int "Maximum number of simultaneous connections" - depends on BLUETOOTH_CONN + depends on BT_CONN range 1 64 default 1 help Maximum number of simultaneous Bluetooth connections supported. -if BLUETOOTH_CONN -config BLUETOOTH_HCI_ACL_FLOW_CONTROL +if BT_CONN +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 !BLUETOOTH_CONTROLLER + default y if !BT_CONTROLLER # Enable if building a Controller-only build - default y if BLUETOOTH_HCI_RAW + default y if BT_HCI_RAW select POLL help Enable support for throttling ACL buffers from the controller to the host. This is particularly useful when the host and controller are on separate cores since it ensures that we do not run out of incoming ACL buffers. -endif # BLUETOOTH_CONN +endif # BT_CONN -config BLUETOOTH_CONTROLLER_TO_HOST_UART_DEV_NAME +config BT_CONTROLLER_TO_HOST_UART_DEV_NAME string "Device Name of UART Device to an external Bluetooth Host" default "UART_0" - depends on BLUETOOTH_HCI_RAW + depends on BT_HCI_RAW help This option specifies the name of UART device to be used to connect to an external Bluetooth Host when Zephyr is @@ -122,8 +122,8 @@ source "subsys/bluetooth/common/Kconfig" source "subsys/bluetooth/host/Kconfig" source "subsys/bluetooth/controller/Kconfig" source "subsys/bluetooth/shell/Kconfig" -endif # BLUETOOTH_HCI +endif # BT_HCI -endif # BLUETOOTH +endif # BT endmenu diff --git a/subsys/bluetooth/Makefile b/subsys/bluetooth/Makefile index 8122349fe15..e56b7cd92ee 100644 --- a/subsys/bluetooth/Makefile +++ b/subsys/bluetooth/Makefile @@ -1,4 +1,4 @@ obj-y += common/ -obj-$(CONFIG_BLUETOOTH_SHELL) += shell/ -obj-$(CONFIG_BLUETOOTH_HCI) += host/ -obj-$(CONFIG_BLUETOOTH_CONTROLLER) += controller/ +obj-$(CONFIG_BT_SHELL) += shell/ +obj-$(CONFIG_BT_HCI) += host/ +obj-$(CONFIG_BT_CONTROLLER) += controller/ diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig index 4d8476871f7..0d7238eb579 100644 --- a/subsys/bluetooth/common/Kconfig +++ b/subsys/bluetooth/common/Kconfig @@ -6,41 +6,41 @@ # SPDX-License-Identifier: Apache-2.0 # -if BLUETOOTH_HCI +if BT_HCI -config BLUETOOTH_RPA +config BT_RPA # Virtual/hidden option bool select TINYCRYPT select TINYCRYPT_AES default n -config BLUETOOTH_DEBUG +config BT_DEBUG # Virtual/hidden option to make the conditions more intuitive bool choice prompt "Bluetooth debug type" - depends on BLUETOOTH - default BLUETOOTH_DEBUG_NONE + depends on BT + default BT_DEBUG_NONE -config BLUETOOTH_DEBUG_NONE +config BT_DEBUG_NONE bool "No debug log" help Select this to disable all Bluetooth debug logs. -config BLUETOOTH_DEBUG_LOG +config BT_DEBUG_LOG bool "Normal printf-style to console" - select BLUETOOTH_DEBUG + select BT_DEBUG select PRINTK select SYS_LOG help This option enables Bluetooth debug going to standard serial console. -config BLUETOOTH_DEBUG_MONITOR +config BT_DEBUG_MONITOR bool "Monitor protocol over UART" - select BLUETOOTH_DEBUG + select BT_DEBUG select PRINTK select CONSOLE_HAS_DRIVER help @@ -57,39 +57,39 @@ config BLUETOOTH_DEBUG_MONITOR endchoice -if BLUETOOTH_DEBUG -config BLUETOOTH_DEBUG_COLOR +if BT_DEBUG +config BT_DEBUG_COLOR bool "Use colored logs" - depends on BLUETOOTH_DEBUG_LOG + depends on BT_DEBUG_LOG select SYS_LOG_SHOW_COLOR default y help Use color in the logs. This requires an ANSI capable terminal. if !HAS_DTS -config BLUETOOTH_MONITOR_ON_DEV_NAME +config BT_MONITOR_ON_DEV_NAME string "Device Name of Bluetooth monitor logging UART" - depends on BLUETOOTH_DEBUG_MONITOR + depends on BT_DEBUG_MONITOR default "UART_0" help This option specifies the name of UART device to be used for the Bluetooth monitor logging. endif -config BLUETOOTH_DEBUG_HCI_DRIVER +config BT_DEBUG_HCI_DRIVER bool "Bluetooth HCI driver debug" - depends on BLUETOOTH_DEBUG + depends on BT_DEBUG help This option enables debug support for the active Bluetooth HCI driver, including the Controller-side HCI layer when included in the build. -config BLUETOOTH_DEBUG_RPA +config BT_DEBUG_RPA bool "Bluetooth Resolvable Private Address (RPA) debug" - depends on BLUETOOTH_RPA + depends on BT_RPA help This option enables debug support for the Bluetooth Resolvable Private Address (RPA) generation and resolution. -endif #BLUETOOTH_DEBUG -endif # BLUETOOTH_HCI +endif #BT_DEBUG +endif # BT_HCI diff --git a/subsys/bluetooth/common/Makefile b/subsys/bluetooth/common/Makefile index d8415350b0d..4b057c1caec 100644 --- a/subsys/bluetooth/common/Makefile +++ b/subsys/bluetooth/common/Makefile @@ -1,5 +1,5 @@ ccflags-y += -I$(srctree)/subsys/bluetooth obj-y += dummy.o -obj-$(CONFIG_BLUETOOTH_DEBUG) += log.o -obj-$(CONFIG_BLUETOOTH_RPA) += rpa.o +obj-$(CONFIG_BT_DEBUG) += log.o +obj-$(CONFIG_BT_RPA) += rpa.o diff --git a/subsys/bluetooth/common/dummy.c b/subsys/bluetooth/common/dummy.c index 9a8cfdc18b0..c65c81c6069 100644 --- a/subsys/bluetooth/common/dummy.c +++ b/subsys/bluetooth/common/dummy.c @@ -23,14 +23,13 @@ BUILD_ASSERT(CONFIG_SYSTEM_WORKQUEUE_PRIORITY < 0); * before new Rx data is processed. This is a necessity to correctly detect * transaction violations in ATT and SMP protocols. */ -BUILD_ASSERT(CONFIG_BLUETOOTH_HCI_TX_PRIO < CONFIG_BLUETOOTH_RX_PRIO); +BUILD_ASSERT(CONFIG_BT_HCI_TX_PRIO < CONFIG_BT_RX_PRIO); -#if defined(CONFIG_BLUETOOTH_CONTROLLER) +#if defined(CONFIG_BT_CONTROLLER) /* 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_BLUETOOTH_CONTROLLER_RX_PRIO < - CONFIG_BLUETOOTH_HCI_TX_PRIO); -#endif /* CONFIG_BLUETOOTH_CONTROLLER */ +BUILD_ASSERT(CONFIG_BT_CONTROLLER_RX_PRIO < CONFIG_BT_HCI_TX_PRIO); +#endif /* CONFIG_BT_CONTROLLER */ diff --git a/subsys/bluetooth/common/log.c b/subsys/bluetooth/common/log.c index 9921a24683a..640351100d6 100644 --- a/subsys/bluetooth/common/log.c +++ b/subsys/bluetooth/common/log.c @@ -46,7 +46,7 @@ const char *bt_hex(const void *buf, size_t len) return str; } -#if defined(CONFIG_BLUETOOTH_DEBUG) +#if defined(CONFIG_BT_DEBUG) const char *bt_addr_str(const bt_addr_t *addr) { static char bufs[2][18]; @@ -72,5 +72,5 @@ const char *bt_addr_le_str(const bt_addr_le_t *addr) return str; } -#endif /* CONFIG_BLUETOOTH_DEBUG */ +#endif /* CONFIG_BT_DEBUG */ diff --git a/subsys/bluetooth/common/log.h b/subsys/bluetooth/common/log.h index bd04d9e9759..5d6881bc7ff 100644 --- a/subsys/bluetooth/common/log.h +++ b/subsys/bluetooth/common/log.h @@ -26,7 +26,7 @@ extern "C" { #define BT_DBG_ENABLED 1 #endif -#if defined(CONFIG_BLUETOOTH_DEBUG_MONITOR) +#if defined(CONFIG_BT_DEBUG_MONITOR) #include /* These defines follow the values used by syslog(2) */ @@ -52,7 +52,7 @@ __printf_like(2, 3) void bt_log(int prio, const char *fmt, ...); /* Enabling debug increases stack size requirement */ #define BT_STACK_DEBUG_EXTRA 300 -#elif defined(CONFIG_BLUETOOTH_DEBUG_LOG) +#elif defined(CONFIG_BT_DEBUG_LOG) #if !defined(SYS_LOG_DOMAIN) #define SYS_LOG_DOMAIN "bt" @@ -99,7 +99,7 @@ static inline __printf_like(1, 2) void _bt_log_dummy(const char *fmt, ...) {}; #define BT_STACK_NOINIT(name, size) \ K_THREAD_STACK_DEFINE(name, (size) + BT_STACK_DEBUG_EXTRA) -/* This helper is only available when BLUETOOTH_DEBUG is enabled */ +/* This helper is only available when BT_DEBUG is enabled */ const char *bt_hex(const void *buf, size_t len); /* These helpers are only safe to be called from internal threads as they're diff --git a/subsys/bluetooth/common/rpa.c b/subsys/bluetooth/common/rpa.c index effe0fd86d2..4484ff47955 100644 --- a/subsys/bluetooth/common/rpa.c +++ b/subsys/bluetooth/common/rpa.c @@ -24,7 +24,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_RPA) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RPA) #include "common/log.h" static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3]) @@ -54,8 +54,7 @@ static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3]) return 0; } -#if defined(CONFIG_BLUETOOTH_SMP) || \ - defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_CONTROLLER_PRIVACY) bool bt_rpa_irk_matches(const u8_t irk[16], const bt_addr_t *addr) { u8_t hash[3]; @@ -72,8 +71,7 @@ bool bt_rpa_irk_matches(const u8_t irk[16], const bt_addr_t *addr) } #endif -#if defined(CONFIG_BLUETOOTH_PRIVACY) || \ - defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_CONTROLLER_PRIVACY) int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa) { int err; @@ -99,5 +97,5 @@ int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa) { return -ENOTSUP; } -#endif /* CONFIG_BLUETOOTH_PRIVACY */ +#endif /* CONFIG_BT_PRIVACY */ diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index dc2c1c03666..98fc56cb991 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -7,21 +7,21 @@ comment "BLE Controller support" -config BLUETOOTH_CONTROLLER +config BT_CONTROLLER bool "Bluetooth Controller" - select BLUETOOTH_RECV_IS_RX_THREAD + select BT_RECV_IS_RX_THREAD help Enables support for SoC native controller implementations. -if BLUETOOTH_CONTROLLER +if BT_CONTROLLER choice prompt "Bluetooth Link Layer Selection" - default BLUETOOTH_LL_SW + default BT_LL_SW help Select the Bluetooth Link Layer to compile. -config BLUETOOTH_LL_SW +config BT_LL_SW bool "Use the software-based BLE Link Layer" help Use Zephyr software BLE Link Layer implementation. @@ -30,31 +30,31 @@ endchoice comment "BLE Controller configuration" -config BLUETOOTH_CONTROLLER_DUP_FILTER_LEN +config BT_CONTROLLER_DUP_FILTER_LEN prompt "Number of addresses in the scan duplicate filter" int - depends on BLUETOOTH_OBSERVER + depends on BT_OBSERVER default 16 help Set the number of unique BLE addresses that can be filtered as duplicates while scanning. -config BLUETOOTH_CONTROLLER_RX_BUFFERS +config BT_CONTROLLER_RX_BUFFERS prompt "Number of Rx buffers" int default 1 - default 6 if BLUETOOTH_HCI_RAW + default 6 if BT_HCI_RAW range 1 18 help Set the number of Rx PDUs to be buffered in the controller. In a 7.5ms connection interval and 2M PHY, maximum 18 packets with L2CAP payload size of 1 byte can be received. -config BLUETOOTH_CONTROLLER_TX_BUFFERS +config BT_CONTROLLER_TX_BUFFERS prompt "Number of Tx buffers" int default 2 - default 7 if BLUETOOTH_HCI_RAW + default 7 if BT_HCI_RAW range 1 19 help Set the number of Tx PDUs to be queued for transmission in the @@ -62,7 +62,7 @@ config BLUETOOTH_CONTROLLER_TX_BUFFERS packets can be enqueued, with 18 packets with L2CAP payload size of 1 byte can be acknowledged. -config BLUETOOTH_CONTROLLER_TX_BUFFER_SIZE +config BT_CONTROLLER_TX_BUFFER_SIZE prompt "Tx buffer size" int range 27 16384 @@ -75,7 +75,7 @@ config BLUETOOTH_CONTROLLER_TX_BUFFER_SIZE Maximum is set to 16384 due to implementation limitations (use of u16_t for size/length variables). -config BLUETOOTH_CONTROLLER_COMPANY_ID +config BT_CONTROLLER_COMPANY_ID prompt "Company Id" hex default 0xFFFF @@ -83,7 +83,7 @@ config BLUETOOTH_CONTROLLER_COMPANY_ID help Set the Company Id that will be used in VERSION_IND PDU. -config BLUETOOTH_CONTROLLER_SUBVERSION_NUMBER +config BT_CONTROLLER_SUBVERSION_NUMBER prompt "Subversion Number" hex default 0xFFFF @@ -91,11 +91,11 @@ config BLUETOOTH_CONTROLLER_SUBVERSION_NUMBER help Set the Subversion Number that will be used in VERSION_IND PDU. -config BLUETOOTH_CONTROLLER_RX_PRIO_STACK_SIZE +config BT_CONTROLLER_RX_PRIO_STACK_SIZE int default 448 -config BLUETOOTH_CONTROLLER_RX_PRIO +config BT_CONTROLLER_RX_PRIO # Hidden option for Controller's Co-Operative high priority Rx thread # priority. int @@ -103,31 +103,31 @@ config BLUETOOTH_CONTROLLER_RX_PRIO comment "BLE Controller features" -if BLUETOOTH_CONN +if BT_CONN -config BLUETOOTH_CONTROLLER_LE_ENC +config BT_CONTROLLER_LE_ENC bool - depends on !BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR && !BLUETOOTH_CONTROLLER_PHY_2M_NRF + depends on !BT_CONTROLLER_DATA_LENGTH_CLEAR && !BT_CONTROLLER_PHY_2M_NRF default y # Enable support for Bluetooth v4.0 LE Encryption feature in the # Controller. -config BLUETOOTH_CONTROLLER_LE_PING +config BT_CONTROLLER_LE_PING bool "LE Ping" default y help Enable support for Bluetooth v4.1 LE Ping feature in the Controller. -config BLUETOOTH_CONTROLLER_PRIVACY +config BT_CONTROLLER_PRIVACY bool "LE Controller-based Privacy" default y - select BLUETOOTH_RPA + select BT_RPA help Enable support for Bluetooth v4.2 LE Controller-based Privacy feature in the Controller. -config BLUETOOTH_CONTROLLER_RL_SIZE +config BT_CONTROLLER_RL_SIZE prompt "LE Controller-based Privacy Resolving List size" - depends on BLUETOOTH_CONTROLLER_PRIVACY + depends on BT_CONTROLLER_PRIVACY int default 8 range 1 8 if SOC_FAMILY_NRF5 @@ -135,91 +135,91 @@ config BLUETOOTH_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 BLUETOOTH_CONTROLLER_DATA_LENGTH +config BT_CONTROLLER_DATA_LENGTH bool "Data Length Update" default y help Enable support for Bluetooth v4.2 LE Data Length Update procedure in the Controller. -config BLUETOOTH_CONTROLLER_DATA_LENGTH_MAX +config BT_CONTROLLER_DATA_LENGTH_MAX prompt "Maximum data length supported" - depends on BLUETOOTH_CONTROLLER_DATA_LENGTH + depends on BT_CONTROLLER_DATA_LENGTH int default 27 - range 27 251 if SOC_SERIES_NRF52X || BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR + range 27 251 if SOC_SERIES_NRF52X || BT_CONTROLLER_DATA_LENGTH_CLEAR range 27 27 help Set the maximum data length of PDU supported in the Controller. -config BLUETOOTH_CONTROLLER_PHY +config BT_CONTROLLER_PHY bool "PHY Update" default y help Enable support for Bluetooth 5.0 PHY Update Procedure in the Controller. -endif # BLUETOOTH_CONN +endif # BT_CONN -config BLUETOOTH_CONTROLLER_CHAN_SEL_2 +config BT_CONTROLLER_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 BLUETOOTH_CONTROLLER_ADV_EXT +config BT_CONTROLLER_ADV_EXT bool "LE Advertising Extensions" - select BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY - select BLUETOOTH_CONTROLLER_CHAN_SEL_2 + select BT_CONTROLLER_SCAN_REQ_NOTIFY + select BT_CONTROLLER_CHAN_SEL_2 default y help Enable support for Bluetooth 5.0 LE Advertising Extensions in the Controller. -config BLUETOOTH_CONTROLLER_ADVANCED_FEATURES +config BT_CONTROLLER_ADVANCED_FEATURES bool "Show advanced features" help Makes advanced features visible to controller developers. menu "Advanced features" - visible if BLUETOOTH_CONTROLLER_ADVANCED_FEATURES + visible if BT_CONTROLLER_ADVANCED_FEATURES -config BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR +config BT_CONTROLLER_DATA_LENGTH_CLEAR bool "Data Length Support (Cleartext only)" - depends on BLUETOOTH_CONTROLLER_DATA_LENGTH && SOC_SERIES_NRF51X + depends on BT_CONTROLLER_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 BLUETOOTH_CONTROLLER_PHY +if BT_CONTROLLER_PHY -config BLUETOOTH_CONTROLLER_PHY_2M +config BT_CONTROLLER_PHY_2M bool "2Mbps PHY Support" - depends on !SOC_SERIES_NRF51X || BLUETOOTH_CONTROLLER_PHY_2M_NRF + depends on !SOC_SERIES_NRF51X || BT_CONTROLLER_PHY_2M_NRF default y help Enable support for Bluetooth 5.0 2Mbps PHY in the Controller. -config BLUETOOTH_CONTROLLER_PHY_2M_NRF +config BT_CONTROLLER_PHY_2M_NRF bool "2Mbps Nordic Semiconductor PHY Support (Cleartext only)" depends on SOC_SERIES_NRF51X - select BLUETOOTH_CONTROLLER_PHY_2M + select BT_CONTROLLER_PHY_2M help Enable support for Nordic Semiconductor proprietary 2Mbps PHY in the Controller. Encrypted connections are not supported. -config BLUETOOTH_CONTROLLER_PHY_CODED +config BT_CONTROLLER_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 # BLUETOOTH_CONTROLLER_PHY +endif # BT_CONTROLLER_PHY -config BLUETOOTH_CONTROLLER_WORKER_PRIO +config BT_CONTROLLER_WORKER_PRIO prompt "Radio and Ticker's Worker IRQ priority" int range 0 3 if SOC_SERIES_NRF51X @@ -229,17 +229,17 @@ config BLUETOOTH_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 BLUETOOTH_CONTROLLER_JOB_PRIO +config BT_CONTROLLER_JOB_PRIO prompt "Ticker's JOB IRQ priority" int - range BLUETOOTH_CONTROLLER_WORKER_PRIO 3 if SOC_SERIES_NRF51X - range BLUETOOTH_CONTROLLER_WORKER_PRIO 6 if SOC_SERIES_NRF52X + range BT_CONTROLLER_WORKER_PRIO 3 if SOC_SERIES_NRF51X + range BT_CONTROLLER_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 BLUETOOTH_CONTROLLER_XTAL_ADVANCED +config BT_CONTROLLER_XTAL_ADVANCED bool "Advanced event preparation" default y help @@ -260,9 +260,9 @@ config BLUETOOTH_CONTROLLER_XTAL_ADVANCED higher average current due to increased number of crystal settling current consumptions. -config BLUETOOTH_CONTROLLER_XTAL_THRESHOLD +config BT_CONTROLLER_XTAL_THRESHOLD prompt "Crystal shutdown threshold in uS" - depends on BLUETOOTH_CONTROLLER_XTAL_ADVANCED + depends on BT_CONTROLLER_XTAL_ADVANCED int default 5168 help @@ -271,11 +271,11 @@ config BLUETOOTH_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 BLUETOOTH_CONTROLLER_SCHED_ADVANCED +config BT_CONTROLLER_SCHED_ADVANCED bool "Advanced scheduling" - depends on (BLUETOOTH_MAX_CONN != 0) + depends on (BT_MAX_CONN != 0) default y - default n if BLUETOOTH_PERIPHERAL && !BLUETOOTH_CENTRAL + default n if BT_PERIPHERAL && !BT_CENTRAL help Enable non-overlapping placement of observer, initiator and master roles in timespace. Uses window offset in connection updates and uses @@ -290,25 +290,25 @@ config BLUETOOTH_CONTROLLER_SCHED_ADVANCED Disabling this feature will lead to overlapping role in timespace leading to skipped events amongst active roles. -config BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST +config BT_CONTROLLER_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 BLUETOOTH_CONTROLLER_TIFS_HW +config BT_CONTROLLER_TIFS_HW bool "H/w Accelerated tIFS Trx switching" - depends on !BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST + depends on !BT_CONTROLLER_RADIO_ENABLE_FAST default y help Enable use of hardware accelerated tIFS Trx switching. -if BLUETOOTH_CONN +if BT_CONN -config BLUETOOTH_CONTROLLER_FAST_ENC +config BT_CONTROLLER_FAST_ENC bool "Fast Encryption Setup" - depends on BLUETOOTH_CONTROLLER_LE_ENC + depends on BT_CONTROLLER_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 BLUETOOTH_CONTROLLER_FAST_ENC Maximum CPU time in Radio ISR will increase if this feature is selected. -config BLUETOOTH_CONTROLLER_CONN_RSSI +config BT_CONTROLLER_CONN_RSSI bool "Connection RSSI" help Enable connection RSSI measurement. -endif # BLUETOOTH_CONN +endif # BT_CONN -config BLUETOOTH_CONTROLLER_ADV_INDICATION +config BT_CONTROLLER_ADV_INDICATION bool "Advertisement indications" help Generate events indicating on air advertisement events. -config BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY +config BT_CONTROLLER_SCAN_REQ_NOTIFY bool "Scan Request Notifications" help Generate events notifying the on air scan requests received. -config BLUETOOTH_CONTROLLER_SCAN_REQ_RSSI +config BT_CONTROLLER_SCAN_REQ_RSSI bool "Measure Scan Request RSSI" - depends on BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY + depends on BT_CONTROLLER_SCAN_REQ_NOTIFY help Measure RSSI of the on air scan requests received. @@ -347,9 +347,9 @@ endmenu comment "BLE Controller debug configuration" -config BLUETOOTH_CONTROLLER_ASSERT_HANDLER +config BT_CONTROLLER_ASSERT_HANDLER bool "Bluetooth Controller Assertion Handler" - depends on BLUETOOTH_HCI_RAW + depends on BT_HCI_RAW help This option enables an application-defined sink for the controller assertion mechanism. This must be defined in @@ -357,7 +357,7 @@ config BLUETOOTH_CONTROLLER_ASSERT_HANDLER and will be invoked whenever the controller code encounters an unrecoverable error. -config BLUETOOTH_CONTROLLER_PROFILE_ISR +config BT_CONTROLLER_PROFILE_ISR bool "Profile radio ISR" help Turn on measurement of radio ISR latency, CPU usage and generation of @@ -365,7 +365,7 @@ config BLUETOOTH_CONTROLLER_PROFILE_ISR contains current, minimum and maximum ISR entry latencies; and current, minimum and maximum ISR CPU use in micro-seconds. -config BLUETOOTH_CONTROLLER_DEBUG_PINS +config BT_CONTROLLER_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 BLUETOOTH_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 # BLUETOOTH_CONTROLLER +endif # BT_CONTROLLER diff --git a/subsys/bluetooth/controller/Makefile b/subsys/bluetooth/controller/Makefile index 4a176901b8a..40da5eaf39b 100644 --- a/subsys/bluetooth/controller/Makefile +++ b/subsys/bluetooth/controller/Makefile @@ -1,6 +1,6 @@ -obj-$(CONFIG_BLUETOOTH_CONTROLLER) += hci/ +obj-$(CONFIG_BT_CONTROLLER) += hci/ -obj-$(CONFIG_BLUETOOTH_LL_SW) += util/ -obj-$(CONFIG_BLUETOOTH_LL_SW) += hal/ -obj-$(CONFIG_BLUETOOTH_LL_SW) += ticker/ -obj-$(CONFIG_BLUETOOTH_LL_SW) += ll_sw/ +obj-$(CONFIG_BT_LL_SW) += util/ +obj-$(CONFIG_BT_LL_SW) += hal/ +obj-$(CONFIG_BT_LL_SW) += ticker/ +obj-$(CONFIG_BT_LL_SW) += ll_sw/ diff --git a/subsys/bluetooth/controller/hal/debug.h b/subsys/bluetooth/controller/hal/debug.h index 5a2662cc153..9ffed4133a4 100644 --- a/subsys/bluetooth/controller/hal/debug.h +++ b/subsys/bluetooth/controller/hal/debug.h @@ -8,7 +8,7 @@ #ifndef _HAL_DEBUG_H_ #define _HAL_DEBUG_H_ -#ifdef CONFIG_BLUETOOTH_CONTROLLER_ASSERT_HANDLER +#ifdef CONFIG_BT_CONTROLLER_ASSERT_HANDLER void bt_controller_assert_handle(char *file, u32_t line); #define LL_ASSERT(cond) if (!(cond)) { \ bt_controller_assert_handle(__FILE__, \ diff --git a/subsys/bluetooth/controller/hal/nrf5/debug.h b/subsys/bluetooth/controller/hal/nrf5/debug.h index f270b0faf20..0ea4e930955 100644 --- a/subsys/bluetooth/controller/hal/nrf5/debug.h +++ b/subsys/bluetooth/controller/hal/nrf5/debug.h @@ -12,7 +12,7 @@ * which can be defined to SoC's GPIO toggle to observe/debug the * controller's runtime behavior. */ -#ifdef CONFIG_BLUETOOTH_CONTROLLER_DEBUG_PINS +#ifdef CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_DEBUG_PINS */ +#endif /* CONFIG_BT_CONTROLLER_DEBUG_PINS */ #endif /* _DEBUG_H_ */ diff --git a/subsys/bluetooth/controller/hal/nrf5/radio.c b/subsys/bluetooth/controller/hal/nrf5/radio.c index 72b88d81625..9e295656a18 100644 --- a/subsys/bluetooth/controller/hal/nrf5/radio.c +++ b/subsys/bluetooth/controller/hal/nrf5/radio.c @@ -94,11 +94,11 @@ void radio_phy_set(u8_t phy, u8_t flags) NRF_RADIO->MODE = (mode << RADIO_MODE_MODE_Pos) & RADIO_MODE_MODE_Msk; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST) +#if defined(CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST) NRF_RADIO->MODECNF0 |= (RADIO_MODECNF0_RU_Fast << RADIO_MODECNF0_RU_Pos) & RADIO_MODECNF0_RU_Msk; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR) && dc) { + if (!IS_ENABLED(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST) +#if defined(CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST) return 40; #elif defined(CONFIG_SOC_NRF52840) switch (phy) { default: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) case BIT(0): return 141; /* floor(140.1 + 1.6) */ case BIT(1): return 146; /* floor(145 + 1) */ -#else /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ case BIT(0): case BIT(1): return 131; /* floor(129.5 + 1.6) */ -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) return 140; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ return 131; /* floor(129.5 + 1.6) */ -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST) +#if defined(CONFIG_BT_CONTROLLER_RADIO_ENABLE_FAST) return 40; #elif defined(CONFIG_SOC_NRF52840) switch (phy) { default: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) case BIT(0): return 141; /* ceil(140.1 + 0.2) */ case BIT(1): return 145; /* ceil(144.6 + 0.2) */ -#else /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ case BIT(0): case BIT(1): return 130; /* ceil(129.5 + 0.2) */ -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ case BIT(2): return 121; /* ceil(120 + 0.2) */ } #else /* !CONFIG_SOC_NRF52840 */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) return 140; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ return 130; /* ceil(129.5 + 0.2) */ -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* CONFIG_BT_CONTROLLER_TIFS_HW */ void radio_switch_complete_and_rx(u8_t phy_rx) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk | RADIO_SHORTS_DISABLED_RXEN_Msk; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk | RADIO_SHORTS_DISABLED_TXEN_Msk; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CONTROLLER_TIFS_HW) NRF_PPI->CHENCLR = PPI_CHEN_CH8_Msk | PPI_CHEN_CH11_Msk; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if defined(CONFIG_BT_CONTROLLER_TIFS_HW) NRF_RADIO->TIFS = tifs; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#else /* !CONFIG_BT_CONTROLLER_TIFS_HW */ NRF_TIMER1->CC[sw_tifs_toggle] = tifs; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_TIFS_HW) +#if !defined(CONFIG_BT_CONTROLLER_TIFS_HW) NRF_TIMER1->TASKS_STOP = 1; NRF_TIMER1->TASKS_SHUTDOWN = 1; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW */ +#endif /* !CONFIG_BT_CONTROLLER_TIFS_HW */ } void radio_tmr_hcto_configure(u32_t hcto) diff --git a/subsys/bluetooth/controller/hci/Makefile b/subsys/bluetooth/controller/hci/Makefile index 2ae837b7a25..7a09687b01e 100644 --- a/subsys/bluetooth/controller/hci/Makefile +++ b/subsys/bluetooth/controller/hci/Makefile @@ -1,5 +1,5 @@ -ccflags-$(CONFIG_BLUETOOTH_LL_SW) += -I$(srctree)/subsys/bluetooth/controller/include -ccflags-$(CONFIG_BLUETOOTH_LL_SW) += -I$(srctree)/subsys/bluetooth/controller +ccflags-$(CONFIG_BT_LL_SW) += -I$(srctree)/subsys/bluetooth/controller/include +ccflags-$(CONFIG_BT_LL_SW) += -I$(srctree)/subsys/bluetooth/controller ccflags-y += -I$(srctree)/subsys/bluetooth obj-y += hci.o hci_driver.o diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c index 4dc97a2db1a..36d5a76f035 100644 --- a/subsys/bluetooth/controller/hci/hci.c +++ b/subsys/bluetooth/controller/hci/hci.c @@ -27,7 +27,7 @@ #include "ll.h" #include "hci_internal.h" -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #include "hal/debug.h" @@ -37,18 +37,18 @@ */ static u16_t _opcode; -#if CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 /* Scan duplicate filter */ struct dup { u8_t mask; bt_addr_le_t addr; }; -static struct dup dup_filter[CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN]; +static struct dup dup_filter[CONFIG_BT_CONTROLLER_DUP_FILTER_LEN]; static s32_t dup_count; static u32_t dup_curr; #endif -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) s32_t hci_hbuf_total; u32_t hci_hbuf_sent; u32_t hci_hbuf_acked; @@ -56,7 +56,7 @@ atomic_t hci_state_mask; static struct k_poll_signal *hbuf_signal; #endif -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) static u32_t conn_count; #endif @@ -92,7 +92,7 @@ static void *cmd_complete(struct net_buf **buf, u8_t plen) return net_buf_add(*buf, plen); } -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) static struct net_buf *cmd_status(u8_t status) { struct bt_hci_evt_cmd_status *cs; @@ -121,7 +121,7 @@ static void *meta_evt(struct net_buf *buf, u8_t subevt, u8_t melen) return net_buf_add(buf, melen); } -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) static void disconnect(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_disconnect *cmd = (void *)buf->data; @@ -145,20 +145,20 @@ static void read_remote_ver_info(struct net_buf *buf, struct net_buf **evt) *evt = cmd_status((!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED); } -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ static int link_control_cmd_handle(u16_t ocf, struct net_buf *cmd, struct net_buf **evt) { switch (ocf) { -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_OCF(BT_HCI_OP_DISCONNECT): disconnect(cmd, evt); break; case BT_OCF(BT_HCI_OP_READ_REMOTE_VERSION_INFO): read_remote_ver_info(cmd, evt); break; -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ default: return -EINVAL; } @@ -192,7 +192,7 @@ static void reset(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_evt_cc_status *ccst; -#if CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 dup_count = -1; #endif /* reset event masks */ @@ -205,7 +205,7 @@ static void reset(struct net_buf *buf, struct net_buf **evt) ccst = cmd_complete(evt, sizeof(*ccst)); ccst->status = 0x00; } -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) hci_hbuf_total = 0; hci_hbuf_sent = 0; hci_hbuf_acked = 0; @@ -217,7 +217,7 @@ static void reset(struct net_buf *buf, struct net_buf **evt) #endif } -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) static void set_ctl_to_host_flow(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_set_ctl_to_host_flow *cmd = (void *)buf->data; @@ -314,7 +314,7 @@ static void host_num_completed_packets(struct net_buf *buf, } #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ static int ctrl_bb_cmd_handle(u16_t ocf, struct net_buf *cmd, struct net_buf **evt) @@ -369,7 +369,7 @@ static int ctrl_bb_cmd_handle(u16_t ocf, struct net_buf *cmd, set_event_mask_page_2(cmd, evt); break; -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) case BT_OCF(BT_HCI_OP_SET_CTL_TO_HOST_FLOW): set_ctl_to_host_flow(cmd, evt); break; @@ -383,7 +383,7 @@ static int ctrl_bb_cmd_handle(u16_t ocf, struct net_buf *cmd, break; #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ default: return -EINVAL; @@ -425,7 +425,7 @@ static void read_supported_commands(struct net_buf *buf, struct net_buf **evt) /* Set Event Mask, and Reset. */ rp->commands[5] |= BIT(6) | BIT(7); -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) /* Set FC, Host Buffer Size and Host Num Completed */ rp->commands[10] |= BIT(5) | BIT(6) | BIT(7); #endif @@ -448,63 +448,63 @@ static void read_supported_commands(struct net_buf *buf, struct net_buf **evt) rp->commands[27] |= BIT(6) | BIT(7); /* LE Read Supported States */ rp->commands[28] |= BIT(3); -#if defined(CONFIG_BLUETOOTH_BROADCASTER) +#if defined(CONFIG_BT_BROADCASTER) /* LE Set Adv Params, LE Read Adv Channel TX Power, LE Set Adv Data */ rp->commands[25] |= BIT(5) | BIT(6) | BIT(7); /* LE Set Scan Response Data, LE Set Adv Enable */ rp->commands[26] |= BIT(0) | BIT(1); #endif -#if defined(CONFIG_BLUETOOTH_OBSERVER) +#if defined(CONFIG_BT_OBSERVER) /* LE Set Scan Params, LE Set Scan Enable */ rp->commands[26] |= BIT(2) | BIT(3); #endif -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) /* LE Create Connection, LE Create Connection Cancel */ rp->commands[26] |= BIT(4) | BIT(5); /* Set Host Channel Classification */ rp->commands[27] |= BIT(3); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) /* LE Start Encryption */ rp->commands[28] |= BIT(0); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ -#endif /* CONFIG_BLUETOOTH_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CENTRAL */ +#if defined(CONFIG_BT_PERIPHERAL) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) /* LE LTK Request Reply, LE LTK Request Negative Reply */ rp->commands[28] |= BIT(1) | BIT(2); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ #endif -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) /* Disconnect. */ rp->commands[0] |= BIT(5); /* LE Connection Update, LE Read Remote Features */ 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_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) /* Read and Write authenticated payload timeout */ rp->commands[32] |= BIT(4) | BIT(5); #endif -#endif /* CONFIG_BLUETOOTH_CONN */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#endif /* CONFIG_BT_CONN */ +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_HCI_RAW) && defined(CONFIG_BLUETOOTH_TINYCRYPT_ECC) +#if defined(CONFIG_BT_HCI_RAW) && defined(CONFIG_BT_TINYCRYPT_ECC) /* LE Read Local P256 Public Key and LE Generate DH Key*/ rp->commands[34] |= BIT(1) | BIT(2); #endif @@ -702,22 +702,22 @@ static void le_read_supp_states(struct net_buf *buf, struct net_buf **evt) BIT64(32) | BIT64(33) | BIT64(34) | BIT64(35) | BIT64(36) | \ BIT64(37) | BIT64(41)) -#if defined(CONFIG_BLUETOOTH_BROADCASTER) +#if defined(CONFIG_BT_BROADCASTER) states |= ST_ADV; #else states &= ~ST_ADV; #endif -#if defined(CONFIG_BLUETOOTH_OBSERVER) +#if defined(CONFIG_BT_OBSERVER) states |= ST_SCA; #else states &= ~ST_SCA; #endif -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) states |= ST_SLA; #else states &= ~ST_SLA; #endif -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) states |= ST_MAS; #else states &= ~ST_MAS; @@ -732,7 +732,7 @@ static void le_read_supp_states(struct net_buf *buf, struct net_buf **evt) sys_put_le64(states, rp->le_states); } -#if defined(CONFIG_BLUETOOTH_BROADCASTER) +#if defined(CONFIG_BT_BROADCASTER) static void le_set_adv_param(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_set_adv_param *cmd = (void *)buf->data; @@ -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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ ccst = cmd_complete(evt, sizeof(*ccst)); ccst->status = status; @@ -802,9 +802,9 @@ static void le_set_adv_enable(struct net_buf *buf, struct net_buf **evt) ccst = cmd_complete(evt, sizeof(*ccst)); ccst->status = (!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED; } -#endif /* CONFIG_BLUETOOTH_BROADCASTER */ +#endif /* CONFIG_BT_BROADCASTER */ -#if defined(CONFIG_BLUETOOTH_OBSERVER) +#if defined(CONFIG_BT_OBSERVER) static void le_set_scan_param(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_set_scan_param *cmd = (void *)buf->data; @@ -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_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 /* initialize duplicate filtering */ if (cmd->enable && cmd->filter_dup) { dup_count = 0; @@ -843,10 +843,10 @@ static void le_set_scan_enable(struct net_buf *buf, struct net_buf **evt) ccst = cmd_complete(evt, sizeof(*ccst)); ccst->status = (!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED; } -#endif /* CONFIG_BLUETOOTH_OBSERVER */ +#endif /* CONFIG_BT_OBSERVER */ -#if defined(CONFIG_BLUETOOTH_CONN) -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CONN) +#if defined(CONFIG_BT_CENTRAL) static void le_create_connection(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_cp_le_create_conn *cmd = (void *)buf->data; @@ -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_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_LE_ENC */ -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_PERIPHERAL) +#if defined(CONFIG_BT_CONTROLLER_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,8 +946,8 @@ 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_BLUETOOTH_CONTROLLER_LE_ENC */ -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_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; @@ -1075,9 +1075,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_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_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; @@ -1144,10 +1144,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_BLUETOOTH_CONTROLLER_PHY */ -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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; @@ -1247,7 +1247,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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, struct net_buf **evt) @@ -1297,7 +1297,7 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, le_read_supp_states(cmd, evt); break; -#if defined(CONFIG_BLUETOOTH_BROADCASTER) +#if defined(CONFIG_BT_BROADCASTER) case BT_OCF(BT_HCI_OP_LE_SET_ADV_PARAM): le_set_adv_param(cmd, evt); break; @@ -1317,9 +1317,9 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, case BT_OCF(BT_HCI_OP_LE_SET_ADV_ENABLE): le_set_adv_enable(cmd, evt); break; -#endif /* CONFIG_BLUETOOTH_BROADCASTER */ +#endif /* CONFIG_BT_BROADCASTER */ -#if defined(CONFIG_BLUETOOTH_OBSERVER) +#if defined(CONFIG_BT_OBSERVER) case BT_OCF(BT_HCI_OP_LE_SET_SCAN_PARAM): le_set_scan_param(cmd, evt); break; @@ -1327,10 +1327,10 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, case BT_OCF(BT_HCI_OP_LE_SET_SCAN_ENABLE): le_set_scan_enable(cmd, evt); break; -#endif /* CONFIG_BLUETOOTH_OBSERVER */ +#endif /* CONFIG_BT_OBSERVER */ -#if defined(CONFIG_BLUETOOTH_CONN) -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CONN) +#if defined(CONFIG_BT_CENTRAL) case BT_OCF(BT_HCI_OP_LE_CREATE_CONN): le_create_connection(cmd, evt); break; @@ -1343,15 +1343,15 @@ static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd, le_set_host_chan_classif(cmd, evt); break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case BT_OCF(BT_HCI_OP_LE_START_ENCRYPTION): le_start_encryption(cmd, evt); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_PERIPHERAL) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case BT_OCF(BT_HCI_OP_LE_LTK_REQ_REPLY): le_ltk_req_reply(cmd, evt); break; @@ -1359,8 +1359,8 @@ 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_BLUETOOTH_CONTROLLER_LE_ENC */ -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_PERIPHERAL */ case BT_OCF(BT_HCI_OP_LE_READ_REMOTE_FEATURES): le_read_remote_features(cmd, evt); @@ -1378,7 +1378,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_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) case BT_OCF(BT_HCI_OP_LE_SET_DATA_LEN): le_set_data_len(cmd, evt); break; @@ -1394,9 +1394,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_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case BT_OCF(BT_HCI_OP_LE_READ_PHY): le_read_phy(cmd, evt); break; @@ -1408,10 +1408,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_BLUETOOTH_CONTROLLER_PHY */ -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) case BT_OCF(BT_HCI_OP_LE_ADD_DEV_TO_RL): le_add_dev_to_rl(cmd, evt); break; @@ -1439,7 +1439,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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ default: @@ -1629,9 +1629,9 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, struct bt_hci_evt_le_advertising_info *adv_info; u8_t data_len; u8_t info_len; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) u8_t rl_idx; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ u8_t *rssi; if (!(event_mask & BT_EVT_MASK_LE_META_EVENT) || @@ -1639,7 +1639,7 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, return; } -#if CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN > 0 +#if CONFIG_BT_CONTROLLER_DUP_FILTER_LEN > 0 /* check for duplicate filtering */ if (dup_count >= 0) { int i; @@ -1666,14 +1666,14 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b, dup_filter[dup_curr].addr.type = adv->tx_addr; dup_filter[dup_curr].mask = BIT(adv->type); - if (dup_count < CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN) { + if (dup_count < CONFIG_BT_CONTROLLER_DUP_FILTER_LEN) { dup_count++; dup_curr = dup_count; } else { dup_curr++; } - if (dup_curr == CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN) { + if (dup_curr == CONFIG_BT_CONTROLLER_DUP_FILTER_LEN) { dup_curr = 0; } } @@ -1696,7 +1696,7 @@ fill_report: adv_info->evt_type = c_adv_type[adv->type]; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) rl_idx = b[offsetof(struct radio_pdu_node_rx, pdu_data) + offsetof(struct pdu_adv, payload) + adv->len + 1]; if (rl_idx < ll_rl_size_get()) { @@ -1708,7 +1708,7 @@ fill_report: } else { #else if (1) { -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ adv_info->addr.type = adv->tx_addr; memcpy(&adv_info->addr.a.val[0], &adv->payload.adv_ind.addr[0], @@ -1724,7 +1724,7 @@ fill_report: } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) static void le_adv_ext_report(struct pdu_data *pdu_data, u8_t *b, struct net_buf *buf, u8_t phy) { @@ -1794,9 +1794,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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) static void le_scan_req_received(struct pdu_data *pdu_data, u8_t *b, struct net_buf *buf) { @@ -1833,9 +1833,9 @@ 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_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -1844,11 +1844,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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) !(le_event_mask & BT_EVT_MASK_LE_ENH_CONN_COMPLETE))) { #else 1)) { -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ return; } @@ -1858,7 +1858,7 @@ static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle, conn_count++; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (le_event_mask & BT_EVT_MASK_LE_ENH_CONN_COMPLETE) { struct bt_hci_evt_le_enh_conn_complete *leecc; @@ -1893,7 +1893,7 @@ static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle, leecc->clock_accuracy = radio_cc->mca; return; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ lecc = meta_evt(buf, BT_HCI_EVT_LE_CONN_COMPLETE, sizeof(*lecc)); @@ -1950,7 +1950,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_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) static void enc_refresh_complete(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -1966,9 +1966,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_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) static void auth_payload_timeout_exp(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -1983,9 +1983,9 @@ static void auth_payload_timeout_exp(struct pdu_data *pdu_data, u16_t handle, ep->handle = sys_cpu_to_le16(handle); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) static void le_chan_sel_algo(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2005,9 +2005,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_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) static void le_phy_upd_complete(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2033,8 +2033,8 @@ 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_BLUETOOTH_CONTROLLER_PHY */ -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONN */ static void encode_control(struct radio_pdu_node_rx *node_rx, struct pdu_data *pdu_data, struct net_buf *buf) @@ -2049,7 +2049,7 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, le_advertising_report(pdu_data, b, buf); break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: le_adv_ext_1M_report(pdu_data, b, buf); break; @@ -2057,15 +2057,15 @@ 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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: le_scan_req_received(pdu_data, b, buf); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case NODE_RX_TYPE_CONNECTION: le_conn_complete(pdu_data, handle, buf); break; @@ -2078,45 +2078,45 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, le_conn_update_complete(pdu_data, handle, buf); break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case NODE_RX_TYPE_ENC_REFRESH: enc_refresh_complete(pdu_data, handle, buf); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) case NODE_RX_TYPE_APTO: auth_payload_timeout_exp(pdu_data, handle, buf); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) case NODE_RX_TYPE_CHAN_SEL_ALGO: le_chan_sel_algo(pdu_data, handle, buf); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case NODE_RX_TYPE_PHY_UPDATE: le_phy_upd_complete(pdu_data, handle, buf); return; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) case NODE_RX_TYPE_RSSI: BT_INFO("handle: 0x%04x, rssi: -%d dB.", handle, pdu_data->payload.rssi); return; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: BT_INFO("Advertised."); return; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: BT_INFO("l: %d, %d, %d; t: %d, %d, %d.", pdu_data->payload.profile.lcur, @@ -2126,7 +2126,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_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ default: LL_ASSERT(0); @@ -2134,7 +2134,7 @@ static void encode_control(struct radio_pdu_node_rx *node_rx, } } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) static void le_ltk_request(struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) { @@ -2170,7 +2170,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_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ static void le_remote_feat_complete(u8_t status, struct pdu_data *pdu_data, u16_t handle, struct net_buf *buf) @@ -2284,7 +2284,7 @@ static void encode_data_ctrl(struct radio_pdu_node_rx *node_rx, switch (pdu_data->payload.llctrl.opcode) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case PDU_DATA_LLCTRL_TYPE_ENC_REQ: le_ltk_request(pdu_data, handle, buf); break; @@ -2292,7 +2292,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_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_FEATURE_RSP: le_remote_feat_complete(0x00, pdu_data, handle, buf); @@ -2302,13 +2302,13 @@ static void encode_data_ctrl(struct radio_pdu_node_rx *node_rx, remote_version_info(pdu_data, handle, buf); break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_CONN_PARAM_REQ: le_conn_param_req(pdu_data, handle, buf); @@ -2329,7 +2329,7 @@ static void encode_data_ctrl(struct radio_pdu_node_rx *node_rx, } } -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) void hci_acl_encode(struct radio_pdu_node_rx *node_rx, struct net_buf *buf) { struct bt_hci_acl_hdr *acl; @@ -2354,7 +2354,7 @@ void hci_acl_encode(struct radio_pdu_node_rx *node_rx, struct net_buf *buf) acl->len = sys_cpu_to_le16(pdu_data->len); data = (void *)net_buf_add(buf, pdu_data->len); memcpy(data, &pdu_data->payload.lldata[0], pdu_data->len); -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) if (hci_hbuf_total > 0) { LL_ASSERT((hci_hbuf_sent - hci_hbuf_acked) < hci_hbuf_total); @@ -2413,17 +2413,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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: case NODE_RX_TYPE_EXT_CODED_REPORT: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION) +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ +#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: #endif return HCI_CLASS_EVT_DISCARDABLE; @@ -2432,22 +2432,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_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case NODE_RX_TYPE_ENC_REFRESH: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) case NODE_RX_TYPE_RSSI: #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) case NODE_RX_TYPE_APTO: #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) case NODE_RX_TYPE_CHAN_SEL_ALGO: #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case NODE_RX_TYPE_PHY_UPDATE: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ return HCI_CLASS_EVT_CONNECTION; default: return -1; @@ -2462,7 +2462,7 @@ s8_t hci_get_class(struct radio_pdu_node_rx *node_rx) void hci_init(struct k_poll_signal *signal_host_buf) { -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) hbuf_signal = signal_host_buf; #endif reset(NULL, NULL); diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c index 2f336f9de86..b83ccc3b022 100644 --- a/subsys/bluetooth/controller/hci/hci_driver.c +++ b/subsys/bluetooth/controller/hci/hci_driver.c @@ -28,7 +28,7 @@ #include #endif -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #include "util/util.h" @@ -49,16 +49,16 @@ static K_FIFO_DEFINE(recv_fifo); struct k_thread prio_recv_thread_data; static BT_STACK_NOINIT(prio_recv_thread_stack, - CONFIG_BLUETOOTH_CONTROLLER_RX_PRIO_STACK_SIZE); + CONFIG_BT_CONTROLLER_RX_PRIO_STACK_SIZE); struct k_thread recv_thread_data; -static BT_STACK_NOINIT(recv_thread_stack, CONFIG_BLUETOOTH_RX_STACK_SIZE); +static BT_STACK_NOINIT(recv_thread_stack, CONFIG_BT_RX_STACK_SIZE); #if defined(CONFIG_INIT_STACKS) static u32_t prio_ts; static u32_t rx_ts; #endif -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) static struct k_poll_signal hbuf_signal = K_POLL_SIGNAL_INITIALIZER(); static sys_slist_t hbuf_pend; static s32_t hbuf_count; @@ -72,7 +72,7 @@ static void prio_recv_thread(void *p1, void *p2, void *p3) u16_t handle; while ((num_cmplt = radio_rx_get(&node_rx, &handle))) { -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) struct net_buf *buf; buf = bt_buf_get_rx(BT_BUF_EVT, K_FOREVER); @@ -126,7 +126,7 @@ static inline struct net_buf *encode_node(struct radio_pdu_node_rx *node_rx, hci_evt_encode(node_rx, buf); } break; -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case HCI_CLASS_ACL_DATA: /* generate ACL data */ buf = bt_buf_get_rx(BT_BUF_ACL_IN, K_FOREVER); @@ -150,7 +150,7 @@ static inline struct net_buf *process_node(struct radio_pdu_node_rx *node_rx) s8_t class = hci_get_class(node_rx); struct net_buf *buf = NULL; -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) if (hbuf_count != -1) { bool pend = !sys_slist_is_empty(&hbuf_pend); @@ -184,7 +184,7 @@ static inline struct net_buf *process_node(struct radio_pdu_node_rx *node_rx) return buf; } -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) static inline struct net_buf *process_hbuf(void) { /* shadow total count in case of preemption */ @@ -267,7 +267,7 @@ static inline struct net_buf *process_hbuf(void) static void recv_thread(void *p1, void *p2, void *p3) { -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) /* @todo: check if the events structure really needs to be static */ static struct k_poll_event events[2] = { K_POLL_EVENT_STATIC_INITIALIZER(K_POLL_TYPE_SIGNAL, @@ -284,7 +284,7 @@ static void recv_thread(void *p1, void *p2, void *p3) struct net_buf *buf = NULL; BT_DBG("blocking"); -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) int err; err = k_poll(events, 2, K_FOREVER); @@ -360,7 +360,7 @@ static int hci_driver_send(struct net_buf *buf) type = bt_buf_get_type(buf); switch (type) { -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_BUF_ACL_OUT: err = hci_acl_handle(buf); break; @@ -394,7 +394,7 @@ static int hci_driver_open(void) return err; } -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) hci_init(&hbuf_signal); #else hci_init(NULL); @@ -403,13 +403,13 @@ 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_BLUETOOTH_CONTROLLER_RX_PRIO), + K_PRIO_COOP(CONFIG_BT_CONTROLLER_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_BLUETOOTH_RX_PRIO), + K_PRIO_COOP(CONFIG_BT_RX_PRIO), 0, K_NO_WAIT); BT_DBG("Success."); diff --git a/subsys/bluetooth/controller/hci/hci_internal.h b/subsys/bluetooth/controller/hci/hci_internal.h index 48c68f240ef..a8d715fb876 100644 --- a/subsys/bluetooth/controller/hci/hci_internal.h +++ b/subsys/bluetooth/controller/hci/hci_internal.h @@ -8,7 +8,7 @@ #ifndef _HCI_CONTROLLER_H_ #define _HCI_CONTROLLER_H_ -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) extern s32_t hci_hbuf_total; extern u32_t hci_hbuf_sent; extern u32_t hci_hbuf_acked; @@ -26,7 +26,7 @@ void hci_init(struct k_poll_signal *signal_host_buf); struct net_buf *hci_cmd_handle(struct net_buf *cmd); void hci_evt_encode(struct radio_pdu_node_rx *node_rx, struct net_buf *buf); s8_t hci_get_class(struct radio_pdu_node_rx *node_rx); -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) int hci_acl_handle(struct net_buf *acl); void hci_acl_encode(struct radio_pdu_node_rx *node_rx, struct net_buf *buf); void hci_num_cmplt_encode(struct net_buf *buf, u16_t handle, u8_t num); diff --git a/subsys/bluetooth/controller/include/ll.h b/subsys/bluetooth/controller/include/ll.h index 2e49e23c30f..96c30b45155 100644 --- a/subsys/bluetooth/controller/include/ll.h +++ b/subsys/bluetooth/controller/include/ll.h @@ -15,18 +15,18 @@ u32_t ll_radio_state_is_idle(void); u8_t *ll_addr_get(u8_t addr_type, u8_t *p_bdaddr); void ll_addr_set(u8_t addr_type, u8_t const *const p_bdaddr); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) u32_t ll_length_req_send(u16_t handle, u16_t tx_octets); 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_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ #endif /* _LL_H_ */ diff --git a/subsys/bluetooth/controller/ll_sw/Makefile b/subsys/bluetooth/controller/ll_sw/Makefile index 542099dbf91..788900aeea4 100644 --- a/subsys/bluetooth/controller/ll_sw/Makefile +++ b/subsys/bluetooth/controller/ll_sw/Makefile @@ -3,6 +3,6 @@ ccflags-y += -I$(srctree)/subsys/bluetooth/controller ccflags-y += -I$(srctree)/subsys/bluetooth obj-y += crypto.o ctrl.o ll.o ll_filter.o -obj-$(CONFIG_BLUETOOTH_BROADCASTER) += ll_adv.o -obj-$(CONFIG_BLUETOOTH_OBSERVER) += ll_scan.o -obj-$(CONFIG_BLUETOOTH_CENTRAL) += ll_master.o +obj-$(CONFIG_BT_BROADCASTER) += ll_adv.o +obj-$(CONFIG_BT_OBSERVER) += ll_scan.o +obj-$(CONFIG_BT_CENTRAL) += ll_master.o diff --git a/subsys/bluetooth/controller/ll_sw/crypto.c b/subsys/bluetooth/controller/ll_sw/crypto.c index a0cfc152753..cb6fba7447b 100644 --- a/subsys/bluetooth/controller/ll_sw/crypto.c +++ b/subsys/bluetooth/controller/ll_sw/crypto.c @@ -6,7 +6,7 @@ #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #include "hal/cpu.h" diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 4ee8645ebd4..5589e293548 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -36,7 +36,7 @@ #include "ll_filter.h" -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #define RADIO_TIFS 150 @@ -49,10 +49,10 @@ #define RADIO_TICKER_PREEMPT_PART_MIN_US 0 #define RADIO_TICKER_PREEMPT_PART_MAX_US RADIO_TICKER_XTAL_OFFSET_US -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) #define RADIO_RSSI_SAMPLE_COUNT 10 #define RADIO_RSSI_THRESHOLD 4 -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ #define RADIO_IRK_COUNT_MAX 8 @@ -82,14 +82,14 @@ struct advertiser { u8_t chan_map_current:3; u8_t rfu:4; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) u8_t phy_p:3; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ u8_t chan_map:3; u8_t filter_policy:2; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) u8_t rl_idx; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ struct radio_adv_data adv_data; struct radio_adv_data scan_data; @@ -105,19 +105,19 @@ struct scanner { u8_t chan:2; u8_t rfu:4; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) u8_t phy:3; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ u8_t type:1; u8_t filter_policy:2; u8_t adv_addr_type:1; u8_t init_addr_type:1; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) u8_t rpa_gen:1; /* initiator only */ u8_t rl_idx; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ u8_t init_addr[BDADDR_SIZE]; u8_t adv_addr[BDADDR_SIZE]; @@ -160,16 +160,16 @@ static struct { u8_t data_chan_count; u8_t sca; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) /* DLE global settings */ u16_t default_tx_octets; u16_t default_tx_time; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) u16_t default_phy_tx; u16_t default_phy_rx; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ /** @todo below members to be made role specific and quota managed for * Rx-es. @@ -233,9 +233,9 @@ static void event_inactive(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, void *context); #if defined(RADIO_UNIT_TEST) && \ - defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) + defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) static void chan_sel_2_ut(void); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ static void adv_setup(void); static void event_adv(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, @@ -276,39 +276,39 @@ static u32_t conn_update_req(struct connection *conn); static u32_t chan_map_update(struct connection *conn, struct pdu_data *pdu_data_rx); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) static inline u32_t phy_upd_ind(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) static void enc_req_reused_send(struct connection *conn, struct radio_pdu_node_tx *node_tx); static void enc_rsp_send(struct connection *conn); static void start_enc_rsp_send(struct connection *conn, struct pdu_data *pdu_ctrl_tx); static void pause_enc_rsp_send(struct connection *conn); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ static void unknown_rsp_send(struct connection *conn, u8_t type); static void feature_rsp_send(struct connection *conn); static void version_ind_send(struct connection *conn); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) static void ping_resp_send(struct connection *conn); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ static void reject_ind_ext_send(struct connection *conn, u8_t reject_opcode, u8_t error_code); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, u16_t eff_tx_octets); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) static void phy_rsp_send(struct connection *conn); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ static u32_t role_disable(u8_t ticker_id_primary, u8_t ticker_id_stop); static void rx_fc_lock(u16_t handle); @@ -425,9 +425,9 @@ u32_t radio_init(void *hf_clock, u8_t sca, u8_t connection_count_max, common_init(); #if defined(RADIO_UNIT_TEST) && \ - defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) + defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) chan_sel_2_ut(); -#endif /* RADIO_UNIT_TEST && CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* RADIO_UNIT_TEST && CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ return retcode; } @@ -519,29 +519,29 @@ static void common_init(void) _radio.data_chan_map[4] = 0x1F; _radio.data_chan_count = 37; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) /* Initialize the DLE defaults */ _radio.default_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; _radio.default_tx_time = RADIO_LL_LENGTH_TIME_RX_MIN; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) /* Initialize the DLE defaults */ _radio.default_phy_tx = BIT(0); _radio.default_phy_rx = BIT(0); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY_2M) +#if defined(CONFIG_BT_CONTROLLER_PHY_2M) /* Initialize the DLE defaults */ _radio.default_phy_tx |= BIT(1); _radio.default_phy_rx |= BIT(1); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY_2M */ +#endif /* CONFIG_BT_CONTROLLER_PHY_2M */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY_CODED) +#if defined(CONFIG_BT_CONTROLLER_PHY_CODED) /* Initialize the DLE defaults */ _radio.default_phy_tx |= BIT(2); _radio.default_phy_rx |= BIT(2); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY_CODED */ -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY_CODED */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ /* allocate the rx queue */ packet_rx_allocate(0xFF); @@ -593,13 +593,13 @@ static inline void isr_radio_state_tx(void) /* assert if radio packet ptr is not set and radio started rx */ LL_ASSERT(!radio_is_ready()); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (ctrl_rl_enabled()) { u8_t count, *irks = ctrl_irks_get(&count); radio_ar_configure(count, irks); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ hcto += radio_rx_chain_delay_get(0, 0); hcto += addr_us_get(0); @@ -608,9 +608,9 @@ static inline void isr_radio_state_tx(void) radio_tmr_hcto_configure(hcto); radio_tmr_end_capture(); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_RSSI) +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_RSSI) radio_rssi_measure(); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_RSSI */ break; @@ -622,13 +622,13 @@ static inline void isr_radio_state_tx(void) /* assert if radio packet ptr is not set and radio started rx */ LL_ASSERT(!radio_is_ready()); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (ctrl_rl_enabled()) { u8_t count, *irks = ctrl_irks_get(&count); radio_ar_configure(count, irks); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ hcto += radio_rx_chain_delay_get(0, 0); hcto += addr_us_get(0); @@ -641,23 +641,23 @@ static inline void isr_radio_state_tx(void) case ROLE_MASTER: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) if (_radio.packet_counter == 0) { radio_rssi_measure(); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ /* fall thru */ case ROLE_SLAVE: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) radio_switch_complete_and_tx(_radio.conn_curr->phy_rx, 0, _radio.conn_curr->phy_tx, _radio.conn_curr->phy_flags); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ radio_switch_complete_and_tx(0, 0, 0, 0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ rx_packet_set(_radio.conn_curr, (struct pdu_data *)_radio. packet_rx[_radio.packet_rx_last]->pdu_data); @@ -665,17 +665,17 @@ static inline void isr_radio_state_tx(void) /* assert if radio packet ptr is not set and radio started rx */ LL_ASSERT(!radio_is_ready()); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) hcto += radio_rx_chain_delay_get(_radio.conn_curr->phy_rx, _radio.conn_curr->phy_flags); hcto += addr_us_get(_radio.conn_curr->phy_rx); hcto -= radio_tx_chain_delay_get(_radio.conn_curr->phy_rx, _radio.conn_curr->phy_flags); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ hcto += radio_rx_chain_delay_get(0, 0); hcto += addr_us_get(0); hcto -= radio_tx_chain_delay_get(0, 0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ radio_tmr_hcto_configure(hcto); radio_tmr_end_capture(); @@ -697,7 +697,7 @@ static inline void isr_radio_state_tx(void) } } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) static u32_t isr_rx_adv_sr_report(struct pdu_adv *pdu_adv_rx, u8_t rssi_ready) { struct radio_pdu_node_rx *radio_pdu_node_rx; @@ -726,7 +726,7 @@ static u32_t isr_rx_adv_sr_report(struct pdu_adv *pdu_adv_rx, u8_t rssi_ready) return 0; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ static inline bool isr_adv_sr_adva_check(struct pdu_adv *adv, struct pdu_adv *sr) @@ -739,7 +739,7 @@ static inline bool isr_adv_sr_adva_check(struct pdu_adv *adv, static inline bool isr_adv_sr_check(struct pdu_adv *adv, struct pdu_adv *sr, u8_t devmatch_ok, u8_t *rl_idx) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) return ((((_radio.advertiser.filter_policy & 0x01) == 0) && ctrl_rl_addr_allowed(sr->tx_addr, sr->payload.scan_req.scan_addr, @@ -751,17 +751,17 @@ static inline bool isr_adv_sr_check(struct pdu_adv *adv, struct pdu_adv *sr, return (((_radio.advertiser.filter_policy & 0x01) == 0) || (devmatch_ok)) && isr_adv_sr_adva_check(adv, sr); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ } static inline bool isr_adv_ci_tgta_check(struct pdu_adv *adv, struct pdu_adv *ci, u8_t rl_idx) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (rl_idx != FILTER_IDX_NONE) { return rl_idx == _radio.advertiser.rl_idx; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ return (adv->rx_addr == ci->tx_addr) && !memcmp(adv->payload.direct_ind.tgt_addr, ci->payload.connect_ind.init_addr, BDADDR_SIZE); @@ -783,7 +783,7 @@ static inline bool isr_adv_ci_check(struct pdu_adv *adv, struct pdu_adv *ci, { /* LL 4.3.2: filter policy shall be ignored for directed adv */ if (adv->type == PDU_ADV_TYPE_DIRECT_IND) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) return ctrl_rl_addr_allowed(ci->tx_addr, ci->payload.connect_ind.init_addr, rl_idx) && @@ -794,7 +794,7 @@ static inline bool isr_adv_ci_check(struct pdu_adv *adv, struct pdu_adv *ci, isr_adv_ci_tgta_check(adv, ci, *rl_idx); } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) return ((((_radio.advertiser.filter_policy & 0x02) == 0) && ctrl_rl_addr_allowed(ci->tx_addr, ci->payload.connect_ind.init_addr, @@ -806,7 +806,7 @@ static inline bool isr_adv_ci_check(struct pdu_adv *adv, struct pdu_adv *ci, return (((_radio.advertiser.filter_policy & 0x02) == 0) || (devmatch_ok)) && isr_adv_ci_adva_check(adv, ci); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ } static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, @@ -815,13 +815,13 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, { struct pdu_adv *pdu_adv, *_pdu_adv; struct radio_pdu_node_rx *radio_pdu_node_rx; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) /* An IRK match implies address resolution enabled */ u8_t rl_idx = irkmatch_ok ? ctrl_rl_irk_idx(irkmatch_id) : FILTER_IDX_NONE; #else u8_t rl_idx = FILTER_IDX_NONE; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ pdu_adv = (struct pdu_adv *)radio_pkt_scratch_get(); _pdu_adv = (struct pdu_adv *)&_radio.advertiser.adv_data.data @@ -831,8 +831,8 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, (pdu_adv->len == sizeof(struct pdu_adv_payload_scan_req)) && isr_adv_sr_check(_pdu_adv, pdu_adv, devmatch_ok, &rl_idx)) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) - if (!IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) || +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) + if (!IS_ENABLED(CONFIG_BT_CONTROLLER_ADV_EXT) || 0 /* TODO: extended adv. scan req notification enabled */) { u32_t err; @@ -843,7 +843,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, return err; } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ _radio.state = STATE_CLOSE; @@ -867,7 +867,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, u32_t rx_ready_delay; u32_t ticker_status; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { radio_pdu_node_rx = packet_rx_reserve_get(4); } else { radio_pdu_node_rx = packet_rx_reserve_get(3); @@ -913,7 +913,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, conn->procedure_reload = RADIO_CONN_EVENTS((40 * 1000 * 1000), conn_interval_us); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) /* APTO in no. of connection events */ conn->apto_reload = RADIO_CONN_EVENTS((30 * 1000 * 1000), conn_interval_us); @@ -924,7 +924,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, conn->appto_reload = (conn->apto_reload > (conn->latency + 6)) ? (conn->apto_reload - (conn->latency + 6)) : conn->apto_reload; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ /* Prepare the rx packet structure */ radio_pdu_node_rx->hdr.handle = conn->handle; @@ -936,7 +936,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, (struct radio_le_conn_cmplt *)&pdu_data->payload; radio_le_conn_cmplt->status = 0x00; radio_le_conn_cmplt->role = 0x01; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) radio_le_conn_cmplt->own_addr_type = pdu_adv->rx_addr; memcpy(&radio_le_conn_cmplt->own_addr[0], &pdu_adv->payload.connect_ind.adv_addr[0], BDADDR_SIZE); @@ -958,7 +958,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, BDADDR_SIZE); #else if (1) { -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ radio_le_conn_cmplt->peer_addr_type = pdu_adv->tx_addr; memcpy(&radio_le_conn_cmplt->peer_addr[0], &pdu_adv->payload.connect_ind.init_addr[0], @@ -979,7 +979,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id, packet_rx_enqueue(); /* Use Channel Selection Algorithm #2 if peer too supports it */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { struct radio_le_chan_sel_algo *le_chan_sel_algo; /* Generate LE Channel Selection Algorithm event */ @@ -1107,7 +1107,7 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx) /* Prepare the report (adv or scan resp) */ radio_pdu_node_rx->hdr.handle = 0xffff; if (0) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) } else if (_radio.scanner.phy) { switch (_radio.scanner.phy) { case BIT(0): @@ -1124,7 +1124,7 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx) LL_ASSERT(0); break; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ } else { radio_pdu_node_rx->hdr.type = NODE_RX_TYPE_REPORT; } @@ -1135,11 +1135,11 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx) pdu_adv_rx->len] = (rssi_ready) ? (radio_rssi_get() & 0x7f) : 0x7f; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) /* save the resolving list index */ ((u8_t *)pdu_adv_rx)[offsetof(struct pdu_adv, payload) + pdu_adv_rx->len + 1] = rl_idx; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ packet_rx_enqueue(); @@ -1149,7 +1149,7 @@ static u32_t isr_rx_scan_report(u8_t rssi_ready, u8_t rl_idx) static inline bool isr_rx_scan_check(u8_t irkmatch_ok, u8_t devmatch_ok, u8_t rl_idx) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) return (((_radio.scanner.filter_policy & 0x01) == 0) && (!devmatch_ok || ctrl_rl_idx_allowed(irkmatch_ok, rl_idx))) || (((_radio.scanner.filter_policy & 0x01) != 0) && @@ -1157,7 +1157,7 @@ static inline bool isr_rx_scan_check(u8_t irkmatch_ok, u8_t devmatch_ok, #else return ((_radio.scanner.filter_policy & 0x01) == 0) || devmatch_ok; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ } static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp) @@ -1172,12 +1172,12 @@ static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp) static inline bool isr_scan_init_adva_check(struct pdu_adv *pdu, u8_t rl_idx) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) /* Only applies to initiator with no whitelist */ if (rl_idx != FILTER_IDX_NONE) { return (rl_idx == _radio.scanner.rl_idx); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ return ((_radio.scanner.adv_addr_type == pdu->tx_addr) && (memcmp(&_radio.scanner.adv_addr[0], &pdu->payload.adv_ind.addr[0], BDADDR_SIZE) == 0)); @@ -1186,7 +1186,7 @@ static inline bool isr_scan_init_adva_check(struct pdu_adv *pdu, static inline bool isr_scan_tgta_check(bool init, struct pdu_adv *pdu, u8_t rl_idx) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (ctrl_rl_addr_resolve(pdu->rx_addr, pdu->payload.direct_ind.tgt_addr, rl_idx)) { return true; @@ -1196,7 +1196,7 @@ static inline bool isr_scan_tgta_check(bool init, struct pdu_adv *pdu, */ return false; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ return (((_radio.scanner.init_addr_type == pdu->rx_addr) && (memcmp(&_radio.scanner.init_addr[0], @@ -1246,11 +1246,11 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, u32_t conn_offset_us; u32_t ticker_status; u32_t conn_space_us; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) bt_addr_t *lrpa; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { radio_pdu_node_rx = packet_rx_reserve_get(4); } else { radio_pdu_node_rx = packet_rx_reserve_get(3); @@ -1270,7 +1270,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, pdu_adv_tx = (struct pdu_adv *)radio_pkt_scratch_get(); pdu_adv_tx->type = PDU_ADV_TYPE_CONNECT_IND; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { pdu_adv_tx->chan_sel = 1; } else { pdu_adv_tx->chan_sel = 0; @@ -1278,7 +1278,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr; pdu_adv_tx->len = sizeof(struct pdu_adv_payload_connect_ind); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) lrpa = ctrl_lrpa_get(rl_idx); if (_radio.scanner.rpa_gen && lrpa) { pdu_adv_tx->tx_addr = 1; @@ -1287,7 +1287,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, } else { #else if (1) { -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ pdu_adv_tx->tx_addr = _radio.scanner.init_addr_type; memcpy(&pdu_adv_tx->payload.connect_ind.init_addr[0], &_radio.scanner.init_addr[0], BDADDR_SIZE); @@ -1370,7 +1370,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, (struct radio_le_conn_cmplt *)&pdu_data->payload; radio_le_conn_cmplt->status = 0x00; radio_le_conn_cmplt->role = 0x00; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) radio_le_conn_cmplt->own_addr_type = pdu_adv_tx->tx_addr; memcpy(&radio_le_conn_cmplt->own_addr[0], &pdu_adv_tx->payload.connect_ind.init_addr[0], @@ -1394,7 +1394,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, BDADDR_SIZE); #else if (1) { -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ radio_le_conn_cmplt->peer_addr_type = pdu_adv_tx->rx_addr; memcpy(&radio_le_conn_cmplt->peer_addr[0], @@ -1413,7 +1413,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, packet_rx_enqueue(); /* Use Channel Selection Algorithm #2 if peer too supports it */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CONTROLLER_CHAN_SEL_2)) { struct radio_le_chan_sel_algo *le_chan_sel_algo; /* Generate LE Channel Selection Algorithm event */ @@ -1503,9 +1503,9 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, (_radio.scanner.type != 0) && (_radio.scanner.conn == 0)) { struct pdu_adv *pdu_adv_tx; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) bt_addr_t *lrpa; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ u32_t err; /* save the adv packet */ @@ -1521,7 +1521,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, pdu_adv_tx->type = PDU_ADV_TYPE_SCAN_REQ; pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr; pdu_adv_tx->len = sizeof(struct pdu_adv_payload_scan_req); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) lrpa = ctrl_lrpa_get(rl_idx); if (_radio.scanner.rpa_gen && lrpa) { pdu_adv_tx->tx_addr = 1; @@ -1530,7 +1530,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, } else { #else if (1) { -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ pdu_adv_tx->tx_addr = _radio.scanner.init_addr_type; memcpy(&pdu_adv_tx->payload.scan_req.scan_addr[0], &_radio.scanner.init_addr[0], BDADDR_SIZE); @@ -1556,10 +1556,10 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, isr_scan_tgta_check(false, pdu_adv_rx, rl_idx))) || (pdu_adv_rx->type == PDU_ADV_TYPE_NONCONN_IND) || (pdu_adv_rx->type == PDU_ADV_TYPE_SCAN_IND) || -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) ((pdu_adv_rx->type == PDU_ADV_TYPE_EXT_IND) && (_radio.scanner.phy)) || -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ ((pdu_adv_rx->type == PDU_ADV_TYPE_SCAN_RSP) && (_radio.scanner.state != 0) && isr_scan_rsp_adva_matches(pdu_adv_rx))) && @@ -1606,7 +1606,7 @@ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, terminate = 1; break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case PDU_DATA_LLCTRL_TYPE_ENC_REQ: /* things from master stored for session key calculation */ memcpy(&_radio.conn_curr->llcp.encryption.skd[0], @@ -1675,9 +1675,9 @@ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, /* Procedure complete */ _radio.conn_curr->procedure_expire = 0; break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) case PDU_DATA_LLCTRL_TYPE_LENGTH_REQ: if ((_radio.conn_curr->llcp_length.req != _radio.conn_curr->llcp_length.ack) && @@ -1691,13 +1691,13 @@ static inline u8_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx, LLCP_LENGTH_STATE_RSP_WAIT; } break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case PDU_DATA_LLCTRL_TYPE_PHY_REQ: _radio.conn_curr->llcp_phy.state = LLCP_PHY_STATE_RSP_WAIT; break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ default: /* Do nothing for other ctrl packet ack */ @@ -1797,7 +1797,7 @@ isr_rx_conn_pkt_ctrl_rej_conn_upd(struct radio_pdu_node_rx *radio_pdu_node_rx, } } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) static inline void isr_rx_conn_pkt_ctrl_rej_dle(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) @@ -1837,9 +1837,9 @@ isr_rx_conn_pkt_ctrl_rej_dle(struct radio_pdu_node_rx *radio_pdu_node_rx, *rx_enqueue = 1; } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) static inline void isr_rx_conn_pkt_ctrl_rej_phy_upd(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) @@ -1884,19 +1884,19 @@ isr_rx_conn_pkt_ctrl_rej_phy_upd(struct radio_pdu_node_rx *radio_pdu_node_rx, *rx_enqueue = 1; } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ static inline void isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) { if (0) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) } else if (_radio.conn_curr->llcp_phy.ack != _radio.conn_curr->llcp_phy.req) { isr_rx_conn_pkt_ctrl_rej_phy_upd(radio_pdu_node_rx, rx_enqueue); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ } else if (_radio.conn_curr->llcp_ack != _radio.conn_curr->llcp_req) { /* reset ctrl procedure */ _radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req; @@ -1912,14 +1912,14 @@ isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *radio_pdu_node_rx, break; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) } else if (_radio.conn_curr->llcp_length.ack != _radio.conn_curr->llcp_length.req) { isr_rx_conn_pkt_ctrl_rej_dle(radio_pdu_node_rx, rx_enqueue); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) } else { struct pdu_data_llctrl_reject_ext_ind *rej_ext_ind; struct pdu_data *pdu_rx; @@ -1949,11 +1949,11 @@ isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *radio_pdu_node_rx, /* Ignore */ break; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ } } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, u8_t *rx_enqueue) { @@ -2083,7 +2083,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx, return nack; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ static inline u8_t isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, @@ -2149,7 +2149,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, pdu_data_rx->payload.llctrl.ctrldata.terminate_ind.error_code; break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case PDU_DATA_LLCTRL_TYPE_ENC_REQ: /* things from master stored for session key calculation */ memcpy(&_radio.conn_curr->llcp.encryption.skd[0], @@ -2178,12 +2178,12 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, } #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC) +#if defined(CONFIG_BT_CONTROLLER_FAST_ENC) /* TODO BT Spec. text: may finalize the sending of additional * data channel PDUs queued in the controller. */ enc_rsp_send(_radio.conn_curr); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC */ +#endif /* CONFIG_BT_CONTROLLER_FAST_ENC */ /* enqueue the enc req */ *rx_enqueue = 1; @@ -2214,14 +2214,14 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, case PDU_DATA_LLCTRL_TYPE_START_ENC_RSP: if (_radio.role == ROLE_SLAVE) { -#if !defined(CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC) +#if !defined(CONFIG_BT_CONTROLLER_FAST_ENC) LL_ASSERT(_radio.conn_curr->llcp_req == _radio.conn_curr->llcp_ack); /* start enc rsp to be scheduled in slave prepare */ _radio.conn_curr->llcp_type = LLCP_ENCRYPTION; _radio.conn_curr->llcp_ack--; -#else /* CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC */ +#else /* CONFIG_BT_CONTROLLER_FAST_ENC */ /* enable transmit encryption */ _radio.conn_curr->enc_tx = 1; @@ -2230,7 +2230,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* resume data packet rx and tx */ _radio.conn_curr->pause_rx = 0; _radio.conn_curr->pause_tx = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC */ +#endif /* CONFIG_BT_CONTROLLER_FAST_ENC */ } else { /* resume data packet rx and tx */ @@ -2250,7 +2250,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* Procedure complete */ _radio.conn_curr->procedure_expire = 0; break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_FEATURE_REQ: case PDU_DATA_LLCTRL_TYPE_SLAVE_FEATURE_REQ: @@ -2289,7 +2289,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, } break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case PDU_DATA_LLCTRL_TYPE_PAUSE_ENC_REQ: pause_enc_rsp_send(_radio.conn_curr); @@ -2318,7 +2318,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* disable transmit encryption */ _radio.conn_curr->enc_tx = 0; break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_VERSION_IND: _radio.conn_curr->llcp_version.version_number = @@ -2347,7 +2347,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, } break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case PDU_DATA_LLCTRL_TYPE_REJECT_IND: /* resume data packet rx and tx */ _radio.conn_curr->pause_rx = 0; @@ -2359,7 +2359,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* enqueue the reject ind */ *rx_enqueue = 1; break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ case PDU_DATA_LLCTRL_TYPE_CONN_PARAM_REQ: /* connection update or params req in progress @@ -2488,7 +2488,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, isr_rx_conn_pkt_ctrl_rej(radio_pdu_node_rx, rx_enqueue); break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) case PDU_DATA_LLCTRL_TYPE_PING_REQ: ping_resp_send(_radio.conn_curr); break; @@ -2497,7 +2497,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* Procedure complete */ _radio.conn_curr->procedure_expire = 0; break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ case PDU_DATA_LLCTRL_TYPE_UNKNOWN_RSP: if (_radio.conn_curr->llcp_req != _radio.conn_curr->llcp_ack) { @@ -2510,7 +2510,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, break; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) } else if (_radio.conn_curr->llcp_length.req != _radio.conn_curr->llcp_length.ack) { /* Procedure complete */ @@ -2524,9 +2524,9 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, * host */ *rx_enqueue = 1; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) } else if (_radio.conn_curr->llcp_phy.req != _radio.conn_curr->llcp_phy.ack) { struct radio_le_phy_upd_cmplt *p; @@ -2550,7 +2550,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, /* enqueue the phy update complete */ *rx_enqueue = 1; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ } else { struct pdu_data_llctrl *llctrl; @@ -2559,13 +2559,13 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, &pdu_data_rx->payload.llctrl; switch (llctrl->ctrldata.unknown_rsp.type) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) case PDU_DATA_LLCTRL_TYPE_PING_REQ: /* unknown rsp to LE Ping Req completes the * procedure; nothing to do here. */ break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ default: /* enqueue the error and let HCI handle it */ @@ -2578,14 +2578,14 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, _radio.conn_curr->procedure_expire = 0; break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) case PDU_DATA_LLCTRL_TYPE_LENGTH_RSP: case PDU_DATA_LLCTRL_TYPE_LENGTH_REQ: nack = isr_rx_conn_pkt_ctrl_dle(pdu_data_rx, rx_enqueue); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case PDU_DATA_LLCTRL_TYPE_PHY_REQ: if (_radio.role == ROLE_MASTER) { if ((_radio.conn_curr->llcp_phy.ack != @@ -2665,7 +2665,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, _radio.conn_curr->llcp_terminate.reason_peer = 0x28; } break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ default: unknown_rsp_send(_radio.conn_curr, @@ -2832,11 +2832,11 @@ isr_rx_conn_pkt(struct radio_pdu_node_rx *radio_pdu_node_rx, return 1; /* terminated */ } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) /* stop authenticated payload (pre) timeout */ _radio.conn_curr->appto_expire = 0; _radio.conn_curr->apto_expire = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ switch (pdu_data_rx->ll_id) { case PDU_DATA_LLID_DATA_CONTINUE: @@ -2855,7 +2855,7 @@ isr_rx_conn_pkt(struct radio_pdu_node_rx *radio_pdu_node_rx, break; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) } else if ((_radio.conn_curr->enc_rx) || (_radio.conn_curr->pause_rx)) { struct connection *conn = _radio.conn_curr; @@ -2877,7 +2877,7 @@ isr_rx_conn_pkt(struct radio_pdu_node_rx *radio_pdu_node_rx, conn->appto_expire = conn->appto_reload; conn->apto_expire = conn->apto_reload; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ } @@ -2904,7 +2904,7 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, u8_t rx_enqueue = 0; u8_t crc_close = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) static u8_t s_lmax; static u8_t s_lmin = (u8_t) -1; static u8_t s_lprv; @@ -2914,9 +2914,9 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, u32_t sample; u8_t latency, elapsed, prv; u8_t chg = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) /* Collect RSSI for connection */ if (_radio.packet_counter == 0) { if (rssi_ready) { @@ -2935,9 +2935,9 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, } } } -#else /* !CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#else /* !CONFIG_BT_CONTROLLER_CONN_RSSI */ ARG_UNUSED(rssi_ready); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* !CONFIG_BT_CONTROLLER_CONN_RSSI */ /* Increment packet counter for this connection event */ _radio.packet_counter++; @@ -3034,11 +3034,11 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, } else { /* if (_radio.state == STATE_TX) */ radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) radio_switch_complete_and_rx(_radio.conn_curr->phy_rx); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ radio_switch_complete_and_rx(0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ radio_tmr_end_capture(); } @@ -3052,7 +3052,7 @@ static inline void isr_rx_conn(u8_t crc_ok, u8_t trx_done, isr_rx_conn_exit: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) /* get the ISR latency sample */ sample = radio_tmr_sample_get(); @@ -3061,7 +3061,7 @@ isr_rx_conn_exit: */ radio_tmr_sample(); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ /* release tx node and generate event for num complete */ if (tx_release) { @@ -3078,7 +3078,7 @@ isr_rx_conn_exit: packet_rx_enqueue(); } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) /* calculate the elapsed time in us since on-air radio packet end * to ISR entry */ @@ -3140,7 +3140,7 @@ isr_rx_conn_exit: packet_rx_enqueue(); } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ return; } @@ -3176,7 +3176,7 @@ static inline void isr_radio_state_rx(u8_t trx_done, u8_t crc_ok, break; case ROLE_SCAN: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) rl_idx = devmatch_ok ? ctrl_rl_idx(!!(_radio.scanner.filter_policy & 0x01), devmatch_id) : @@ -3278,13 +3278,13 @@ static inline u32_t isr_close_scan(void) radio_pkt_rx_set(_radio.packet_rx[_radio.packet_rx_last]-> pdu_data); radio_rssi_measure(); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (ctrl_rl_enabled()) { u8_t count, *irks = ctrl_irks_get(&count); radio_ar_configure(count, irks); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ _radio.state = STATE_RX; radio_rx_enable(); @@ -3354,12 +3354,12 @@ static inline void isr_close_conn(void) start_to_address_actual_us = radio_tmr_aa_get(); window_widening_event_us = _radio.conn_curr->slave.window_widening_event_us; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) preamble_to_addr_us = addr_us_get(_radio.conn_curr->phy_rx); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ preamble_to_addr_us = addr_us_get(0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ start_to_address_expected_us = RADIO_TICKER_JITTER_US + (RADIO_TICKER_JITTER_US << 1) + preamble_to_addr_us + @@ -3487,7 +3487,7 @@ static inline void isr_close_conn(void) } } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) /* check apto */ if (_radio.conn_curr->apto_expire != 0) { if (_radio.conn_curr->apto_expire > elapsed_event) { @@ -3524,9 +3524,9 @@ static inline void isr_close_conn(void) } } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) /* generate RSSI event */ if (_radio.conn_curr->rssi_sample_count == 0) { struct radio_pdu_node_rx *radio_pdu_node_rx; @@ -3554,7 +3554,7 @@ static inline void isr_close_conn(void) packet_rx_enqueue(); } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ /* break latency based on ctrl procedure pending */ if ((_radio.conn_curr->llcp_ack != _radio.conn_curr->llcp_req) && @@ -3602,7 +3602,7 @@ static inline void isr_radio_state_close(void) case ROLE_ADV: dont_close = isr_close_adv(); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) if (!dont_close) { struct radio_pdu_node_rx *radio_pdu_node_rx; @@ -3618,7 +3618,7 @@ static inline void isr_radio_state_close(void) packet_rx_enqueue(); } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ break; @@ -3686,12 +3686,12 @@ static void isr(void) trx_done = radio_is_done(); if (trx_done) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) /* sample the packet timer here, use it to calculate ISR latency * and generate the profiling event at the end of the ISR. */ radio_tmr_sample(); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ crc_ok = radio_crc_is_valid(); devmatch_ok = radio_filter_has_match(); @@ -3940,7 +3940,7 @@ static void mayfly_xtal_stop(void *params) DEBUG_RADIO_CLOSE(0); } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) static void mayfly_xtal_retain(u8_t caller_id, u8_t retain) { static u8_t s_xtal_retained; @@ -4110,14 +4110,14 @@ static void mayfly_xtal_stop_calc(void *params) if ((ticker_id != 0xff) && (ticks_to_expire < - TICKER_US_TO_TICKS(CONFIG_BLUETOOTH_CONTROLLER_XTAL_THRESHOLD))) { + TICKER_US_TO_TICKS(CONFIG_BT_CONTROLLER_XTAL_THRESHOLD))) { mayfly_xtal_retain(RADIO_TICKER_USER_ID_JOB, 1); if (ticker_id >= RADIO_TICKER_ID_ADV) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) u8_t ticker_id_current = ((u32_t)params & 0xff); struct connection *conn_curr = NULL; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ u32_t ticks_prepare_to_start; struct connection *conn = NULL; struct shdr *hdr = NULL; @@ -4177,7 +4177,7 @@ static void mayfly_xtal_stop_calc(void *params) } } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) if (ticker_id_current >= RADIO_TICKER_ID_FIRST_CONNECTION) { /* compensate the current ticker for reduced * prepare. @@ -4245,7 +4245,7 @@ static void mayfly_xtal_stop_calc(void *params) } } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ } } else { mayfly_xtal_retain(RADIO_TICKER_USER_ID_JOB, 0); @@ -4276,9 +4276,9 @@ static void mayfly_xtal_stop_calc(void *params) } } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) static void sched_after_mstr_free_slot_get(u8_t user_id, u32_t ticks_slot_abs, u32_t *ticks_anchor, @@ -4696,7 +4696,7 @@ static void mayfly_sched_win_offset_select(void *params) error_code = 0x20; /* Unsupported parameter value */ } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ static void mayfly_radio_stop(void *params) { @@ -4882,7 +4882,7 @@ static void event_common_prepare(u32_t ticks_at_expire, /* route all packets queued for connections */ packet_tx_enqueue(0xFF); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) /* calc whether xtal needs to be retained after this event */ { static void *s_link[2]; @@ -4897,7 +4897,7 @@ static void event_common_prepare(u32_t ticks_at_expire, &s_mfy_xtal_stop_calc); LL_ASSERT(!retval); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ } static u8_t chan_sel_remap(u8_t *chan_map, u8_t chan_index) @@ -4955,7 +4955,7 @@ static u8_t chan_sel_1(u8_t *chan_use, u8_t hop, u16_t latency, u8_t *chan_map, return chan_next; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) static u8_t chan_rev_8(u8_t i) { u8_t iterate; @@ -5046,7 +5046,7 @@ static void chan_sel_2_ut(void) LL_ASSERT(m == 34); } #endif /* RADIO_UNIT_TEST */ -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ static void chan_set(u32_t chan) { @@ -5253,7 +5253,7 @@ static void adv_setup(void) pdu = (struct pdu_adv *) _radio.advertiser.adv_data.data[ _radio.advertiser.adv_data.first]; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (upd) { struct pdu_adv *scan_pdu = (struct pdu_adv *) _radio.advertiser.scan_data.data[ @@ -5267,10 +5267,10 @@ static void adv_setup(void) } #else ARG_UNUSED(upd); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* !CONFIG_BT_CONTROLLER_PRIVACY */ radio_pkt_tx_set(pdu); if ((pdu->type != PDU_ADV_TYPE_NONCONN_IND) && - (!IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) || + (!IS_ENABLED(CONFIG_BT_CONTROLLER_ADV_EXT) || (pdu->type != PDU_ADV_TYPE_EXT_IND))) { _radio.state = STATE_TX; radio_tmr_tifs_set(RADIO_TIFS); @@ -5314,17 +5314,17 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, _radio.ticker_id_event = RADIO_TICKER_ID_ADV; _radio.ticks_anchor = ticks_at_expire; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) /* TODO: if coded we use S8? */ adv_scan_configure(_radio.advertiser.phy_p, 1); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ adv_scan_configure(0, 0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ _radio.advertiser.chan_map_current = _radio.advertiser.chan_map; adv_setup(); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (ctrl_rl_enabled()) { struct ll_filter *filter = ctrl_filter_get(!!(_radio.advertiser.filter_policy)); @@ -5333,7 +5333,7 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, filter->addr_type_bitmask, (u8_t *)filter->bdaddr); } else -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ /* Setup Radio Filter */ if (_radio.advertiser.filter_policy) { @@ -5350,7 +5350,7 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, _radio.remainder_anchor); radio_tmr_end_capture(); -#if (defined(CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (preempt_calc(&_radio.advertiser.hdr, RADIO_TICKER_ID_ADV, @@ -5358,7 +5358,7 @@ static void event_adv(u32_t ticks_at_expire, u32_t remainder, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ { /* Ticker Job Silence */ @@ -5439,7 +5439,7 @@ static void event_scan_prepare(u32_t ticks_at_expire, u32_t remainder, _radio.scanner.hdr.ticks_preempt_to_start, RADIO_TICKER_ID_SCAN, event_scan, NULL); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) /* calc next group in us for the anchor where first connection event * to be placed */ @@ -5472,7 +5472,7 @@ static void event_scan_prepare(u32_t ticks_at_expire, u32_t remainder, &s_mfy_sched_after_mstr_free_offset_get); LL_ASSERT(!retval); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ DEBUG_RADIO_PREPARE_O(0); } @@ -5501,11 +5501,11 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.ticks_anchor = ticks_at_expire; _radio.scanner.state = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) adv_scan_configure(_radio.scanner.phy, 1); /* if coded then use S8. */ -#else /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ adv_scan_configure(0, 0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ chan_set(37 + _radio.scanner.chan++); if (_radio.scanner.chan == 3) { @@ -5517,7 +5517,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_pkt_rx_set(_radio.packet_rx[_radio.packet_rx_last]->pdu_data); radio_rssi_measure(); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) if (ctrl_rl_enabled()) { struct ll_filter *filter = ctrl_filter_get(!!(_radio.scanner.filter_policy & 0x1)); @@ -5529,7 +5529,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_ar_configure(count, irks); } else -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ /* Setup Radio Filter */ if (_radio.scanner.filter_policy) { @@ -5546,7 +5546,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.remainder_anchor); radio_tmr_end_capture(); -#if (defined(CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (preempt_calc(&_radio.scanner.hdr, RADIO_TICKER_ID_SCAN, @@ -5554,7 +5554,7 @@ static void event_scan(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ { /* start window close timeout */ ticker_status = @@ -5624,7 +5624,7 @@ event_conn_update_st_init(struct connection *conn, pdu_ctrl_tx->payload.llctrl.ctrldata.conn_update_ind.instant = conn->llcp.connection_update.instant; -#if CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED +#if CONFIG_BT_CONTROLLER_SCHED_ADVANCED { u32_t retval; @@ -5656,11 +5656,11 @@ event_conn_update_st_init(struct connection *conn, mayfly_sched_offset); LL_ASSERT(!retval); } -#else /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ ARG_UNUSED(ticks_at_expire); ARG_UNUSED(mayfly_sched_offset); ARG_UNUSED(fp_mayfly_select_or_use); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ } static inline void event_conn_update_st_req(struct connection *conn, @@ -5700,7 +5700,7 @@ static inline void event_conn_update_st_req(struct connection *conn, */ conn->procedure_expire = conn->procedure_reload; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) { u32_t retval; @@ -5729,10 +5729,10 @@ static inline void event_conn_update_st_req(struct connection *conn, mayfly_sched_offset); LL_ASSERT(!retval); } -#else /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ ARG_UNUSED(ticks_at_expire); ARG_UNUSED(mayfly_sched_offset); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ } static inline void event_conn_update_st_rsp(struct connection *conn, @@ -5801,12 +5801,12 @@ static inline u32_t event_conn_update_prep(struct connection *conn, LLCP_CONN_STATE_APP_WAIT) && (conn->llcp.connection_update.state != LLCP_CONN_STATE_RSP_WAIT)) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) static void *s_link[2]; static struct mayfly s_mfy_sched_offset = {0, 0, s_link, NULL, NULL }; void (*fp_mayfly_select_or_use)(void *); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ struct radio_pdu_node_tx *node_tx; struct pdu_data *pdu_ctrl_tx; u8_t state; @@ -5818,54 +5818,54 @@ static inline u32_t event_conn_update_prep(struct connection *conn, pdu_ctrl_tx = (struct pdu_data *)node_tx->pdu_data; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) fp_mayfly_select_or_use = mayfly_sched_win_offset_use; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ state = conn->llcp.connection_update.state; if ((state == LLCP_CONN_STATE_RSP) && !conn->role) { state = LLCP_CONN_STATE_INITIATE; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) fp_mayfly_select_or_use = mayfly_sched_win_offset_select; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ } switch (state) { case LLCP_CONN_STATE_INITIATE: if (!conn->role) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) event_conn_update_st_init(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, &s_mfy_sched_offset, fp_mayfly_select_or_use); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ event_conn_update_st_init(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, NULL, NULL); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ break; } /* fall thru if slave */ case LLCP_CONN_STATE_REQ: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) event_conn_update_st_req(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, &s_mfy_sched_offset); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#else /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ event_conn_update_st_req(conn, event_counter, pdu_ctrl_tx, ticks_at_expire, NULL); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* !CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ break; case LLCP_CONN_STATE_RSP: @@ -6031,7 +6031,7 @@ static inline u32_t event_conn_update_prep(struct connection *conn, conn->procedure_reload = RADIO_CONN_EVENTS((40 * 1000 * 1000), conn_interval_us); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) /* APTO in no. of connection events */ conn->apto_reload = RADIO_CONN_EVENTS((30 * 1000 * 1000), conn_interval_us); @@ -6042,7 +6042,7 @@ static inline u32_t event_conn_update_prep(struct connection *conn, conn->appto_reload = (conn->apto_reload > (conn->latency + 6)) ? (conn->apto_reload - (conn->latency + 6)) : conn->apto_reload; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ if (!conn->llcp.connection_update.is_internal) { conn->supervision_expire = 0; @@ -6148,7 +6148,7 @@ static inline void event_ch_map_prep(struct connection *conn, } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) static inline void event_enc_reject_prep(struct connection *conn, struct pdu_data *pdu) { @@ -6227,11 +6227,11 @@ static inline void event_enc_prep(struct connection *conn) /* slave send reject ind or start enc req at control priority */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC) +#if defined(CONFIG_BT_CONTROLLER_FAST_ENC) else { -#else /* !CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC */ +#else /* !CONFIG_BT_CONTROLLER_FAST_ENC */ else if (!conn->pause_tx || conn->refresh) { -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC */ +#endif /* !CONFIG_BT_CONTROLLER_FAST_ENC */ /* ll ctrl packet */ pdu_ctrl_tx->ll_id = PDU_DATA_LLID_CTRL; @@ -6243,13 +6243,13 @@ static inline void event_enc_prep(struct connection *conn) /* place the start enc req packet as next in tx queue */ else { -#if !defined(CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC) +#if !defined(CONFIG_BT_CONTROLLER_FAST_ENC) /* TODO BT Spec. text: may finalize the sending * of additional data channel PDUs queued in the * controller. */ enc_rsp_send(conn); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC */ +#endif /* !CONFIG_BT_CONTROLLER_FAST_ENC */ /* calc the Session Key */ ecb_encrypt(&conn->llcp.encryption.ltk[0], @@ -6289,7 +6289,7 @@ static inline void event_enc_prep(struct connection *conn) PDU_DATA_LLCTRL_TYPE_START_ENC_REQ; } -#if !defined(CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC) +#if !defined(CONFIG_BT_CONTROLLER_FAST_ENC) } else { /* enable transmit encryption */ _radio.conn_curr->enc_tx = 1; @@ -6299,14 +6299,14 @@ static inline void event_enc_prep(struct connection *conn) /* resume data packet rx and tx */ _radio.conn_curr->pause_rx = 0; _radio.conn_curr->pause_tx = 0; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC */ +#endif /* !CONFIG_BT_CONTROLLER_FAST_ENC */ } ctrl_tx_enqueue(conn, node_tx); } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ static inline void event_fex_prep(struct connection *conn) { @@ -6426,7 +6426,7 @@ static inline void event_vex_prep(struct connection *conn) } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) static inline void event_ping_prep(struct connection *conn) { struct radio_pdu_node_tx *node_tx; @@ -6454,9 +6454,9 @@ static inline void event_ping_prep(struct connection *conn) } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) static inline void event_len_prep(struct connection *conn) { switch (conn->llcp_length.state) { @@ -6665,9 +6665,9 @@ static inline void event_len_prep(struct connection *conn) break; } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) static inline void event_phy_req_prep(struct connection *conn) { switch (conn->llcp_phy.state) { @@ -6879,7 +6879,7 @@ static inline void event_phy_upd_ind_prep(struct connection *conn, packet_rx_enqueue(); } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ static void event_connection_prepare(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, @@ -6908,7 +6908,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, /* calc current event counter value */ event_counter = conn->event_counter + conn->latency_prepare; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) /* check if PHY Req procedure is requested and no other procedure * using instant is active. */ @@ -6922,7 +6922,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, /* handle PHY Upd state machine */ event_phy_req_prep(conn); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ /* check if procedure is requested */ if (conn->llcp_ack != conn->llcp_req) { @@ -6942,11 +6942,11 @@ static void event_connection_prepare(u32_t ticks_at_expire, event_ch_map_prep(conn, event_counter); break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) case LLCP_ENCRYPTION: event_enc_prep(conn); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ case LLCP_FEATURE_EXCHANGE: event_fex_prep(conn); @@ -6956,17 +6956,17 @@ static void event_connection_prepare(u32_t ticks_at_expire, event_vex_prep(conn); break; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) case LLCP_PING: event_ping_prep(conn); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case LLCP_PHY_UPD: event_phy_upd_ind_prep(conn, event_counter); break; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ default: LL_ASSERT(0); @@ -7017,7 +7017,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, } } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) /* check if procedure is requested */ if (conn->llcp_length.ack != conn->llcp_length.req) { /* Stop previous event, to avoid Radio DMA corrupting the @@ -7028,7 +7028,7 @@ static void event_connection_prepare(u32_t ticks_at_expire, /* handle DLU state machine */ event_len_prep(conn); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ /* Setup XTAL startup and radio active events */ event_common_prepare(ticks_at_expire, remainder, @@ -7100,26 +7100,26 @@ static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) radio_switch_complete_and_tx(conn->phy_rx, 0, conn->phy_tx, conn->phy_flags); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ radio_switch_complete_and_tx(0, 0, 0, 0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ rx_packet_set(conn, (struct pdu_data *) _radio.packet_rx[_radio.packet_rx_last]->pdu_data); /* Setup Radio Channel */ if (conn->data_chan_sel) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) data_chan_use = chan_sel_2(conn->event_counter - 1, conn->data_chan_id, &conn->data_chan_map[0], conn->data_chan_count); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#else /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ LL_ASSERT(0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ } else { data_chan_use = chan_sel_1(&conn->data_chan_use, conn->data_chan_hop, @@ -7154,22 +7154,22 @@ static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, (conn->slave.window_widening_event_us << 1) + conn->slave.window_size_event_us; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) hcto += radio_rx_ready_delay_get(conn->phy_rx); hcto += addr_us_get(conn->phy_rx); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ hcto += radio_rx_ready_delay_get(0); hcto += addr_us_get(0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ radio_tmr_hcto_configure(hcto); radio_tmr_end_capture(); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) radio_rssi_measure(); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ -#if (defined(CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (preempt_calc(&conn->hdr, (RADIO_TICKER_ID_FIRST_CONNECTION + @@ -7177,7 +7177,7 @@ static void event_slave(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ { /* Ticker Job Silence */ @@ -7254,24 +7254,24 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) radio_switch_complete_and_rx(conn->phy_rx); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ radio_switch_complete_and_rx(0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ tx_packet_set(conn, pdu_data_tx); /* Setup Radio Channel */ if (conn->data_chan_sel) { -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) data_chan_use = chan_sel_2(conn->event_counter - 1, conn->data_chan_id, &conn->data_chan_map[0], conn->data_chan_count); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#else /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ LL_ASSERT(0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ } else { data_chan_use = chan_sel_1(&conn->data_chan_use, conn->data_chan_hop, @@ -7303,12 +7303,12 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_tifs_set(RADIO_TIFS); -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) radio_switch_complete_and_tx(conn->phy_rx, 0, conn->phy_tx, conn->phy_flags); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ radio_switch_complete_and_tx(0, 0, 0, 0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ rx_packet_set(conn, (struct pdu_data *)_radio. packet_rx[_radio.packet_rx_last]->pdu_data); @@ -7321,15 +7321,15 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, radio_tmr_aa_capture(); hcto = remainder_us + RADIO_TIFS; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) hcto += radio_tx_ready_delay_get(conn->phy_tx, conn->phy_flags); hcto += empty_pkt_us_get(conn->phy_rx); hcto += addr_us_get(conn->phy_rx); -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ hcto += radio_tx_ready_delay_get(0, 0); hcto += empty_pkt_us_get(0); hcto += addr_us_get(0); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ /* TODO: account for slave window widening */ hcto += 256; @@ -7338,7 +7338,7 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, } #endif -#if (defined(CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED) && \ +#if (defined(CONFIG_BT_CONTROLLER_XTAL_ADVANCED) && \ (RADIO_TICKER_PREEMPT_PART_US <= RADIO_TICKER_PREEMPT_PART_MIN_US)) /* check if preempt to start has changed */ if (0 != @@ -7347,7 +7347,7 @@ static void event_master(u32_t ticks_at_expire, u32_t remainder, u16_t lazy, _radio.state = STATE_STOP; radio_disable(); } else -#endif /* CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_XTAL_ADVANCED */ { /* Ticker Job Silence */ @@ -7371,17 +7371,17 @@ static void rx_packet_set(struct connection *conn, struct pdu_data *pdu_data_rx) u16_t max_rx_octets; u8_t phy; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) max_rx_octets = conn->max_rx_octets; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#else /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) phy = conn->phy_rx; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ phy = 0; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ radio_phy_set(phy, 0); @@ -7402,19 +7402,19 @@ static void tx_packet_set(struct connection *conn, struct pdu_data *pdu_data_tx) u16_t max_tx_octets; u8_t phy, flags; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) max_tx_octets = conn->max_tx_octets; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#else /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) phy = conn->phy_tx; flags = conn->phy_flags; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#else /* !CONFIG_BT_CONTROLLER_PHY */ phy = 0; flags = 0; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* !CONFIG_BT_CONTROLLER_PHY */ radio_phy_set(phy, flags); @@ -7460,11 +7460,11 @@ static void prepare_pdu_data_tx(struct connection *conn, conn->packet_tx_head_offset; _pdu_data_tx->md = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) max_tx_octets = conn->max_tx_octets; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#else /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH */ if (_pdu_data_tx->len > max_tx_octets) { _pdu_data_tx->len = max_tx_octets; @@ -7484,9 +7484,9 @@ static void prepare_pdu_data_tx(struct connection *conn, _pdu_data_tx->rfu = 0; -#if !defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR) +#if !defined(CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR) _pdu_data_tx->resv = 0; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR */ +#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR */ *pdu_data_tx = _pdu_data_tx; } @@ -8020,7 +8020,7 @@ static u32_t chan_map_update(struct connection *conn, return 0; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) static inline u32_t phy_upd_ind(struct radio_pdu_node_rx *radio_pdu_node_rx, u8_t *rx_enqueue) { @@ -8086,9 +8086,9 @@ static inline u32_t phy_upd_ind(struct radio_pdu_node_rx *radio_pdu_node_rx, return 0; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) static void enc_req_reused_send(struct connection *conn, struct radio_pdu_node_tx *node_tx) { @@ -8182,7 +8182,7 @@ static void pause_enc_rsp_send(struct connection *conn) ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ static void unknown_rsp_send(struct connection *conn, u8_t type) { @@ -8257,7 +8257,7 @@ static void version_ind_send(struct connection *conn) empty_tx_enqueue(conn); } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) static void ping_resp_send(struct connection *conn) { struct radio_pdu_node_tx *node_tx; @@ -8274,7 +8274,7 @@ static void ping_resp_send(struct connection *conn) ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ static void reject_ind_ext_send(struct connection *conn, u8_t reject_opcode, u8_t error_code) @@ -8300,7 +8300,7 @@ static void reject_ind_ext_send(struct connection *conn, ctrl_tx_enqueue(conn, node_tx); } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, u16_t eff_tx_octets) { @@ -8327,9 +8327,9 @@ static void length_resp_send(struct connection *conn, u16_t eff_rx_octets, ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) static void phy_rsp_send(struct connection *conn) { struct radio_pdu_node_tx *node_tx; @@ -8351,7 +8351,7 @@ static void phy_rsp_send(struct connection *conn) ctrl_tx_enqueue(conn, node_tx); } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ void ll_radio_state_abort(void) { @@ -8639,13 +8639,13 @@ role_disable_cleanup: return ret_cb; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, u8_t rl_idx) -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ { u32_t volatile ret_cb = TICKER_STATUS_BUSY; u32_t ticks_slot_offset; @@ -8690,20 +8690,20 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->latency_prepare = 0; conn->latency_event = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) conn->default_tx_octets = _radio.default_tx_octets; conn->max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; conn->max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) conn->phy_pref_tx = _radio.default_phy_tx; conn->phy_tx = BIT(0); conn->phy_pref_flags = 0; conn->phy_flags = 0; conn->phy_pref_rx = _radio.default_phy_rx; conn->phy_rx = BIT(0); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ conn->role = 1; conn->connect_expire = 6; @@ -8716,10 +8716,10 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->supervision_expire = 0; conn->procedure_expire = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) conn->apto_expire = 0; conn->appto_expire = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ conn->llcp_req = 0; conn->llcp_ack = 0; @@ -8730,15 +8730,15 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->llcp_terminate.reason_peer = 0; conn->llcp_terminate.radio_pdu_node_rx.hdr.onion.link = link; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) conn->llcp_length.req = 0; conn->llcp_length.ack = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) conn->llcp_phy.req = 0; conn->llcp_phy.ack = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ conn->sn = 0; conn->nesn = 0; @@ -8756,28 +8756,28 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, conn->packet_tx_head_len = 0; conn->packet_tx_head_offset = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) conn->rssi_latest = 0x7F; conn->rssi_reported = 0x7F; conn->rssi_sample_count = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ _radio.advertiser.conn = conn; } else { conn = NULL; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) _radio.advertiser.phy_p = phy_p; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ _radio.advertiser.chan_map = chan_map; _radio.advertiser.filter_policy = filter_policy; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) _radio.advertiser.rl_idx = rl_idx; #else ARG_UNUSED(rl_idx); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ _radio.advertiser.hdr.ticks_active_to_start = _radio.ticks_active_to_start; @@ -8949,14 +8949,14 @@ u32_t radio_scan_enable(u8_t type, u8_t init_addr_type, u8_t *init_addr, _radio.scanner.type = type; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) _radio.scanner.phy = type >> 1; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) _radio.scanner.rpa_gen = rpa_gen; _radio.scanner.rl_idx = rl_idx; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ _radio.scanner.init_addr_type = init_addr_type; memcpy(&_radio.scanner.init_addr[0], init_addr, BDADDR_SIZE); @@ -8992,10 +8992,10 @@ u32_t radio_scan_enable(u8_t type, u8_t init_addr_type, u8_t *init_addr, ticks_anchor = ticker_ticks_now_get(); if ((_radio.scanner.conn) || - !IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED)) { + !IS_ENABLED(CONFIG_BT_CONTROLLER_SCHED_ADVANCED)) { us_offset = 0; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED) +#if defined(CONFIG_BT_CONTROLLER_SCHED_ADVANCED) else { u32_t ticks_ref = 0; @@ -9011,7 +9011,7 @@ u32_t radio_scan_enable(u8_t type, u8_t init_addr_type, u8_t *init_addr, ticks_anchor = ticks_ref; } } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */ +#endif /* CONFIG_BT_CONTROLLER_SCHED_ADVANCED */ ret = ticker_start(RADIO_TICKER_INSTANCE_ID_RADIO, RADIO_TICKER_USER_ID_APP, RADIO_TICKER_ID_SCAN, @@ -9141,20 +9141,20 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->latency_event = 0; conn->latency = _radio.scanner.conn_latency; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) conn->default_tx_octets = _radio.default_tx_octets; conn->max_tx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; conn->max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MIN; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) conn->phy_pref_tx = _radio.default_phy_tx; conn->phy_tx = BIT(0); conn->phy_pref_flags = 0; conn->phy_flags = 0; conn->phy_pref_rx = _radio.default_phy_rx; conn->phy_rx = BIT(0); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ conn->role = 0; conn->connect_expire = 6; @@ -9170,7 +9170,7 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, RADIO_CONN_EVENTS((40 * 1000 * 1000), conn_interval_us); conn->procedure_expire = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) /* APTO in no. of connection events */ conn->apto_reload = RADIO_CONN_EVENTS((30 * 1000 * 1000), conn_interval_us); @@ -9183,7 +9183,7 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->apto_reload; conn->apto_expire = 0; conn->appto_expire = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ conn->llcp_req = 0; conn->llcp_ack = 0; @@ -9194,15 +9194,15 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->llcp_terminate.reason_peer = 0; conn->llcp_terminate.radio_pdu_node_rx.hdr.onion.link = link; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) conn->llcp_length.req = 0; conn->llcp_length.ack = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) conn->llcp_phy.req = 0; conn->llcp_phy.ack = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ conn->sn = 0; conn->nesn = 0; @@ -9220,11 +9220,11 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval, conn->packet_tx_head_len = 0; conn->packet_tx_head_offset = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) conn->rssi_latest = 0x7F; conn->rssi_reported = 0x7F; conn->rssi_sample_count = 0; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ _radio.scanner.conn = conn; @@ -9330,7 +9330,7 @@ u32_t ll_chm_get(u16_t handle, u8_t *chm) return 0; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) u32_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv, u8_t *ltk) { struct connection *conn; @@ -9442,7 +9442,7 @@ u32_t ll_start_enc_req_send(u16_t handle, u8_t error_code, return 0; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ u32_t ll_feature_req_send(u16_t handle) { @@ -9490,7 +9490,7 @@ u32_t ll_terminate_ind_send(u16_t handle, u8_t reason) return 0; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) u32_t ll_apto_get(u16_t handle, u16_t *apto) { struct connection *conn; @@ -9519,9 +9519,9 @@ u32_t ll_apto_set(u16_t handle, u16_t apto) return 0; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) u32_t ll_length_req_send(u16_t handle, u16_t tx_octets) { struct connection *conn; @@ -9565,9 +9565,9 @@ void ll_length_max_get(u16_t *max_tx_octets, u16_t *max_tx_time, *max_rx_octets = RADIO_LL_LENGTH_OCTETS_RX_MAX; *max_rx_time = RADIO_LL_LENGTH_TIME_RX_MAX; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) u32_t ll_phy_get(u16_t handle, u8_t *tx, u8_t *rx) { struct connection *conn; @@ -9613,7 +9613,7 @@ u32_t ll_phy_req_send(u16_t handle, u8_t tx, u8_t flags, u8_t rx) return 0; } -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last) { @@ -9727,40 +9727,40 @@ void radio_rx_dequeue(void) case NODE_RX_TYPE_DC_PDU: case NODE_RX_TYPE_REPORT: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: case NODE_RX_TYPE_EXT_CODED_REPORT: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ case NODE_RX_TYPE_CONNECTION: case NODE_RX_TYPE_CONN_UPDATE: case NODE_RX_TYPE_ENC_REFRESH: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) case NODE_RX_TYPE_APTO: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ case NODE_RX_TYPE_CHAN_SEL_ALGO: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case NODE_RX_TYPE_PHY_UPDATE: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) case NODE_RX_TYPE_RSSI: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ /* release data link credit quota */ LL_ASSERT(_radio.link_rx_data_quota < @@ -9834,40 +9834,40 @@ void radio_rx_mem_release(struct radio_pdu_node_rx **radio_pdu_node_rx) case NODE_RX_TYPE_DC_PDU: case NODE_RX_TYPE_REPORT: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) case NODE_RX_TYPE_EXT_1M_REPORT: case NODE_RX_TYPE_EXT_CODED_REPORT: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) case NODE_RX_TYPE_SCAN_REQ: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ case NODE_RX_TYPE_CONNECTION: case NODE_RX_TYPE_CONN_UPDATE: case NODE_RX_TYPE_ENC_REFRESH: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) case NODE_RX_TYPE_APTO: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ case NODE_RX_TYPE_CHAN_SEL_ALGO: -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) case NODE_RX_TYPE_PHY_UPDATE: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) case NODE_RX_TYPE_RSSI: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) case NODE_RX_TYPE_PROFILE: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) case NODE_RX_TYPE_ADV_INDICATION: -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ mem_release(_radio_pdu_node_rx_free, &_radio.pkt_rx_data_free); diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.h b/subsys/bluetooth/controller/ll_sw/ctrl.h index 7c53037c6c7..af0ee006ccb 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.h +++ b/subsys/bluetooth/controller/ll_sw/ctrl.h @@ -11,73 +11,69 @@ /***************************************************************************** * Zephyr Kconfig defined ****************************************************************************/ -#ifdef CONFIG_BLUETOOTH_MAX_CONN -#define RADIO_CONNECTION_CONTEXT_MAX CONFIG_BLUETOOTH_MAX_CONN +#ifdef CONFIG_BT_MAX_CONN +#define RADIO_CONNECTION_CONTEXT_MAX CONFIG_BT_MAX_CONN #else #define RADIO_CONNECTION_CONTEXT_MAX 0 #endif -#ifdef CONFIG_BLUETOOTH_CONTROLLER_RX_BUFFERS -#define RADIO_PACKET_COUNT_RX_MAX \ - CONFIG_BLUETOOTH_CONTROLLER_RX_BUFFERS +#ifdef CONFIG_BT_CONTROLLER_RX_BUFFERS +#define RADIO_PACKET_COUNT_RX_MAX CONFIG_BT_CONTROLLER_RX_BUFFERS #endif -#ifdef CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFERS -#define RADIO_PACKET_COUNT_TX_MAX \ - CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFERS +#ifdef CONFIG_BT_CONTROLLER_TX_BUFFERS +#define RADIO_PACKET_COUNT_TX_MAX CONFIG_BT_CONTROLLER_TX_BUFFERS #endif -#ifdef CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFER_SIZE -#define RADIO_PACKET_TX_DATA_SIZE \ - CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFER_SIZE +#ifdef CONFIG_BT_CONTROLLER_TX_BUFFER_SIZE +#define RADIO_PACKET_TX_DATA_SIZE CONFIG_BT_CONTROLLER_TX_BUFFER_SIZE #endif #define BIT64(n) (1ULL << (n)) -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) #define RADIO_BLE_FEAT_BIT_ENC BIT64(BT_LE_FEAT_BIT_ENC) -#else /* !CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#else /* !CONFIG_BT_CONTROLLER_LE_ENC */ #define RADIO_BLE_FEAT_BIT_ENC 0 -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* !CONFIG_BT_CONTROLLER_LE_ENC */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) #define RADIO_BLE_FEAT_BIT_PING BIT64(BT_LE_FEAT_BIT_PING) -#else /* !CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#else /* !CONFIG_BT_CONTROLLER_LE_PING */ #define RADIO_BLE_FEAT_BIT_PING 0 -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* !CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_MAX) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH_MAX) #define RADIO_BLE_FEAT_BIT_DLE BIT64(BT_LE_FEAT_BIT_DLE) -#define RADIO_LL_LENGTH_OCTETS_RX_MAX \ - CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_MAX +#define RADIO_LL_LENGTH_OCTETS_RX_MAX CONFIG_BT_CONTROLLER_DATA_LENGTH_MAX #else #define RADIO_BLE_FEAT_BIT_DLE 0 #define RADIO_LL_LENGTH_OCTETS_RX_MAX 27 -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_MAX */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH_MAX */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) #define RADIO_BLE_FEAT_BIT_PRIVACY BIT64(BT_LE_FEAT_BIT_PRIVACY) -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#else /* !CONFIG_BT_CONTROLLER_PRIVACY */ #define RADIO_BLE_FEAT_BIT_PRIVACY 0 -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* !CONFIG_BT_CONTROLLER_PRIVACY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2) +#if defined(CONFIG_BT_CONTROLLER_CHAN_SEL_2) #define RADIO_BLE_FEAT_BIT_CHAN_SEL_2 BIT64(BT_LE_FEAT_BIT_CHAN_SEL_ALGO_2) -#else /* !CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#else /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ #define RADIO_BLE_FEAT_BIT_CHAN_SEL_2 0 -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2 */ +#endif /* !CONFIG_BT_CONTROLLER_CHAN_SEL_2 */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY_2M) +#if defined(CONFIG_BT_CONTROLLER_PHY_2M) #define RADIO_BLE_FEAT_BIT_PHY_2M BIT64(BT_LE_FEAT_BIT_PHY_2M) -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY_2M */ +#else /* !CONFIG_BT_CONTROLLER_PHY_2M */ #define RADIO_BLE_FEAT_BIT_PHY_2M 0 -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY_2M */ +#endif /* !CONFIG_BT_CONTROLLER_PHY_2M */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY_CODED) +#if defined(CONFIG_BT_CONTROLLER_PHY_CODED) #define RADIO_BLE_FEAT_BIT_PHY_CODED BIT64(BT_LE_FEAT_BIT_PHY_CODED) -#else /* !CONFIG_BLUETOOTH_CONTROLLER_PHY_CODED */ +#else /* !CONFIG_BT_CONTROLLER_PHY_CODED */ #define RADIO_BLE_FEAT_BIT_PHY_CODED 0 -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_PHY_CODED */ +#endif /* !CONFIG_BT_CONTROLLER_PHY_CODED */ /***************************************************************************** * Timer Resources (Controller defined) @@ -116,14 +112,14 @@ * Controller Interface Defines ****************************************************************************/ #define RADIO_BLE_VERSION_NUMBER BT_HCI_VERSION_5_0 -#if defined(CONFIG_BLUETOOTH_CONTROLLER_COMPANY_ID) -#define RADIO_BLE_COMPANY_ID CONFIG_BLUETOOTH_CONTROLLER_COMPANY_ID +#if defined(CONFIG_BT_CONTROLLER_COMPANY_ID) +#define RADIO_BLE_COMPANY_ID CONFIG_BT_CONTROLLER_COMPANY_ID #else #define RADIO_BLE_COMPANY_ID 0xFFFF #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SUBVERSION_NUMBER) +#if defined(CONFIG_BT_CONTROLLER_SUBVERSION_NUMBER) #define RADIO_BLE_SUB_VERSION_NUMBER \ - CONFIG_BLUETOOTH_CONTROLLER_SUBVERSION_NUMBER + CONFIG_BT_CONTROLLER_SUBVERSION_NUMBER #else #define RADIO_BLE_SUB_VERSION_NUMBER 0xFFFF #endif @@ -141,14 +137,14 @@ RADIO_BLE_FEAT_BIT_PHY_CODED | \ RADIO_BLE_FEAT_BIT_CHAN_SEL_2) -#if defined(CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO) -#define RADIO_TICKER_USER_ID_WORKER_PRIO CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO +#if defined(CONFIG_BT_CONTROLLER_WORKER_PRIO) +#define RADIO_TICKER_USER_ID_WORKER_PRIO CONFIG_BT_CONTROLLER_WORKER_PRIO #else #define RADIO_TICKER_USER_ID_WORKER_PRIO 0 #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_JOB_PRIO) -#define RADIO_TICKER_USER_ID_JOB_PRIO CONFIG_BLUETOOTH_CONTROLLER_JOB_PRIO +#if defined(CONFIG_BT_CONTROLLER_JOB_PRIO) +#define RADIO_TICKER_USER_ID_JOB_PRIO CONFIG_BT_CONTROLLER_JOB_PRIO #else #define RADIO_TICKER_USER_ID_JOB_PRIO 0 #endif @@ -229,41 +225,41 @@ enum radio_pdu_node_rx_type { NODE_RX_TYPE_DC_PDU, NODE_RX_TYPE_REPORT, -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) NODE_RX_TYPE_EXT_1M_REPORT, NODE_RX_TYPE_EXT_CODED_REPORT, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY) +#if defined(CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY) NODE_RX_TYPE_SCAN_REQ, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY */ +#endif /* CONFIG_BT_CONTROLLER_SCAN_REQ_NOTIFY */ NODE_RX_TYPE_CONNECTION, NODE_RX_TYPE_TERMINATE, NODE_RX_TYPE_CONN_UPDATE, NODE_RX_TYPE_ENC_REFRESH, -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) NODE_RX_TYPE_APTO, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ NODE_RX_TYPE_CHAN_SEL_ALGO, -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) NODE_RX_TYPE_PHY_UPDATE, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) NODE_RX_TYPE_RSSI, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) NODE_RX_TYPE_PROFILE, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION) +#if defined(CONFIG_BT_CONTROLLER_ADV_INDICATION) NODE_RX_TYPE_ADV_INDICATION, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION */ +#endif /* CONFIG_BT_CONTROLLER_ADV_INDICATION */ }; struct radio_le_conn_cmplt { @@ -271,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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) u8_t peer_rpa[BDADDR_SIZE]; u8_t own_addr_type; u8_t own_addr[BDADDR_SIZE]; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ u16_t interval; u16_t latency; u16_t timeout; @@ -330,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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy, u8_t rl_idx); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ u32_t radio_adv_disable(void); u32_t radio_adv_is_enabled(void); diff --git a/subsys/bluetooth/controller/ll_sw/ctrl_internal.h b/subsys/bluetooth/controller/ll_sw/ctrl_internal.h index e27b4a2e10d..8a924c6f36a 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl_internal.h +++ b/subsys/bluetooth/controller/ll_sw/ctrl_internal.h @@ -10,21 +10,21 @@ enum llcp { LLCP_CONNECTION_UPDATE, LLCP_CHAN_MAP, -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_ENC) +#if defined(CONFIG_BT_CONTROLLER_LE_ENC) LLCP_ENCRYPTION, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_ENC */ +#endif /* CONFIG_BT_CONTROLLER_LE_ENC */ LLCP_FEATURE_EXCHANGE, LLCP_VERSION_EXCHANGE, /* LLCP_TERMINATE, */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) LLCP_PING, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) LLCP_PHY_UPD, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ }; @@ -62,20 +62,20 @@ struct connection { u16_t latency_prepare; u16_t latency_event; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) u16_t default_tx_octets; u16_t max_tx_octets; u16_t max_rx_octets; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) u8_t phy_pref_tx:3; u8_t phy_tx:3; u8_t phy_pref_flags:1; u8_t phy_flags:1; u8_t phy_pref_rx:3; u8_t phy_rx:3; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ u16_t connect_expire; u16_t supervision_reload; @@ -83,12 +83,12 @@ struct connection { u16_t procedure_reload; u16_t procedure_expire; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING) +#if defined(CONFIG_BT_CONTROLLER_LE_PING) u16_t appto_reload; u16_t appto_expire; u16_t apto_reload; u16_t apto_expire; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_LE_PING */ +#endif /* CONFIG_BT_CONTROLLER_LE_PING */ union { struct { @@ -158,7 +158,7 @@ struct connection { u16_t instant; } chan_map; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) struct { u8_t initiate:1; u8_t cmd:1; @@ -166,7 +166,7 @@ struct connection { u8_t rx:3; u16_t instant; } phy_upd_ind; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ struct { u8_t error_code; @@ -198,7 +198,7 @@ struct connection { } radio_pdu_node_rx; } llcp_terminate; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH) +#if defined(CONFIG_BT_CONTROLLER_DATA_LENGTH) struct { u8_t req; u8_t ack; @@ -210,9 +210,9 @@ struct connection { u16_t rx_octets; u16_t tx_octets; } llcp_length; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH */ +#endif /* CONFIG_BT_CONTROLLER_DATA_LENGTH */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PHY) +#if defined(CONFIG_BT_CONTROLLER_PHY) struct { u8_t req; u8_t ack; @@ -226,7 +226,7 @@ struct connection { u8_t flags:1; u8_t cmd:1; } llcp_phy; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ +#endif /* CONFIG_BT_CONTROLLER_PHY */ u8_t sn:1; u8_t nesn:1; @@ -248,11 +248,11 @@ struct connection { u8_t packet_tx_head_len; u8_t packet_tx_head_offset; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) u8_t rssi_latest; u8_t rssi_reported; u8_t rssi_sample_count; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ }; #define CONNECTION_T_SIZE MROUND(sizeof(struct connection)) @@ -262,11 +262,11 @@ struct pdu_data_q_tx { }; /* Extra bytes for enqueued rx_node metadata: rssi and resolving index */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) #define PDU_AC_SIZE_EXTRA 2 #else #define PDU_AC_SIZE_EXTRA 1 -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ /* Minimum Rx Data allocation size */ #define PACKET_RX_DATA_SIZE_MIN \ diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c index d3e697a6506..d1192ab3177 100644 --- a/subsys/bluetooth/controller/ll_sw/ll.c +++ b/subsys/bluetooth/controller/ll_sw/ll.c @@ -16,7 +16,7 @@ #endif #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #include "hal/cpu.h" @@ -246,11 +246,11 @@ int ll_init(struct k_sem *sem_rx) ll_filter_reset(true); IRQ_DIRECT_CONNECT(NRF5_IRQ_RADIO_IRQn, - CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO, + CONFIG_BT_CONTROLLER_WORKER_PRIO, radio_nrf5_isr, 0); - IRQ_CONNECT(NRF5_IRQ_RTC0_IRQn, CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO, + IRQ_CONNECT(NRF5_IRQ_RTC0_IRQn, CONFIG_BT_CONTROLLER_WORKER_PRIO, rtc0_nrf5_isr, NULL, 0); - IRQ_CONNECT(NRF5_IRQ_SWI4_IRQn, CONFIG_BLUETOOTH_CONTROLLER_JOB_PRIO, + IRQ_CONNECT(NRF5_IRQ_SWI4_IRQn, CONFIG_BT_CONTROLLER_JOB_PRIO, swi4_nrf5_isr, NULL, 0); IRQ_CONNECT(NRF5_IRQ_RNG_IRQn, 1, rng_nrf5_isr, NULL, 0); diff --git a/subsys/bluetooth/controller/ll_sw/ll_adv.c b/subsys/bluetooth/controller/ll_sw/ll_adv.c index 8769674291a..b5f2dbf5a7e 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_adv.c +++ b/subsys/bluetooth/controller/ll_sw/ll_adv.c @@ -28,7 +28,7 @@ struct ll_adv_set *ll_adv_set_get(void) return &ll_adv; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_CHAN_SEL_2) && + if (IS_ENABLED(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT) && + (IS_ENABLED(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ } else { bool priv = false; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ status = radio_adv_enable(ll_adv.interval, ll_adv.chan_map, ll_adv.filter_policy, rl_idx); -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ return status; } diff --git a/subsys/bluetooth/controller/ll_sw/ll_adv.h b/subsys/bluetooth/controller/ll_sw/ll_adv.h index d5e8d2917e4..19ef6cd20f5 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_adv.h +++ b/subsys/bluetooth/controller/ll_sw/ll_adv.h @@ -7,19 +7,19 @@ struct ll_adv_set { u8_t chan_map:3; u8_t filter_policy:2; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) u8_t phy_p:3; u32_t interval; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ u16_t interval; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_ADV_EXT */ }; struct ll_adv_set *ll_adv_set_get(void); diff --git a/subsys/bluetooth/controller/ll_sw/ll_filter.c b/subsys/bluetooth/controller/ll_sw/ll_filter.c index d5208ca2388..df8da96f398 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_filter.c +++ b/subsys/bluetooth/controller/ll_sw/ll_filter.c @@ -21,7 +21,7 @@ #define ADDR_TYPE_ANON 0xFF -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #include "common/log.h" #include "hal/debug.h" @@ -31,7 +31,7 @@ static struct ll_filter wl_filter; u8_t wl_anon; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE]; +} rl[CONFIG_BT_CONTROLLER_RL_SIZE]; -static u8_t peer_irks[CONFIG_BLUETOOTH_CONTROLLER_RL_SIZE][16]; -static u8_t peer_irk_rl_ids[CONFIG_BLUETOOTH_CONTROLLER_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_irk_count; -static bt_addr_t local_rpas[CONFIG_BLUETOOTH_CONTROLLER_RL_SIZE]; +static bt_addr_t local_rpas[CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if !defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE); + LL_ASSERT(i < CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) wl_clear(); #else filter_clear(&wl_filter); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) return wl_add(addr); #else return filter_add(&wl_filter, addr->type, addr->a.val); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) return wl_remove(addr); #else return filter_remove(&wl_filter, addr->type, addr->a.val); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE); + LL_ASSERT(rl_idx < CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE); + LL_ASSERT(rl_idx < CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CONTROLLER_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++) { @@ -506,7 +506,7 @@ bool ctrl_rl_enabled(void) return rl_enable; } -#if defined(CONFIG_BLUETOOTH_BROADCASTER) +#if defined(CONFIG_BT_BROADCASTER) void ll_rl_pdu_adv_update(int idx, struct pdu_adv *pdu) { u8_t *adva = pdu->type == PDU_ADV_TYPE_SCAN_RSP ? @@ -572,7 +572,7 @@ static void rpa_adv_refresh(void) pdu->type = prev->type; pdu->rfu = 0; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) { + if (IS_ENABLED(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE; i++) { + for (int i = 0; i < CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE; i++) { + for (i = 0; i < CONFIG_BT_CONTROLLER_RL_SIZE; i++) { if ((rl[i].taken) && (all || !rl[i].rpas_ready)) { if (rl[i].pirk) { @@ -656,7 +656,7 @@ void ll_rl_rpa_update(bool timeout) } if (timeout) { -#if defined(CONFIG_BLUETOOTH_BROADCASTER) +#if defined(CONFIG_BT_BROADCASTER) if (radio_adv_is_enabled()) { rpa_adv_refresh(); } @@ -700,7 +700,7 @@ void ll_adv_scan_state_cb(u8_t bm) u32_t ll_rl_size_get(void) { - return CONFIG_BLUETOOTH_CONTROLLER_RL_SIZE; + return CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_RL_SIZE; + k < CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ void ll_filter_reset(bool init) { wl_anon = 0; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) wl_clear(); rl_enable = 0; @@ -914,6 +914,6 @@ void ll_filter_reset(bool init) } #else filter_clear(&wl_filter); -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PRIVACY */ +#endif /* CONFIG_BT_CONTROLLER_PRIVACY */ } diff --git a/subsys/bluetooth/controller/ll_sw/ll_master.c b/subsys/bluetooth/controller/ll_sw/ll_master.c index 7c032e98280..b1dc51547e5 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_master.c +++ b/subsys/bluetooth/controller/ll_sw/ll_master.c @@ -36,7 +36,7 @@ u32_t ll_create_connection(u16_t scan_interval, u16_t scan_window, return status; } -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) ll_filters_scan_update(filter_policy); if (!filter_policy && ctrl_rl_enabled()) { diff --git a/subsys/bluetooth/controller/ll_sw/ll_scan.c b/subsys/bluetooth/controller/ll_sw/ll_scan.c index 2c6b153662f..dbce5d47479 100644 --- a/subsys/bluetooth/controller/ll_sw/ll_scan.c +++ b/subsys/bluetooth/controller/ll_sw/ll_scan.c @@ -19,11 +19,11 @@ static struct { u16_t interval; u16_t window; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) u8_t type:4; -#else /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#else /* !CONFIG_BT_CONTROLLER_ADV_EXT */ u8_t type:1; -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* !CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PRIVACY) +#if defined(CONFIG_BT_CONTROLLER_PRIVACY) ll_filters_scan_update(ll_scan.filter_policy); if ((ll_scan.type & 0x1) && diff --git a/subsys/bluetooth/controller/ll_sw/pdu.h b/subsys/bluetooth/controller/ll_sw/pdu.h index af2d52949b9..f1059360544 100644 --- a/subsys/bluetooth/controller/ll_sw/pdu.h +++ b/subsys/bluetooth/controller/ll_sw/pdu.h @@ -53,7 +53,7 @@ struct pdu_adv_payload_connect_ind { } __packed lldata; } __packed; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) struct pdu_adv_payload_com_ext_adv adv_ext_ind; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ } __packed payload; } __packed; @@ -330,7 +330,7 @@ struct pdu_data_llctrl { } __packed ctrldata; } __packed; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ struct pdu_data { u8_t ll_id:2; @@ -350,21 +350,21 @@ struct pdu_data { u8_t len:8; -#if !defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR) +#if !defined(CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR) u8_t resv:8; /* TODO: remove nRF specific code */ -#endif /* !CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_CLEAR */ +#endif /* !CONFIG_BT_CONTROLLER_DATA_LENGTH_CLEAR */ union { u8_t lldata[1]; struct pdu_data_llctrl llctrl; -#if defined(CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI) +#if defined(CONFIG_BT_CONTROLLER_CONN_RSSI) u8_t rssi; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI */ +#endif /* CONFIG_BT_CONTROLLER_CONN_RSSI */ -#if defined(CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR) +#if defined(CONFIG_BT_CONTROLLER_PROFILE_ISR) struct profile profile; -#endif /* CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR */ +#endif /* CONFIG_BT_CONTROLLER_PROFILE_ISR */ } __packed payload; } __packed; diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig index 201503f9956..cdb64823b13 100644 --- a/subsys/bluetooth/host/Kconfig +++ b/subsys/bluetooth/host/Kconfig @@ -9,33 +9,33 @@ comment "Host Stack Configuration" -config BLUETOOTH_HCI_HOST +config BT_HCI_HOST # Virtual/hidden option to make the conditions more intuitive bool default y - depends on !BLUETOOTH_HCI_RAW + depends on !BT_HCI_RAW select POLL -config BLUETOOTH_HCI_CMD_COUNT +config BT_HCI_CMD_COUNT int "Number of HCI command buffers" default 2 range 2 64 help Number of buffers available for HCI commands. -config BLUETOOTH_RX_BUF_COUNT +config BT_RX_BUF_COUNT int "Number of HCI RX buffers" default 10 - default 3 if BLUETOOTH_RECV_IS_RX_THREAD + default 3 if BT_RECV_IS_RX_THREAD range 2 255 help Number of buffers available for incoming ACL packets or HCI events from the controller. -config BLUETOOTH_RX_BUF_LEN +config BT_RX_BUF_LEN int "Maximum supported HCI RX buffer length" default 76 - default 264 if BLUETOOTH_BREDR + default 264 if BT_BREDR range 73 2000 help Maximum data size for each HCI RX buffer. This size includes @@ -46,34 +46,34 @@ config BLUETOOTH_RX_BUF_LEN an L2CAP MTU of 65 bytes. On top of this there's the L2CAP header (4 bytes) and the ACL header (also 4 bytes) which yields 73 bytes. -config BLUETOOTH_HCI_TX_STACK_SIZE +config BT_HCI_TX_STACK_SIZE # Stack size needed for executing bt_send with specified driver int # Even if no driver is selected the following default is still # needed e.g. for unit tests. default 256 - default 256 if BLUETOOTH_H4 - default 256 if BLUETOOTH_H5 - default 256 if BLUETOOTH_SPI - default 640 if BLUETOOTH_CONTROLLER + default 256 if BT_H4 + default 256 if BT_H5 + default 256 if BT_SPI + default 640 if BT_CONTROLLER -config BLUETOOTH_HCI_TX_PRIO +config BT_HCI_TX_PRIO # Hidden option for Co-Operative Tx thread priority int default 7 # Headroom that the driver needs for sending and receiving buffers. # Add a new 'default' entry for each new driver. -config BLUETOOTH_HCI_RESERVE +config BT_HCI_RESERVE int # Even if no driver is selected the following default is still # needed e.g. for unit tests. default 0 - default 0 if BLUETOOTH_H4 - default 1 if BLUETOOTH_H5 - default 1 if BLUETOOTH_SPI + default 0 if BT_H4 + default 1 if BT_H5 + default 1 if BT_SPI -config BLUETOOTH_RECV_IS_RX_THREAD +config BT_RECV_IS_RX_THREAD # Virtual option set by the HCI driver to indicate that there's # no need for the host to have its own RX thread, rather the # context that bt_recv() gets called in is already good enough. @@ -81,15 +81,15 @@ config BLUETOOTH_RECV_IS_RX_THREAD # thing to make a call to bt_rx_thread_ready(). bool -config BLUETOOTH_RX_STACK_SIZE +config BT_RX_STACK_SIZE int "Size of the receiving thread stack" - depends on BLUETOOTH_HCI_HOST || BLUETOOTH_RECV_IS_RX_THREAD + depends on BT_HCI_HOST || BT_RECV_IS_RX_THREAD default 1024 - default 2048 if BLUETOOTH_MESH - default 512 if CONFIG_BLUETOOTH_HCI_RAW + default 2048 if BT_MESH + default 512 if CONFIG_BT_HCI_RAW range 1024 65536 - range 1100 65536 if BLUETOOTH_MESH - range 512 65536 if CONFIG_BLUETOOTH_HCI_RAW + range 1100 65536 if BT_MESH + range 512 65536 if CONFIG_BT_HCI_RAW help Size of the receiving thread stack. This is the context from which all event callbacks to the application occur. The @@ -98,29 +98,29 @@ config BLUETOOTH_RX_STACK_SIZE require extra stack space, this value can be increased to accommodate for that. -config BLUETOOTH_RX_PRIO +config BT_RX_PRIO # Hidden option for Co-Operative Rx thread priority int - depends on BLUETOOTH_HCI_HOST || BLUETOOTH_RECV_IS_RX_THREAD + depends on BT_HCI_HOST || BT_RECV_IS_RX_THREAD default 8 -if BLUETOOTH_HCI_HOST +if BT_HCI_HOST source "subsys/bluetooth/host/mesh/Kconfig" -config BLUETOOTH_HOST_CRYPTO +config BT_HOST_CRYPTO # Hidden option that compiles in random number generation and AES # encryption support using TinyCrypt library if software-based # controller is disabled. bool - default y if !BLUETOOTH_CONTROLLER + default y if !BT_CONTROLLER select TINYCRYPT select TINYCRYPT_AES select TINYCRYPT_SHA256 select TINYCRYPT_SHA256_HMAC select TINYCRYPT_SHA256_HMAC_PRNG -config BLUETOOTH_INTERNAL_STORAGE +config BT_INTERNAL_STORAGE bool "Use an internal persistent storage handler" depends on FILE_SYSTEM depends on PRINTK @@ -129,62 +129,62 @@ config BLUETOOTH_INTERNAL_STORAGE persistent storage handlers through the bt_storage API, rather an internal default handler is used for this. -if BLUETOOTH_CONN +if BT_CONN -if BLUETOOTH_HCI_ACL_FLOW_CONTROL -config BLUETOOTH_ACL_RX_COUNT +if BT_HCI_ACL_FLOW_CONTROL +config BT_ACL_RX_COUNT int "Number of incoming ACL data buffers" default 6 - default BLUETOOTH_CONTROLLER_RX_BUFFERS if BLUETOOTH_CONTROLLER + default BT_CONTROLLER_RX_BUFFERS if BT_CONTROLLER range 2 64 help Number of buffers available for incoming ACL data. -config BLUETOOTH_L2CAP_RX_MTU +config BT_L2CAP_RX_MTU int "Maximum supported L2CAP MTU for incoming data" default 23 - default 65 if BLUETOOTH_SMP - default 200 if BLUETOOTH_BREDR + default 65 if BT_SMP + default 200 if BT_BREDR range 23 1300 - range 65 1300 if BLUETOOTH_SMP + range 65 1300 if BT_SMP help Maximum size of each incoming L2CAP PDU. -endif # BLUETOOTH_HCI_ACL_FLOW_CONTROL +endif # BT_HCI_ACL_FLOW_CONTROL -config BLUETOOTH_L2CAP_TX_BUF_COUNT +config BT_L2CAP_TX_BUF_COUNT int "Number of L2CAP TX buffers" default 3 range 2 255 help Number of buffers available for outgoing L2CAP packets. -config BLUETOOTH_L2CAP_TX_MTU +config BT_L2CAP_TX_MTU int "Maximum supported L2CAP MTU for L2CAP TX buffers" default 23 - default 65 if BLUETOOTH_SMP - default 253 if BLUETOOTH_BREDR + default 65 if BT_SMP + default 253 if BT_BREDR range 23 2000 - range 65 2000 if BLUETOOTH_SMP + range 65 2000 if BT_SMP help Maximum L2CAP MTU for L2CAP TX buffers. -config BLUETOOTH_CONN_TX_MAX +config BT_CONN_TX_MAX int "Maximum number of pending TX buffers" default 7 - default BLUETOOTH_CONTROLLER_TX_BUFFERS if BLUETOOTH_CONTROLLER + default BT_CONTROLLER_TX_BUFFERS if BT_CONTROLLER range 1 128 help Maximum number of pending TX buffers that have not yet been acknowledged by the controller. -config BLUETOOTH_L2CAP_TX_USER_DATA_SIZE +config BT_L2CAP_TX_USER_DATA_SIZE int "Maximum supported user data size for L2CAP TX buffers" default 4 range 4 65535 help Maximum supported user data size for L2CAP TX buffers. -config BLUETOOTH_ATT_ENFORCE_FLOW +config BT_ATT_ENFORCE_FLOW bool "Enforce strict flow control semantics for incoming PDUs" default y default n if BOARD_QEMU_CORTEX_M3 || BOARD_QEMU_X86 @@ -196,7 +196,7 @@ config BLUETOOTH_ATT_ENFORCE_FLOW conditions arising from a USB based HCI transport that splits HCI events and ACL data to separate endpoints. -config BLUETOOTH_ATT_PREPARE_COUNT +config BT_ATT_PREPARE_COUNT int "Number of ATT prepare write buffers" default 0 range 0 64 @@ -204,49 +204,49 @@ config BLUETOOTH_ATT_PREPARE_COUNT Number of buffers available for ATT prepare write, setting this to 0 disables GATT long/reliable writes. -config BLUETOOTH_ATT_TX_MAX +config BT_ATT_TX_MAX int "Maximum number of queued outgoing ATT PDUs" default 2 - range 1 BLUETOOTH_L2CAP_TX_BUF_COUNT + range 1 BT_L2CAP_TX_BUF_COUNT help Number of ATT PDUs that can be at a single moment queued for transmission. If the application tries to send more than this amount the calls will block until an existing queued PDU gets sent. -config BLUETOOTH_SMP +config BT_SMP bool "Security Manager Protocol support" select TINYCRYPT select TINYCRYPT_AES select TINYCRYPT_AES_CMAC - select BLUETOOTH_RPA + select BT_RPA help This option enables support for the Security Manager Protocol (SMP), making it possible to pair devices over LE. -if BLUETOOTH_SMP -config BLUETOOTH_PRIVACY +if BT_SMP +config BT_PRIVACY bool "Privacy Feature" help Enable local Privacy Feature support. This makes it possible to use Resolvable Private Addresses (RPAs). -config BLUETOOTH_RPA_TIMEOUT +config BT_RPA_TIMEOUT int "Resolvable Private Address timeout" - depends on BLUETOOTH_PRIVACY + depends on BT_PRIVACY default 900 range 1 65535 help This option defines how often resolvable private address is rotated. Value is provided in seconds and defaults to 900 seconds (15 minutes). -config BLUETOOTH_SIGNING +config BT_SIGNING bool "Data signing support" help This option enables data signing which is used for transferring authenticated data in an unencrypted connection. -config BLUETOOTH_SMP_SC_ONLY +config BT_SMP_SC_ONLY bool "Secure Connections Only Mode" help This option enables support for Secure Connection Only Mode. In this @@ -255,9 +255,9 @@ config BLUETOOTH_SMP_SC_ONLY Security Mode 1 Level 4 stands for authenticated LE Secure Connections pairing with encryption. Enabling this option disables legacy pairing. -config BLUETOOTH_USE_DEBUG_KEYS +config BT_USE_DEBUG_KEYS bool "Enable Security Manager Debug Mode" - depends on BLUETOOTH_TINYCRYPT_ECC + depends on BT_TINYCRYPT_ECC help This option places Security Manager in a Debug Mode. In this mode predefined Diffie-Hellman private/public key pair is used as described @@ -266,39 +266,39 @@ config BLUETOOTH_USE_DEBUG_KEYS If this option is enabled anyone is able to decipher encrypted air traffic. -endif # BLUETOOTH_SMP +endif # BT_SMP -config BLUETOOTH_L2CAP_DYNAMIC_CHANNEL +config BT_L2CAP_DYNAMIC_CHANNEL bool "L2CAP Dynamic Channel support" - depends on BLUETOOTH_SMP + depends on BT_SMP help This option enables support for LE Connection oriented Channels, allowing the creation of dynamic L2CAP Channels. -config BLUETOOTH_GATT_CLIENT +config BT_GATT_CLIENT bool "GATT client support" help This option enables support for the GATT Client role. -config BLUETOOTH_MAX_PAIRED +config BT_MAX_PAIRED int "Maximum number of paired devices" default 1 - default 0 if !BLUETOOTH_SMP + default 0 if !BT_SMP range 0 128 help Maximum number of paired Bluetooth devices. The minimum (and default) number is 1. -endif # BLUETOOTH_CONN +endif # BT_CONN -config BLUETOOTH_DEVICE_NAME +config BT_DEVICE_NAME string "Bluetooth device name" default "Zephyr" help Bluetooth device name. Name can be up to 248 bytes long (excluding NULL termination). Can be empty string. -config BLUETOOTH_DEVICE_APPEARANCE +config BT_DEVICE_APPEARANCE int "Bluetooth device appearance" range 0 65535 default 0 @@ -307,13 +307,13 @@ config BLUETOOTH_DEVICE_APPEARANCE consult the following link: https://www.bluetooth.com/specifications/assigned-numbers -endif # BLUETOOTH_HCI_HOST +endif # BT_HCI_HOST -config BLUETOOTH_TINYCRYPT_ECC +config BT_TINYCRYPT_ECC bool "Use TinyCrypt library for ECDH" select TINYCRYPT select TINYCRYPT_ECC_DH - depends on BLUETOOTH_HCI_RAW || BLUETOOTH_HCI_HOST + depends on BT_HCI_RAW || BT_HCI_HOST help If this option is set TinyCrypt library is used for emulating the ECDH HCI commands and events needed by e.g. LE Secure Connections. @@ -324,120 +324,120 @@ config BLUETOOTH_TINYCRYPT_ECC option injects support for the 2 HCI commands required for LE Secure Connections so that Hosts can make use of those. -if BLUETOOTH_DEBUG -config BLUETOOTH_DEBUG_HCI_CORE +if BT_DEBUG +config BT_DEBUG_HCI_CORE bool "Bluetooth HCI core debug" help This option enables debug support for Bluetooth HCI core. -config BLUETOOTH_DEBUG_CONN +config BT_DEBUG_CONN bool "Bluetooth connection debug" - depends on BLUETOOTH_CONN + depends on BT_CONN help This option enables debug support for Bluetooth connection handling. -config BLUETOOTH_DEBUG_KEYS +config BT_DEBUG_KEYS bool "Bluetooth security keys debug" - depends on BLUETOOTH_HCI_HOST - depends on BLUETOOTH_SMP + depends on BT_HCI_HOST + depends on BT_SMP help This option enables debug support for the handling of Bluetooth security keys. -config BLUETOOTH_DEBUG_L2CAP +config BT_DEBUG_L2CAP bool "Bluetooth L2CAP debug" - depends on BLUETOOTH_CONN + depends on BT_CONN help This option enables debug support for the Bluetooth L2ACP layer. -config BLUETOOTH_DEBUG_SMP +config BT_DEBUG_SMP bool "Bluetooth Security Manager Protocol (SMP) debug" - depends on BLUETOOTH_HCI_HOST - depends on BLUETOOTH_SMP + depends on BT_HCI_HOST + depends on BT_SMP help This option enables debug support for the Bluetooth Security Manager Protocol (SMP). -config BLUETOOTH_SMP_SELFTEST +config BT_SMP_SELFTEST bool "Bluetooth SMP self tests executed on init" - depends on BLUETOOTH_DEBUG_SMP + depends on BT_DEBUG_SMP help This option enables SMP self-tests executed on startup to verify security and crypto functions. -config BLUETOOTH_SMP_FORCE_BREDR +config BT_SMP_FORCE_BREDR bool "Force Bluetooth SMP over BR/EDR" - depends on BLUETOOTH_DEBUG_SMP + depends on BT_DEBUG_SMP help This option enables SMP over BR/EDR even if controller is not supporting BR/EDR Secure Connections. This option is solely for testing and should never be enabled on production devices. -config BLUETOOTH_DEBUG_ATT +config BT_DEBUG_ATT bool "Bluetooth Attribute Protocol (ATT) debug" - depends on BLUETOOTH_CONN + depends on BT_CONN help This option enables debug support for the Bluetooth Attribute Protocol (ATT). -config BLUETOOTH_DEBUG_GATT +config BT_DEBUG_GATT bool "Bluetooth Generic Attribute Profile (GATT) debug" - depends on BLUETOOTH_CONN + depends on BT_CONN help This option enables debug support for the Bluetooth Generic Attribute Profile (GATT). -config BLUETOOTH_DEBUG_RFCOMM +config BT_DEBUG_RFCOMM bool "Bluetooth RFCOMM debug" - depends on BLUETOOTH_RFCOMM + depends on BT_RFCOMM help This option enables debug support for the Bluetooth RFCOMM layer. -config BLUETOOTH_DEBUG_HFP_HF +config BT_DEBUG_HFP_HF bool "Bluetooth Hands Free Profile (HFP) debug" - depends on BLUETOOTH_HFP_HF + depends on BT_HFP_HF help This option enables debug support for the Bluetooth Hands Free Profile (HFP). -config BLUETOOTH_DEBUG_AVDTP +config BT_DEBUG_AVDTP bool "Bluetooth AVDTP debug" - depends on BLUETOOTH_AVDTP + depends on BT_AVDTP help This option enables debug support for the Bluetooth AVDTP. -config BLUETOOTH_DEBUG_A2DP +config BT_DEBUG_A2DP bool "Bluetooth A2DP debug" - depends on BLUETOOTH_A2DP + depends on BT_A2DP help This option enables debug support for the Bluetooth A2DP profile. -config BLUETOOTH_DEBUG_SDP +config BT_DEBUG_SDP bool "Bluetooth Service Discovery Protocol (SDP) debug" - depends on BLUETOOTH_BREDR + depends on BT_BREDR help This option enables debug support for the Bluetooth Service Discovery Protocol (SDP). -endif # BLUETOOTH_DEBUG +endif # BT_DEBUG -config BLUETOOTH_BREDR +config BT_BREDR bool "Bluetooth BR/EDR support [EXPERIMENTAL]" - depends on BLUETOOTH_HCI_HOST - select BLUETOOTH_PERIPHERAL - select BLUETOOTH_CENTRAL - select BLUETOOTH_SMP - select BLUETOOTH_L2CAP_DYNAMIC_CHANNEL + depends on BT_HCI_HOST + select BT_PERIPHERAL + select BT_CENTRAL + select BT_SMP + select BT_L2CAP_DYNAMIC_CHANNEL help This option enables Bluetooth BR/EDR support" -if BLUETOOTH_BREDR -config BLUETOOTH_MAX_SCO_CONN +if BT_BREDR +config BT_MAX_SCO_CONN int "Maximum number of simultaneous SCO connections" default 1 range 1 3 @@ -445,40 +445,40 @@ config BLUETOOTH_MAX_SCO_CONN Maximum number of simultaneous Bluetooth synchronous connections supported. The minimum (and default) number is 1. -config BLUETOOTH_RFCOMM +config BT_RFCOMM bool "Bluetooth RFCOMM protocol support [EXPERIMENTAL]" help This option enables Bluetooth RFCOMM support -config BLUETOOTH_RFCOMM_L2CAP_MTU +config BT_RFCOMM_L2CAP_MTU int "L2CAP MTU for RFCOMM frames" - default BLUETOOTH_RX_BUF_LEN - default BLUETOOTH_L2CAP_RX_MTU if BLUETOOTH_HCI_ACL_FLOW_CONTROL - depends on BLUETOOTH_RFCOMM - range BLUETOOTH_RX_BUF_LEN 32767 - range BLUETOOTH_L2CAP_RX_MTU 32767 if BLUETOOTH_HCI_ACL_FLOW_CONTROL + default BT_RX_BUF_LEN + default BT_L2CAP_RX_MTU if BT_HCI_ACL_FLOW_CONTROL + depends on BT_RFCOMM + range BT_RX_BUF_LEN 32767 + range BT_L2CAP_RX_MTU 32767 if BT_HCI_ACL_FLOW_CONTROL help Maximum size of L2CAP PDU for RFCOMM frames. -config BLUETOOTH_HFP_HF +config BT_HFP_HF bool "Bluetooth Handsfree profile HF Role support [EXPERIMENTAL]" depends on PRINTK - select BLUETOOTH_RFCOMM + select BT_RFCOMM help This option enables Bluetooth HF support -config BLUETOOTH_AVDTP +config BT_AVDTP bool "Bluetooth AVDTP protocol support [EXPERIMENTAL]" help This option enables Bluetooth AVDTP support -config BLUETOOTH_A2DP +config BT_A2DP bool "Bluetooth A2DP Profile [EXPERIMENTAL]" - select BLUETOOTH_AVDTP + select BT_AVDTP help This option enables the A2DP profile -config BLUETOOTH_PAGE_TIMEOUT +config BT_PAGE_TIMEOUT hex "Bluetooth Page Timeout" default 0x2000 range 0x0001 0xffff @@ -486,4 +486,4 @@ config BLUETOOTH_PAGE_TIMEOUT This option sets the page timeout value. Value is selected as (N * 0.625) ms. -endif # BLUETOOTH_BREDR +endif # BT_BREDR diff --git a/subsys/bluetooth/host/Makefile b/subsys/bluetooth/host/Makefile index 1d119245022..04f1390811a 100644 --- a/subsys/bluetooth/host/Makefile +++ b/subsys/bluetooth/host/Makefile @@ -1,38 +1,38 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/subsys/bluetooth -obj-$(CONFIG_BLUETOOTH_HCI_RAW) += hci_raw.o +obj-$(CONFIG_BT_HCI_RAW) += hci_raw.o -obj-$(CONFIG_BLUETOOTH_DEBUG_MONITOR) += monitor.o +obj-$(CONFIG_BT_DEBUG_MONITOR) += monitor.o -obj-$(CONFIG_BLUETOOTH_TINYCRYPT_ECC) += hci_ecc.o +obj-$(CONFIG_BT_TINYCRYPT_ECC) += hci_ecc.o -obj-$(CONFIG_BLUETOOTH_INTERNAL_STORAGE) += storage.o +obj-$(CONFIG_BT_INTERNAL_STORAGE) += storage.o -ifeq ($(CONFIG_BLUETOOTH_HCI_HOST),y) +ifeq ($(CONFIG_BT_HCI_HOST),y) obj-y += uuid.o hci_core.o - ifeq ($(CONFIG_BLUETOOTH_CONN),y) + ifeq ($(CONFIG_BT_CONN),y) obj-y += conn.o l2cap.o att.o gatt.o - ifeq ($(CONFIG_BLUETOOTH_SMP),y) + ifeq ($(CONFIG_BT_SMP),y) obj-y += smp.o keys.o else obj-y += smp_null.o endif endif - obj-$(CONFIG_BLUETOOTH_HOST_CRYPTO) += crypto.o + obj-$(CONFIG_BT_HOST_CRYPTO) += crypto.o endif -obj-$(CONFIG_BLUETOOTH_BREDR) += keys_br.o l2cap_br.o sdp.o +obj-$(CONFIG_BT_BREDR) += keys_br.o l2cap_br.o sdp.o -obj-$(CONFIG_BLUETOOTH_RFCOMM) += rfcomm.o +obj-$(CONFIG_BT_RFCOMM) += rfcomm.o -obj-$(CONFIG_BLUETOOTH_HFP_HF) += at.o hfp_hf.o +obj-$(CONFIG_BT_HFP_HF) += at.o hfp_hf.o -obj-$(CONFIG_BLUETOOTH_AVDTP) += avdtp.o +obj-$(CONFIG_BT_AVDTP) += avdtp.o -obj-$(CONFIG_BLUETOOTH_A2DP) += a2dp.o +obj-$(CONFIG_BT_A2DP) += a2dp.o -obj-$(CONFIG_BLUETOOTH_MESH) += mesh/ +obj-$(CONFIG_BT_MESH) += mesh/ diff --git a/subsys/bluetooth/host/a2dp.c b/subsys/bluetooth/host/a2dp.c index c0194d07d1c..9afb9bff2fb 100644 --- a/subsys/bluetooth/host/a2dp.c +++ b/subsys/bluetooth/host/a2dp.c @@ -22,7 +22,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_A2DP) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_A2DP) #include "common/log.h" #include "hci_core.h" @@ -37,7 +37,7 @@ struct bt_a2dp { }; /* Connections */ -static struct bt_a2dp connection[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_a2dp connection[CONFIG_BT_MAX_CONN]; void a2d_reset(struct bt_a2dp *a2dp_conn) { @@ -56,7 +56,7 @@ struct bt_a2dp *get_new_connection(struct bt_conn *conn) } /* Find a space */ - for (i = 0; i < CONFIG_BLUETOOTH_MAX_CONN; i++) { + for (i = 0; i < CONFIG_BT_MAX_CONN; i++) { if (connection[i].session.br_chan.chan.conn == conn) { BT_DBG("Conn already exists"); return NULL; diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c index 7bf96870e1e..4e330300468 100644 --- a/subsys/bluetooth/host/att.c +++ b/subsys/bluetooth/host/att.c @@ -20,7 +20,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_ATT) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_ATT) #include "common/log.h" #include "hci_core.h" @@ -59,16 +59,16 @@ typedef enum __packed { static att_type_t att_op_get_type(u8_t op); -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0 +#if CONFIG_BT_ATT_PREPARE_COUNT > 0 struct bt_attr_data { u16_t handle; u16_t offset; }; /* Pool for incoming ATT packets */ -NET_BUF_POOL_DEFINE(prep_pool, CONFIG_BLUETOOTH_ATT_PREPARE_COUNT, BT_ATT_MTU, +NET_BUF_POOL_DEFINE(prep_pool, CONFIG_BT_ATT_PREPARE_COUNT, BT_ATT_MTU, sizeof(struct bt_attr_data), NULL); -#endif /* CONFIG_BLUETOOTH_ATT_PREPARE_COUNT */ +#endif /* CONFIG_BT_ATT_PREPARE_COUNT */ enum { ATT_PENDING_RSP, @@ -88,12 +88,12 @@ struct bt_att { sys_slist_t reqs; struct k_delayed_work timeout_work; struct k_sem tx_sem; -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0 +#if CONFIG_BT_ATT_PREPARE_COUNT > 0 struct k_fifo prep_queue; #endif }; -static struct bt_att bt_req_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_att bt_req_pool[CONFIG_BT_MAX_CONN]; static void att_req_destroy(struct bt_att_req *req) { @@ -126,9 +126,9 @@ static void att_cfm_sent(struct bt_conn *conn) BT_DBG("conn %p att %p", conn, att); -#if defined(CONFIG_BLUETOOTH_ATT_ENFORCE_FLOW) +#if defined(CONFIG_BT_ATT_ENFORCE_FLOW) atomic_clear_bit(att->flags, ATT_PENDING_CFM); -#endif /* CONFIG_BLUETOOTH_ATT_ENFORCE_FLOW */ +#endif /* CONFIG_BT_ATT_ENFORCE_FLOW */ k_sem_give(&att->tx_sem); } @@ -139,9 +139,9 @@ static void att_rsp_sent(struct bt_conn *conn) BT_DBG("conn %p att %p", conn, att); -#if defined(CONFIG_BLUETOOTH_ATT_ENFORCE_FLOW) +#if defined(CONFIG_BT_ATT_ENFORCE_FLOW) atomic_clear_bit(att->flags, ATT_PENDING_RSP); -#endif /* CONFIG_BLUETOOTH_ATT_ENFORCE_FLOW */ +#endif /* CONFIG_BT_ATT_ENFORCE_FLOW */ k_sem_give(&att->tx_sem); } @@ -679,23 +679,23 @@ static u8_t check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr, mask &= attr->perm; if (mask & BT_GATT_PERM_AUTHEN_MASK) { -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) if (conn->sec_level < BT_SECURITY_HIGH) { return BT_ATT_ERR_AUTHENTICATION; } #else return BT_ATT_ERR_AUTHENTICATION; -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ } if ((mask & BT_GATT_PERM_ENCRYPT_MASK)) { -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) if (!conn->encrypt) { return BT_ATT_ERR_INSUFFICIENT_ENCRYPTION; } #else return BT_ATT_ERR_INSUFFICIENT_ENCRYPTION; -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ } return 0; @@ -1272,7 +1272,7 @@ static u8_t att_write_req(struct bt_att *att, struct net_buf *buf) handle, 0, buf->data, buf->len); } -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0 +#if CONFIG_BT_ATT_PREPARE_COUNT > 0 struct prep_data { struct bt_conn *conn; struct net_buf *buf; @@ -1376,11 +1376,11 @@ static u8_t att_prep_write_rsp(struct bt_att *att, u16_t handle, u16_t offset, return 0; } -#endif /* CONFIG_BLUETOOTH_ATT_PREPARE_COUNT */ +#endif /* CONFIG_BT_ATT_PREPARE_COUNT */ static u8_t att_prepare_write_req(struct bt_att *att, struct net_buf *buf) { -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT == 0 +#if CONFIG_BT_ATT_PREPARE_COUNT == 0 return BT_ATT_ERR_NOT_SUPPORTED; #else struct bt_att_prepare_write_req *req; @@ -1395,10 +1395,10 @@ static u8_t att_prepare_write_req(struct bt_att *att, struct net_buf *buf) BT_DBG("handle 0x%04x offset %u", handle, offset); return att_prep_write_rsp(att, handle, offset, buf->data, buf->len); -#endif /* CONFIG_BLUETOOTH_ATT_PREPARE_COUNT */ +#endif /* CONFIG_BT_ATT_PREPARE_COUNT */ } -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0 +#if CONFIG_BT_ATT_PREPARE_COUNT > 0 static u8_t att_exec_write_rsp(struct bt_att *att, u8_t flags) { struct bt_conn *conn = att->chan.chan.conn; @@ -1440,12 +1440,12 @@ static u8_t att_exec_write_rsp(struct bt_att *att, u8_t flags) return 0; } -#endif /* CONFIG_BLUETOOTH_ATT_PREPARE_COUNT */ +#endif /* CONFIG_BT_ATT_PREPARE_COUNT */ static u8_t att_exec_write_req(struct bt_att *att, struct net_buf *buf) { -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT == 0 +#if CONFIG_BT_ATT_PREPARE_COUNT == 0 return BT_ATT_ERR_NOT_SUPPORTED; #else struct bt_att_exec_write_req *req; @@ -1455,7 +1455,7 @@ static u8_t att_exec_write_req(struct bt_att *att, struct net_buf *buf) BT_DBG("flags 0x%02x", req->flags); return att_exec_write_rsp(att, req->flags); -#endif /* CONFIG_BLUETOOTH_ATT_PREPARE_COUNT */ +#endif /* CONFIG_BT_ATT_PREPARE_COUNT */ } static u8_t att_write_cmd(struct bt_att *att, struct net_buf *buf) @@ -1499,7 +1499,7 @@ static u8_t att_signed_write_cmd(struct bt_att *att, struct net_buf *buf) buf->len - sizeof(struct bt_att_signature)); } -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) static int att_change_security(struct bt_conn *conn, u8_t err) { bt_security_t sec; @@ -1559,7 +1559,7 @@ static int att_change_security(struct bt_conn *conn, u8_t err) return bt_conn_security(conn, sec); } -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ static u8_t att_error_rsp(struct bt_att *att, struct net_buf *buf) { @@ -1582,7 +1582,7 @@ static u8_t att_error_rsp(struct bt_att *att, struct net_buf *buf) } err = rsp->error; -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) if (att->req->retrying) { goto done; } @@ -1593,7 +1593,7 @@ static u8_t att_error_rsp(struct bt_att *att, struct net_buf *buf) /* Wait security_changed: TODO: Handle fail case */ return 0; } -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ done: return att_handle_rsp(att, NULL, 0, err); @@ -1873,7 +1873,7 @@ static void bt_att_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) return; } - if (IS_ENABLED(CONFIG_BLUETOOTH_ATT_ENFORCE_FLOW)) { + if (IS_ENABLED(CONFIG_BT_ATT_ENFORCE_FLOW)) { if (handler->type == ATT_REQUEST && atomic_test_and_set_bit(att->flags, ATT_PENDING_RSP)) { BT_WARN("Ignoring unexpected request"); @@ -1953,7 +1953,7 @@ static void att_reset(struct bt_att *att) { struct bt_att_req *req, *tmp; int i; -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0 +#if CONFIG_BT_ATT_PREPARE_COUNT > 0 struct net_buf *buf; /* Discard queued buffers */ @@ -1965,7 +1965,7 @@ static void att_reset(struct bt_att *att) atomic_set_bit(att->flags, ATT_DISCONNECTED); /* Ensure that any waiters are woken up */ - for (i = 0; i < CONFIG_BLUETOOTH_ATT_TX_MAX; i++) { + for (i = 0; i < CONFIG_BT_ATT_TX_MAX; i++) { k_sem_give(&att->tx_sem); } @@ -2018,7 +2018,7 @@ static void bt_att_connected(struct bt_l2cap_chan *chan) BT_DBG("chan %p cid 0x%04x", ch, ch->tx.cid); -#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0 +#if CONFIG_BT_ATT_PREPARE_COUNT > 0 k_fifo_init(&att->prep_queue); #endif @@ -2044,7 +2044,7 @@ static void bt_att_disconnected(struct bt_l2cap_chan *chan) memset(att, 0, sizeof(*att)); } -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) static void bt_att_encrypt_change(struct bt_l2cap_chan *chan, u8_t hci_status) { @@ -2086,7 +2086,7 @@ static void bt_att_encrypt_change(struct bt_l2cap_chan *chan, att_cb(att->req->buf)); att->req->buf = NULL; } -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ static int bt_att_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan) { @@ -2095,9 +2095,9 @@ static int bt_att_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan) .connected = bt_att_connected, .disconnected = bt_att_disconnected, .recv = bt_att_recv, -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) .encrypt_change = bt_att_encrypt_change, -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ }; BT_DBG("conn %p handle %u", conn, conn->handle); @@ -2111,8 +2111,8 @@ static int bt_att_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan) att->chan.chan.ops = &ops; atomic_set(att->flags, 0); - k_sem_init(&att->tx_sem, CONFIG_BLUETOOTH_ATT_TX_MAX, - CONFIG_BLUETOOTH_ATT_TX_MAX); + k_sem_init(&att->tx_sem, CONFIG_BT_ATT_TX_MAX, + CONFIG_BT_ATT_TX_MAX); *chan = &att->chan.chan; diff --git a/subsys/bluetooth/host/att_internal.h b/subsys/bluetooth/host/att_internal.h index 7a8254762fb..b8cd5d0a903 100644 --- a/subsys/bluetooth/host/att_internal.h +++ b/subsys/bluetooth/host/att_internal.h @@ -8,10 +8,10 @@ #define BT_ATT_DEFAULT_LE_MTU 23 -#if BT_L2CAP_RX_MTU < CONFIG_BLUETOOTH_L2CAP_TX_MTU +#if BT_L2CAP_RX_MTU < CONFIG_BT_L2CAP_TX_MTU #define BT_ATT_MTU BT_L2CAP_RX_MTU #else -#define BT_ATT_MTU CONFIG_BLUETOOTH_L2CAP_TX_MTU +#define BT_ATT_MTU CONFIG_BT_L2CAP_TX_MTU #endif struct bt_att_hdr { diff --git a/subsys/bluetooth/host/avdtp.c b/subsys/bluetooth/host/avdtp.c index eb068cb9eac..c91c32dbaae 100644 --- a/subsys/bluetooth/host/avdtp.c +++ b/subsys/bluetooth/host/avdtp.c @@ -18,7 +18,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_AVDTP) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_AVDTP) #include "common/log.h" #include "hci_core.h" diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c index e5e7dfb949c..726e3a3341b 100644 --- a/subsys/bluetooth/host/conn.c +++ b/subsys/bluetooth/host/conn.c @@ -23,7 +23,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_CONN) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_CONN) #include "common/log.h" #include "hci_core.h" @@ -33,18 +33,18 @@ #include "smp.h" #include "att_internal.h" -NET_BUF_POOL_DEFINE(acl_tx_pool, CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT, - BT_L2CAP_BUF_SIZE(CONFIG_BLUETOOTH_L2CAP_TX_MTU), - CONFIG_BLUETOOTH_L2CAP_TX_USER_DATA_SIZE, NULL); +NET_BUF_POOL_DEFINE(acl_tx_pool, CONFIG_BT_L2CAP_TX_BUF_COUNT, + BT_L2CAP_BUF_SIZE(CONFIG_BT_L2CAP_TX_MTU), + CONFIG_BT_L2CAP_TX_USER_DATA_SIZE, NULL); /* How long until we cancel HCI_LE_Create_Connection */ #define CONN_TIMEOUT K_SECONDS(3) -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) const struct bt_conn_auth_cb *bt_auth; -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ -static struct bt_conn conns[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_conn conns[CONFIG_BT_MAX_CONN]; static struct bt_conn_cb *callback_list; struct conn_tx_cb { @@ -53,11 +53,11 @@ struct conn_tx_cb { #define conn_tx(buf) ((struct conn_tx_cb *)net_buf_user_data(buf)) -static struct bt_conn_tx conn_tx[CONFIG_BLUETOOTH_CONN_TX_MAX]; +static struct bt_conn_tx conn_tx[CONFIG_BT_CONN_TX_MAX]; static sys_slist_t free_tx = SYS_SLIST_STATIC_INIT(&free_tx); -#if defined(CONFIG_BLUETOOTH_BREDR) -static struct bt_conn sco_conns[CONFIG_BLUETOOTH_MAX_SCO_CONN]; +#if defined(CONFIG_BT_BREDR) +static struct bt_conn sco_conns[CONFIG_BT_MAX_SCO_CONN]; enum pairing_method { LEGACY, /* Legacy (pre-SSP) pairing */ @@ -74,15 +74,15 @@ static const u8_t ssp_method[4 /* remote */][4 /* local */] = { { PASSKEY_DISPLAY, PASSKEY_DISPLAY, PASSKEY_INPUT, JUST_WORKS }, { JUST_WORKS, JUST_WORKS, JUST_WORKS, JUST_WORKS }, }; -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ struct k_sem *bt_conn_get_pkts(struct bt_conn *conn) { -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR || !bt_dev.le.mtu) { return &bt_dev.br.pkts; } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ return &bt_dev.le.pkts; } @@ -176,7 +176,7 @@ static void le_conn_update(struct k_work *work) struct bt_conn *conn = CONTAINER_OF(le, struct bt_conn, le); const struct bt_le_conn_param *param; - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->state == BT_CONN_CONNECT) { bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN); return; @@ -213,7 +213,7 @@ static struct bt_conn *conn_new(void) return conn; } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) void bt_sco_cleanup(struct bt_conn *sco_conn) { bt_conn_unref(sco_conn->sco.acl); @@ -747,9 +747,9 @@ static int conn_auth(struct bt_conn *conn) return bt_hci_cmd_send_sync(BT_HCI_OP_AUTH_REQUESTED, buf, NULL); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) void bt_conn_identity_resolved(struct bt_conn *conn) { const bt_addr_le_t *rpa; @@ -791,16 +791,16 @@ int bt_conn_le_start_encryption(struct bt_conn *conn, u64_t rand, return bt_hci_cmd_send_sync(BT_HCI_OP_LE_START_ENCRYPTION, buf, NULL); } -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) u8_t bt_conn_enc_key_size(struct bt_conn *conn) { if (!conn->encrypt) { return 0; } - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR) && + if (IS_ENABLED(CONFIG_BT_BREDR) && conn->type == BT_CONN_TYPE_BR) { struct bt_hci_cp_read_encryption_key_size *cp; struct bt_hci_rp_read_encryption_key_size *rp; @@ -831,7 +831,7 @@ u8_t bt_conn_enc_key_size(struct bt_conn *conn) return key_size; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP)) { + if (IS_ENABLED(CONFIG_BT_SMP)) { return conn->le.keys ? conn->le.keys->enc_size : 0; } @@ -851,7 +851,7 @@ void bt_conn_security_changed(struct bt_conn *conn) static int start_security(struct bt_conn *conn) { -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { if (atomic_test_bit(conn->flags, BT_CONN_BR_PAIRING)) { return -EBUSY; @@ -868,10 +868,10 @@ static int start_security(struct bt_conn *conn) return conn_auth(conn); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ switch (conn->role) { -#if defined(CONFIG_BLUETOOTH_CENTRAL) && defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_CENTRAL) && defined(CONFIG_BT_SMP) case BT_HCI_ROLE_MASTER: { if (!conn->le.keys) { @@ -908,11 +908,11 @@ static int start_security(struct bt_conn *conn) conn->le.keys->ltk.val, conn->le.keys->enc_size); } -#endif /* CONFIG_BLUETOOTH_CENTRAL && CONFIG_BLUETOOTH_SMP */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) && defined(CONFIG_BLUETOOTH_SMP) +#endif /* CONFIG_BT_CENTRAL && CONFIG_BT_SMP */ +#if defined(CONFIG_BT_PERIPHERAL) && defined(CONFIG_BT_SMP) case BT_HCI_ROLE_SLAVE: return bt_smp_send_security_req(conn); -#endif /* CONFIG_BLUETOOTH_PERIPHERAL && CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_PERIPHERAL && CONFIG_BT_SMP */ default: return -EINVAL; } @@ -926,7 +926,7 @@ int bt_conn_security(struct bt_conn *conn, bt_security_t sec) return -ENOTCONN; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_SC_ONLY) && + if (IS_ENABLED(CONFIG_BT_SMP_SC_ONLY) && sec < BT_SECURITY_FIPS) { return -EOPNOTSUPP; } @@ -947,7 +947,7 @@ int bt_conn_security(struct bt_conn *conn, bt_security_t sec) return err; } -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ void bt_conn_cb_register(struct bt_conn_cb *cb) { @@ -1195,11 +1195,11 @@ fail: static inline u16_t conn_mtu(struct bt_conn *conn) { -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR || !bt_dev.le.mtu) { return bt_dev.br.mtu; } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ return bt_dev.le.mtu; } @@ -1362,10 +1362,10 @@ struct bt_conn *bt_conn_add_le(const bt_addr_le_t *peer) } bt_addr_le_copy(&conn->le.dst, peer); -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) conn->sec_level = BT_SECURITY_LOW; conn->required_sec_level = BT_SECURITY_LOW; -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ conn->type = BT_CONN_TYPE_LE; conn->le.interval_min = BT_GAP_INIT_CONN_INT_MIN; conn->le.interval_max = BT_GAP_INIT_CONN_INT_MAX; @@ -1419,7 +1419,7 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state) bt_conn_ref(conn); break; case BT_CONN_CONNECT: - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->type == BT_CONN_TYPE_LE) { k_delayed_work_cancel(&conn->le.update_work); } @@ -1492,7 +1492,7 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state) * Timer is needed only for LE. For other link types controller * will handle connection timeout. */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->type == BT_CONN_TYPE_LE) { k_delayed_work_submit(&conn->le.update_work, CONN_TIMEOUT); @@ -1528,7 +1528,7 @@ struct bt_conn *bt_conn_lookup_handle(u16_t handle) } } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) for (i = 0; i < ARRAY_SIZE(sco_conns); i++) { if (!atomic_get(&sco_conns[i].ref)) { continue; @@ -1668,7 +1668,7 @@ int bt_conn_get_info(const struct bt_conn *conn, struct bt_conn_info *info) info->le.latency = conn->le.latency; info->le.timeout = conn->le.timeout; return 0; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) case BT_CONN_TYPE_BR: info->br.dst = &conn->br.dst; return 0; @@ -1743,7 +1743,7 @@ int bt_conn_disconnect(struct bt_conn *conn, u8_t reason) * and we could send LE Create Connection as soon as the remote * starts advertising. */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->type == BT_CONN_TYPE_LE) { bt_le_set_auto_conn(&conn->le.dst, NULL); } @@ -1755,13 +1755,13 @@ int bt_conn_disconnect(struct bt_conn *conn, u8_t reason) bt_le_scan_update(false); return 0; case BT_CONN_CONNECT: -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { return bt_hci_connect_br_cancel(conn); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL)) { + if (IS_ENABLED(CONFIG_BT_CENTRAL)) { k_delayed_work_cancel(&conn->le.update_work); return bt_hci_cmd_send(BT_HCI_OP_LE_CREATE_CONN_CANCEL, NULL); @@ -1778,7 +1778,7 @@ int bt_conn_disconnect(struct bt_conn *conn, u8_t reason) } } -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) static void bt_conn_set_param_le(struct bt_conn *conn, const struct bt_le_conn_param *param) { @@ -1878,15 +1878,15 @@ int bt_le_set_auto_conn(bt_addr_le_t *addr, return 0; } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) struct bt_conn *bt_conn_create_slave_le(const bt_addr_le_t *peer, const struct bt_le_adv_param *param) { return NULL; } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ int bt_conn_le_conn_update(struct bt_conn *conn, const struct bt_le_conn_param *param) @@ -1922,13 +1922,13 @@ struct net_buf *bt_conn_create_pdu(struct net_buf_pool *pool, size_t reserve) buf = net_buf_alloc(pool, K_FOREVER); __ASSERT_NO_MSG(buf); - reserve += sizeof(struct bt_hci_acl_hdr) + CONFIG_BLUETOOTH_HCI_RESERVE; + reserve += sizeof(struct bt_hci_acl_hdr) + CONFIG_BT_HCI_RESERVE; net_buf_reserve(buf, reserve); return buf; } -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) int bt_conn_auth_cb_register(const struct bt_conn_auth_cb *cb) { if (!cb) { @@ -1955,13 +1955,12 @@ int bt_conn_auth_passkey_entry(struct bt_conn *conn, unsigned int passkey) return -EINVAL; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP) && - conn->type == BT_CONN_TYPE_LE) { + if (IS_ENABLED(CONFIG_BT_SMP) && conn->type == BT_CONN_TYPE_LE) { bt_smp_auth_passkey_entry(conn, passkey); return 0; } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { /* User entered passkey, reset user state. */ if (!atomic_test_and_clear_bit(conn->flags, BT_CONN_USER)) { @@ -1972,7 +1971,7 @@ int bt_conn_auth_passkey_entry(struct bt_conn *conn, unsigned int passkey) return ssp_passkey_reply(conn, passkey); } } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ return -EINVAL; } @@ -1983,12 +1982,12 @@ int bt_conn_auth_passkey_confirm(struct bt_conn *conn) return -EINVAL; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP) && + if (IS_ENABLED(CONFIG_BT_SMP) && conn->type == BT_CONN_TYPE_LE) { return bt_smp_auth_passkey_confirm(conn); } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { /* Allow user confirm passkey value, then reset user state. */ if (!atomic_test_and_clear_bit(conn->flags, BT_CONN_USER)) { @@ -1997,7 +1996,7 @@ int bt_conn_auth_passkey_confirm(struct bt_conn *conn) return ssp_confirm_reply(conn); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ return -EINVAL; } @@ -2008,12 +2007,11 @@ int bt_conn_auth_cancel(struct bt_conn *conn) return -EINVAL; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP) && - conn->type == BT_CONN_TYPE_LE) { + if (IS_ENABLED(CONFIG_BT_SMP) && conn->type == BT_CONN_TYPE_LE) { return bt_smp_auth_cancel(conn); } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { /* Allow user cancel authentication, then reset user state. */ if (!atomic_test_and_clear_bit(conn->flags, BT_CONN_USER)) { @@ -2035,7 +2033,7 @@ int bt_conn_auth_cancel(struct bt_conn *conn) break; } } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ return -EINVAL; } @@ -2047,19 +2045,19 @@ int bt_conn_auth_pairing_confirm(struct bt_conn *conn) } switch (conn->type) { -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) case BT_CONN_TYPE_LE: return bt_smp_auth_pairing_confirm(conn); -#endif /* CONFIG_BLUETOOTH_SMP */ -#if defined(CONFIG_BLUETOOTH_BREDR) +#endif /* CONFIG_BT_SMP */ +#if defined(CONFIG_BT_BREDR) case BT_CONN_TYPE_BR: return ssp_confirm_reply(conn); -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ default: return -EINVAL; } } -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ int bt_conn_init(void) { @@ -2079,7 +2077,7 @@ int bt_conn_init(void) bt_l2cap_init(); /* Initialize background scan */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL)) { + if (IS_ENABLED(CONFIG_BT_CENTRAL)) { for (i = 0; i < ARRAY_SIZE(conns); i++) { struct bt_conn *conn = &conns[i]; diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h index 303cd9a6494..9b18dd9e496 100644 --- a/subsys/bluetooth/host/conn_internal.h +++ b/subsys/bluetooth/host/conn_internal.h @@ -52,7 +52,7 @@ struct bt_conn_le { struct k_delayed_work update_work; }; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) /* For now reserve space for 2 pages of LMP remote features */ #define LMP_MAX_PAGES 2 @@ -88,11 +88,11 @@ struct bt_conn { ATOMIC_DEFINE(flags, BT_CONN_NUM_FLAGS); -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) bt_security_t sec_level; bt_security_t required_sec_level; u8_t encrypt; -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ /* Connection error or reason for disconnect */ u8_t err; @@ -117,7 +117,7 @@ struct bt_conn { union { struct bt_conn_le le; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) struct bt_conn_br br; struct bt_conn_sco sco; #endif @@ -183,19 +183,19 @@ void notify_le_param_updated(struct bt_conn *conn); bool le_param_req(struct bt_conn *conn, struct bt_le_conn_param *param); -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) /* rand and ediv should be in BT order */ int bt_conn_le_start_encryption(struct bt_conn *conn, u64_t rand, u16_t ediv, const u8_t *ltk, size_t len); /* Notify higher layers that RPA was resolved */ void bt_conn_identity_resolved(struct bt_conn *conn); -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) /* Notify higher layers that connection security changed */ void bt_conn_security_changed(struct bt_conn *conn); -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ /* Prepare a PDU to be sent over a connection */ struct net_buf *bt_conn_create_pdu(struct net_buf_pool *pool, size_t reserve); diff --git a/subsys/bluetooth/host/crypto.c b/subsys/bluetooth/host/crypto.c index 743659374af..91825e6414b 100644 --- a/subsys/bluetooth/host/crypto.c +++ b/subsys/bluetooth/host/crypto.c @@ -20,7 +20,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_CORE) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #include "common/log.h" #include "hci_core.h" diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c index c386805c481..3edbe0174c1 100644 --- a/subsys/bluetooth/host/gatt.c +++ b/subsys/bluetooth/host/gatt.c @@ -20,7 +20,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_GATT) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_GATT) #include "common/log.h" #include "hci_core.h" @@ -33,12 +33,12 @@ #define SC_TIMEOUT K_MSEC(10) -#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) +#if defined(CONFIG_BT_GATT_CLIENT) static sys_slist_t subscriptions; -#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ +#endif /* CONFIG_BT_GATT_CLIENT */ -static const char *gap_name = CONFIG_BLUETOOTH_DEVICE_NAME; -static const u16_t gap_appearance = CONFIG_BLUETOOTH_DEVICE_APPEARANCE; +static const char *gap_name = CONFIG_BT_DEVICE_NAME; +static const u16_t gap_appearance = CONFIG_BT_DEVICE_APPEARANCE; static sys_slist_t db; @@ -948,7 +948,7 @@ static u8_t disconnected_cb(const struct bt_gatt_attr *attr, void *user_data) return BT_GATT_ITER_CONTINUE; } -#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) +#if defined(CONFIG_BT_GATT_CLIENT) void bt_gatt_notification(struct bt_conn *conn, u16_t handle, const void *data, u16_t length) { @@ -1748,7 +1748,7 @@ int bt_gatt_write_without_response(struct bt_conn *conn, u16_t handle, return -ENOTCONN; } -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) if (conn->encrypt) { /* Don't need to sign if already encrypted */ sign = false; @@ -2065,15 +2065,15 @@ static void add_subscriptions(struct bt_conn *conn) } } -#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ +#endif /* CONFIG_BT_GATT_CLIENT */ void bt_gatt_connected(struct bt_conn *conn) { BT_DBG("conn %p", conn); bt_gatt_foreach_attr(0x0001, 0xffff, connected_cb, conn); -#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) +#if defined(CONFIG_BT_GATT_CLIENT) add_subscriptions(conn); -#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ +#endif /* CONFIG_BT_GATT_CLIENT */ } void bt_gatt_disconnected(struct bt_conn *conn) @@ -2081,7 +2081,7 @@ void bt_gatt_disconnected(struct bt_conn *conn) BT_DBG("conn %p", conn); bt_gatt_foreach_attr(0x0001, 0xffff, disconnected_cb, conn); -#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) +#if defined(CONFIG_BT_GATT_CLIENT) remove_subscriptions(conn); -#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ +#endif /* CONFIG_BT_GATT_CLIENT */ } diff --git a/subsys/bluetooth/host/gatt_internal.h b/subsys/bluetooth/host/gatt_internal.h index 968762c5efd..0ea4139344a 100644 --- a/subsys/bluetooth/host/gatt_internal.h +++ b/subsys/bluetooth/host/gatt_internal.h @@ -12,7 +12,7 @@ void bt_gatt_init(void); void bt_gatt_connected(struct bt_conn *conn); void bt_gatt_disconnected(struct bt_conn *conn); -#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) +#if defined(CONFIG_BT_GATT_CLIENT) void bt_gatt_notification(struct bt_conn *conn, u16_t handle, const void *data, u16_t length); #else @@ -20,4 +20,4 @@ static inline void bt_gatt_notification(struct bt_conn *conn, u16_t handle, const void *data, u16_t length) { } -#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ +#endif /* CONFIG_BT_GATT_CLIENT */ diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c index 79367298ad2..40f236e4e2d 100644 --- a/subsys/bluetooth/host/hci_core.c +++ b/subsys/bluetooth/host/hci_core.c @@ -26,7 +26,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_CORE) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #include "common/log.h" #include "common/rpa.h" @@ -43,17 +43,17 @@ /* Peripheral timeout to initialize Connection Parameter Update procedure */ #define CONN_UPDATE_TIMEOUT K_SECONDS(5) -#define RPA_TIMEOUT K_SECONDS(CONFIG_BLUETOOTH_RPA_TIMEOUT) +#define RPA_TIMEOUT K_SECONDS(CONFIG_BT_RPA_TIMEOUT) #define HCI_CMD_TIMEOUT K_SECONDS(10) /* Stacks for the threads */ -#if !defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if !defined(CONFIG_BT_RECV_IS_RX_THREAD) static struct k_thread rx_thread_data; -static BT_STACK_NOINIT(rx_thread_stack, CONFIG_BLUETOOTH_RX_STACK_SIZE); +static BT_STACK_NOINIT(rx_thread_stack, CONFIG_BT_RX_STACK_SIZE); #endif static struct k_thread tx_thread_data; -static BT_STACK_NOINIT(tx_thread_stack, CONFIG_BLUETOOTH_HCI_TX_STACK_SIZE); +static BT_STACK_NOINIT(tx_thread_stack, CONFIG_BT_HCI_TX_STACK_SIZE); static void init_work(struct k_work *work); @@ -63,13 +63,13 @@ struct bt_dev bt_dev = { * exception is if the controller requests to wait for an * initial Command Complete for NOP. */ -#if !defined(CONFIG_BLUETOOTH_WAIT_NOP) +#if !defined(CONFIG_BT_WAIT_NOP) .ncmd_sem = _K_SEM_INITIALIZER(bt_dev.ncmd_sem, 1, 1), #else .ncmd_sem = _K_SEM_INITIALIZER(bt_dev.ncmd_sem, 0, 1), #endif .cmd_tx_queue = _K_FIFO_INITIALIZER(bt_dev.cmd_tx_queue), -#if !defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if !defined(CONFIG_BT_RECV_IS_RX_THREAD) .rx_queue = _K_FIFO_INITIALIZER(bt_dev.rx_queue), #endif }; @@ -84,12 +84,12 @@ static u8_t pub_key[64]; static struct bt_pub_key_cb *pub_key_cb; static bt_dh_key_cb_t dh_key_cb; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static bt_br_discovery_cb_t *discovery_cb; struct bt_br_discovery_result *discovery_results; static size_t discovery_results_size; static size_t discovery_results_count; -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ struct cmd_data { /** BT_BUF_CMD */ @@ -120,13 +120,13 @@ struct acl_data { * the same buffer is also used for the response. */ #define CMD_BUF_SIZE BT_BUF_RX_SIZE -NET_BUF_POOL_DEFINE(hci_cmd_pool, CONFIG_BLUETOOTH_HCI_CMD_COUNT, +NET_BUF_POOL_DEFINE(hci_cmd_pool, CONFIG_BT_HCI_CMD_COUNT, CMD_BUF_SIZE, sizeof(struct cmd_data), NULL); -NET_BUF_POOL_DEFINE(hci_rx_pool, CONFIG_BLUETOOTH_RX_BUF_COUNT, +NET_BUF_POOL_DEFINE(hci_rx_pool, CONFIG_BT_RX_BUF_COUNT, BT_BUF_RX_SIZE, BT_BUF_USER_DATA_MIN, NULL); -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) static void report_completed_packet(struct net_buf *buf) { @@ -160,10 +160,10 @@ static void report_completed_packet(struct net_buf *buf) bt_hci_cmd_send(BT_HCI_OP_HOST_NUM_COMPLETED_PACKETS, buf); } -#define ACL_IN_SIZE BT_L2CAP_BUF_SIZE(CONFIG_BLUETOOTH_L2CAP_RX_MTU) -NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BLUETOOTH_ACL_RX_COUNT, ACL_IN_SIZE, +#define ACL_IN_SIZE BT_L2CAP_BUF_SIZE(CONFIG_BT_L2CAP_RX_MTU) +NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BT_ACL_RX_COUNT, ACL_IN_SIZE, BT_BUF_USER_DATA_MIN, report_completed_packet); -#endif /* CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL */ +#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */ struct net_buf *bt_hci_cmd_create(u16_t opcode, u8_t param_len) { @@ -177,7 +177,7 @@ struct net_buf *bt_hci_cmd_create(u16_t opcode, u8_t param_len) BT_DBG("buf %p", buf); - net_buf_reserve(buf, CONFIG_BLUETOOTH_HCI_RESERVE); + net_buf_reserve(buf, CONFIG_BT_HCI_RESERVE); cmd(buf)->type = BT_BUF_CMD; cmd(buf)->opcode = opcode; @@ -304,7 +304,7 @@ static int bt_hci_stop_scanning(void) static const bt_addr_le_t *find_id_addr(const bt_addr_le_t *addr) { - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP)) { + if (IS_ENABLED(CONFIG_BT_SMP)) { struct bt_keys *keys; keys = bt_keys_find_irk(addr); @@ -378,7 +378,7 @@ static int set_random_address(const bt_addr_t *addr) return 0; } -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) /* this function sets new RPA only if current one is no longer valid */ static int le_set_private_addr(void) { @@ -444,7 +444,7 @@ static int le_set_private_addr(void) } #endif -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) static void hci_acl(struct net_buf *buf) { struct bt_hci_acl_hdr *hdr = (void *)buf->data; @@ -578,7 +578,7 @@ static void hci_disconn_complete(struct net_buf *buf) /* Check stacks usage (no-ops if not enabled) */ k_call_stacks_analyze(); -#if !defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if !defined(CONFIG_BT_RECV_IS_RX_THREAD) STACK_ANALYZE("rx stack", rx_thread_stack); #endif STACK_ANALYZE("tx stack", tx_thread_stack); @@ -587,7 +587,7 @@ static void hci_disconn_complete(struct net_buf *buf) conn->handle = 0; if (conn->type != BT_CONN_TYPE_LE) { -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_SCO) { bt_sco_cleanup(conn); return; @@ -615,7 +615,7 @@ static void hci_disconn_complete(struct net_buf *buf) advertise: if (atomic_test_bit(bt_dev.flags, BT_DEV_KEEP_ADVERTISING) && !atomic_test_bit(bt_dev.flags, BT_DEV_ADVERTISING)) { - if (IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (IS_ENABLED(CONFIG_BT_PRIVACY)) { le_set_private_addr(); } @@ -792,7 +792,7 @@ static void le_conn_complete(struct net_buf *buf) * called in this file before le_conn_complete is processed * here. */ - if (IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (IS_ENABLED(CONFIG_BT_PRIVACY)) { bt_addr_le_copy(&conn->le.resp_addr, &bt_dev.random_addr); } else { @@ -806,7 +806,7 @@ static void le_conn_complete(struct net_buf *buf) */ if (atomic_test_bit(bt_dev.flags, BT_DEV_KEEP_ADVERTISING) && BT_LE_STATES_SLAVE_CONN_ADV(bt_dev.le.states)) { - if (IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (IS_ENABLED(CONFIG_BT_PRIVACY)) { le_set_private_addr(); } @@ -1112,7 +1112,7 @@ static void check_pending_conn(const bt_addr_le_t *id_addr, goto failed; } - if (IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (IS_ENABLED(CONFIG_BT_PRIVACY)) { if (le_set_private_addr()) { goto failed; } @@ -1147,7 +1147,7 @@ failed: bt_le_scan_update(false); } -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) static int set_flow_control(void) { struct bt_hci_cp_host_buffer_size *hbs; @@ -1168,9 +1168,9 @@ static int set_flow_control(void) hbs = net_buf_add(buf, sizeof(*hbs)); memset(hbs, 0, sizeof(*hbs)); - hbs->acl_mtu = sys_cpu_to_le16(CONFIG_BLUETOOTH_L2CAP_RX_MTU + + hbs->acl_mtu = sys_cpu_to_le16(CONFIG_BT_L2CAP_RX_MTU + sizeof(struct bt_l2cap_hdr)); - hbs->acl_pkts = sys_cpu_to_le16(CONFIG_BLUETOOTH_ACL_RX_COUNT); + hbs->acl_pkts = sys_cpu_to_le16(CONFIG_BT_ACL_RX_COUNT); err = bt_hci_cmd_send_sync(BT_HCI_OP_HOST_BUFFER_SIZE, buf, NULL); if (err) { @@ -1185,10 +1185,10 @@ static int set_flow_control(void) net_buf_add_u8(buf, BT_HCI_CTL_TO_HOST_FLOW_ENABLE); return bt_hci_cmd_send_sync(BT_HCI_OP_SET_CTL_TO_HOST_FLOW, buf, NULL); } -#endif /* CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL */ -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */ +#endif /* CONFIG_BT_CONN */ -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static void reset_pairing(struct bt_conn *conn) { atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING); @@ -2207,9 +2207,9 @@ static void role_change(struct net_buf *buf) bt_conn_unref(conn); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) static void update_sec_level(struct bt_conn *conn) { if (!conn->encrypt) { @@ -2233,9 +2233,9 @@ static void update_sec_level(struct bt_conn *conn) bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL); } } -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) static void hci_encrypt_change(struct net_buf *buf) { struct bt_hci_evt_encrypt_change *evt = (void *)buf->data; @@ -2256,11 +2256,11 @@ static void hci_encrypt_change(struct net_buf *buf) if (conn->type == BT_CONN_TYPE_LE) { /* reset required security level in case of error */ conn->required_sec_level = conn->sec_level; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) } else { bt_l2cap_encrypt_change(conn, evt->status); reset_pairing(conn); -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ } bt_conn_unref(conn); return; @@ -2268,7 +2268,7 @@ static void hci_encrypt_change(struct net_buf *buf) conn->encrypt = evt->encrypt; -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) if (conn->type == BT_CONN_TYPE_LE) { /* * we update keys properties only on successful encryption to @@ -2283,12 +2283,12 @@ static void hci_encrypt_change(struct net_buf *buf) } update_sec_level(conn); } -#endif /* CONFIG_BLUETOOTH_SMP */ -#if defined(CONFIG_BLUETOOTH_BREDR) +#endif /* CONFIG_BT_SMP */ +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { update_sec_level_br(conn); - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP)) { + if (IS_ENABLED(CONFIG_BT_SMP)) { /* * Start SMP over BR/EDR if we are pairing and are * master on the link @@ -2301,7 +2301,7 @@ static void hci_encrypt_change(struct net_buf *buf) reset_pairing(conn); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ bt_l2cap_encrypt_change(conn, evt->status); bt_conn_security_changed(conn); @@ -2336,25 +2336,25 @@ static void hci_encrypt_key_refresh_complete(struct net_buf *buf) * updated on HCI 'Link Key Notification Event', therefore update here * only security level based on available keys and encryption state. */ -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) if (conn->type == BT_CONN_TYPE_LE) { bt_smp_update_keys(conn); update_sec_level(conn); } -#endif /* CONFIG_BLUETOOTH_SMP */ -#if defined(CONFIG_BLUETOOTH_BREDR) +#endif /* CONFIG_BT_SMP */ +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { update_sec_level_br(conn); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ bt_l2cap_encrypt_change(conn, evt->status); bt_conn_security_changed(conn); bt_conn_unref(conn); } -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) static void le_ltk_request(struct net_buf *buf) { struct bt_hci_evt_le_ltk_request *evt = (void *)buf->data; @@ -2431,7 +2431,7 @@ static void le_ltk_request(struct net_buf *buf) goto done; } -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) if (conn->le.keys && (conn->le.keys->keys & BT_KEYS_SLAVE_LTK) && conn->le.keys->slave_ltk.rand == evt->rand && conn->le.keys->slave_ltk.ediv == evt->ediv) { @@ -2459,7 +2459,7 @@ static void le_ltk_request(struct net_buf *buf) bt_hci_cmd_send(BT_HCI_OP_LE_LTK_REQ_REPLY, buf); goto done; } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ buf = bt_hci_cmd_create(BT_HCI_OP_LE_LTK_REQ_NEG_REPLY, sizeof(*cp)); if (!buf) { @@ -2475,7 +2475,7 @@ static void le_ltk_request(struct net_buf *buf) done: bt_conn_unref(conn); } -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ static void le_pkey_complete(struct net_buf *buf) { @@ -2519,12 +2519,12 @@ static void hci_reset_complete(struct net_buf *buf) } scan_dev_found_cb = NULL; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) discovery_cb = NULL; discovery_results = NULL; discovery_results_size = 0; discovery_results_count = 0; -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ /* we only allow to enable once so this bit must be keep set */ atomic_set(bt_dev.flags, BIT(BT_DEV_ENABLE)); @@ -2619,7 +2619,7 @@ static int start_le_scan(u8_t scan_type, u16_t interval, u16_t window, set_param->window = sys_cpu_to_le16(window); set_param->filter_policy = 0x00; - if (IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (IS_ENABLED(CONFIG_BT_PRIVACY)) { err = le_set_private_addr(); if (err) { net_buf_unref(buf); @@ -2689,7 +2689,7 @@ int bt_le_scan_update(bool fast_scan) } } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL)) { + if (IS_ENABLED(CONFIG_BT_CENTRAL)) { u16_t interval, window; struct bt_conn *conn; @@ -2748,9 +2748,9 @@ static void le_adv_report(struct net_buf *buf) net_buf_simple_restore(&buf->b, &state); } -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) check_pending_conn(addr, &info->addr, info->evt_type); -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ /* Get next report iteration by moving pointer to right offset * in buf according to spec 4.2, Vol 2, Part E, 7.7.65.2. @@ -2768,7 +2768,7 @@ static void hci_le_meta_event(struct net_buf *buf) net_buf_pull(buf, sizeof(*evt)); switch (evt->subevent) { -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_HCI_EVT_LE_CONN_COMPLETE: le_conn_complete(buf); break; @@ -2787,12 +2787,12 @@ static void hci_le_meta_event(struct net_buf *buf) case BT_HCI_EVT_LE_PHY_UPDATE_COMPLETE: le_phy_update_complete(buf); break; -#endif /* CONFIG_BLUETOOTH_CONN */ -#if defined(CONFIG_BLUETOOTH_SMP) +#endif /* CONFIG_BT_CONN */ +#if defined(CONFIG_BT_SMP) case BT_HCI_EVT_LE_LTK_REQUEST: le_ltk_request(buf); break; -#endif /* CONFIG_BLUETOOTH_SMP */ +#endif /* CONFIG_BT_SMP */ case BT_HCI_EVT_LE_P256_PUBLIC_KEY_COMPLETE: le_pkey_complete(buf); break; @@ -2820,7 +2820,7 @@ static void hci_event(struct net_buf *buf) net_buf_pull(buf, sizeof(*hdr)); switch (hdr->evt) { -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) case BT_HCI_EVT_CONN_REQUEST: conn_req(buf); break; @@ -2882,19 +2882,19 @@ static void hci_event(struct net_buf *buf) synchronous_conn_complete(buf); break; #endif -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_HCI_EVT_DISCONN_COMPLETE: hci_disconn_complete(buf); break; -#endif /* CONFIG_BLUETOOTH_CONN */ -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#endif /* CONFIG_BT_CONN */ +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) case BT_HCI_EVT_ENCRYPT_CHANGE: hci_encrypt_change(buf); break; case BT_HCI_EVT_ENCRYPT_KEY_REFRESH_COMPLETE: hci_encrypt_key_refresh_complete(buf); break; -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ case BT_HCI_EVT_LE_META_EVENT: hci_le_meta_event(buf); break; @@ -2959,7 +2959,7 @@ static void process_events(struct k_poll_event *ev, int count) case K_POLL_STATE_FIFO_DATA_AVAILABLE: if (ev->tag == BT_EVENT_CMD_TX) { send_cmd(); - } else if (IS_ENABLED(CONFIG_BLUETOOTH_CONN)) { + } else if (IS_ENABLED(CONFIG_BT_CONN)) { struct bt_conn *conn; if (ev->tag == BT_EVENT_CONN_TX_NOTIFY) { @@ -2984,9 +2984,9 @@ static void process_events(struct k_poll_event *ev, int count) } } -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) /* command FIFO + conn_change signal + MAX_CONN * 2 (tx & tx_notify) */ -#define EV_COUNT (2 + (CONFIG_BLUETOOTH_MAX_CONN * 2)) +#define EV_COUNT (2 + (CONFIG_BT_MAX_CONN * 2)) #else /* command FIFO */ #define EV_COUNT 1 @@ -3009,7 +3009,7 @@ static void hci_tx_thread(void *p1, void *p2, void *p3) events[0].state = K_POLL_STATE_NOT_READY; ev_count = 1; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONN)) { + if (IS_ENABLED(CONFIG_BT_CONN)) { ev_count += bt_conn_prepare_events(&events[1]); } @@ -3060,7 +3060,7 @@ static void read_le_features_complete(struct net_buf *buf) memcpy(bt_dev.le.features, rp->features, sizeof(bt_dev.le.features)); } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static void read_buffer_size_complete(struct net_buf *buf) { struct bt_hci_rp_read_buffer_size *rp = (void *)buf->data; @@ -3075,7 +3075,7 @@ static void read_buffer_size_complete(struct net_buf *buf) k_sem_init(&bt_dev.br.pkts, pkts, pkts); } -#elif defined(CONFIG_BLUETOOTH_CONN) +#elif defined(CONFIG_BT_CONN) static void read_buffer_size_complete(struct net_buf *buf) { struct bt_hci_rp_read_buffer_size *rp = (void *)buf->data; @@ -3093,13 +3093,13 @@ static void read_buffer_size_complete(struct net_buf *buf) BT_DBG("ACL BR/EDR buffers: pkts %u mtu %u", pkts, bt_dev.le.mtu); - pkts = min(pkts, CONFIG_BLUETOOTH_CONN_TX_MAX); + pkts = min(pkts, CONFIG_BT_CONN_TX_MAX); k_sem_init(&bt_dev.le.pkts, pkts, pkts); } #endif -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) static void le_read_buffer_size_complete(struct net_buf *buf) { struct bt_hci_rp_le_read_buffer_size *rp = (void *)buf->data; @@ -3114,7 +3114,7 @@ static void le_read_buffer_size_complete(struct net_buf *buf) BT_DBG("ACL LE buffers: pkts %u mtu %u", rp->le_max_num, bt_dev.le.mtu); - le_max_num = min(rp->le_max_num, CONFIG_BLUETOOTH_CONN_TX_MAX); + le_max_num = min(rp->le_max_num, CONFIG_BT_CONN_TX_MAX); k_sem_init(&bt_dev.le.pkts, le_max_num, le_max_num); } #endif @@ -3132,7 +3132,7 @@ static void read_supported_commands_complete(struct net_buf *buf) * Report "LE Read Local P-256 Public Key" and "LE Generate DH Key" as * supported if TinyCrypt ECC is used for emulation. */ - if (IS_ENABLED(CONFIG_BLUETOOTH_TINYCRYPT_ECC)) { + if (IS_ENABLED(CONFIG_BT_TINYCRYPT_ECC)) { bt_dev.supported_commands[34] |= 0x02; bt_dev.supported_commands[34] |= 0x04; } @@ -3203,7 +3203,7 @@ static int common_init(void) read_supported_commands_complete(rsp); net_buf_unref(rsp); - if (IS_ENABLED(CONFIG_BLUETOOTH_HOST_CRYPTO)) { + if (IS_ENABLED(CONFIG_BT_HOST_CRYPTO)) { /* Initialize the PRNG so that it is safe to use it later * on in the initialization process. */ @@ -3213,12 +3213,12 @@ static int common_init(void) } } -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) err = set_flow_control(); if (err) { return err; } -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ return 0; } @@ -3239,7 +3239,7 @@ static int le_set_event_mask(void) mask |= BT_EVT_MASK_LE_ADVERTISING_REPORT; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONN)) { + if (IS_ENABLED(CONFIG_BT_CONN)) { mask |= BT_EVT_MASK_LE_CONN_COMPLETE; mask |= BT_EVT_MASK_LE_CONN_UPDATE_COMPLETE; mask |= BT_EVT_MASK_LE_REMOTE_FEAT_COMPLETE; @@ -3255,7 +3255,7 @@ static int le_set_event_mask(void) } } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP) && + if (IS_ENABLED(CONFIG_BT_SMP) && BT_FEAT_LE_ENCR(bt_dev.le.features)) { mask |= BT_EVT_MASK_LE_LTK_REQUEST; } @@ -3296,7 +3296,7 @@ static int le_init(void) read_le_features_complete(rsp); net_buf_unref(rsp); -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) /* Read LE Buffer Size */ err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_READ_BUFFER_SIZE, NULL, &rsp); @@ -3337,7 +3337,7 @@ static int le_init(void) net_buf_unref(rsp); } - if (IS_ENABLED(CONFIG_BLUETOOTH_CONN) && + if (IS_ENABLED(CONFIG_BT_CONN) && BT_FEAT_LE_DLE(bt_dev.le.features)) { struct bt_hci_cp_le_write_default_data_len *cp; struct bt_hci_rp_le_read_max_data_len *rp; @@ -3375,7 +3375,7 @@ static int le_init(void) return le_set_event_mask(); } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static int read_ext_features(void) { int i; @@ -3516,7 +3516,7 @@ static int br_init(void) } name_cp = net_buf_add(buf, sizeof(*name_cp)); - strncpy((char *)name_cp->local_name, CONFIG_BLUETOOTH_DEVICE_NAME, + strncpy((char *)name_cp->local_name, CONFIG_BT_DEVICE_NAME, sizeof(name_cp->local_name)); err = bt_hci_cmd_send_sync(BT_HCI_OP_WRITE_LOCAL_NAME, buf, NULL); @@ -3530,7 +3530,7 @@ static int br_init(void) return -ENOBUFS; } - net_buf_add_le16(buf, CONFIG_BLUETOOTH_PAGE_TIMEOUT); + net_buf_add_le16(buf, CONFIG_BT_PAGE_TIMEOUT); err = bt_hci_cmd_send_sync(BT_HCI_OP_WRITE_PAGE_TIMEOUT, buf, NULL); if (err) { @@ -3562,7 +3562,7 @@ static int br_init(void) #else static int br_init(void) { -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) struct net_buf *rsp; int err; @@ -3578,7 +3578,7 @@ static int br_init(void) read_buffer_size_complete(rsp); net_buf_unref(rsp); -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ return 0; } @@ -3597,7 +3597,7 @@ static int set_event_mask(void) ev = net_buf_add(buf, sizeof(*ev)); - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR)) { + if (IS_ENABLED(CONFIG_BT_BREDR)) { /* Since we require LE support, we can count on a * Bluetooth 4.0 feature set */ @@ -3627,12 +3627,12 @@ static int set_event_mask(void) mask |= BT_EVT_MASK_DATA_BUFFER_OVERFLOW; mask |= BT_EVT_MASK_LE_META_EVENT; - if (IS_ENABLED(CONFIG_BLUETOOTH_CONN)) { + if (IS_ENABLED(CONFIG_BT_CONN)) { mask |= BT_EVT_MASK_DISCONN_COMPLETE; mask |= BT_EVT_MASK_REMOTE_VERSION_INFO; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP) && + if (IS_ENABLED(CONFIG_BT_SMP) && BT_FEAT_LE_ENCR(bt_dev.le.features)) { mask |= BT_EVT_MASK_ENCRYPT_CHANGE; mask |= BT_EVT_MASK_ENCRYPT_KEY_REFRESH_COMPLETE; @@ -3750,7 +3750,7 @@ set_addr: return 0; } -#if defined(CONFIG_BLUETOOTH_DEBUG) +#if defined(CONFIG_BT_DEBUG) static const char *ver_str(u8_t ver) { const char * const str[] = { @@ -3783,7 +3783,7 @@ static void show_dev_info(void) static inline void show_dev_info(void) { } -#endif /* CONFIG_BLUETOOTH_DEBUG */ +#endif /* CONFIG_BT_DEBUG */ static int hci_init(void) { @@ -3804,7 +3804,7 @@ static int hci_init(void) if (err) { return err; } - } else if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR)) { + } else if (IS_ENABLED(CONFIG_BT_BREDR)) { BT_ERR("Non-BR/EDR controller detected"); return -EIO; } @@ -3835,7 +3835,7 @@ int bt_send(struct net_buf *buf) bt_monitor_send(bt_monitor_opcode(buf), buf->data, buf->len); - if (IS_ENABLED(CONFIG_BLUETOOTH_TINYCRYPT_ECC)) { + if (IS_ENABLED(CONFIG_BT_TINYCRYPT_ECC)) { return bt_hci_ecc_send(buf); } @@ -3858,17 +3858,17 @@ int bt_recv(struct net_buf *buf) } switch (bt_buf_get_type(buf)) { -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_BUF_ACL_IN: -#if defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if defined(CONFIG_BT_RECV_IS_RX_THREAD) hci_acl(buf); #else net_buf_put(&bt_dev.rx_queue, buf); #endif return 0; -#endif /* BLUETOOTH_CONN */ +#endif /* BT_CONN */ case BT_BUF_EVT: -#if defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if defined(CONFIG_BT_RECV_IS_RX_THREAD) hci_event(buf); #else net_buf_put(&bt_dev.rx_queue, buf); @@ -3900,11 +3900,11 @@ int bt_recv_prio(struct net_buf *buf) case BT_HCI_EVT_CMD_STATUS: hci_cmd_status(buf); break; -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_HCI_EVT_NUM_COMPLETED_PACKETS: hci_num_completed_packets(buf); break; -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ default: net_buf_unref(buf); BT_ASSERT(0); @@ -3936,7 +3936,7 @@ int bt_hci_driver_register(const struct bt_hci_driver *drv) return 0; } -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) static int irk_init(void) { ssize_t err; @@ -3968,7 +3968,7 @@ static int irk_init(void) return 0; } -#endif /* CONFIG_BLUETOOTH_PRIVACY */ +#endif /* CONFIG_BT_PRIVACY */ static int bt_init(void) { @@ -3979,14 +3979,14 @@ static int bt_init(void) return err; } - if (IS_ENABLED(CONFIG_BLUETOOTH_CONN)) { + if (IS_ENABLED(CONFIG_BT_CONN)) { err = bt_conn_init(); if (err) { return err; } } -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) err = irk_init(); if (err) { return err; @@ -4012,7 +4012,7 @@ static void init_work(struct k_work *work) } } -#if !defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if !defined(CONFIG_BT_RECV_IS_RX_THREAD) static void hci_rx_thread(void) { struct net_buf *buf; @@ -4027,11 +4027,11 @@ static void hci_rx_thread(void) buf->len); switch (bt_buf_get_type(buf)) { -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) case BT_BUF_ACL_IN: hci_acl(buf); break; -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ case BT_BUF_EVT: hci_event(buf); break; @@ -4047,7 +4047,7 @@ static void hci_rx_thread(void) k_yield(); } } -#endif /* !CONFIG_BLUETOOTH_RECV_IS_RX_THREAD */ +#endif /* !CONFIG_BT_RECV_IS_RX_THREAD */ int bt_enable(bt_ready_cb_t cb) { @@ -4068,19 +4068,19 @@ int bt_enable(bt_ready_cb_t cb) k_thread_create(&tx_thread_data, tx_thread_stack, K_THREAD_STACK_SIZEOF(tx_thread_stack), hci_tx_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BLUETOOTH_HCI_TX_PRIO), + K_PRIO_COOP(CONFIG_BT_HCI_TX_PRIO), 0, K_NO_WAIT); -#if !defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if !defined(CONFIG_BT_RECV_IS_RX_THREAD) /* RX thread */ k_thread_create(&rx_thread_data, rx_thread_stack, K_THREAD_STACK_SIZEOF(rx_thread_stack), (k_thread_entry_t)hci_rx_thread, NULL, NULL, NULL, - K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO), + K_PRIO_COOP(CONFIG_BT_RX_PRIO), 0, K_NO_WAIT); #endif - if (IS_ENABLED(CONFIG_BLUETOOTH_TINYCRYPT_ECC)) { + if (IS_ENABLED(CONFIG_BT_TINYCRYPT_ECC)) { bt_hci_ecc_init(); } @@ -4100,7 +4100,7 @@ int bt_enable(bt_ready_cb_t cb) bool bt_addr_le_is_bonded(const bt_addr_le_t *addr) { - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP)) { + if (IS_ENABLED(CONFIG_BT_SMP)) { struct bt_keys *keys = bt_keys_find_addr(addr); /* if there are any keys stored then device is bonded */ @@ -4217,7 +4217,7 @@ int bt_le_adv_start(const struct bt_le_adv_param *param, set_param->channel_map = 0x07; if (param->options & BT_LE_ADV_OPT_CONNECTABLE) { - if (IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (IS_ENABLED(CONFIG_BT_PRIVACY)) { err = le_set_private_addr(); if (err) { net_buf_unref(buf); @@ -4302,7 +4302,7 @@ int bt_le_adv_stop(void) return err; } - if (!IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (!IS_ENABLED(CONFIG_BT_PRIVACY)) { /* If active scan is ongoing set NRPA */ if (atomic_test_bit(bt_dev.flags, BT_DEV_ACTIVE_SCAN)) { le_set_private_addr(); @@ -4392,7 +4392,7 @@ struct net_buf *bt_buf_get_rx(enum bt_buf_type type, s32_t timeout) __ASSERT(type == BT_BUF_EVT || type == BT_BUF_ACL_IN, "Invalid buffer type requested"); -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) if (type == BT_BUF_EVT) { buf = net_buf_alloc(&hci_rx_pool, timeout); } else { @@ -4403,7 +4403,7 @@ struct net_buf *bt_buf_get_rx(enum bt_buf_type type, s32_t timeout) #endif if (buf) { - net_buf_reserve(buf, CONFIG_BLUETOOTH_HCI_RESERVE); + net_buf_reserve(buf, CONFIG_BT_HCI_RESERVE); bt_buf_set_type(buf, type); } @@ -4425,7 +4425,7 @@ struct net_buf *bt_buf_get_cmd_complete(s32_t timeout) if (buf) { bt_buf_set_type(buf, BT_BUF_EVT); buf->len = 0; - net_buf_reserve(buf, CONFIG_BLUETOOTH_HCI_RESERVE); + net_buf_reserve(buf, CONFIG_BT_HCI_RESERVE); return buf; } @@ -4433,7 +4433,7 @@ struct net_buf *bt_buf_get_cmd_complete(s32_t timeout) return bt_buf_get_rx(BT_BUF_EVT, timeout); } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static int br_start_inquiry(const struct bt_br_discovery_param *param) { const u8_t iac[3] = { 0x33, 0x8b, 0x9e }; @@ -4625,7 +4625,7 @@ int bt_br_set_discoverable(bool enable) return write_scan_enable(BT_BREDR_SCAN_PAGE); } } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ void bt_storage_register(const struct bt_storage *storage) { @@ -4634,15 +4634,15 @@ void bt_storage_register(const struct bt_storage *storage) static int bt_storage_clear_all(void) { - if (IS_ENABLED(CONFIG_BLUETOOTH_CONN)) { + if (IS_ENABLED(CONFIG_BT_CONN)) { bt_conn_disconnect_all(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP)) { + if (IS_ENABLED(CONFIG_BT_SMP)) { bt_keys_clear_all(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR)) { + if (IS_ENABLED(CONFIG_BT_BREDR)) { bt_keys_link_key_clear_addr(NULL); } @@ -4659,7 +4659,7 @@ int bt_storage_clear(const bt_addr_le_t *addr) return bt_storage_clear_all(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_CONN)) { + if (IS_ENABLED(CONFIG_BT_CONN)) { struct bt_conn *conn = bt_conn_lookup_addr_le(addr); if (conn) { bt_conn_disconnect(conn, @@ -4668,14 +4668,14 @@ int bt_storage_clear(const bt_addr_le_t *addr) } } - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR)) { + if (IS_ENABLED(CONFIG_BT_BREDR)) { /* LE Public may indicate BR/EDR as well */ if (addr->type == BT_ADDR_LE_PUBLIC) { bt_keys_link_key_clear_addr(&addr->a); } } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP)) { + if (IS_ENABLED(CONFIG_BT_SMP)) { struct bt_keys *keys = bt_keys_find_addr(addr); if (keys) { bt_keys_clear(keys); @@ -4780,18 +4780,18 @@ int bt_dh_key_gen(const u8_t remote_pk[64], bt_dh_key_cb_t cb) return 0; } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) int bt_br_oob_get_local(struct bt_br_oob *oob) { bt_addr_copy(&oob->addr, &bt_dev.id_addr.a); return 0; } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ int bt_le_oob_get_local(struct bt_le_oob *oob) { - if (IS_ENABLED(CONFIG_BLUETOOTH_PRIVACY)) { + if (IS_ENABLED(CONFIG_BT_PRIVACY)) { int err; /* Invalidate RPA so a new one is generated */ diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h index f6ab7f3fbcf..ed31397a263 100644 --- a/subsys/bluetooth/host/hci_core.h +++ b/subsys/bluetooth/host/hci_core.h @@ -10,7 +10,7 @@ #define LE_CONN_LATENCY 0x0000 #define LE_CONN_TIMEOUT 0x002a -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) #define LMP_FEAT_PAGES_COUNT 3 #else #define LMP_FEAT_PAGES_COUNT 1 @@ -42,11 +42,11 @@ enum { BT_DEV_RPA_VALID, -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) BT_DEV_ISCAN, BT_DEV_PSCAN, BT_DEV_INQUIRY, -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ /* Total number of flags - must be at the end of the enum */ BT_DEV_NUM_FLAGS, @@ -58,14 +58,14 @@ struct bt_dev_le { /* LE states */ u64_t states; -#if defined(CONFIG_BLUETOOTH_CONN) +#if defined(CONFIG_BT_CONN) /* Controller buffer information */ u16_t mtu; struct k_sem pkts; -#endif /* CONFIG_BLUETOOTH_CONN */ +#endif /* CONFIG_BT_CONN */ }; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) struct bt_dev_br { /* Max controller's acceptable ACL packet length */ u16_t mtu; @@ -102,7 +102,7 @@ struct bt_dev { /* LE controller specific features */ struct bt_dev_le le; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) /* BR/EDR controller specific features */ struct bt_dev_br br; #endif @@ -113,7 +113,7 @@ struct bt_dev { /* Last sent HCI command */ struct net_buf *sent_cmd; -#if !defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD) +#if !defined(CONFIG_BT_RECV_IS_RX_THREAD) /* Queue for incoming HCI events & ACL data */ struct k_fifo rx_queue; #endif @@ -130,7 +130,7 @@ struct bt_dev { /* Registered HCI driver */ const struct bt_hci_driver *drv; -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) /* Local Identity Resolving Key */ u8_t irk[16]; @@ -141,9 +141,9 @@ struct bt_dev { extern struct bt_dev bt_dev; extern const struct bt_storage *bt_storage; -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) extern const struct bt_conn_auth_cb *bt_auth; -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ bool bt_le_conn_params_valid(const struct bt_le_conn_param *param); diff --git a/subsys/bluetooth/host/hci_ecc.c b/subsys/bluetooth/host/hci_ecc.c index c3b207aee18..fc299defad7 100644 --- a/subsys/bluetooth/host/hci_ecc.c +++ b/subsys/bluetooth/host/hci_ecc.c @@ -23,11 +23,11 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_CORE) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #include "common/log.h" #include "hci_ecc.h" -#ifdef CONFIG_BLUETOOTH_HCI_RAW +#ifdef CONFIG_BT_HCI_RAW #include #include "hci_raw_internal.h" #else @@ -43,7 +43,7 @@ static const u32_t debug_private_key[8] = { 0xa3c55f38, 0x3f49f6d4 }; -#if defined(CONFIG_BLUETOOTH_USE_DEBUG_KEYS) +#if defined(CONFIG_BT_USE_DEBUG_KEYS) static const u8_t debug_public_key[64] = { 0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc, 0xdb, 0xfd, 0xf4, 0xac, 0x11, 0x91, 0xf4, 0xef, 0xb9, 0xa5, 0xf9, 0xe9, 0xa7, 0x83, 0x2c, 0x5e, @@ -100,7 +100,7 @@ static void send_cmd_status(u16_t opcode, u8_t status) static u8_t generate_keys(void) { -#if !defined(CONFIG_BLUETOOTH_USE_DEBUG_KEYS) +#if !defined(CONFIG_BT_USE_DEBUG_KEYS) do { int rc; diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c index f2f14e000d0..d603ad05e14 100644 --- a/subsys/bluetooth/host/hci_raw.c +++ b/subsys/bluetooth/host/hci_raw.c @@ -12,7 +12,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_CORE) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #include "common/log.h" #include "hci_ecc.h" @@ -21,7 +21,7 @@ static struct k_fifo *raw_rx; -NET_BUF_POOL_DEFINE(hci_rx_pool, CONFIG_BLUETOOTH_RX_BUF_COUNT, +NET_BUF_POOL_DEFINE(hci_rx_pool, CONFIG_BT_RX_BUF_COUNT, BT_BUF_RX_SIZE, BT_BUF_USER_DATA_MIN, NULL); struct bt_dev_raw bt_dev; @@ -94,7 +94,7 @@ int bt_send(struct net_buf *buf) bt_monitor_send(bt_monitor_opcode(buf), buf->data, buf->len); - if (IS_ENABLED(CONFIG_BLUETOOTH_TINYCRYPT_ECC)) { + if (IS_ENABLED(CONFIG_BT_TINYCRYPT_ECC)) { return bt_hci_ecc_send(buf); } @@ -115,7 +115,7 @@ int bt_enable_raw(struct k_fifo *rx_queue) return -ENODEV; } - if (IS_ENABLED(CONFIG_BLUETOOTH_TINYCRYPT_ECC)) { + if (IS_ENABLED(CONFIG_BT_TINYCRYPT_ECC)) { bt_hci_ecc_init(); } diff --git a/subsys/bluetooth/host/hfp_hf.c b/subsys/bluetooth/host/hfp_hf.c index 2bcedab602e..ab2a2131739 100644 --- a/subsys/bluetooth/host/hfp_hf.c +++ b/subsys/bluetooth/host/hfp_hf.c @@ -14,7 +14,7 @@ #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HFP_HF) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HFP_HF) /* FIXME: #include "common/log.h" */ #include #include @@ -30,11 +30,11 @@ struct bt_hfp_hf_cb *bt_hf; -NET_BUF_POOL_DEFINE(hf_pool, CONFIG_BLUETOOTH_MAX_CONN + 1, - BT_RFCOMM_BUF_SIZE(BLUETOOTH_HF_CLIENT_MAX_PDU), +NET_BUF_POOL_DEFINE(hf_pool, CONFIG_BT_MAX_CONN + 1, + BT_RFCOMM_BUF_SIZE(BT_HF_CLIENT_MAX_PDU), BT_BUF_USER_DATA_MIN, NULL); -static struct bt_hfp_hf bt_hfp_hf_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_hfp_hf bt_hfp_hf_pool[CONFIG_BT_MAX_CONN]; /* The order should follow the enum hfp_hf_ag_indicators */ static const struct { @@ -659,7 +659,7 @@ static int bt_hfp_hf_accept(struct bt_conn *conn, struct bt_rfcomm_dlc **dlc) hf->at.buf_max_len = HF_MAX_BUF_LEN; hf->rfcomm_dlc.ops = &ops; - hf->rfcomm_dlc.mtu = BLUETOOTH_HFP_MAX_MTU; + hf->rfcomm_dlc.mtu = BT_HFP_MAX_MTU; *dlc = &hf->rfcomm_dlc; diff --git a/subsys/bluetooth/host/hfp_internal.h b/subsys/bluetooth/host/hfp_internal.h index 98d684ea98e..921eabc1dfd 100644 --- a/subsys/bluetooth/host/hfp_internal.h +++ b/subsys/bluetooth/host/hfp_internal.h @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define BLUETOOTH_HFP_MAX_MTU 140 -#define BLUETOOTH_HF_CLIENT_MAX_PDU BLUETOOTH_HFP_MAX_MTU +#define BT_HFP_MAX_MTU 140 +#define BT_HF_CLIENT_MAX_PDU BT_HFP_MAX_MTU /* HFP AG Features */ #define BT_HFP_AG_FEATURE_3WAY_CALL 0x00000001 /* Three-way calling */ @@ -41,7 +41,7 @@ #define BT_HFP_HF_SUPPORTED_FEATURES (BT_HFP_HF_FEATURE_CLI | \ BT_HFP_HF_FEATURE_VOLUME) -#define HF_MAX_BUF_LEN BLUETOOTH_HF_CLIENT_MAX_PDU +#define HF_MAX_BUF_LEN BT_HF_CLIENT_MAX_PDU #define HF_MAX_AG_INDICATORS 20 struct bt_hfp_hf { diff --git a/subsys/bluetooth/host/keys.c b/subsys/bluetooth/host/keys.c index ba222004c46..6478411a1ef 100644 --- a/subsys/bluetooth/host/keys.c +++ b/subsys/bluetooth/host/keys.c @@ -15,7 +15,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_KEYS) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_KEYS) #include "common/log.h" #include "common/rpa.h" @@ -23,7 +23,7 @@ #include "smp.h" #include "keys.h" -static struct bt_keys key_pool[CONFIG_BLUETOOTH_MAX_PAIRED]; +static struct bt_keys key_pool[CONFIG_BT_MAX_PAIRED]; struct bt_keys *bt_keys_get_addr(const bt_addr_le_t *addr) { diff --git a/subsys/bluetooth/host/keys.h b/subsys/bluetooth/host/keys.h index a2470753c73..cd7f14d1d22 100644 --- a/subsys/bluetooth/host/keys.h +++ b/subsys/bluetooth/host/keys.h @@ -50,13 +50,13 @@ struct bt_keys { u16_t keys; struct bt_ltk ltk; struct bt_irk irk; -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) struct bt_csrk local_csrk; struct bt_csrk remote_csrk; -#endif /* BLUETOOTH_SIGNING */ -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#endif /* BT_SIGNING */ +#if !defined(CONFIG_BT_SMP_SC_ONLY) struct bt_ltk slave_ltk; -#endif /* CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* CONFIG_BT_SMP_SC_ONLY */ }; struct bt_keys *bt_keys_get_addr(const bt_addr_le_t *addr); diff --git a/subsys/bluetooth/host/keys_br.c b/subsys/bluetooth/host/keys_br.c index d3ffd8c1e15..abaa8b035ac 100644 --- a/subsys/bluetooth/host/keys_br.c +++ b/subsys/bluetooth/host/keys_br.c @@ -15,13 +15,13 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_KEYS) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_KEYS) #include "common/log.h" #include "hci_core.h" #include "keys.h" -static struct bt_keys_link_key key_pool[CONFIG_BLUETOOTH_MAX_PAIRED]; +static struct bt_keys_link_key key_pool[CONFIG_BT_MAX_PAIRED]; struct bt_keys_link_key *bt_keys_find_link_key(const bt_addr_t *addr) { diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c index 9a3d8b6d856..7332e90619e 100644 --- a/subsys/bluetooth/host/l2cap.c +++ b/subsys/bluetooth/host/l2cap.c @@ -18,7 +18,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_L2CAP) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP) #include "common/log.h" #include "hci_core.h" @@ -29,10 +29,10 @@ #define L2CAP_LE_MIN_MTU 23 -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) -#define L2CAP_LE_MAX_CREDITS (CONFIG_BLUETOOTH_ACL_RX_COUNT - 1) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) +#define L2CAP_LE_MAX_CREDITS (CONFIG_BT_ACL_RX_COUNT - 1) #else -#define L2CAP_LE_MAX_CREDITS (CONFIG_BLUETOOTH_RX_BUF_COUNT - 1) +#define L2CAP_LE_MAX_CREDITS (CONFIG_BT_RX_BUF_COUNT - 1) #endif #define L2CAP_LE_CREDITS_THRESHOLD(_creds) (_creds / 2) @@ -50,7 +50,7 @@ static sys_slist_t le_channels; -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) /* Size of MTU is based on the maximum amount of data the buffer can hold * excluding ACL and driver headers. */ @@ -63,7 +63,7 @@ static sys_slist_t le_channels; static sys_slist_t servers; -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ /* L2CAP signalling channel specific context */ struct bt_l2cap { @@ -71,7 +71,7 @@ struct bt_l2cap { struct bt_l2cap_le_chan chan; }; -static struct bt_l2cap bt_l2cap_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_l2cap bt_l2cap_pool[CONFIG_BT_MAX_CONN]; static u8_t get_ident(void) { @@ -93,7 +93,7 @@ void bt_l2cap_le_fixed_chan_register(struct bt_l2cap_fixed_chan *chan) sys_slist_append(&le_channels, &chan->node); } -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) static struct bt_l2cap_le_chan *l2cap_chan_alloc_cid(struct bt_conn *conn, struct bt_l2cap_chan *chan) { @@ -138,7 +138,7 @@ __l2cap_lookup_ident(struct bt_conn *conn, u16_t ident, bool remove) return NULL; } -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ void bt_l2cap_chan_remove(struct bt_conn *conn, struct bt_l2cap_chan *ch) { @@ -155,8 +155,8 @@ void bt_l2cap_chan_remove(struct bt_conn *conn, struct bt_l2cap_chan *ch) } } -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) -#if defined(CONFIG_BLUETOOTH_DEBUG_L2CAP) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_DEBUG_L2CAP) const char *bt_l2cap_chan_state_str(bt_l2cap_chan_state_t state) { switch (state) { @@ -223,8 +223,8 @@ void bt_l2cap_chan_set_state(struct bt_l2cap_chan *chan, { chan->state = state; } -#endif /* CONFIG_BLUETOOTH_DEBUG_L2CAP */ -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_DEBUG_L2CAP */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ void bt_l2cap_chan_del(struct bt_l2cap_chan *chan) { @@ -241,7 +241,7 @@ void bt_l2cap_chan_del(struct bt_l2cap_chan *chan) chan->conn = NULL; destroy: -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) /* Reset internal members of common channel */ bt_l2cap_chan_set_state(chan, BT_L2CAP_DISCONNECTED); chan->psm = 0; @@ -278,7 +278,7 @@ static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan, { struct bt_l2cap_le_chan *ch; -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) ch = l2cap_chan_alloc_cid(conn, chan); #else ch = BT_L2CAP_LE_CHAN(chan); @@ -293,7 +293,7 @@ static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan, bt_l2cap_chan_add(conn, chan, destroy); - if (IS_ENABLED(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) && + if (IS_ENABLED(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) && L2CAP_LE_CID_IS_DYN(ch->rx.cid)) { bt_l2cap_chan_set_state(chan, BT_L2CAP_CONNECT); } @@ -306,7 +306,7 @@ void bt_l2cap_connected(struct bt_conn *conn) struct bt_l2cap_fixed_chan *fchan; struct bt_l2cap_chan *chan; - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR) && + if (IS_ENABLED(CONFIG_BT_BREDR) && conn->type == BT_CONN_TYPE_BR) { bt_l2cap_br_connected(conn); return; @@ -362,7 +362,7 @@ static struct net_buf *l2cap_create_le_sig_pdu(struct net_buf *buf, return buf; } -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) static void l2cap_chan_send_req(struct bt_l2cap_le_chan *chan, struct net_buf *buf, s32_t timeout) { @@ -422,20 +422,20 @@ static void l2cap_le_encrypt_change(struct bt_l2cap_chan *chan, u8_t status) /* Retry to connect */ l2cap_le_conn_req(BT_L2CAP_LE_CHAN(chan)); } -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ void bt_l2cap_encrypt_change(struct bt_conn *conn, u8_t hci_status) { struct bt_l2cap_chan *chan; - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR) && + if (IS_ENABLED(CONFIG_BT_BREDR) && conn->type == BT_CONN_TYPE_BR) { l2cap_br_encrypt_change(conn, hci_status); return; } SYS_SLIST_FOR_EACH_CONTAINER(&conn->channels, chan, node) { -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) l2cap_le_encrypt_change(chan, hci_status); #endif @@ -495,7 +495,7 @@ static void le_conn_param_rsp(struct bt_l2cap *l2cap, struct net_buf *buf) BT_DBG("LE conn param rsp result %u", sys_le16_to_cpu(rsp->result)); } -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) static void le_conn_param_update_req(struct bt_l2cap *l2cap, u8_t ident, struct net_buf *buf) { @@ -543,7 +543,7 @@ static void le_conn_param_update_req(struct bt_l2cap *l2cap, u8_t ident, bt_conn_le_conn_update(conn, ¶m); } } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ struct bt_l2cap_chan *bt_l2cap_le_lookup_tx_cid(struct bt_conn *conn, u16_t cid) @@ -573,7 +573,7 @@ struct bt_l2cap_chan *bt_l2cap_le_lookup_rx_cid(struct bt_conn *conn, return NULL; } -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) static struct bt_l2cap_server *l2cap_server_lookup_psm(u16_t psm) { struct bt_l2cap_server *server; @@ -1238,7 +1238,7 @@ static void reject_cmd(struct bt_l2cap *l2cap, u8_t ident, bt_l2cap_chan_del(&chan->chan); } -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ static void l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) { @@ -1271,12 +1271,12 @@ static void l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) case BT_L2CAP_CONN_PARAM_RSP: le_conn_param_rsp(l2cap, buf); break; -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) case BT_L2CAP_CONN_PARAM_REQ: le_conn_param_update_req(l2cap, hdr->ident, buf); break; -#endif /* CONFIG_BLUETOOTH_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#endif /* CONFIG_BT_CENTRAL */ +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) case BT_L2CAP_LE_CONN_REQ: le_conn_req(l2cap, hdr->ident, buf); break; @@ -1299,7 +1299,7 @@ static void l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) case BT_L2CAP_CMD_REJECT: /* Ignored */ break; -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ default: BT_WARN("Unknown L2CAP PDU code 0x%02x", hdr->code); l2cap_send_reject(chan->conn, hdr->ident, @@ -1308,7 +1308,7 @@ static void l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) } } -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) static void l2cap_chan_update_credits(struct bt_l2cap_le_chan *chan, struct net_buf *buf) { @@ -1445,18 +1445,18 @@ static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan, l2cap_chan_update_credits(chan, buf); } -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ static void l2cap_chan_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) { -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) struct bt_l2cap_le_chan *ch = BT_L2CAP_LE_CHAN(chan); if (L2CAP_LE_CID_IS_DYN(ch->rx.cid)) { l2cap_chan_le_recv(ch, buf); return; } -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ BT_DBG("chan %p len %u", chan, buf->len); @@ -1469,7 +1469,7 @@ void bt_l2cap_recv(struct bt_conn *conn, struct net_buf *buf) struct bt_l2cap_chan *chan; u16_t cid; - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR) && + if (IS_ENABLED(CONFIG_BT_BREDR) && conn->type == BT_CONN_TYPE_BR) { bt_l2cap_br_recv(conn, buf); return; @@ -1567,12 +1567,12 @@ void bt_l2cap_init(void) bt_l2cap_le_fixed_chan_register(&chan); - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR)) { + if (IS_ENABLED(CONFIG_BT_BREDR)) { bt_l2cap_br_init(); } } -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_le_chan *ch, u16_t psm) { @@ -1605,7 +1605,7 @@ int bt_l2cap_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan, return -EINVAL; } - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR) && + if (IS_ENABLED(CONFIG_BT_BREDR) && conn->type == BT_CONN_TYPE_BR) { return bt_l2cap_br_chan_connect(conn, chan, psm); } @@ -1630,7 +1630,7 @@ int bt_l2cap_chan_disconnect(struct bt_l2cap_chan *chan) return -ENOTCONN; } - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR) && + if (IS_ENABLED(CONFIG_BT_BREDR) && conn->type == BT_CONN_TYPE_BR) { return bt_l2cap_br_chan_disconnect(chan); } @@ -1669,7 +1669,7 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf) return -ENOTCONN; } - if (IS_ENABLED(CONFIG_BLUETOOTH_BREDR) && + if (IS_ENABLED(CONFIG_BT_BREDR) && chan->conn->type == BT_CONN_TYPE_BR) { return bt_l2cap_br_chan_send(chan, buf); } @@ -1686,4 +1686,4 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf) return err; } -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ diff --git a/subsys/bluetooth/host/l2cap_br.c b/subsys/bluetooth/host/l2cap_br.c index ab502501438..ee07a52d2a5 100644 --- a/subsys/bluetooth/host/l2cap_br.c +++ b/subsys/bluetooth/host/l2cap_br.c @@ -18,7 +18,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_L2CAP) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP) #include "common/log.h" #include "hci_core.h" @@ -80,7 +80,7 @@ static sys_slist_t br_servers; static sys_slist_t br_fixed_channels; /* Pool for outgoing BR/EDR signaling packets, min MTU is 48 */ -NET_BUF_POOL_DEFINE(br_sig_pool, CONFIG_BLUETOOTH_MAX_CONN, +NET_BUF_POOL_DEFINE(br_sig_pool, CONFIG_BT_MAX_CONN, BT_L2CAP_BUF_SIZE(L2CAP_BR_MIN_MTU), BT_BUF_USER_DATA_MIN, NULL); @@ -93,7 +93,7 @@ struct bt_l2cap_br { u32_t info_feat_mask; }; -static struct bt_l2cap_br bt_l2cap_br_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_l2cap_br bt_l2cap_br_pool[CONFIG_BT_MAX_CONN]; struct bt_l2cap_chan *bt_l2cap_br_lookup_rx_cid(struct bt_conn *conn, u16_t cid) @@ -1566,17 +1566,17 @@ void bt_l2cap_br_init(void) bt_l2cap_br_fixed_chan_register(&chan_br); - if (IS_ENABLED(CONFIG_BLUETOOTH_RFCOMM)) { + if (IS_ENABLED(CONFIG_BT_RFCOMM)) { bt_rfcomm_init(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_AVDTP)) { + if (IS_ENABLED(CONFIG_BT_AVDTP)) { bt_avdtp_init(); } bt_sdp_init(); - if (IS_ENABLED(CONFIG_BLUETOOTH_A2DP)) { + if (IS_ENABLED(CONFIG_BT_A2DP)) { bt_a2dp_init(); } } diff --git a/subsys/bluetooth/host/l2cap_internal.h b/subsys/bluetooth/host/l2cap_internal.h index 3ba2aa2e4af..381499d55d2 100644 --- a/subsys/bluetooth/host/l2cap_internal.h +++ b/subsys/bluetooth/host/l2cap_internal.h @@ -192,10 +192,10 @@ struct bt_l2cap_le_credits { #define BT_L2CAP_SDU_HDR_LEN 2 -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) -#define BT_L2CAP_RX_MTU CONFIG_BLUETOOTH_L2CAP_RX_MTU +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) +#define BT_L2CAP_RX_MTU CONFIG_BT_L2CAP_RX_MTU #else -#define BT_L2CAP_RX_MTU (CONFIG_BLUETOOTH_RX_BUF_LEN - \ +#define BT_L2CAP_RX_MTU (CONFIG_BT_RX_BUF_LEN - \ BT_HCI_ACL_HDR_SIZE - BT_L2CAP_HDR_SIZE) #endif @@ -226,7 +226,7 @@ void bt_l2cap_chan_del(struct bt_l2cap_chan *chan); const char *bt_l2cap_chan_state_str(bt_l2cap_chan_state_t state); -#if defined(CONFIG_BLUETOOTH_DEBUG_L2CAP) +#if defined(CONFIG_BT_DEBUG_L2CAP) void bt_l2cap_chan_set_state_debug(struct bt_l2cap_chan *chan, bt_l2cap_chan_state_t state, const char *func, int line); @@ -235,7 +235,7 @@ void bt_l2cap_chan_set_state_debug(struct bt_l2cap_chan *chan, #else void bt_l2cap_chan_set_state(struct bt_l2cap_chan *chan, bt_l2cap_chan_state_t state); -#endif /* CONFIG_BLUETOOTH_DEBUG_L2CAP */ +#endif /* CONFIG_BT_DEBUG_L2CAP */ /* * Notify L2CAP channels of a change in encryption state passing additionally diff --git a/subsys/bluetooth/host/mesh/Kconfig b/subsys/bluetooth/host/mesh/Kconfig index 3d06718f9de..f2c336d9de7 100644 --- a/subsys/bluetooth/host/mesh/Kconfig +++ b/subsys/bluetooth/host/mesh/Kconfig @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 # -menuconfig BLUETOOTH_MESH +menuconfig BT_MESH bool "Smart Mesh support" select TINYCRYPT select TINYCRYPT_AES @@ -16,58 +16,58 @@ menuconfig BLUETOOTH_MESH that will be available is dependent on other features that have been enabled in the stack, such as GATT support. -if BLUETOOTH_MESH +if BT_MESH # Virtual option enabled whenever Generic Provisioning layer is needed -config BLUETOOTH_MESH_PROV +config BT_MESH_PROV bool -config BLUETOOTH_MESH_PB_ADV +config BT_MESH_PB_ADV bool "Provisioning support using the advertising bearer (PB-ADV)" - select BLUETOOTH_MESH_PROV + select BT_MESH_PROV default y help Enable this option to allow the device to be provisioned over the advertising bearer. -if BLUETOOTH_CONN +if BT_CONN # Virtual option enabled whenever any Proxy protocol is needed -config BLUETOOTH_MESH_PROXY +config BT_MESH_PROXY bool -config BLUETOOTH_MESH_PB_GATT +config BT_MESH_PB_GATT bool "Provisioning support using GATT (PB-GATT)" - select BLUETOOTH_MESH_PROXY - select BLUETOOTH_MESH_PROV + select BT_MESH_PROXY + select BT_MESH_PROV help Enable this option to allow the device to be provisioned over GATT. -config BLUETOOTH_MESH_GATT_PROXY +config BT_MESH_GATT_PROXY bool "GATT Proxy Service" - select BLUETOOTH_MESH_PROXY + select BT_MESH_PROXY help This option enables support for the Mesh GATT Proxy Service, i.e. the ability to act as a proxy between a Mesh GATT Client and a Mesh network. -if BLUETOOTH_MESH_PROXY +if BT_MESH_PROXY -config BLUETOOTH_MESH_PROXY_FILTER_SIZE +config BT_MESH_PROXY_FILTER_SIZE int "Maximum number of filter entries per Proxy Client" default 1 - default 3 if BLUETOOTH_MESH_GATT_PROXY + default 3 if BT_MESH_GATT_PROXY range 1 32767 help This option specifies how many Proxy Filter entries the local node supports. -endif # BLUETOOTH_MESH_PROXY +endif # BT_MESH_PROXY -endif # BLUETOOTH_CONN +endif # BT_CONN -config BLUETOOTH_MESH_LOCAL_INTERFACE +config BT_MESH_LOCAL_INTERFACE bool "Local network interface" default y help @@ -75,19 +75,19 @@ config BLUETOOTH_MESH_LOCAL_INTERFACE elements. Only disable it if you're sure this will not be needed (which helps save a little bit of memory). -config BLUETOOTH_MESH_SELF_TEST +config BT_MESH_SELF_TEST bool "Perform self-tests" help This option adds extra self-tests which are run every time mesh networking is initialized. -config BLUETOOTH_MESH_IV_UPDATE_TEST +config BT_MESH_IV_UPDATE_TEST bool "Test the IV Update Procedure" help This option removes the 96 hour limit of the IV Update Procedure and lets the state be changed at any time. -config BLUETOOTH_MESH_SUBNET_COUNT +config BT_MESH_SUBNET_COUNT int "Maximum number of mesh subnets per network" default 1 range 1 4096 @@ -95,7 +95,7 @@ config BLUETOOTH_MESH_SUBNET_COUNT This option specifies how many subnets a Mesh network can participate in at the same time. -config BLUETOOTH_MESH_APP_KEY_COUNT +config BT_MESH_APP_KEY_COUNT int "Maximum number of application keys per network" default 1 range 1 4096 @@ -103,7 +103,7 @@ config BLUETOOTH_MESH_APP_KEY_COUNT This option specifies how many application keys the device can store per network. -config BLUETOOTH_MESH_MODEL_KEY_COUNT +config BT_MESH_MODEL_KEY_COUNT int "Maximum number of application keys per model" default 1 range 1 4096 @@ -111,7 +111,7 @@ config BLUETOOTH_MESH_MODEL_KEY_COUNT This option specifies how many application keys each model can at most be bound to. -config BLUETOOTH_MESH_MODEL_GROUP_COUNT +config BT_MESH_MODEL_GROUP_COUNT int "Maximum number of group address subscriptions per model" default 1 range 1 4096 @@ -119,14 +119,14 @@ config BLUETOOTH_MESH_MODEL_GROUP_COUNT This option specifies how many group addresses each model can at most be subscribed to. -config BLUETOOTH_MESH_LABEL_COUNT +config BT_MESH_LABEL_COUNT int "Maximum number of Label UUIDs used for Virtual Addresses" default 1 range 0 4096 help This option specifies how many Label UUIDs can be stored. -config BLUETOOTH_MESH_CRPL +config BT_MESH_CRPL int "Maximum capacity of the replay protection list" default 10 range 2 65535 @@ -135,7 +135,7 @@ config BLUETOOTH_MESH_CRPL protection list. This option is similar to the network message cache size, but has a different purpose. -config BLUETOOTH_MESH_MSG_CACHE_SIZE +config BT_MESH_MSG_CACHE_SIZE int "Network message cache size" default 10 range 2 65535 @@ -145,7 +145,7 @@ config BLUETOOTH_MESH_MSG_CACHE_SIZE relays. This option is similar to the replay protection list, but has a different purpose. -config BLUETOOTH_MESH_ADV_BUF_COUNT +config BT_MESH_ADV_BUF_COUNT int "Number of advertising buffers" default 6 range 6 256 @@ -158,15 +158,15 @@ config BLUETOOTH_MESH_ADV_BUF_COUNT which leaves 56 bytes for application layer data using a 4-byte MIC and 52 bytes using an 8-byte MIC. -config BLUETOOTH_MESH_TX_SEG_MSG_COUNT +config BT_MESH_TX_SEG_MSG_COUNT int "Maximum number of simultaneous outgoing segmented messages" default 1 - range 1 BLUETOOTH_MESH_ADV_BUF_COUNT + range 1 BT_MESH_ADV_BUF_COUNT help Maximum number of simultaneous outgoing multi-segment and/or reliable messages. -config BLUETOOTH_MESH_RX_SEG_MSG_COUNT +config BT_MESH_RX_SEG_MSG_COUNT int "Maximum number of simultaneous incoming segmented messages" default 1 range 1 255 @@ -174,7 +174,7 @@ config BLUETOOTH_MESH_RX_SEG_MSG_COUNT Maximum number of simultaneous incoming multi-segment and/or reliable messages. -config BLUETOOTH_MESH_RX_SDU_MAX +config BT_MESH_RX_SDU_MAX int "Maximum incoming Upper Transport Access PDU length" default 384 range 36 384 @@ -183,18 +183,18 @@ config BLUETOOTH_MESH_RX_SDU_MAX to the default value, unless you really need to optimize memory usage. -config BLUETOOTH_MESH_RELAY +config BT_MESH_RELAY bool "Relay support" help Support for acting as a Mesh Relay Node. -config BLUETOOTH_MESH_LOW_POWER +config BT_MESH_LOW_POWER bool "Support for Low Power features" help Enable this option to be able to act as a Low Power Node. -if BLUETOOTH_MESH_LOW_POWER -config BLUETOOTH_MESH_LPN_RSSI_FACTOR +if BT_MESH_LOW_POWER +config BT_MESH_LPN_RSSI_FACTOR int "RSSIFactor, used in the Friend Offer Delay calculation" range 0 3 default 0 @@ -202,7 +202,7 @@ config BLUETOOTH_MESH_LPN_RSSI_FACTOR The contribution of the RSSI measured by the Friend node used in Friend Offer Delay calculations. 0 = 1, 1 = 1.5, 2 = 2, 3 = 2.5. -config BLUETOOTH_MESH_LPN_RECV_WIN_FACTOR +config BT_MESH_LPN_RECV_WIN_FACTOR int "ReceiveWindowFactor, used in the Friend Offer Delay calculation" range 0 3 default 0 @@ -210,7 +210,7 @@ config BLUETOOTH_MESH_LPN_RECV_WIN_FACTOR The contribution of the supported Receive Window used in Friend Offer Delay calculations. 0 = 1, 1 = 1.5, 2 = 2, 3 = 2.5. -config BLUETOOTH_MESH_LPN_MIN_QUEUE_SIZE +config BT_MESH_LPN_MIN_QUEUE_SIZE int "Minimum size of acceptable friend queue (MinQueueSizeLog)" range 1 7 default 1 @@ -220,7 +220,7 @@ config BLUETOOTH_MESH_LPN_MIN_QUEUE_SIZE the Friend node can store in its Friend Queue. As an example, MinQueueSizeLog value 1 gives N = 2, and value 7 gives N = 128. -config BLUETOOTH_MESH_LPN_RECV_DELAY +config BT_MESH_LPN_RECV_DELAY int "Receive delay requested by the local node" range 10 255 default 20 @@ -230,7 +230,7 @@ config BLUETOOTH_MESH_LPN_RECV_DELAY allows the Friend node time to prepare the response. The value is in units of milliseconds. -config BLUETOOTH_MESH_LPN_POLL_TIMEOUT +config BT_MESH_LPN_POLL_TIMEOUT int "The initial value of the PollTimeout timer" range 10 244735 default 100 @@ -241,7 +241,7 @@ config BLUETOOTH_MESH_LPN_POLL_TIMEOUT PollTimeout timer expires, then the friendship is considered terminated. The value is in units of 100 milliseconds. -config BLUETOOTH_MESH_LPN_SCAN_LATENCY +config BT_MESH_LPN_SCAN_LATENCY int "Latency for enabling scanning" range 0 50 default 10 @@ -250,36 +250,36 @@ config BLUETOOTH_MESH_LPN_SCAN_LATENCY is in practice how much time in advance before the Receive Window that scanning is requested to be enabled. -config BLUETOOTH_MESH_LPN_GROUPS +config BT_MESH_LPN_GROUPS int "Number of groups the LPN can subscribe to" range 0 16384 default 8 help Maximum number of groups that the LPN can subscribe to. -endif # BLUETOOTH_MESH_LOW_POWER +endif # BT_MESH_LOW_POWER -config BLUETOOTH_MESH_FRIEND +config BT_MESH_FRIEND bool "Support for acting as a Friend Node" help Enable this option to be able to act as a Friend Node. -if BLUETOOTH_MESH_FRIEND +if BT_MESH_FRIEND -config BLUETOOTH_MESH_FRIEND_RECV_WIN +config BT_MESH_FRIEND_RECV_WIN int "Friend Receive Window" range 1 255 default 255 help Receive Window in milliseconds supported by the Friend node. -config BLUETOOTH_MESH_FRIEND_QUEUE_SIZE +config BT_MESH_FRIEND_QUEUE_SIZE int "Friend Queue Size" - range 1 BLUETOOTH_MESH_ADV_BUF_COUNT + range 1 BT_MESH_ADV_BUF_COUNT default 16 help Queue Size available on the Friend node. -config BLUETOOTH_MESH_FRIEND_SUB_LIST_SIZE +config BT_MESH_FRIEND_SUB_LIST_SIZE int "Friend Subscription List Size" range 1 255 default 16 @@ -287,7 +287,7 @@ config BLUETOOTH_MESH_FRIEND_SUB_LIST_SIZE Size of the Subscription List that can be supported by a Friend node for a Low Power node. -config BLUETOOTH_MESH_FRIEND_LPN_COUNT +config BT_MESH_FRIEND_LPN_COUNT int "Number of supported LPN nodes" range 1 1000 default 1 @@ -295,83 +295,83 @@ config BLUETOOTH_MESH_FRIEND_LPN_COUNT Number of Low Power Nodes the Friend can have a Friendship with simultaneously. -endif # BLUETOOTH_MESH_FRIEND +endif # BT_MESH_FRIEND -config BLUETOOTH_MESH_DEBUG +config BT_MESH_DEBUG bool "Enable debug logs" - depends on BLUETOOTH_DEBUG + depends on BT_DEBUG help Use this option to enable debug logs for the Bluetooth Mesh functionality. -if BLUETOOTH_MESH_DEBUG +if BT_MESH_DEBUG -config BLUETOOTH_MESH_DEBUG_NET +config BT_MESH_DEBUG_NET bool "Network layer debug" help Use this option to enable Network layer debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_TRANS +config BT_MESH_DEBUG_TRANS bool "Transport layer debug" help Use this option to enable Transport layer debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_BEACON +config BT_MESH_DEBUG_BEACON bool "Beacon debug" help Use this option to enable Beacon-related debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_CRYPTO +config BT_MESH_DEBUG_CRYPTO bool "Crypto debug" help Use this option to enable cryptographic debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_PROV +config BT_MESH_DEBUG_PROV bool "Provisioning debug" help Use this option to enable Provisioning debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_ACCESS +config BT_MESH_DEBUG_ACCESS bool "Access layer debug" help Use this option to enable Access layer and device composition related debug logs for Bluetooth Mesh. -config BLUETOOTH_MESH_DEBUG_MODEL +config BT_MESH_DEBUG_MODEL bool "Foundation model debug" help Use this option to enable debug logs for the Foundation Models. -config BLUETOOTH_MESH_DEBUG_ADV +config BT_MESH_DEBUG_ADV bool "Advertising debug" help Use this option to enable advertising debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_LOW_POWER +config BT_MESH_DEBUG_LOW_POWER bool "Low Power debug" help Use this option to enable Low Power debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_FRIEND +config BT_MESH_DEBUG_FRIEND bool "Friend debug" help Use this option to enable Friend debug logs for the Bluetooth Mesh functionality. -config BLUETOOTH_MESH_DEBUG_PROXY +config BT_MESH_DEBUG_PROXY bool "Proxy debug" - depends on BLUETOOTH_MESH_PROXY + depends on BT_MESH_PROXY help Use this option to enable Proxy protocol debug logs. -endif # BLUETOOTH_MESH_DEBUG +endif # BT_MESH_DEBUG -endif # BLUETOOTH_MESH +endif # BT_MESH diff --git a/subsys/bluetooth/host/mesh/Makefile b/subsys/bluetooth/host/mesh/Makefile index e3a2b765fcf..979f1c07a7d 100644 --- a/subsys/bluetooth/host/mesh/Makefile +++ b/subsys/bluetooth/host/mesh/Makefile @@ -1,6 +1,6 @@ ccflags-y +=-I$(srctree)/subsys/bluetooth -obj-$(CONFIG_BLUETOOTH_MESH) += main.o \ +obj-$(CONFIG_BT_MESH) += main.o \ adv.o \ beacon.o \ net.o \ @@ -10,12 +10,12 @@ obj-$(CONFIG_BLUETOOTH_MESH) += main.o \ cfg.o \ health.o \ -obj-$(CONFIG_BLUETOOTH_MESH_LOW_POWER) += lpn.o +obj-$(CONFIG_BT_MESH_LOW_POWER) += lpn.o -obj-$(CONFIG_BLUETOOTH_MESH_FRIEND) += friend.o +obj-$(CONFIG_BT_MESH_FRIEND) += friend.o -obj-$(CONFIG_BLUETOOTH_MESH_PROV) += prov.o +obj-$(CONFIG_BT_MESH_PROV) += prov.o -obj-$(CONFIG_BLUETOOTH_MESH_PROXY) += proxy.o +obj-$(CONFIG_BT_MESH_PROXY) += proxy.o -obj-$(CONFIG_BLUETOOTH_MESH_SELF_TEST) += test.o +obj-$(CONFIG_BT_MESH_SELF_TEST) += test.o diff --git a/subsys/bluetooth/host/mesh/access.c b/subsys/bluetooth/host/mesh/access.c index 848190afb25..0824961b2e2 100644 --- a/subsys/bluetooth/host/mesh/access.c +++ b/subsys/bluetooth/host/mesh/access.c @@ -15,7 +15,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ACCESS) #include "common/log.h" #include "mesh.h" diff --git a/subsys/bluetooth/host/mesh/adv.c b/subsys/bluetooth/host/mesh/adv.c index 2ce99be0a11..e733391110d 100644 --- a/subsys/bluetooth/host/mesh/adv.c +++ b/subsys/bluetooth/host/mesh/adv.c @@ -16,7 +16,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_ADV) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ADV) #include "common/log.h" #include "../hci_core.h" @@ -44,7 +44,7 @@ /* TinyCrypt PRNG consumes a lot of stack space, so we need to have * an increased call stack whenever it's used. */ -#if defined(CONFIG_BLUETOOTH_HOST_CRYPTO) +#if defined(CONFIG_BT_HOST_CRYPTO) #define ADV_STACK_SIZE 768 #else #define ADV_STACK_SIZE 512 @@ -60,7 +60,7 @@ static const u8_t adv_type[] = { [BT_MESH_ADV_BEACON] = BT_DATA_MESH_BEACON, }; -NET_BUF_POOL_DEFINE(adv_buf_pool, CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT, +NET_BUF_POOL_DEFINE(adv_buf_pool, CONFIG_BT_MESH_ADV_BUF_COUNT, BT_MESH_ADV_DATA_SIZE, sizeof(struct bt_mesh_adv), NULL); static inline void adv_sent(struct net_buf *buf, int err) @@ -129,7 +129,7 @@ static void adv_thread(void *p1, void *p2, void *p3) while (1) { struct net_buf *buf; - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_PROXY)) { buf = net_buf_get(&adv_queue, K_NO_WAIT); while (!buf) { s32_t timeout; @@ -234,7 +234,7 @@ static void bt_mesh_scan_cb(const bt_addr_le_t *addr, s8_t rssi, case BT_DATA_MESH_MESSAGE: bt_mesh_net_recv(buf, rssi, BT_MESH_NET_IF_ADV); break; -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) case BT_DATA_MESH_PROV: bt_mesh_pb_adv_recv(buf); break; diff --git a/subsys/bluetooth/host/mesh/beacon.c b/subsys/bluetooth/host/mesh/beacon.c index 921bc80785e..03326c85eda 100644 --- a/subsys/bluetooth/host/mesh/beacon.c +++ b/subsys/bluetooth/host/mesh/beacon.c @@ -15,7 +15,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_BEACON) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_BEACON) #include "common/log.h" #include "adv.h" @@ -45,7 +45,7 @@ static struct k_delayed_work beacon_timer; static struct { u16_t net_idx; u8_t data[21]; -} beacon_cache[CONFIG_BLUETOOTH_MESH_SUBNET_COUNT]; +} beacon_cache[CONFIG_BT_MESH_SUBNET_COUNT]; static struct bt_mesh_subnet *cache_check(u8_t data[21]) { @@ -164,7 +164,7 @@ static int secure_beacon_send(void) static int unprovisioned_beacon_send(void) { -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) struct net_buf *buf; BT_DBG(""); @@ -185,7 +185,7 @@ static int unprovisioned_beacon_send(void) bt_mesh_adv_send(buf, NULL); net_buf_unref(buf); -#endif /* CONFIG_BLUETOOTH_MESH_PB_ADV */ +#endif /* CONFIG_BT_MESH_PB_ADV */ return 0; } @@ -218,7 +218,7 @@ static void update_beacon_observation(void) static void beacon_send(struct k_work *work) { /* Don't send anything if we have an active provisioning link */ - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PROV) && bt_prov_active()) { + if (IS_ENABLED(CONFIG_BT_MESH_PROV) && bt_prov_active()) { k_delayed_work_submit(&beacon_timer, UNPROVISIONED_INTERVAL); return; } diff --git a/subsys/bluetooth/host/mesh/cfg.c b/subsys/bluetooth/host/mesh/cfg.c index e79817cc446..eedac8685ef 100644 --- a/subsys/bluetooth/host/mesh/cfg.c +++ b/subsys/bluetooth/host/mesh/cfg.c @@ -18,7 +18,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_MODEL) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL) #include "common/log.h" #include "mesh.h" @@ -39,7 +39,7 @@ static struct bt_mesh_cfg *conf; static struct label { u16_t addr; u8_t uuid[16]; -} labels[CONFIG_BLUETOOTH_MESH_LABEL_COUNT]; +} labels[CONFIG_BT_MESH_LABEL_COUNT]; static inline void key_idx_unpack(struct net_buf_simple *buf, u16_t *idx1, u16_t *idx2) @@ -87,7 +87,7 @@ static void hb_send(struct bt_mesh_model *model) feat |= BT_MESH_FEAT_FRIEND; } -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) if (bt_mesh.lpn.state != BT_MESH_LPN_DISABLED) { feat |= BT_MESH_FEAT_LOW_POWER; } @@ -139,18 +139,18 @@ static int comp_get_page_0(struct net_buf_simple *buf) comp = bt_mesh_comp_get(); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_RELAY)) { + if (IS_ENABLED(CONFIG_BT_MESH_RELAY)) { feat |= BT_MESH_FEAT_RELAY; } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { feat |= BT_MESH_FEAT_LOW_POWER; } net_buf_simple_add_le16(buf, comp->cid); net_buf_simple_add_le16(buf, comp->pid); net_buf_simple_add_le16(buf, comp->vid); - net_buf_simple_add_le16(buf, CONFIG_BLUETOOTH_MESH_CRPL); + net_buf_simple_add_le16(buf, CONFIG_BT_MESH_CRPL); net_buf_simple_add_le16(buf, feat); for (i = 0; i < comp->elem_count; i++) { @@ -247,7 +247,7 @@ static u8_t _mod_pub_set(struct bt_mesh_model *model, u16_t pub_addr, return STATUS_NVAL_PUB_PARAM; } - if (!IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER) && cred_flag) { + if (!IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) && cred_flag) { return STATUS_FEAT_NOT_SUPP; } @@ -573,7 +573,7 @@ static void app_key_get(struct bt_mesh_model *model, { struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 3 + 4 + - IDX_LEN(CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT)); + IDX_LEN(CONFIG_BT_MESH_APP_KEY_COUNT)); u16_t get_idx, i, prev; u8_t status; @@ -772,7 +772,7 @@ static void gatt_proxy_set(struct bt_mesh_model *model, return; } - if (!IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY) || + if (!IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY) || bt_mesh_gatt_proxy_get() == BT_MESH_GATT_PROXY_NOT_SUPPORTED) { goto send_status; } @@ -1045,7 +1045,7 @@ send_status: status, mod_id); } -#if CONFIG_BLUETOOTH_MESH_LABEL_COUNT > 0 +#if CONFIG_BT_MESH_LABEL_COUNT > 0 static u16_t va_find(u8_t *label_uuid, struct label **free_slot) { int i; @@ -1198,7 +1198,7 @@ send_status: send_mod_pub_status(model, ctx, elem_addr, pub_addr, vnd, mod, status, mod_id); } -#endif /* CONFIG_BLUETOOTH_MESH_LABEL_COUNT > 0 */ +#endif /* CONFIG_BT_MESH_LABEL_COUNT > 0 */ static void send_mod_sub_status(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, u8_t status, @@ -1283,7 +1283,7 @@ static void mod_sub_add(struct bt_mesh_model *model, } else { status = STATUS_SUCCESS; - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_add(sub_addr); } } @@ -1336,7 +1336,7 @@ static void mod_sub_del(struct bt_mesh_model *model, */ status = STATUS_SUCCESS; - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_del(&sub_addr, 1); } @@ -1387,7 +1387,7 @@ static void mod_sub_overwrite(struct bt_mesh_model *model, goto send_status; } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_del(mod->groups, ARRAY_SIZE(mod->groups)); } @@ -1398,7 +1398,7 @@ static void mod_sub_overwrite(struct bt_mesh_model *model, mod->groups[0] = sub_addr; status = STATUS_SUCCESS; - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_add(sub_addr); } } else { @@ -1442,7 +1442,7 @@ static void mod_sub_del_all(struct bt_mesh_model *model, goto send_status; } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_del(mod->groups, ARRAY_SIZE(mod->groups)); } @@ -1462,7 +1462,7 @@ static void mod_sub_get(struct bt_mesh_model *model, { struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 5 + 4 + - CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT * 2); + CONFIG_BT_MESH_MODEL_GROUP_COUNT * 2); struct bt_mesh_model *mod; struct bt_mesh_elem *elem; u16_t addr, id; @@ -1514,7 +1514,7 @@ static void mod_sub_get_vnd(struct bt_mesh_model *model, { struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 7 + 4 + - CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT * 2); + CONFIG_BT_MESH_MODEL_GROUP_COUNT * 2); struct bt_mesh_model *mod; struct bt_mesh_elem *elem; u16_t company, addr, id; @@ -1564,7 +1564,7 @@ send_list: } } -#if CONFIG_BLUETOOTH_MESH_LABEL_COUNT > 0 +#if CONFIG_BT_MESH_LABEL_COUNT > 0 static void mod_sub_va_add(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, struct net_buf_simple *buf) @@ -1622,7 +1622,7 @@ static void mod_sub_va_add(struct bt_mesh_model *model, if (i == ARRAY_SIZE(mod->groups)) { status = STATUS_INSUFF_RESOURCES; } else { - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_add(sub_addr); } @@ -1724,7 +1724,7 @@ static void mod_sub_va_overwrite(struct bt_mesh_model *model, goto send_status; } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_del(mod->groups, ARRAY_SIZE(mod->groups)); } @@ -1736,7 +1736,7 @@ static void mod_sub_va_overwrite(struct bt_mesh_model *model, if (status == STATUS_SUCCESS) { mod->groups[0] = sub_addr; - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_group_add(sub_addr); } } @@ -1853,7 +1853,7 @@ send_status: send_mod_sub_status(model, ctx, status, elem_addr, BT_MESH_ADDR_UNASSIGNED, mod_id, vnd); } -#endif /* CONFIG_BLUETOOTH_MESH_LABEL_COUNT > 0 */ +#endif /* CONFIG_BT_MESH_LABEL_COUNT > 0 */ static void send_net_key_status(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, @@ -1926,7 +1926,7 @@ static void net_key_add(struct bt_mesh_model *model, sub->net_idx = idx; - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) { sub->node_id = BT_MESH_NODE_IDENTITY_STOPPED; bt_mesh_proxy_beacon_send(sub); bt_mesh_adv_update(); @@ -1984,8 +1984,8 @@ static void net_key_update(struct bt_mesh_model *model, } err = bt_mesh_net_keys_create(&sub->keys[1], buf->data); - if (!err && (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER) || - IS_ENABLED(CONFIG_BLUETOOTH_MESH_FRIEND))) { + if (!err && (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) || + IS_ENABLED(CONFIG_BT_MESH_FRIEND))) { err = bt_mesh_friend_cred_update(ctx->net_idx, 1, buf->data); } @@ -2074,8 +2074,7 @@ static void net_key_get(struct bt_mesh_model *model, struct net_buf_simple *buf) { struct net_buf_simple *msg = - NET_BUF_SIMPLE(2 + 4 + - IDX_LEN(CONFIG_BLUETOOTH_MESH_SUBNET_COUNT)); + NET_BUF_SIMPLE(2 + 4 + IDX_LEN(CONFIG_BT_MESH_SUBNET_COUNT)); u16_t prev, i; bt_mesh_model_msg_init(msg, OP_NET_KEY_LIST); @@ -2182,7 +2181,7 @@ static void node_identity_set(struct bt_mesh_model *model, net_buf_simple_add_u8(msg, STATUS_SUCCESS); net_buf_simple_add_le16(msg, idx); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) { sub->node_id = node_id; bt_mesh_adv_update(); } @@ -2302,7 +2301,7 @@ send_status: } } -#define KEY_LIST_LEN (CONFIG_BLUETOOTH_MESH_MODEL_KEY_COUNT * 2) +#define KEY_LIST_LEN (CONFIG_BT_MESH_MODEL_KEY_COUNT * 2) static void mod_app_get(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, @@ -2579,8 +2578,8 @@ static void krp_set(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, sub->kr_phase == BT_MESH_KR_PHASE_2) && phase == BT_MESH_KR_PHASE_3) { memcpy(&sub->keys[0], &sub->keys[1], sizeof(sub->keys[0])); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER) || - IS_ENABLED(CONFIG_BLUETOOTH_MESH_FRIEND)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) || + IS_ENABLED(CONFIG_BT_MESH_FRIEND)) { bt_mesh_friend_cred_refresh(ctx->net_idx); } sub->kr_phase = BT_MESH_KR_NORMAL; @@ -2956,15 +2955,15 @@ int bt_mesh_conf_init(struct bt_mesh_model *model, bool primary) /* Configuration Model security is device-key based */ model->keys[0] = BT_MESH_KEY_DEV; - if (!IS_ENABLED(CONFIG_BLUETOOTH_MESH_RELAY)) { + if (!IS_ENABLED(CONFIG_BT_MESH_RELAY)) { cfg->relay = BT_MESH_RELAY_NOT_SUPPORTED; } - if (!IS_ENABLED(CONFIG_BLUETOOTH_MESH_FRIEND)) { + if (!IS_ENABLED(CONFIG_BT_MESH_FRIEND)) { cfg->frnd = BT_MESH_RELAY_NOT_SUPPORTED; } - if (!IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) { + if (!IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) { cfg->gatt_proxy = BT_MESH_GATT_PROXY_NOT_SUPPORTED; } diff --git a/subsys/bluetooth/host/mesh/crypto.c b/subsys/bluetooth/host/mesh/crypto.c index c3f61de6e27..01190031fc0 100644 --- a/subsys/bluetooth/host/mesh/crypto.c +++ b/subsys/bluetooth/host/mesh/crypto.c @@ -23,7 +23,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_CRYPTO) #include "common/log.h" #include "mesh.h" @@ -519,7 +519,7 @@ static int bt_mesh_ccm_encrypt(const u8_t key[16], u8_t nonce[13], return 0; } -#if defined(CONFIG_BLUETOOTH_MESH_PROXY) +#if defined(CONFIG_BT_MESH_PROXY) static void create_proxy_nonce(u8_t nonce[13], const u8_t *pdu, u32_t iv_index) { @@ -610,7 +610,7 @@ int bt_mesh_net_encrypt(const u8_t key[16], struct net_buf_simple *buf, mic_len); BT_DBG("PDU (len %u) %s", buf->len, bt_hex(buf->data, buf->len)); -#if defined(CONFIG_BLUETOOTH_MESH_PROXY) +#if defined(CONFIG_BT_MESH_PROXY) if (proxy) { create_proxy_nonce(nonce, buf->data, iv_index); } else { @@ -641,7 +641,7 @@ int bt_mesh_net_decrypt(const u8_t key[16], struct net_buf_simple *buf, BT_DBG("iv_index %u, key %s mic_len %u", iv_index, bt_hex(key, 16), mic_len); -#if defined(CONFIG_BLUETOOTH_MESH_PROXY) +#if defined(CONFIG_BT_MESH_PROXY) if (proxy) { create_proxy_nonce(nonce, buf->data, iv_index); } else { diff --git a/subsys/bluetooth/host/mesh/friend.c b/subsys/bluetooth/host/mesh/friend.c index c25f1b9b64c..18b896a690e 100644 --- a/subsys/bluetooth/host/mesh/friend.c +++ b/subsys/bluetooth/host/mesh/friend.c @@ -14,7 +14,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_FRIEND) #include "common/log.h" #include "crypto.h" @@ -89,8 +89,8 @@ static int send_friend_offer(s8_t rssi) .src = bt_mesh_primary_addr(), }; struct bt_mesh_ctl_friend_offer off = { - .recv_win = CONFIG_BLUETOOTH_MESH_FRIEND_RECV_WIN, - .queue_size = CONFIG_BLUETOOTH_MESH_FRIEND_QUEUE_SIZE, + .recv_win = CONFIG_BT_MESH_FRIEND_RECV_WIN, + .queue_size = CONFIG_BT_MESH_FRIEND_QUEUE_SIZE, .rssi = rssi, .frnd_counter = bt_mesh.frnd.counter++, }; diff --git a/subsys/bluetooth/host/mesh/friend.h b/subsys/bluetooth/host/mesh/friend.h index c57f06b7631..2c639b206df 100644 --- a/subsys/bluetooth/host/mesh/friend.h +++ b/subsys/bluetooth/host/mesh/friend.h @@ -8,7 +8,7 @@ static inline bool bt_mesh_friend_dst_is_lpn(u16_t dst) { -#if defined(CONFIG_BLUETOOTH_MESH_FRIEND) +#if defined(CONFIG_BT_MESH_FRIEND) return (dst == bt_mesh.frnd.lpn); #else return false; diff --git a/subsys/bluetooth/host/mesh/health.c b/subsys/bluetooth/host/mesh/health.c index c6e777f9328..985e66ffb22 100644 --- a/subsys/bluetooth/host/mesh/health.c +++ b/subsys/bluetooth/host/mesh/health.c @@ -17,7 +17,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_MODEL) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL) #include "common/log.h" #include "mesh.h" diff --git a/subsys/bluetooth/host/mesh/lpn.c b/subsys/bluetooth/host/mesh/lpn.c index 02996787360..4ba90b9b256 100644 --- a/subsys/bluetooth/host/mesh/lpn.c +++ b/subsys/bluetooth/host/mesh/lpn.c @@ -14,7 +14,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_LOW_POWER) #include "common/log.h" #include "crypto.h" @@ -26,8 +26,8 @@ #include "beacon.h" #include "lpn.h" -#define LPN_RECV_DELAY CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY -#define SCAN_LATENCY min(CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY, \ +#define LPN_RECV_DELAY CONFIG_BT_MESH_LPN_RECV_DELAY +#define SCAN_LATENCY min(CONFIG_BT_MESH_LPN_SCAN_LATENCY, \ LPN_RECV_DELAY) #define FRIEND_REQ_RETRY_TIMEOUT K_SECONDS(5) @@ -41,17 +41,17 @@ (LPN_RECV_DELAY + (lpn)->recv_win + \ POLL_RETRY_TIMEOUT)) -#define POLL_TIMEOUT(lpn) ((CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT * 100) - \ +#define POLL_TIMEOUT(lpn) ((CONFIG_BT_MESH_LPN_POLL_TIMEOUT * 100) - \ REQ_RETRY_DURATION(lpn)) -#define LPN_CRITERIA ((CONFIG_BLUETOOTH_MESH_LPN_MIN_QUEUE_SIZE) | \ - (CONFIG_BLUETOOTH_MESH_LPN_RSSI_FACTOR << 3) | \ - (CONFIG_BLUETOOTH_MESH_LPN_RECV_WIN_FACTOR << 5)) +#define LPN_CRITERIA ((CONFIG_BT_MESH_LPN_MIN_QUEUE_SIZE) | \ + (CONFIG_BT_MESH_LPN_RSSI_FACTOR << 3) | \ + (CONFIG_BT_MESH_LPN_RECV_WIN_FACTOR << 5)) #define POLL_TO(to) { (u8_t)((to) >> 16), (u8_t)((to) >> 8), (u8_t)(to) } -#define LPN_POLL_TO POLL_TO(CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT) +#define LPN_POLL_TO POLL_TO(CONFIG_BT_MESH_LPN_POLL_TIMEOUT) -#if defined(CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER) +#if defined(CONFIG_BT_MESH_DEBUG_LOW_POWER) static const char *state2str(int state) { switch (state) { @@ -75,11 +75,11 @@ static const char *state2str(int state) return "(unknown)"; } } -#endif /* CONFIG_BLUETOOTH_MESH_DEBUG_LPN */ +#endif /* CONFIG_BT_MESH_DEBUG_LPN */ static inline void lpn_set_state(int state) { -#if defined(CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER) +#if defined(CONFIG_BT_MESH_DEBUG_LOW_POWER) BT_DBG("%s -> %s", state2str(bt_mesh.lpn.state), state2str(state)); #endif bt_mesh.lpn.state = state; @@ -210,7 +210,7 @@ static int send_friend_req(void) static inline void group_zero(atomic_t *target) { -#if CONFIG_BLUETOOTH_MESH_LPN_GROUPS > 32 +#if CONFIG_BT_MESH_LPN_GROUPS > 32 int i; for (i = 0; i < ARRAY_SIZE(bt_mesh.lpn.added); i++) { @@ -223,7 +223,7 @@ static inline void group_zero(atomic_t *target) static inline void group_set(atomic_t *target, atomic_t *source) { -#if CONFIG_BLUETOOTH_MESH_LPN_GROUPS > 32 +#if CONFIG_BT_MESH_LPN_GROUPS > 32 int i; for (i = 0; i < ARRAY_SIZE(bt_mesh.lpn.added); i++) { @@ -236,7 +236,7 @@ static inline void group_set(atomic_t *target, atomic_t *source) static inline void group_clear(atomic_t *target, atomic_t *source) { -#if CONFIG_BLUETOOTH_MESH_LPN_GROUPS > 32 +#if CONFIG_BT_MESH_LPN_GROUPS > 32 int i; for (i = 0; i < ARRAY_SIZE(bt_mesh.lpn.added); i++) { @@ -526,7 +526,7 @@ static void lpn_group_del(u16_t group) static inline int group_popcount(atomic_t *target) { -#if CONFIG_BLUETOOTH_MESH_LPN_GROUPS > 32 +#if CONFIG_BT_MESH_LPN_GROUPS > 32 int i, count = 0; for (i = 0; i < ARRAY_SIZE(bt_mesh.lpn.added); i++) { @@ -609,7 +609,7 @@ static void lpn_timeout(struct k_work *work) { struct bt_mesh_lpn *lpn = &bt_mesh.lpn; -#if defined(CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER) +#if defined(CONFIG_BT_MESH_DEBUG_LOW_POWER) BT_DBG("state: %s", state2str(lpn->state)); #endif diff --git a/subsys/bluetooth/host/mesh/lpn.h b/subsys/bluetooth/host/mesh/lpn.h index dd5a957b8f3..63e926934de 100644 --- a/subsys/bluetooth/host/mesh/lpn.h +++ b/subsys/bluetooth/host/mesh/lpn.h @@ -17,7 +17,7 @@ int bt_mesh_lpn_friend_sub_cfm(struct bt_mesh_net_rx *rx, static inline bool bt_mesh_lpn_established(void) { -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) return (bt_mesh.lpn.state >= BT_MESH_LPN_ESTABLISHED); #else return false; @@ -26,7 +26,7 @@ static inline bool bt_mesh_lpn_established(void) static inline bool bt_mesh_lpn_waiting_update(void) { -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) return (bt_mesh.lpn.state == BT_MESH_LPN_WAIT_UPDATE); #else return false; diff --git a/subsys/bluetooth/host/mesh/main.c b/subsys/bluetooth/host/mesh/main.c index e4c78bf606e..bc0368290ca 100644 --- a/subsys/bluetooth/host/mesh/main.c +++ b/subsys/bluetooth/host/mesh/main.c @@ -15,7 +15,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG) #include "common/log.h" #include "test.h" @@ -41,13 +41,13 @@ int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx, BT_INFO("Primary Element: 0x%04x", addr); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_GATT)) { + if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) { bt_mesh_proxy_prov_disable(); } err = bt_mesh_net_create(net_idx, flags, net_key, iv_index); if (err) { - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_GATT)) { + if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) { bt_mesh_proxy_prov_enable(); } @@ -68,22 +68,22 @@ int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx, bt_mesh_beacon_disable(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY) && + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY) && bt_mesh_gatt_proxy_get() != BT_MESH_GATT_PROXY_NOT_SUPPORTED) { bt_mesh_proxy_gatt_enable(); bt_mesh_adv_update(); } /* If PB-ADV is disabled then scanning will have been disabled */ - if (!IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_ADV)) { + if (!IS_ENABLED(CONFIG_BT_MESH_PB_ADV)) { bt_mesh_scan_enable(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_init(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_FRIEND)) { + if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) { bt_mesh_friend_init(); } @@ -107,15 +107,15 @@ void bt_mesh_reset(void) k_delayed_work_cancel(&bt_mesh.ivu_complete); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) { bt_mesh_lpn_disable(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) { bt_mesh_proxy_gatt_disable(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_GATT)) { + if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) { bt_mesh_proxy_prov_enable(); } @@ -126,7 +126,7 @@ void bt_mesh_reset(void) provisioned = false; enable_beacon: - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_ADV)) { + if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV)) { /* Make sure we're scanning for provisioning inviations */ bt_mesh_scan_enable(); /* Enable unprovisioned beacon sending */ @@ -157,7 +157,7 @@ int bt_mesh_init(const struct bt_mesh_prov *prov, return err; } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PROV)) { + if (IS_ENABLED(CONFIG_BT_MESH_PROV)) { bt_mesh_prov_init(prov); } @@ -166,18 +166,18 @@ int bt_mesh_init(const struct bt_mesh_prov *prov, bt_mesh_beacon_init(); bt_mesh_adv_init(); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_PROXY)) { bt_mesh_proxy_init(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_ADV)) { + if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV)) { /* Make sure we're scanning for provisioning inviations */ bt_mesh_scan_enable(); /* Enable unprovisioned beacon sending */ bt_mesh_beacon_enable(); } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_GATT)) { + if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) { bt_mesh_proxy_prov_enable(); } diff --git a/subsys/bluetooth/host/mesh/net.c b/subsys/bluetooth/host/mesh/net.c index 703242cc0bd..05e9fce4b37 100644 --- a/subsys/bluetooth/host/mesh/net.c +++ b/subsys/bluetooth/host/mesh/net.c @@ -19,7 +19,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_NET) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_NET) #include "common/log.h" #include "crypto.h" @@ -37,13 +37,13 @@ /* Seq limit after IV Update is triggered */ #define IV_UPDATE_SEQ_LIMIT 8000000 -#if defined(CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST) +#if defined(CONFIG_BT_MESH_IV_UPDATE_TEST) /* Small test timeout for IV Update Procedure testing */ #define IV_UPDATE_TIMEOUT K_SECONDS(120) #else /* Maximum time to stay in IV Update mode (96 < time < 144) */ #define IV_UPDATE_TIMEOUT K_HOURS(120) -#endif /* CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST */ +#endif /* CONFIG_BT_MESH_IV_UPDATE_TEST */ #define IVI(pdu) ((pdu)[0] >> 7) #define NID(pdu) ((pdu)[0] & 0x7f) @@ -51,10 +51,10 @@ #define TTL(pdu) ((pdu)[1] & 0x7f) /* Determine how many friendship credentials we need */ -#if defined(CONFIG_BLUETOOTH_MESH_FRIEND) -#define FRIEND_CRED_COUNT CONFIG_BLUETOOTH_MESH_FRIEND_LPN_COUNT -#elif defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) -#define FRIEND_CRED_COUNT CONFIG_BLUETOOTH_MESH_SUBNET_COUNT +#if defined(CONFIG_BT_MESH_FRIEND) +#define FRIEND_CRED_COUNT CONFIG_BT_MESH_FRIEND_LPN_COUNT +#elif defined(CONFIG_BT_MESH_LOW_POWER) +#define FRIEND_CRED_COUNT CONFIG_BT_MESH_SUBNET_COUNT #else #define FRIEND_CRED_COUNT 0 #endif @@ -63,18 +63,18 @@ static struct bt_mesh_friend_cred friend_cred[FRIEND_CRED_COUNT]; #endif -static u64_t msg_cache[CONFIG_BLUETOOTH_MESH_MSG_CACHE_SIZE]; +static u64_t msg_cache[CONFIG_BT_MESH_MSG_CACHE_SIZE]; static u16_t msg_cache_next; /* Singleton network context (the implementation only supports one) */ struct bt_mesh_net bt_mesh = { .sub = { - [0 ... (CONFIG_BLUETOOTH_MESH_SUBNET_COUNT - 1)] = { + [0 ... (CONFIG_BT_MESH_SUBNET_COUNT - 1)] = { .net_idx = BT_MESH_KEY_UNUSED, } }, .app_keys = { - [0 ... (CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT - 1)] = { + [0 ... (CONFIG_BT_MESH_APP_KEY_COUNT - 1)] = { .net_idx = BT_MESH_KEY_UNUSED, } }, @@ -190,7 +190,7 @@ int bt_mesh_net_keys_create(struct bt_mesh_subnet_keys *keys, BT_DBG("NetID %s", bt_hex(keys->net_id, 8)); -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) err = bt_mesh_identity_key(key, keys->identity); if (err) { BT_ERR("Unable to generate IdentityKey"); @@ -211,8 +211,8 @@ int bt_mesh_net_keys_create(struct bt_mesh_subnet_keys *keys, return 0; } -#if (defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) || \ - defined(CONFIG_BLUETOOTH_MESH_FRIEND)) +#if (defined(CONFIG_BT_MESH_LOW_POWER) || \ + defined(CONFIG_BT_MESH_FRIEND)) int bt_mesh_friend_cred_set(struct bt_mesh_friend_cred *cred, u8_t idx, const u8_t net_key[16]) { @@ -220,7 +220,7 @@ int bt_mesh_friend_cred_set(struct bt_mesh_friend_cred *cred, u8_t idx, int err; u8_t p[9]; -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) if (cred->addr == bt_mesh.lpn.frnd) { lpn_addr = bt_mesh_primary_addr(); frnd_addr = cred->addr; @@ -449,7 +449,7 @@ int bt_mesh_net_create(u16_t idx, u8_t flags, const u8_t key[16], bt_mesh.valid = 1; sub->net_idx = idx; - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) { sub->node_id = BT_MESH_NODE_IDENTITY_RUNNING; } else { sub->node_id = BT_MESH_NODE_IDENTITY_NOT_SUPPORTED; @@ -503,8 +503,8 @@ bool bt_mesh_kr_update(struct bt_mesh_subnet *sub, u8_t new_kr, bool new_key) BT_DBG("KR Phase 0x%02x -> Normal", sub->kr_phase); memcpy(&sub->keys[0], &sub->keys[1], sizeof(sub->keys[0])); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER) || - IS_ENABLED(CONFIG_BLUETOOTH_MESH_FRIEND)) { + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) || + IS_ENABLED(CONFIG_BT_MESH_FRIEND)) { bt_mesh_friend_cred_refresh(sub->net_idx); } sub->kr_phase = BT_MESH_KR_NORMAL; @@ -575,7 +575,7 @@ void bt_mesh_iv_update(u32_t iv_index, bool iv_update) } } - if (!IS_ENABLED(CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST)) { + if (!IS_ENABLED(CONFIG_BT_MESH_IV_UPDATE_TEST)) { s64_t delta = k_uptime_get() - bt_mesh.last_update; if (delta < K_HOURS(96)) { @@ -677,7 +677,7 @@ int bt_mesh_net_resend(struct bt_mesh_subnet *sub, struct net_buf *buf, return 0; } -#if defined(CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE) +#if defined(CONFIG_BT_MESH_LOCAL_INTERFACE) static void bt_mesh_net_local(struct k_work *work) { struct net_buf *buf; @@ -773,7 +773,7 @@ int bt_mesh_net_send(struct bt_mesh_net_tx *tx, struct net_buf *buf, BT_DBG("Payload len %u: %s", buf->len, bt_hex(buf->data, buf->len)); BT_DBG("Seq 0x%06x", bt_mesh.seq); -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) /* Communication between LPN & Friend should always be using * the Friendship Credentials. Any other destination should * use the Master Credentials. @@ -793,7 +793,7 @@ int bt_mesh_net_send(struct bt_mesh_net_tx *tx, struct net_buf *buf, } /* Deliver to GATT Proxy Clients if necessary */ - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) { if (bt_mesh_proxy_relay(&buf->b, tx->ctx->addr) && BT_MESH_ADDR_IS_UNICAST(tx->ctx->addr)) { err = 0; @@ -801,7 +801,7 @@ int bt_mesh_net_send(struct bt_mesh_net_tx *tx, struct net_buf *buf, } } -#if defined(CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE) +#if defined(CONFIG_BT_MESH_LOCAL_INTERFACE) /* Deliver to local network interface if necessary */ if (bt_mesh_fixed_group_match(tx->ctx->addr) || bt_mesh_elem_find(tx->ctx->addr)) { @@ -927,7 +927,7 @@ static int net_decrypt(struct bt_mesh_subnet *sub, u8_t idx, const u8_t *data, BT_DBG("src 0x%04x", rx->ctx.addr); - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PROXY) && + if (IS_ENABLED(CONFIG_BT_MESH_PROXY) && rx->net_if == BT_MESH_NET_IF_PROXY_CFG) { return bt_mesh_net_decrypt(enc, buf, BT_MESH_NET_IVI_RX(rx), true); @@ -975,9 +975,9 @@ static int net_find_and_decrypt(const u8_t *data, size_t data_len, return false; } -#if (defined(CONFIG_BLUETOOTH_MESH_RELAY) || \ - defined(CONFIG_BLUETOOTH_MESH_FRIEND) || \ - defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) +#if (defined(CONFIG_BT_MESH_RELAY) || \ + defined(CONFIG_BT_MESH_FRIEND) || \ + defined(CONFIG_BT_MESH_GATT_PROXY)) static void bt_mesh_net_relay(struct net_buf_simple *sbuf, struct bt_mesh_net_rx *rx) { @@ -1059,14 +1059,14 @@ static void bt_mesh_net_relay(struct net_buf_simple *sbuf, goto done; } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_FRIEND)) { + if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) { if (bt_mesh_friend_enqueue(buf, rx->dst) && BT_MESH_ADDR_IS_UNICAST(rx->dst)) { goto done; } } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) { + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) { if (bt_mesh_proxy_relay(&buf->b, rx->dst) && BT_MESH_ADDR_IS_UNICAST(rx->dst)) { goto done; @@ -1168,7 +1168,7 @@ void bt_mesh_net_recv(struct net_buf_simple *data, s8_t rssi, return; } - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_GATT_PROXY) && + if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY) && net_if == BT_MESH_NET_IF_PROXY) { bt_mesh_proxy_addr_add(data, rx.ctx.addr); } @@ -1181,12 +1181,12 @@ void bt_mesh_net_recv(struct net_buf_simple *data, s8_t rssi, } } -#if (defined(CONFIG_BLUETOOTH_MESH_RELAY) || \ - defined(CONFIG_BLUETOOTH_MESH_FRIEND) || \ - defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY)) +#if (defined(CONFIG_BT_MESH_RELAY) || \ + defined(CONFIG_BT_MESH_FRIEND) || \ + defined(CONFIG_BT_MESH_GATT_PROXY)) net_buf_simple_restore(buf, &state); bt_mesh_net_relay(buf, &rx); -#endif /* CONFIG_BLUETOOTH_MESH_RELAY || FRIEND || GATT_PROXY */ +#endif /* CONFIG_BT_MESH_RELAY || FRIEND || GATT_PROXY */ } static void ivu_complete(struct k_work *work) @@ -1201,7 +1201,7 @@ void bt_mesh_net_init(void) { k_delayed_work_init(&bt_mesh.ivu_complete, ivu_complete); -#if defined(CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE) +#if defined(CONFIG_BT_MESH_LOCAL_INTERFACE) k_work_init(&bt_mesh.local_work, bt_mesh_net_local); #endif } diff --git a/subsys/bluetooth/host/mesh/net.h b/subsys/bluetooth/host/mesh/net.h index 68b9ce09aa8..6638fac3394 100644 --- a/subsys/bluetooth/host/mesh/net.h +++ b/subsys/bluetooth/host/mesh/net.h @@ -65,7 +65,7 @@ struct bt_mesh_subnet { u8_t nid; /* NID */ u8_t enc[16]; /* EncKey */ u8_t net_id[8]; /* Network ID */ -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) u8_t identity[16]; /* IdentityKey */ #endif u8_t privacy[16]; /* PrivacyKey */ @@ -97,8 +97,8 @@ struct bt_mesh_friend { struct k_fifo queue; }; -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) -#define LPN_GROUPS CONFIG_BLUETOOTH_MESH_LOW_POWER +#if defined(CONFIG_BT_MESH_LOW_POWER) +#define LPN_GROUPS CONFIG_BT_MESH_LOW_POWER #else #define LPN_GROUPS 0 #endif @@ -166,17 +166,17 @@ struct bt_mesh_net { s64_t last_update; /* Time since last IV Update change */ -#if defined(CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE) +#if defined(CONFIG_BT_MESH_LOCAL_INTERFACE) /* Local network interface */ struct k_work local_work; struct k_fifo local_queue; #endif -#if defined(CONFIG_BLUETOOTH_MESH_FRIEND) +#if defined(CONFIG_BT_MESH_FRIEND) struct bt_mesh_friend frnd; /* Friend state */ #endif -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) struct bt_mesh_lpn lpn; /* Low Power Node state */ #endif @@ -185,11 +185,11 @@ struct bt_mesh_net { u8_t dev_key[16]; - struct bt_mesh_app_key app_keys[CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT]; + struct bt_mesh_app_key app_keys[CONFIG_BT_MESH_APP_KEY_COUNT]; - struct bt_mesh_subnet sub[CONFIG_BLUETOOTH_MESH_SUBNET_COUNT]; + struct bt_mesh_subnet sub[CONFIG_BT_MESH_SUBNET_COUNT]; - struct bt_mesh_rpl rpl[CONFIG_BLUETOOTH_MESH_CRPL]; + struct bt_mesh_rpl rpl[CONFIG_BT_MESH_CRPL]; }; /* Network interface */ diff --git a/subsys/bluetooth/host/mesh/prov.c b/subsys/bluetooth/host/mesh/prov.c index 05d862b4e49..8ffb03961d2 100644 --- a/subsys/bluetooth/host/mesh/prov.c +++ b/subsys/bluetooth/host/mesh/prov.c @@ -18,7 +18,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_PROV) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV) #include "common/log.h" #include "../ecc.h" @@ -115,7 +115,7 @@ enum { struct prov_link { ATOMIC_DEFINE(flags, NUM_FLAGS); -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) struct bt_conn *conn; /* GATT connection */ #endif u8_t dhkey[32]; /* Calculated DHKey */ @@ -134,7 +134,7 @@ struct prov_link { u8_t conf_inputs[145]; /* ConfirmationInputs */ u8_t prov_salt[16]; /* Provisioning Salt */ -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) u32_t id; /* Link ID */ struct { @@ -169,7 +169,7 @@ struct prov_rx { #define BUF_TIMEOUT K_MSEC(400) #define TRANSACTION_TIMEOUT K_SECONDS(30) -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) #define PROV_BUF_HEADROOM 5 #else #define PROV_BUF_HEADROOM 0 @@ -184,7 +184,7 @@ static const struct bt_mesh_prov *prov; static void close_link(u8_t err, u8_t reason); -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) static void buf_sent(struct net_buf *buf, int err) { if (!link.tx.buf[0]) { @@ -234,7 +234,7 @@ static void reset_link(void) atomic_set_bit(link.flags, LOCAL_PUB_KEY); } -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) link.rx.buf = bt_mesh_proxy_get_buf(); #else net_buf_simple_init(rx_buf, 0); @@ -422,9 +422,9 @@ static int prov_send_adv(struct net_buf_simple *msg) return 0; } -#endif /* CONFIG_BLUETOOTH_MESH_PB_ADV */ +#endif /* CONFIG_BT_MESH_PB_ADV */ -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) static int prov_send_gatt(struct net_buf_simple *msg) { if (!link.conn) { @@ -433,16 +433,16 @@ static int prov_send_gatt(struct net_buf_simple *msg) return bt_mesh_proxy_send(link.conn, BT_MESH_PROXY_PROV, msg); } -#endif /* CONFIG_BLUETOOTH_MESH_PB_GATT */ +#endif /* CONFIG_BT_MESH_PB_GATT */ static inline int prov_send(struct net_buf_simple *buf) { -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) if (link.conn) { return prov_send_gatt(buf); } #endif -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) return prov_send_adv(buf); #else return 0; @@ -838,7 +838,7 @@ static void prov_pub_key(const u8_t *data) if (!atomic_test_bit(link.flags, LOCAL_PUB_KEY)) { /* Clear retransmit timer */ -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) prov_clear_tx(); #endif atomic_set_bit(link.flags, REMOTE_PUB_KEY); @@ -877,7 +877,7 @@ static void prov_confirm(const u8_t *data) memcpy(link.conf, data, 16); if (!atomic_test_bit(link.flags, HAVE_DHKEY)) { -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) prov_clear_tx(); #endif atomic_set_bit(link.flags, SEND_CONFIRM); @@ -1026,14 +1026,14 @@ static const struct { static void close_link(u8_t err, u8_t reason) { -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) if (link.conn) { bt_mesh_pb_gatt_close(link.conn); return; } #endif -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) if (err) { struct net_buf_simple *buf = PROV_BUF(2); @@ -1054,7 +1054,7 @@ static void close_link(u8_t err, u8_t reason) } } -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) static void prov_retransmit(struct k_work *work) { int i; @@ -1354,9 +1354,9 @@ void bt_mesh_pb_adv_recv(struct net_buf_simple *buf) gen_prov_recv(&rx, buf); } -#endif /* CONFIG_BLUETOOTH_MESH_PB_ADV */ +#endif /* CONFIG_BT_MESH_PB_ADV */ -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) int bt_mesh_pb_gatt_recv(struct bt_conn *conn, struct net_buf_simple *buf) { u8_t type; @@ -1435,7 +1435,7 @@ int bt_mesh_pb_gatt_close(struct bt_conn *conn) return 0; } -#endif /* CONFIG_BLUETOOTH_MESH_PB_GATT */ +#endif /* CONFIG_BT_MESH_PB_GATT */ const u8_t *bt_mesh_prov_get_uuid(void) { @@ -1459,20 +1459,20 @@ void bt_mesh_prov_init(const struct bt_mesh_prov *prov_info) prov = prov_info; -#if defined(CONFIG_BLUETOOTH_MESH_PB_ADV) +#if defined(CONFIG_BT_MESH_PB_ADV) k_delayed_work_init(&link.tx.retransmit, prov_retransmit); link.rx.prev_id = XACT_NVAL; -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) link.rx.buf = bt_mesh_proxy_get_buf(); #else net_buf_simple_init(rx_buf, 0); link.rx.buf = rx_buf; #endif -#endif /* CONFIG_BLUETOOTH_MESH_PB_ADV */ +#endif /* CONFIG_BT_MESH_PB_ADV */ - if (IS_ENABLED(CONFIG_BLUETOOTH_DEBUG)) { + if (IS_ENABLED(CONFIG_BT_DEBUG)) { struct bt_uuid_128 uuid = { .uuid.type = BT_UUID_TYPE_128 }; memcpy(uuid.val, prov->uuid, 16); BT_INFO("Device UUID: %s", bt_uuid_str(&uuid.uuid)); diff --git a/subsys/bluetooth/host/mesh/proxy.c b/subsys/bluetooth/host/mesh/proxy.c index 1c0d10bf150..3fb1de9b637 100644 --- a/subsys/bluetooth/host/mesh/proxy.c +++ b/subsys/bluetooth/host/mesh/proxy.c @@ -15,7 +15,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_PROXY) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROXY) #include "common/log.h" #include "mesh.h" @@ -60,13 +60,13 @@ static const struct bt_le_adv_param *proxy_adv_param = &fast_adv_param; static bool proxy_adv_enabled; -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) static void proxy_send_beacons(struct k_work *work); #endif static struct bt_mesh_proxy_client { struct bt_conn *conn; - u16_t filter[CONFIG_BLUETOOTH_MESH_PROXY_FILTER_SIZE]; + u16_t filter[CONFIG_BT_MESH_PROXY_FILTER_SIZE]; enum __packed { NONE, WHITELIST, @@ -74,14 +74,14 @@ static struct bt_mesh_proxy_client { PROV, } filter_type; u8_t msg_type; -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) struct k_work send_beacons; #endif struct net_buf_simple buf; u8_t buf_data[CLIENT_BUF_SIZE]; -} clients[CONFIG_BLUETOOTH_MAX_CONN] = { - [0 ... (CONFIG_BLUETOOTH_MAX_CONN - 1)] = { -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +} clients[CONFIG_BT_MAX_CONN] = { + [0 ... (CONFIG_BT_MAX_CONN - 1)] = { +#if defined(CONFIG_BT_MESH_GATT_PROXY) .send_beacons = _K_WORK_INITIALIZER(proxy_send_beacons), #endif .buf.size = CLIENT_BUF_SIZE, @@ -108,7 +108,7 @@ static struct bt_mesh_proxy_client *find_client(struct bt_conn *conn) return NULL; } -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) static int proxy_segment_and_send(struct bt_conn *conn, u8_t type, struct net_buf_simple *msg); @@ -353,7 +353,7 @@ int bt_mesh_proxy_identity_enable(void) static void proxy_complete_pdu(struct bt_mesh_proxy_client *client) { switch (client->msg_type) { -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) case BT_MESH_PROXY_NET_PDU: BT_DBG("Mesh Network PDU"); bt_mesh_net_recv(&client->buf, 0, BT_MESH_NET_IF_PROXY); @@ -367,7 +367,7 @@ static void proxy_complete_pdu(struct bt_mesh_proxy_client *client) proxy_cfg(client); break; #endif -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) case BT_MESH_PROXY_PROV: BT_DBG("Mesh Provisioning PDU"); bt_mesh_pb_gatt_recv(client->conn, &client->buf); @@ -474,7 +474,7 @@ static void proxy_connected(struct bt_conn *conn, u8_t err) /* Since we use ADV_OPT_ONE_TIME */ proxy_adv_enabled = false; -#if CONFIG_BLUETOOTH_MAX_CONN > 1 +#if CONFIG_BT_MAX_CONN > 1 /* Try to re-enable advertising in case it's possible */ bt_mesh_adv_update(); #endif @@ -507,7 +507,7 @@ static void proxy_disconnected(struct bt_conn *conn, u8_t reason) struct bt_mesh_proxy_client *client = &clients[i]; if (client->conn == conn) { - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_PB_GATT) && + if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && client->filter_type == PROV) { bt_mesh_pb_gatt_close(conn); } @@ -530,7 +530,7 @@ struct net_buf_simple *bt_mesh_proxy_get_buf(void) return buf; } -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) static ssize_t prov_ccc_write(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, u16_t len, @@ -624,11 +624,11 @@ int bt_mesh_proxy_prov_disable(void) return 0; } -#endif /* CONFIG_BLUETOOTH_MESH_PB_GATT */ +#endif /* CONFIG_BT_MESH_PB_GATT */ -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) static ssize_t proxy_ccc_write(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, u16_t len, @@ -796,19 +796,19 @@ bool bt_mesh_proxy_relay(struct net_buf_simple *buf, u16_t dst) return relayed; } -#endif /* CONFIG_BLUETOOTH_MESH_GATT_PROXY */ +#endif /* CONFIG_BT_MESH_GATT_PROXY */ static int proxy_send(struct bt_conn *conn, const void *data, u16_t len) { BT_DBG("%u bytes: %s", len, bt_hex(data, len)); -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) if (gatt_svc == MESH_GATT_PROXY) { return bt_gatt_notify(conn, &proxy_attrs[4], data, len); } #endif -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) if (gatt_svc == MESH_GATT_PROV) { return bt_gatt_notify(conn, &prov_attrs[4], data, len); } @@ -869,7 +869,7 @@ int bt_mesh_proxy_send(struct bt_conn *conn, u8_t type, return proxy_segment_and_send(conn, type, msg); } -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) static u8_t prov_svc_data[20] = { 0x27, 0x18, }; static const struct bt_data prov_ad[] = { @@ -879,12 +879,12 @@ static const struct bt_data prov_ad[] = { }; static const struct bt_data prov_sd[] = { - BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BLUETOOTH_DEVICE_NAME, - (sizeof(CONFIG_BLUETOOTH_DEVICE_NAME) - 1)), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, + (sizeof(CONFIG_BT_DEVICE_NAME) - 1)), }; #endif /* PB_GATT */ -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) static s64_t node_id_start; #define ID_TYPE_NET 0x00 @@ -1014,7 +1014,7 @@ s32_t bt_mesh_proxy_adv_start(void) { BT_DBG(""); -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) if (!bt_mesh_is_provisioned()) { if (bt_le_adv_start(proxy_adv_param, prov_ad, ARRAY_SIZE(prov_ad), @@ -1028,7 +1028,7 @@ s32_t bt_mesh_proxy_adv_start(void) } #endif /* PB_GATT */ -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) if (bt_mesh_is_provisioned()) { return gatt_proxy_advertise(); } @@ -1064,7 +1064,7 @@ int bt_mesh_proxy_init(void) { bt_conn_cb_register(&conn_callbacks); -#if defined(CONFIG_BLUETOOTH_MESH_PB_GATT) +#if defined(CONFIG_BT_MESH_PB_GATT) memcpy(prov_svc_data + 2, bt_mesh_prov_get_uuid(), 16); #endif diff --git a/subsys/bluetooth/host/mesh/test.h b/subsys/bluetooth/host/mesh/test.h index d515136026a..8375ef9abae 100644 --- a/subsys/bluetooth/host/mesh/test.h +++ b/subsys/bluetooth/host/mesh/test.h @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_BLUETOOTH_MESH_SELF_TEST) +#if defined(CONFIG_BT_MESH_SELF_TEST) int bt_mesh_test(void); #else static inline int bt_mesh_test(void) diff --git a/subsys/bluetooth/host/mesh/transport.c b/subsys/bluetooth/host/mesh/transport.c index e12f7a26acd..555664ce9dc 100644 --- a/subsys/bluetooth/host/mesh/transport.c +++ b/subsys/bluetooth/host/mesh/transport.c @@ -18,7 +18,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_MESH_DEBUG_TRANS) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_TRANS) #include "common/log.h" #include "crypto.h" @@ -69,7 +69,7 @@ static struct seg_tx { bt_mesh_cb_t cb; void *cb_data; struct k_delayed_work retransmit; /* Retransmit timer */ -} seg_tx[CONFIG_BLUETOOTH_MESH_TX_SEG_MSG_COUNT]; +} seg_tx[CONFIG_BT_MESH_TX_SEG_MSG_COUNT]; static struct seg_rx { struct bt_mesh_subnet *sub; @@ -85,10 +85,10 @@ static struct seg_rx { u32_t last; struct k_delayed_work ack; struct net_buf_simple buf; - u8_t buf_data[CONFIG_BLUETOOTH_MESH_RX_SDU_MAX]; -} seg_rx[CONFIG_BLUETOOTH_MESH_RX_SEG_MSG_COUNT] = { - [0 ... (CONFIG_BLUETOOTH_MESH_RX_SEG_MSG_COUNT - 1)] = { - .buf.size = CONFIG_BLUETOOTH_MESH_RX_SDU_MAX, + u8_t buf_data[CONFIG_BT_MESH_RX_SDU_MAX]; +} seg_rx[CONFIG_BT_MESH_RX_SEG_MSG_COUNT] = { + [0 ... (CONFIG_BT_MESH_RX_SEG_MSG_COUNT - 1)] = { + .buf.size = CONFIG_BT_MESH_RX_SDU_MAX, }, }; @@ -450,7 +450,7 @@ static int sdu_recv(struct bt_mesh_net_rx *rx, u8_t hdr, u8_t mic_size, u8_t aszmic, struct net_buf_simple *buf) { struct net_buf_simple *sdu = - NET_BUF_SIMPLE(CONFIG_BLUETOOTH_MESH_RX_SDU_MAX - 4); + NET_BUF_SIMPLE(CONFIG_BT_MESH_RX_SDU_MAX - 4); u8_t *ad; u16_t i; int err; @@ -644,7 +644,7 @@ static int ctl_recv(struct bt_mesh_net_rx *rx, u8_t hdr, return trans_heartbeat(rx, buf); } -#if defined(CONFIG_BLUETOOTH_MESH_FRIEND) +#if defined(CONFIG_BT_MESH_FRIEND) switch (ctl_op) { case TRANS_CTL_OP_FRIEND_POLL: return bt_mesh_friend_poll(rx, buf); @@ -653,7 +653,7 @@ static int ctl_recv(struct bt_mesh_net_rx *rx, u8_t hdr, } #endif -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) if (ctl_op == TRANS_CTL_OP_FRIEND_OFFER) { return bt_mesh_lpn_friend_offer(rx, buf); } @@ -675,7 +675,7 @@ static int ctl_recv(struct bt_mesh_net_rx *rx, u8_t hdr, return bt_mesh_lpn_friend_sub_cfm(rx, buf); } } -#endif /* CONFIG_BLUETOOTH_MESH_LOW_POWER */ +#endif /* CONFIG_BT_MESH_LOW_POWER */ BT_WARN("Unhandled TransOpCode 0x%02x", ctl_op); @@ -825,7 +825,7 @@ static inline u8_t seg_len(bool ctl) static inline bool sdu_len_is_ok(bool ctl, u8_t seg_n) { - return ((seg_n * seg_len(ctl) + 1) <= CONFIG_BLUETOOTH_MESH_RX_SDU_MAX); + return ((seg_n * seg_len(ctl) + 1) <= CONFIG_BT_MESH_RX_SDU_MAX); } static struct seg_rx *seg_rx_find(struct bt_mesh_net_rx *net_rx, @@ -1013,7 +1013,7 @@ found_rx: BT_DBG("Target len %u * %u + %u = %u", seg_n, seg_len(rx->ctl), buf->len, rx->buf.len); - if (rx->buf.len > CONFIG_BLUETOOTH_MESH_RX_SDU_MAX) { + if (rx->buf.len > CONFIG_BT_MESH_RX_SDU_MAX) { BT_ERR("Too large SDU len"); send_ack(net_rx->sub, net_rx->dst, net_rx->ctx.addr, net_rx->ctx.send_ttl, seq_zero, 0); @@ -1080,7 +1080,7 @@ int bt_mesh_trans_recv(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx) * requested the Friend to send them. The messages must also * be encrypted using the Friend Credentials. */ - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER) && + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) && bt_mesh_lpn_established() && (!bt_mesh_lpn_waiting_update() || !rx->ctx.friend_cred)) { BT_WARN("Ignoring unexpected message in Low Power mode"); @@ -1100,7 +1100,7 @@ int bt_mesh_trans_recv(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx) * we still need to go through the actual sending to the bearer and * wait for ReceiveDelay before transitioning to WAIT_UPDATE state. */ - if (IS_ENABLED(CONFIG_BLUETOOTH_MESH_LOW_POWER) && + if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) && bt_mesh_lpn_established() && bt_mesh_lpn_waiting_update()) { bt_mesh_lpn_msg_received(rx); } diff --git a/subsys/bluetooth/host/mesh/transport.h b/subsys/bluetooth/host/mesh/transport.h index 756af6bd38e..ad84678ba42 100644 --- a/subsys/bluetooth/host/mesh/transport.h +++ b/subsys/bluetooth/host/mesh/transport.h @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define BT_MESH_TX_SEG_COUNT (CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT - 3) +#define BT_MESH_TX_SEG_COUNT (CONFIG_BT_MESH_ADV_BUF_COUNT - 3) #define BT_MESH_TX_SDU_MAX (BT_MESH_TX_SEG_COUNT * 12) #define TRANS_CTL_OP_ACK 0x00 diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c index 63b2173b429..be523c4e024 100644 --- a/subsys/bluetooth/host/monitor.c +++ b/subsys/bluetooth/host/monitor.c @@ -43,7 +43,7 @@ static struct { atomic_t evt; atomic_t acl_tx; atomic_t acl_rx; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) atomic_t sco_tx; atomic_t sco_rx; #endif @@ -91,7 +91,7 @@ static inline void encode_hdr(struct bt_monitor_hdr *hdr, u16_t opcode, encode_drops(hdr, BT_MONITOR_EVENT_DROPS, &drops.evt); encode_drops(hdr, BT_MONITOR_ACL_TX_DROPS, &drops.acl_tx); encode_drops(hdr, BT_MONITOR_ACL_RX_DROPS, &drops.acl_rx); -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) encode_drops(hdr, BT_MONITOR_SCO_TX_DROPS, &drops.sco_tx); encode_drops(hdr, BT_MONITOR_SCO_RX_DROPS, &drops.sco_rx); #endif @@ -121,7 +121,7 @@ static void drop_add(u16_t opcode) case BT_MONITOR_ACL_RX_PKT: atomic_inc(&drops.acl_rx); break; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) case BT_MONITOR_SCO_TX_PKT: atomic_inc(&drops.sco_tx); break; @@ -237,15 +237,15 @@ extern void __printk_hook_install(int (*fn)(int)); extern void __stdout_hook_install(int (*fn)(int)); #endif /* !CONFIG_UART_CONSOLE */ -#if defined(CONFIG_HAS_DTS) && !defined(CONFIG_BLUETOOTH_MONITOR_ON_DEV_NAME) -#define CONFIG_BLUETOOTH_MONITOR_ON_DEV_NAME CONFIG_UART_CONSOLE_ON_DEV_NAME +#if defined(CONFIG_HAS_DTS) && !defined(CONFIG_BT_MONITOR_ON_DEV_NAME) +#define CONFIG_BT_MONITOR_ON_DEV_NAME CONFIG_UART_CONSOLE_ON_DEV_NAME #endif static int bt_monitor_init(struct device *d) { ARG_UNUSED(d); - monitor_dev = device_get_binding(CONFIG_BLUETOOTH_MONITOR_ON_DEV_NAME); + monitor_dev = device_get_binding(CONFIG_BT_MONITOR_ON_DEV_NAME); #if defined(CONFIG_UART_INTERRUPT_DRIVEN) uart_irq_rx_disable(monitor_dev); diff --git a/subsys/bluetooth/host/monitor.h b/subsys/bluetooth/host/monitor.h index b884994b781..1e80c1c6ee9 100644 --- a/subsys/bluetooth/host/monitor.h +++ b/subsys/bluetooth/host/monitor.h @@ -8,7 +8,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_BLUETOOTH_DEBUG_MONITOR) +#if defined(CONFIG_BT_DEBUG_MONITOR) #define BT_MONITOR_NEW_INDEX 0 #define BT_MONITOR_DEL_INDEX 1 @@ -41,7 +41,7 @@ #define BT_MONITOR_BASE_HDR_LEN 6 -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) #define BT_MONITOR_EXT_HDR_MAX 19 #else #define BT_MONITOR_EXT_HDR_MAX 15 @@ -94,7 +94,7 @@ void bt_monitor_send(u16_t opcode, const void *data, size_t len); void bt_monitor_new_index(u8_t type, u8_t bus, bt_addr_t *addr, const char *name); -#else /* !CONFIG_BLUETOOTH_DEBUG_MONITOR */ +#else /* !CONFIG_BT_DEBUG_MONITOR */ #define bt_monitor_send(opcode, data, len) #define bt_monitor_new_index(type, bus, addr, name) diff --git a/subsys/bluetooth/host/rfcomm.c b/subsys/bluetooth/host/rfcomm.c index 6416604c8de..2da7ed48aa7 100644 --- a/subsys/bluetooth/host/rfcomm.c +++ b/subsys/bluetooth/host/rfcomm.c @@ -20,7 +20,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_RFCOMM) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RFCOMM) /* FIXME: #include "common/log.h" */ #include @@ -35,10 +35,10 @@ #define RFCOMM_MIN_MTU BT_RFCOMM_SIG_MIN_MTU #define RFCOMM_DEFAULT_MTU 127 -#if defined(CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL) -#define RFCOMM_MAX_CREDITS (CONFIG_BLUETOOTH_ACL_RX_COUNT - 1) +#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) +#define RFCOMM_MAX_CREDITS (CONFIG_BT_ACL_RX_COUNT - 1) #else -#define RFCOMM_MAX_CREDITS (CONFIG_BLUETOOTH_RX_BUF_COUNT - 1) +#define RFCOMM_MAX_CREDITS (CONFIG_BT_RX_BUF_COUNT - 1) #endif #define RFCOMM_CREDITS_THRESHOLD (RFCOMM_MAX_CREDITS / 2) @@ -55,12 +55,12 @@ static struct bt_rfcomm_server *servers; /* Pool for dummy buffers to wake up the tx threads */ -NET_BUF_POOL_DEFINE(dummy_pool, CONFIG_BLUETOOTH_MAX_CONN, 0, 0, NULL); +NET_BUF_POOL_DEFINE(dummy_pool, CONFIG_BT_MAX_CONN, 0, 0, NULL); #define RFCOMM_SESSION(_ch) CONTAINER_OF(_ch, \ struct bt_rfcomm_session, br_chan.chan) -static struct bt_rfcomm_session bt_rfcomm_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_rfcomm_session bt_rfcomm_pool[CONFIG_BT_MAX_CONN]; /* reversed, 8-bit, poly=0x07 */ static const u8_t rfcomm_crc_table[256] = { @@ -1575,7 +1575,7 @@ static struct bt_rfcomm_session *rfcomm_session_new(bt_rfcomm_role_t role) BT_DBG("session %p initialized", session); session->br_chan.chan.ops = &ops; - session->br_chan.rx.mtu = CONFIG_BLUETOOTH_RFCOMM_L2CAP_MTU; + session->br_chan.rx.mtu = CONFIG_BT_RFCOMM_L2CAP_MTU; session->state = BT_RFCOMM_STATE_INIT; session->role = role; session->cfc = BT_RFCOMM_CFC_UNKNOWN; diff --git a/subsys/bluetooth/host/rfcomm_internal.h b/subsys/bluetooth/host/rfcomm_internal.h index 524d57ef9b4..3b176b77fcc 100644 --- a/subsys/bluetooth/host/rfcomm_internal.h +++ b/subsys/bluetooth/host/rfcomm_internal.h @@ -132,7 +132,7 @@ struct bt_rfcomm_rpn { * Length in rfcomm header can be two bytes depending on user data length. * One byte in the tail should be reserved for FCS. */ -#define BT_RFCOMM_BUF_SIZE(mtu) (CONFIG_BLUETOOTH_HCI_RESERVE + \ +#define BT_RFCOMM_BUF_SIZE(mtu) (CONFIG_BT_HCI_RESERVE + \ BT_HCI_ACL_HDR_SIZE + BT_L2CAP_HDR_SIZE + \ sizeof(struct bt_rfcomm_hdr) + 1 + (mtu) + \ BT_RFCOMM_FCS_SIZE) diff --git a/subsys/bluetooth/host/sdp.c b/subsys/bluetooth/host/sdp.c index 13c81d88549..af6e95b4f60 100644 --- a/subsys/bluetooth/host/sdp.c +++ b/subsys/bluetooth/host/sdp.c @@ -15,7 +15,7 @@ #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_SDP) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SDP) #include "common/log.h" #include "hci_core.h" @@ -64,10 +64,10 @@ struct bt_sdp { static struct bt_sdp_record *db; static u8_t num_services; -static struct bt_sdp bt_sdp_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_sdp bt_sdp_pool[CONFIG_BT_MAX_CONN]; /* Pool for outgoing SDP packets */ -NET_BUF_POOL_DEFINE(sdp_pool, CONFIG_BLUETOOTH_MAX_CONN, +NET_BUF_POOL_DEFINE(sdp_pool, CONFIG_BT_MAX_CONN, BT_L2CAP_BUF_SIZE(SDP_MTU), BT_BUF_USER_DATA_MIN, NULL); #define SDP_CLIENT_CHAN(_ch) CONTAINER_OF(_ch, struct bt_sdp_client, chan.chan) @@ -88,7 +88,7 @@ struct bt_sdp_client { struct net_buf *rec_buf; }; -static struct bt_sdp_client bt_sdp_client_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_sdp_client bt_sdp_client_pool[CONFIG_BT_MAX_CONN]; enum { BT_SDP_ITER_STOP, diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c index 16714b56e57..c748c6ae8dc 100644 --- a/subsys/bluetooth/host/smp.c +++ b/subsys/bluetooth/host/smp.c @@ -30,7 +30,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_SMP) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SMP) #include "common/log.h" #include "hci_core.h" @@ -42,19 +42,19 @@ #define SMP_TIMEOUT K_SECONDS(30) -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) #define SIGN_DIST BT_SMP_DIST_SIGN #else #define SIGN_DIST 0 #endif -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) #define ID_DIST BT_SMP_DIST_ID_KEY #else #define ID_DIST 0 #endif -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) #define LINK_DIST BT_SMP_DIST_LINK_KEY #else #define LINK_DIST 0 @@ -72,7 +72,7 @@ #define BT_SMP_AUTH_MASK 0x07 -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) #define BT_SMP_AUTH_MASK_SC 0x2f #define BT_SMP_AUTH_DEFAULT (BT_SMP_AUTH_BONDING | BT_SMP_AUTH_SC |\ BT_SMP_AUTH_CT2) @@ -173,7 +173,7 @@ struct bt_smp { struct k_delayed_work work; }; -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) /* based on table 2.8 Core Spec 2.3.5.1 Vol. 3 Part H */ static const u8_t gen_method_legacy[5 /* remote */][5 /* local */] = { { JUST_WORKS, JUST_WORKS, PASSKEY_INPUT, JUST_WORKS, PASSKEY_INPUT }, @@ -184,7 +184,7 @@ static const u8_t gen_method_legacy[5 /* remote */][5 /* local */] = { { PASSKEY_DISPLAY, PASSKEY_DISPLAY, PASSKEY_INPUT, JUST_WORKS, PASSKEY_ROLE }, }; -#endif /* CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* CONFIG_BT_SMP_SC_ONLY */ /* based on table 2.8 Core Spec 2.3.5.1 Vol. 3 Part H */ static const u8_t gen_method_sc[5 /* remote */][5 /* local */] = { @@ -207,7 +207,7 @@ static const u8_t sc_debug_public_key[64] = { 0x49, 0x9c, 0x80, 0xdc }; -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) /* SMP over BR/EDR channel specific context */ struct bt_smp_br { /* The channel this context is associated with */ @@ -232,10 +232,10 @@ struct bt_smp_br { struct k_delayed_work work; }; -static struct bt_smp_br bt_smp_br_pool[CONFIG_BLUETOOTH_MAX_CONN]; -#endif /* CONFIG_BLUETOOTH_BREDR */ +static struct bt_smp_br bt_smp_br_pool[CONFIG_BT_MAX_CONN]; +#endif /* CONFIG_BT_BREDR */ -static struct bt_smp bt_smp_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_smp bt_smp_pool[CONFIG_BT_MAX_CONN]; static bool sc_supported; static bool sc_local_pkey_valid; static u8_t sc_public_key[64]; @@ -516,11 +516,11 @@ static u8_t get_encryption_key_size(struct bt_smp *smp) return min(req->max_key_size, rsp->max_key_size); } -#if defined(CONFIG_BLUETOOTH_PRIVACY) || defined(CONFIG_BLUETOOTH_SIGNING) || \ - !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_SIGNING) || \ + !defined(CONFIG_BT_SMP_SC_ONLY) /* For TX callbacks */ static void smp_pairing_complete(struct bt_smp *smp, u8_t status); -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static void smp_pairing_br_complete(struct bt_smp_br *smp, u8_t status); #endif @@ -545,7 +545,7 @@ static void smp_check_complete(struct bt_conn *conn, u8_t dist_complete) return; } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (conn->type == BT_CONN_TYPE_BR) { struct bt_smp_br *smp; @@ -564,21 +564,21 @@ static void smp_check_complete(struct bt_conn *conn, u8_t dist_complete) } #endif -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) static void id_sent(struct bt_conn *conn) { smp_check_complete(conn, BT_SMP_DIST_ID_KEY); } -#endif /* CONFIG_BLUETOOTH_PRIVACY */ +#endif /* CONFIG_BT_PRIVACY */ -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) static void sign_info_sent(struct bt_conn *conn) { smp_check_complete(conn, BT_SMP_DIST_SIGN); } -#endif /* CONFIG_BLUETOOTH_SIGNING */ +#endif /* CONFIG_BT_SIGNING */ -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static int smp_h6(const u8_t w[16], const u8_t key_id[4], u8_t res[16]) { u8_t ws[16]; @@ -789,8 +789,7 @@ static void smp_br_derive_ltk(struct bt_smp_br *smp) return; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_FORCE_BREDR) && - conn->encrypt != 0x02) { + if (IS_ENABLED(CONFIG_BT_SMP_FORCE_BREDR) && conn->encrypt != 0x02) { BT_WARN("Using P192 Link Key for P256 LTK derivation"); } @@ -865,7 +864,7 @@ static void smp_br_distribute_keys(struct bt_smp_br *smp) return; } -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) if (smp->local_dist & BT_SMP_DIST_ID_KEY) { struct bt_smp_ident_info *id_info; struct bt_smp_ident_addr_info *id_addr_info; @@ -897,9 +896,9 @@ static void smp_br_distribute_keys(struct bt_smp_br *smp) smp_br_send(smp, buf, id_sent); } -#endif /* CONFIG_BLUETOOTH_PRIVACY */ +#endif /* CONFIG_BT_PRIVACY */ -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) if (smp->local_dist & BT_SMP_DIST_SIGN) { struct bt_smp_signing_info *info; struct net_buf *buf; @@ -925,7 +924,7 @@ static void smp_br_distribute_keys(struct bt_smp_br *smp) smp_br_send(smp, buf, sign_info_sent); } -#endif /* CONFIG_BLUETOOTH_SIGNING */ +#endif /* CONFIG_BT_SIGNING */ } static bool smp_br_pairing_allowed(struct bt_smp_br *smp) @@ -934,7 +933,7 @@ static bool smp_br_pairing_allowed(struct bt_smp_br *smp) return true; } - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_FORCE_BREDR) && + if (IS_ENABLED(CONFIG_BT_SMP_FORCE_BREDR) && smp->chan.chan.conn->encrypt == 0x01) { BT_WARN("Allowing BR/EDR SMP with P-192 key"); return true; @@ -1166,7 +1165,7 @@ static u8_t smp_br_ident_addr_info(struct bt_smp_br *smp, return 0; } -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) static u8_t smp_br_signing_info(struct bt_smp_br *smp, struct net_buf *buf) { struct bt_smp_signing_info *req = (void *)buf->data; @@ -1209,7 +1208,7 @@ static u8_t smp_br_signing_info(struct bt_smp_br *smp, struct net_buf *buf) { return BT_SMP_ERR_CMD_NOTSUPP; } -#endif /* CONFIG_BLUETOOTH_SIGNING */ +#endif /* CONFIG_BT_SIGNING */ static const struct { u8_t (*func)(struct bt_smp_br *smp, struct net_buf *buf); @@ -1430,14 +1429,14 @@ int bt_smp_br_send_pairing_req(struct bt_conn *conn) static bool br_sc_supported(void) { - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_FORCE_BREDR)) { + if (IS_ENABLED(CONFIG_BT_SMP_FORCE_BREDR)) { BT_WARN("Enabling BR/EDR SMP without BR/EDR SC support"); return true; } return BT_FEAT_SC(bt_dev.features); } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ static void smp_reset(struct bt_smp *smp) { @@ -1455,13 +1454,13 @@ static void smp_reset(struct bt_smp *smp) conn->required_sec_level = conn->sec_level; } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_HCI_ROLE_MASTER) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_SECURITY_REQUEST); return; } - if (IS_ENABLED(CONFIG_BLUETOOTH_PERIPHERAL)) { + if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_REQ); } } @@ -1470,7 +1469,7 @@ static void smp_pairing_complete(struct bt_smp *smp, u8_t status) { BT_DBG("status 0x%x", status); -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) if (!status) { /* * Don't derive if Debug Keys are used. @@ -1481,7 +1480,7 @@ static void smp_pairing_complete(struct bt_smp *smp, u8_t status) sc_derive_link_key(smp); } } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ smp_reset(smp); } @@ -1555,7 +1554,7 @@ static u8_t smp_send_pairing_random(struct bt_smp *smp) return 0; } -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) static void xor_128(const u8_t p[16], const u8_t q[16], u8_t r[16]) { size_t len = 16; @@ -1606,7 +1605,7 @@ static int smp_c1(const u8_t k[16], const u8_t r[16], return bt_encrypt_le(k, enc_data, enc_data); } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ static u8_t smp_send_pairing_confirm(struct bt_smp *smp) { @@ -1655,7 +1654,7 @@ static u8_t smp_send_pairing_confirm(struct bt_smp *smp) return 0; } -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) static void ident_sent(struct bt_conn *conn) { smp_check_complete(conn, BT_SMP_DIST_ENC_KEY); @@ -1719,7 +1718,7 @@ static void legacy_distribute_keys(struct bt_smp *smp) } } } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ static void bt_smp_distribute_keys(struct bt_smp *smp) { @@ -1731,14 +1730,14 @@ static void bt_smp_distribute_keys(struct bt_smp *smp) return; } -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) /* Distribute legacy pairing specific keys */ if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { legacy_distribute_keys(smp); } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) if (smp->local_dist & BT_SMP_DIST_ID_KEY) { struct bt_smp_ident_info *id_info; struct bt_smp_ident_addr_info *id_addr_info; @@ -1768,9 +1767,9 @@ static void bt_smp_distribute_keys(struct bt_smp *smp) smp_send(smp, buf, id_sent); } -#endif /* CONFIG_BLUETOOTH_PRIVACY */ +#endif /* CONFIG_BT_PRIVACY */ -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) if (smp->local_dist & BT_SMP_DIST_SIGN) { struct bt_smp_signing_info *info; struct net_buf *buf; @@ -1794,10 +1793,10 @@ static void bt_smp_distribute_keys(struct bt_smp *smp) smp_send(smp, buf, sign_info_sent); } -#endif /* CONFIG_BLUETOOTH_SIGNING */ +#endif /* CONFIG_BT_SIGNING */ } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) static u8_t send_pairing_rsp(struct bt_smp *smp) { struct bt_conn *conn = smp->chan.chan.conn; @@ -1816,9 +1815,9 @@ static u8_t send_pairing_rsp(struct bt_smp *smp) return 0; } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) static int smp_s1(const u8_t k[16], const u8_t r1[16], const u8_t r2[16], u8_t out[16]) { @@ -1941,7 +1940,7 @@ static u8_t legacy_send_pairing_confirm(struct bt_smp *smp) return 0; } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) static u8_t legacy_pairing_req(struct bt_smp *smp, u8_t remote_io) { u8_t ret; @@ -1968,7 +1967,7 @@ static u8_t legacy_pairing_req(struct bt_smp *smp, u8_t remote_io) return legacy_request_tk(smp); } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ static u8_t legacy_pairing_random(struct bt_smp *smp) { @@ -1991,7 +1990,7 @@ static u8_t legacy_pairing_random(struct bt_smp *smp) return BT_SMP_ERR_CONFIRM_FAILED; } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_HCI_ROLE_MASTER) { /* No need to store master STK */ err = smp_s1(smp->tk, smp->rrnd, smp->prnd, tmp); @@ -2011,7 +2010,7 @@ static u8_t legacy_pairing_random(struct bt_smp *smp) return 0; } - if (IS_ENABLED(CONFIG_BLUETOOTH_PERIPHERAL)) { + if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) { err = smp_s1(smp->tk, smp->prnd, smp->rrnd, tmp); if (err) { return BT_SMP_ERR_UNSPECIFIED; @@ -2032,13 +2031,13 @@ static u8_t legacy_pairing_confirm(struct bt_smp *smp) { BT_DBG(""); - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_CONFIRM); return legacy_send_pairing_confirm(smp); } - if (IS_ENABLED(CONFIG_BLUETOOTH_PERIPHERAL)) { + if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) { if (!atomic_test_bit(smp->flags, SMP_FLAG_USER)) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_RANDOM); @@ -2066,13 +2065,13 @@ static void legacy_passkey_entry(struct bt_smp *smp, unsigned int passkey) return; } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_CONFIRM); return; } - if (IS_ENABLED(CONFIG_BLUETOOTH_PERIPHERAL)) { + if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_RANDOM); } } @@ -2130,7 +2129,7 @@ static u8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf) atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_SIGNING_INFO); } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_HCI_ROLE_MASTER && !smp->remote_dist) { bt_smp_distribute_keys(smp); } @@ -2143,7 +2142,7 @@ static u8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf) return 0; } -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) static u8_t legacy_pairing_rsp(struct bt_smp *smp, u8_t remote_io) { u8_t ret; @@ -2175,7 +2174,7 @@ static u8_t legacy_pairing_rsp(struct bt_smp *smp, u8_t remote_io) return 0; } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ #else static u8_t smp_encrypt_info(struct bt_smp *smp, struct net_buf *buf) { @@ -2186,7 +2185,7 @@ static u8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf) { return BT_SMP_ERR_CMD_NOTSUPP; } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ static int smp_init(struct bt_smp *smp) { @@ -2252,7 +2251,7 @@ static struct bt_smp *smp_chan_get(struct bt_conn *conn) return CONTAINER_OF(chan, struct bt_smp, chan); } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) int bt_smp_send_security_req(struct bt_conn *conn) { struct bt_smp *smp; @@ -2354,22 +2353,22 @@ static u8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf) atomic_set_bit(smp->flags, SMP_FLAG_PAIRING); if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { -#if defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if defined(CONFIG_BT_SMP_SC_ONLY) return BT_SMP_ERR_AUTH_REQUIREMENTS; #else return legacy_pairing_req(smp, req->io_capability); -#endif /* CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* CONFIG_BT_SMP_SC_ONLY */ } smp->method = get_pair_method(smp, req->io_capability); - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_SC_ONLY) && + if (IS_ENABLED(CONFIG_BT_SMP_SC_ONLY) && smp->method == JUST_WORKS) { return BT_SMP_ERR_AUTH_REQUIREMENTS; } if (smp->method == JUST_WORKS) { - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_SC_ONLY)) { + if (IS_ENABLED(CONFIG_BT_SMP_SC_ONLY)) { return BT_SMP_ERR_AUTH_REQUIREMENTS; } @@ -2390,7 +2389,7 @@ static u8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf) { return BT_SMP_ERR_CMD_NOTSUPP; } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ static u8_t sc_send_public_key(struct bt_smp *smp) { @@ -2410,14 +2409,14 @@ static u8_t sc_send_public_key(struct bt_smp *smp) smp_send(smp, req_buf, NULL); - if (IS_ENABLED(CONFIG_BLUETOOTH_USE_DEBUG_KEYS)) { + if (IS_ENABLED(CONFIG_BT_USE_DEBUG_KEYS)) { atomic_set_bit(smp->flags, SMP_FLAG_SC_DEBUG_KEY); } return 0; } -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) int bt_smp_send_pairing_req(struct bt_conn *conn) { struct bt_smp *smp; @@ -2514,11 +2513,11 @@ static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf) } if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { -#if defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if defined(CONFIG_BT_SMP_SC_ONLY) return BT_SMP_ERR_AUTH_REQUIREMENTS; #else return legacy_pairing_rsp(smp, rsp->io_capability); -#endif /* CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* CONFIG_BT_SMP_SC_ONLY */ } smp->method = get_pair_method(smp, rsp->io_capability); @@ -2527,7 +2526,7 @@ static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf) smp->remote_dist &= RECV_KEYS_SC; if (smp->method == JUST_WORKS) { - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_SC_ONLY)) { + if (IS_ENABLED(CONFIG_BT_SMP_SC_ONLY)) { return BT_SMP_ERR_AUTH_REQUIREMENTS; } @@ -2553,7 +2552,7 @@ static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf) { return BT_SMP_ERR_CMD_NOTSUPP; } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ static u8_t smp_pairing_confirm(struct bt_smp *smp, struct net_buf *buf) { @@ -2563,21 +2562,21 @@ static u8_t smp_pairing_confirm(struct bt_smp *smp, struct net_buf *buf) memcpy(smp->pcnf, req->val, sizeof(smp->pcnf)); - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_RANDOM); return smp_send_pairing_random(smp); } - if (!IS_ENABLED(CONFIG_BLUETOOTH_PERIPHERAL)) { + if (!IS_ENABLED(CONFIG_BT_PERIPHERAL)) { return 0; } -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { return legacy_pairing_confirm(smp); } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ switch (smp->method) { case PASSKEY_DISPLAY: @@ -2619,7 +2618,7 @@ static u8_t sc_smp_send_dhkey_check(struct bt_smp *smp, const u8_t *e) return 0; } -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) static u8_t compute_and_send_master_dhcheck(struct bt_smp *smp) { u8_t e[16], r[16]; @@ -2656,9 +2655,9 @@ static u8_t compute_and_send_master_dhcheck(struct bt_smp *smp) sc_smp_send_dhkey_check(smp, e); return 0; } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) static u8_t compute_and_check_and_send_slave_dhcheck(struct bt_smp *smp) { u8_t re[16], e[16], r[16]; @@ -2710,7 +2709,7 @@ static u8_t compute_and_check_and_send_slave_dhcheck(struct bt_smp *smp) atomic_set_bit(smp->flags, SMP_FLAG_ENC_PENDING); return 0; } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ static void bt_smp_dhkey_ready(const u8_t *dhkey) { @@ -2753,7 +2752,7 @@ static void bt_smp_dhkey_ready(const u8_t *dhkey) if (atomic_test_bit(smp->flags, SMP_FLAG_DHKEY_SEND)) { u8_t err; -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) if (smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { err = compute_and_send_master_dhcheck(smp); if (err) { @@ -2762,14 +2761,14 @@ static void bt_smp_dhkey_ready(const u8_t *dhkey) return; } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) err = compute_and_check_and_send_slave_dhcheck(smp); if (err) { smp_error(smp, err); } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ } } @@ -2822,13 +2821,13 @@ static u8_t smp_pairing_random(struct bt_smp *smp, struct net_buf *buf) memcpy(smp->rrnd, req->val, sizeof(smp->rrnd)); -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { return legacy_pairing_random(smp); } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) if (smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { err = sc_smp_check_confirm(smp); if (err) { @@ -2876,9 +2875,9 @@ static u8_t smp_pairing_random(struct bt_smp *smp, struct net_buf *buf) return compute_and_send_master_dhcheck(smp); } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) switch (smp->method) { case PASSKEY_CONFIRM: if (smp_g2(smp->pkey, sc_public_key, smp->rrnd, smp->prnd, @@ -2921,7 +2920,7 @@ static u8_t smp_pairing_random(struct bt_smp *smp, struct net_buf *buf) atomic_set_bit(&smp->allowed_cmds, BT_SMP_DHKEY_CHECK); atomic_set_bit(smp->flags, SMP_FLAG_DHCHECK_WAIT); smp_send_pairing_random(smp); -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ return 0; } @@ -3049,7 +3048,7 @@ static u8_t smp_ident_addr_info(struct bt_smp *smp, struct net_buf *buf) atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_SIGNING_INFO); } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_HCI_ROLE_MASTER && !smp->remote_dist) { bt_smp_distribute_keys(smp); } @@ -3062,7 +3061,7 @@ static u8_t smp_ident_addr_info(struct bt_smp *smp, struct net_buf *buf) return 0; } -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) static u8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf) { struct bt_conn *conn = smp->chan.chan.conn; @@ -3086,7 +3085,7 @@ static u8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf) smp->remote_dist &= ~BT_SMP_DIST_SIGN; - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_HCI_ROLE_MASTER && !smp->remote_dist) { bt_smp_distribute_keys(smp); } @@ -3103,9 +3102,9 @@ static u8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf) { return BT_SMP_ERR_CMD_NOTSUPP; } -#endif /* CONFIG_BLUETOOTH_SIGNING */ +#endif /* CONFIG_BT_SIGNING */ -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) static u8_t smp_security_request(struct bt_smp *smp, struct net_buf *buf) { struct bt_conn *conn = smp->chan.chan.conn; @@ -3177,7 +3176,7 @@ static u8_t smp_security_request(struct bt_smp *smp, struct net_buf *buf) { return BT_SMP_ERR_CMD_NOTSUPP; } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ static u8_t generate_dhkey(struct bt_smp *smp) { @@ -3204,7 +3203,7 @@ static u8_t display_passkey(struct bt_smp *smp) return 0; } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) static u8_t smp_public_key_slave(struct bt_smp *smp) { u8_t err; @@ -3243,7 +3242,7 @@ static u8_t smp_public_key_slave(struct bt_smp *smp) return generate_dhkey(smp); } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ static u8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf) { @@ -3261,7 +3260,7 @@ static u8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf) atomic_set_bit(smp->flags, SMP_FLAG_SC_DEBUG_KEY); } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { switch (smp->method) { case PASSKEY_CONFIRM: @@ -3294,7 +3293,7 @@ static u8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf) return generate_dhkey(smp); } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) if (!sc_local_pkey_valid) { atomic_set_bit(smp->flags, SMP_FLAG_PKEY_SEND); return 0; @@ -3304,7 +3303,7 @@ static u8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf) if (err) { return err; } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ return 0; } @@ -3315,7 +3314,7 @@ static u8_t smp_dhkey_check(struct bt_smp *smp, struct net_buf *buf) BT_DBG(""); - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { u8_t e[16], r[16], enc_size; @@ -3355,7 +3354,7 @@ static u8_t smp_dhkey_check(struct bt_smp *smp, struct net_buf *buf) return 0; } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) if (smp->chan.chan.conn->role == BT_HCI_ROLE_SLAVE) { atomic_clear_bit(smp->flags, SMP_FLAG_DHCHECK_WAIT); memcpy(smp->e, req->e, sizeof(smp->e)); @@ -3374,7 +3373,7 @@ static u8_t smp_dhkey_check(struct bt_smp *smp, struct net_buf *buf) return compute_and_check_and_send_slave_dhcheck(smp); } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ return 0; } @@ -3472,7 +3471,7 @@ static void bt_smp_pkey_ready(const u8_t *pkey) continue; } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { err = sc_send_public_key(smp); if (err) { @@ -3484,12 +3483,12 @@ static void bt_smp_pkey_ready(const u8_t *pkey) continue; } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) err = smp_public_key_slave(smp); if (err) { smp_error(smp, err); } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ } } @@ -3590,7 +3589,7 @@ static void bt_smp_encrypt_change(struct bt_l2cap_chan *chan, atomic_set_bit(smp->flags, SMP_FLAG_KEYS_DISTR); /* Slave distributes it's keys first */ - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_HCI_ROLE_MASTER && smp->remote_dist) { return; } @@ -3603,7 +3602,7 @@ static void bt_smp_encrypt_change(struct bt_l2cap_chan *chan, } } -#if defined(CONFIG_BLUETOOTH_SIGNING) +#if defined(CONFIG_BT_SIGNING) /* Sign message using msg as a buffer, len is a size of the message, * msg buffer contains message itself, 32 bit count and signature, * so total buffer size is len + 4 + 8 octets. @@ -3729,9 +3728,9 @@ int bt_smp_sign(struct bt_conn *conn, struct net_buf *buf) { return -ENOTSUP; } -#endif /* CONFIG_BLUETOOTH_SIGNING */ +#endif /* CONFIG_BT_SIGNING */ -#if defined(CONFIG_BLUETOOTH_SMP_SELFTEST) +#if defined(CONFIG_BT_SMP_SELFTEST) /* Test vectors are taken from RFC 4493 * https://tools.ietf.org/html/rfc4493 * Same mentioned in the Bluetooth Spec. @@ -4026,7 +4025,7 @@ static int smp_g2_test(void) return 0; } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static int smp_h6_test(void) { u8_t w[16] = { 0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34, @@ -4071,7 +4070,7 @@ static int smp_h7_test(void) return 0; } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ static int smp_self_test(void) { @@ -4113,7 +4112,7 @@ static int smp_self_test(void) return err; } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) err = smp_h6_test(); if (err) { BT_ERR("SMP h6 self test failed"); @@ -4125,7 +4124,7 @@ static int smp_self_test(void) BT_ERR("SMP h7 self test failed"); return err; } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ return 0; } @@ -4149,16 +4148,16 @@ int bt_smp_auth_passkey_entry(struct bt_conn *conn, unsigned int passkey) return -EINVAL; } -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { legacy_passkey_entry(smp, passkey); return 0; } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ smp->passkey = sys_cpu_to_le32(passkey); - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { if (smp_send_pairing_confirm(smp)) { smp_error(smp, BT_SMP_ERR_PASSKEY_ENTRY_FAILED); @@ -4168,7 +4167,7 @@ int bt_smp_auth_passkey_entry(struct bt_conn *conn, unsigned int passkey) return 0; } - if (IS_ENABLED(CONFIG_BLUETOOTH_PERIPHERAL) && + if (IS_ENABLED(CONFIG_BT_PERIPHERAL) && atomic_test_bit(smp->flags, SMP_FLAG_CFM_DELAYED)) { if (smp_send_pairing_confirm(smp)) { smp_error(smp, BT_SMP_ERR_PASSKEY_ENTRY_FAILED); @@ -4208,7 +4207,7 @@ int bt_smp_auth_passkey_confirm(struct bt_conn *conn) if (atomic_test_bit(smp->flags, SMP_FLAG_DHKEY_SEND)) { u8_t err; -#if defined(CONFIG_BLUETOOTH_CENTRAL) +#if defined(CONFIG_BT_CENTRAL) if (smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) { err = compute_and_send_master_dhcheck(smp); if (err) { @@ -4216,14 +4215,14 @@ int bt_smp_auth_passkey_confirm(struct bt_conn *conn) } return 0; } -#endif /* CONFIG_BLUETOOTH_CENTRAL */ +#endif /* CONFIG_BT_CENTRAL */ -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) err = compute_and_check_and_send_slave_dhcheck(smp); if (err) { smp_error(smp, err); } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ } return 0; @@ -4255,7 +4254,7 @@ int bt_smp_auth_cancel(struct bt_conn *conn) } } -#if !defined(CONFIG_BLUETOOTH_SMP_SC_ONLY) +#if !defined(CONFIG_BT_SMP_SC_ONLY) int bt_smp_auth_pairing_confirm(struct bt_conn *conn) { struct bt_smp *smp; @@ -4269,7 +4268,7 @@ int bt_smp_auth_pairing_confirm(struct bt_conn *conn) return -EINVAL; } - if (IS_ENABLED(CONFIG_BLUETOOTH_CENTRAL) && + if (IS_ENABLED(CONFIG_BT_CENTRAL) && conn->role == BT_CONN_ROLE_MASTER) { if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { atomic_set_bit(&smp->allowed_cmds, @@ -4286,7 +4285,7 @@ int bt_smp_auth_pairing_confirm(struct bt_conn *conn) return sc_send_public_key(smp); } -#if defined(CONFIG_BLUETOOTH_PERIPHERAL) +#if defined(CONFIG_BT_PERIPHERAL) if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) { atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_CONFIRM); @@ -4297,7 +4296,7 @@ int bt_smp_auth_pairing_confirm(struct bt_conn *conn) if (send_pairing_rsp(smp)) { return -EIO; } -#endif /* CONFIG_BLUETOOTH_PERIPHERAL */ +#endif /* CONFIG_BT_PERIPHERAL */ return 0; } @@ -4307,7 +4306,7 @@ int bt_smp_auth_pairing_confirm(struct bt_conn *conn) /* confirm_pairing will never be called in LE SC only mode */ return -EINVAL; } -#endif /* !CONFIG_BLUETOOTH_SMP_SC_ONLY */ +#endif /* !CONFIG_BT_SMP_SC_ONLY */ void bt_smp_update_keys(struct bt_conn *conn) { @@ -4458,13 +4457,13 @@ int bt_smp_init(void) }; sc_supported = le_sc_supported(); - if (IS_ENABLED(CONFIG_BLUETOOTH_SMP_SC_ONLY) && !sc_supported) { + if (IS_ENABLED(CONFIG_BT_SMP_SC_ONLY) && !sc_supported) { BT_ERR("SC Only Mode selected but LE SC not supported"); return -ENOENT; } bt_l2cap_le_fixed_chan_register(&chan); -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) /* Register BR/EDR channel only if BR/EDR SC is supported */ if (br_sc_supported()) { static struct bt_l2cap_fixed_chan br_chan = { diff --git a/subsys/bluetooth/host/smp_null.c b/subsys/bluetooth/host/smp_null.c index 63e03819962..8d683a45fad 100644 --- a/subsys/bluetooth/host/smp_null.c +++ b/subsys/bluetooth/host/smp_null.c @@ -18,7 +18,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_CORE) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #include "common/log.h" #include "hci_core.h" @@ -26,7 +26,7 @@ #include "l2cap_internal.h" #include "smp.h" -static struct bt_l2cap_le_chan bt_smp_pool[CONFIG_BLUETOOTH_MAX_CONN]; +static struct bt_l2cap_le_chan bt_smp_pool[CONFIG_BT_MAX_CONN]; int bt_smp_sign_verify(struct bt_conn *conn, struct net_buf *buf) { diff --git a/subsys/bluetooth/host/storage.c b/subsys/bluetooth/host/storage.c index e6da964668c..9031fc62681 100644 --- a/subsys/bluetooth/host/storage.c +++ b/subsys/bluetooth/host/storage.c @@ -15,7 +15,7 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BLUETOOTH_DEBUG_HCI_CORE) +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE) #include "common/log.h" #define STORAGE_ROOT "/bt" diff --git a/subsys/bluetooth/host/uuid.c b/subsys/bluetooth/host/uuid.c index f93403f6f78..5de22505de6 100644 --- a/subsys/bluetooth/host/uuid.c +++ b/subsys/bluetooth/host/uuid.c @@ -79,7 +79,7 @@ int bt_uuid_cmp(const struct bt_uuid *u1, const struct bt_uuid *u2) return -EINVAL; } -#if defined(CONFIG_BLUETOOTH_DEBUG) +#if defined(CONFIG_BT_DEBUG) void bt_uuid_to_str(const struct bt_uuid *uuid, char *str, size_t len) { u32_t tmp1, tmp5; @@ -117,4 +117,4 @@ const char *bt_uuid_str(const struct bt_uuid *uuid) return str; } -#endif /* CONFIG_BLUETOOTH_DEBUG */ +#endif /* CONFIG_BT_DEBUG */ diff --git a/subsys/bluetooth/shell/Kconfig b/subsys/bluetooth/shell/Kconfig index a9145a11098..0845856b7fc 100644 --- a/subsys/bluetooth/shell/Kconfig +++ b/subsys/bluetooth/shell/Kconfig @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 # -config BLUETOOTH_SHELL +config BT_SHELL bool "Enable Bluetooth shell" default n select CONSOLE_SHELL diff --git a/subsys/bluetooth/shell/Makefile b/subsys/bluetooth/shell/Makefile index fdb483c3011..612d1d6c5b6 100644 --- a/subsys/bluetooth/shell/Makefile +++ b/subsys/bluetooth/shell/Makefile @@ -1,5 +1,5 @@ obj-y += bt.o obj-y += gatt.o -obj-$(CONFIG_BLUETOOTH_CONTROLLER) += ll.o -obj-$(CONFIG_BLUETOOTH_CONTROLLER) += ticker.o +obj-$(CONFIG_BT_CONTROLLER) += ll.o +obj-$(CONFIG_BT_CONTROLLER) += ticker.o obj-$(CONFIG_SOC_FLASH_NRF5) += flash.o diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c index 5bf9e0de4a9..a0d9b248466 100644 --- a/subsys/bluetooth/shell/bt.c +++ b/subsys/bluetooth/shell/bt.c @@ -32,7 +32,7 @@ #include "gatt.h" #include "ll.h" -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define CREDITS 10 #define DATA_MTU (23 * CREDITS) @@ -45,21 +45,21 @@ static bt_addr_le_t id_addr; /* Connection context for BR/EDR legacy pairing in sec mode 3 */ static struct bt_conn *pairing_conn; -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) NET_BUF_POOL_DEFINE(data_tx_pool, 1, DATA_MTU, BT_BUF_USER_DATA_MIN, NULL); NET_BUF_POOL_DEFINE(data_rx_pool, 1, DATA_MTU, BT_BUF_USER_DATA_MIN, NULL); #endif -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) NET_BUF_POOL_DEFINE(data_bredr_pool, 1, DATA_BREDR_MTU, BT_BUF_USER_DATA_MIN, NULL); #define SDP_CLIENT_USER_BUF_LEN 512 -NET_BUF_POOL_DEFINE(sdp_client_pool, CONFIG_BLUETOOTH_MAX_CONN, +NET_BUF_POOL_DEFINE(sdp_client_pool, CONFIG_BT_MAX_CONN, SDP_CLIENT_USER_BUF_LEN, BT_BUF_USER_DATA_MIN, NULL); -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ -#if defined(CONFIG_BLUETOOTH_RFCOMM) +#if defined(CONFIG_BT_RFCOMM) static struct bt_sdp_attribute spp_attrs[] = { BT_SDP_NEW_SERVICE, @@ -125,7 +125,7 @@ static struct bt_sdp_attribute spp_attrs[] = { static struct bt_sdp_record spp_rec = BT_SDP_RECORD(spp_attrs); -#endif /* CONFIG_BLUETOOTH_RFCOMM */ +#endif /* CONFIG_BT_RFCOMM */ static const char *current_prompt(void) { @@ -202,7 +202,7 @@ static void conn_addr_str(struct bt_conn *conn, char *addr, size_t len) } switch (info.type) { -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) case BT_CONN_TYPE_BR: bt_addr_to_str(info.br.dst, addr, len); break; @@ -213,7 +213,7 @@ static void conn_addr_str(struct bt_conn *conn, char *addr, size_t len) } } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static u8_t sdp_hfp_ag_user(struct bt_conn *conn, struct bt_sdp_client_result *result) { @@ -393,7 +393,7 @@ static void le_param_updated(struct bt_conn *conn, u16_t interval, latency, timeout); } -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) static void identity_resolved(struct bt_conn *conn, const bt_addr_le_t *rpa, const bt_addr_le_t *identity) { @@ -407,7 +407,7 @@ static void identity_resolved(struct bt_conn *conn, const bt_addr_le_t *rpa, } #endif -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) static void security_changed(struct bt_conn *conn, bt_security_t level) { char addr[BT_ADDR_LE_STR_LEN]; @@ -422,10 +422,10 @@ static struct bt_conn_cb conn_callbacks = { .disconnected = disconnected, .le_param_req = le_param_req, .le_param_updated = le_param_updated, -#if defined(CONFIG_BLUETOOTH_SMP) +#if defined(CONFIG_BT_SMP) .identity_resolved = identity_resolved, #endif -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) .security_changed = security_changed, #endif }; @@ -819,7 +819,7 @@ static int cmd_conn_update(int argc, char *argv[]) return 0; } -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) static int cmd_security(int argc, char *argv[]) { int err, sec; @@ -944,7 +944,7 @@ static int cmd_oob(int argc, char *argv[]) return 0; } -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) static void auth_passkey_display(struct bt_conn *conn, unsigned int passkey) { char addr[BT_ADDR_LE_STR_LEN]; @@ -1002,7 +1002,7 @@ static void auth_pairing_confirm(struct bt_conn *conn) printk("Confirm pairing for %s\n", addr); } -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static void auth_pincode_entry(struct bt_conn *conn, bool highsec) { char addr[BT_ADDR_STR_LEN]; @@ -1038,7 +1038,7 @@ static struct bt_conn_auth_cb auth_cb_display = { .passkey_display = auth_passkey_display, .passkey_entry = NULL, .passkey_confirm = NULL, -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) .pincode_entry = auth_pincode_entry, #endif .cancel = auth_cancel, @@ -1049,7 +1049,7 @@ static struct bt_conn_auth_cb auth_cb_display_yes_no = { .passkey_display = auth_passkey_display, .passkey_entry = NULL, .passkey_confirm = auth_passkey_confirm, -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) .pincode_entry = auth_pincode_entry, #endif .cancel = auth_cancel, @@ -1060,7 +1060,7 @@ static struct bt_conn_auth_cb auth_cb_input = { .passkey_display = NULL, .passkey_entry = auth_passkey_entry, .passkey_confirm = NULL, -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) .pincode_entry = auth_pincode_entry, #endif .cancel = auth_cancel, @@ -1071,7 +1071,7 @@ static struct bt_conn_auth_cb auth_cb_all = { .passkey_display = auth_passkey_display, .passkey_entry = auth_passkey_entry, .passkey_confirm = auth_passkey_confirm, -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) .pincode_entry = auth_pincode_entry, #endif .cancel = auth_cancel, @@ -1170,9 +1170,9 @@ static int cmd_auth_passkey(int argc, char *argv[]) return 0; } -#endif /* CONFIG_BLUETOOTH_SMP) || CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_SMP) || CONFIG_BT_BREDR */ -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static int cmd_auth_pincode(int argc, char *argv[]) { struct bt_conn *conn; @@ -1344,7 +1344,7 @@ static int cmd_bredr_discovery(int argc, char *argv[]) return 0; } -#endif /* CONFIG_BLUETOOTH_BREDR */ +#endif /* CONFIG_BT_BREDR */ static int cmd_clear(int argc, char *argv[]) { @@ -1368,7 +1368,7 @@ static int cmd_clear(int argc, char *argv[]) } if (argc < 3) { -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) addr.type = BT_ADDR_LE_PUBLIC; err = str2bt_addr(argv[1], &addr.a); #else @@ -1394,7 +1394,7 @@ static int cmd_clear(int argc, char *argv[]) return 0; } -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) static void hexdump(const u8_t *data, size_t len) { int n = 0; @@ -1630,7 +1630,7 @@ static int cmd_l2cap_metrics(int argc, char *argv[]) #endif -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) static void l2cap_bredr_recv(struct bt_l2cap_chan *chan, struct net_buf *buf) { printk("Incoming data channel %p len %u\n", chan, buf->len); @@ -1707,7 +1707,7 @@ static int cmd_bredr_l2cap_register(int argc, char *argv[]) return 0; } -#if defined(CONFIG_BLUETOOTH_RFCOMM) +#if defined(CONFIG_BT_RFCOMM) static void rfcomm_bredr_recv(struct bt_rfcomm_dlc *dlci, struct net_buf *buf) { printk("Incoming data dlc %p len %u\n", dlci, buf->len); @@ -1842,7 +1842,7 @@ static int cmd_rfcomm_disconnect(int argc, char *argv[]) return 0; } -#endif /* CONFIG_BLUETOOTH_RFCOMM) */ +#endif /* CONFIG_BT_RFCOMM) */ static int cmd_bredr_discoverable(int argc, char *argv[]) { @@ -1979,7 +1979,7 @@ static const struct shell_cmd bt_commands[] = { { "conn-update", cmd_conn_update, " " }, { "oob", cmd_oob }, { "clear", cmd_clear }, -#if defined(CONFIG_BLUETOOTH_SMP) || defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) { "security", cmd_security, "" }, { "auth", cmd_auth, "" }, @@ -1987,11 +1987,11 @@ static const struct shell_cmd bt_commands[] = { { "auth-passkey", cmd_auth_passkey, "" }, { "auth-passkey-confirm", cmd_auth_passkey_confirm, HELP_NONE }, { "auth-pairing-confirm", cmd_auth_pairing_confirm, HELP_NONE }, -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) { "auth-pincode", cmd_auth_pincode, "" }, -#endif /* CONFIG_BLUETOOTH_BREDR */ -#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR) */ -#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) +#endif /* CONFIG_BT_BREDR */ +#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR) */ +#if defined(CONFIG_BT_GATT_CLIENT) { "gatt-exchange-mtu", cmd_gatt_exchange_mtu, HELP_NONE }, { "gatt-discover-primary", cmd_gatt_discover, " [start handle] [end handle]" }, @@ -2013,7 +2013,7 @@ static const struct shell_cmd bt_commands[] = { { "gatt-subscribe", cmd_gatt_subscribe, " [ind]" }, { "gatt-unsubscribe", cmd_gatt_unsubscribe, HELP_NONE }, -#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ +#endif /* CONFIG_BT_GATT_CLIENT */ { "gatt-show-db", cmd_gatt_show_db, HELP_NONE }, { "gatt-register-service", cmd_gatt_register_test_svc, "register pre-predefined test service" }, @@ -2021,14 +2021,14 @@ static const struct shell_cmd bt_commands[] = { "unregister pre-predefined test service" }, { "gatt-metrics", cmd_gatt_write_cmd_metrics, "register vendr char and measure rx [value on, off]" }, -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) { "l2cap-register", cmd_l2cap_register, " [sec_level]" }, { "l2cap-connect", cmd_l2cap_connect, "" }, { "l2cap-disconnect", cmd_l2cap_disconnect, HELP_NONE }, { "l2cap-send", cmd_l2cap_send, "" }, { "l2cap-metrics", cmd_l2cap_metrics, "" }, #endif -#if defined(CONFIG_BLUETOOTH_BREDR) +#if defined(CONFIG_BT_BREDR) { "br-iscan", cmd_bredr_discoverable, "" }, { "br-pscan", cmd_bredr_connectable, "value: on, off" }, { "br-connect", cmd_connect_bredr, "
" }, @@ -2037,17 +2037,17 @@ static const struct shell_cmd bt_commands[] = { { "br-l2cap-register", cmd_bredr_l2cap_register, "" }, { "br-oob", cmd_bredr_oob }, { "br-sdp-find", cmd_bredr_sdp_find_record, "" }, -#if defined(CONFIG_BLUETOOTH_RFCOMM) +#if defined(CONFIG_BT_RFCOMM) { "br-rfcomm-register", cmd_bredr_rfcomm_register }, { "br-rfcomm-connect", cmd_rfcomm_connect, "" }, { "br-rfcomm-send", cmd_rfcomm_send, ""}, { "br-rfcomm-disconnect", cmd_rfcomm_disconnect, HELP_NONE }, -#endif /* CONFIG_BLUETOOTH_RFCOMM */ +#endif /* CONFIG_BT_RFCOMM */ #endif -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_ADV_EXT) { "advx", cmd_advx, " [coded] [anon] [txp]" }, { "scanx", cmd_scanx, " [coded]" }, -#endif /* CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ { NULL, NULL, NULL } }; diff --git a/subsys/bluetooth/shell/gatt.c b/subsys/bluetooth/shell/gatt.c index a3243ceff09..4337184d837 100644 --- a/subsys/bluetooth/shell/gatt.c +++ b/subsys/bluetooth/shell/gatt.c @@ -27,7 +27,7 @@ #define CHAR_SIZE_MAX 512 -#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) +#if defined(CONFIG_BT_GATT_CLIENT) static void exchange_func(struct bt_conn *conn, u8_t err, struct bt_gatt_exchange_params *params) { @@ -481,7 +481,7 @@ int cmd_gatt_unsubscribe(int argc, char *argv[]) return 0; } -#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ +#endif /* CONFIG_BT_GATT_CLIENT */ static u8_t print_attr(const struct bt_gatt_attr *attr, void *user_data) { diff --git a/subsys/bluetooth/shell/ll.c b/subsys/bluetooth/shell/ll.c index 1a652563e30..fef39b006eb 100644 --- a/subsys/bluetooth/shell/ll.c +++ b/subsys/bluetooth/shell/ll.c @@ -18,7 +18,7 @@ #include "../controller/include/ll.h" -#if defined(CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT) +#if defined(CONFIG_BT_CONTROLLER_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_BLUETOOTH_CONTROLLER_ADV_EXT */ +#endif /* CONFIG_BT_CONTROLLER_ADV_EXT */ diff --git a/subsys/bluetooth/shell/ticker.c b/subsys/bluetooth/shell/ticker.c index 6dbb9203d9b..4e617c556d3 100644 --- a/subsys/bluetooth/shell/ticker.c +++ b/subsys/bluetooth/shell/ticker.c @@ -18,8 +18,8 @@ #define TICKER_SHELL_MODULE "ticker" -#if defined(CONFIG_BLUETOOTH_MAX_CONN) -#define TICKERS_MAX (CONFIG_BLUETOOTH_MAX_CONN + 2) +#if defined(CONFIG_BT_MAX_CONN) +#define TICKERS_MAX (CONFIG_BT_MAX_CONN + 2) #else #define TICKERS_MAX 2 #endif diff --git a/subsys/net/TODO b/subsys/net/TODO index fc0e3b95536..9a524c40557 100644 --- a/subsys/net/TODO +++ b/subsys/net/TODO @@ -192,7 +192,7 @@ Bluetooth Priority: High Complexity: C1 - Enable samples to use CONFIG_NET_L2_BLUETOOTH. + Enable samples to use CONFIG_NET_L2_BT. IP-based services ================= diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig index 86ed640b4a9..98adccf8476 100644 --- a/subsys/net/ip/Kconfig +++ b/subsys/net/ip/Kconfig @@ -253,7 +253,7 @@ config NET_SLIP_TAP select UART_INTERRUPT_DRIVEN select SLIP_TAP default n - default y if (QEMU_TARGET && !NET_TEST && !NET_L2_BLUETOOTH) + default y if (QEMU_TARGET && !NET_TEST && !NET_L2_BT) help SLIP TAP support is necessary when testing with QEMU. The host needs to have tunslip6 with TAP support running in order to @@ -319,7 +319,7 @@ config NET_BUF_DATA_SIZE config NET_BUF_USER_DATA_SIZE int "Size of user_data reserved" default 0 - default 4 if NET_L2_BLUETOOTH + default 4 if NET_L2_BT help This is for drivers to set how much user_data shall be included in each network data fragment. diff --git a/subsys/net/ip/l2/Kconfig b/subsys/net/ip/l2/Kconfig index 25decde7c7e..78056dd4d69 100644 --- a/subsys/net/ip/l2/Kconfig +++ b/subsys/net/ip/l2/Kconfig @@ -43,13 +43,13 @@ config NET_DEBUG_NET_OFFLOAD help Enables offload TCP/IP stack output debug messages. -config NET_L2_BLUETOOTH +config NET_L2_BT bool "Enable Bluetooth support" - select BLUETOOTH - select BLUETOOTH_PERIPHERAL - select BLUETOOTH_CENTRAL - select BLUETOOTH_SMP - select BLUETOOTH_L2CAP_DYNAMIC_CHANNEL + select BT + select BT_PERIPHERAL + select BT_CENTRAL + select BT_SMP + select BT_L2CAP_DYNAMIC_CHANNEL select NET_6LO default n help @@ -57,9 +57,9 @@ config NET_L2_BLUETOOTH does header compression on it and writes it to the Bluetooth stack via L2CAP channel. -config NET_L2_BLUETOOTH_ZEP1656 +config NET_L2_BT_ZEP1656 bool "***Workaround to work with Linux.***" - depends on NET_L2_BLUETOOTH + depends on NET_L2_BT default n help This workaround is necessary to interoperate with Linux up to 4.10 but @@ -68,9 +68,9 @@ config NET_L2_BLUETOOTH_ZEP1656 omitted. For more details why this is needed see: https://jira.zephyrproject.org/browse/ZEP-1656 -config NET_L2_BLUETOOTH_SEC_LEVEL +config NET_L2_BT_SEC_LEVEL int "Security level of Bluetooth Link" - depends on NET_L2_BLUETOOTH + depends on NET_L2_BT default 1 range 1 4 help @@ -80,26 +80,26 @@ config NET_L2_BLUETOOTH_SEC_LEVEL Level 3 (BT_SECURITY_HIGH) = Encryption and authentication required Level 4 (BT_SECURITY_FIPS) = Secure connection required -config NET_DEBUG_L2_BLUETOOTH +config NET_DEBUG_L2_BT bool "Debug Bluetooth L2 layer" default n depends on NET_LOG - depends on NET_L2_BLUETOOTH + depends on NET_L2_BT help Enables Bluetooth L2 output debug messages -config NET_L2_BLUETOOTH_MGMT +config NET_L2_BT_MGMT bool "Enable Bluetooth Network Management support" - depends on NET_L2_BLUETOOTH + depends on NET_L2_BT select NET_MGMT select NET_MGMT_EVENT default n -config NET_L2_BLUETOOTH_SHELL +config NET_L2_BT_SHELL bool "Enable Bluetooth shell module" default n select CONSOLE_SHELL - select NET_L2_BLUETOOTH_MGMT + select NET_L2_BT_MGMT help This can be used for testing Bluetooth management commands through the console via a shell module named "net_bt". diff --git a/subsys/net/ip/l2/Makefile b/subsys/net/ip/l2/Makefile index e2ceb6400d5..b7013abc878 100644 --- a/subsys/net/ip/l2/Makefile +++ b/subsys/net/ip/l2/Makefile @@ -3,7 +3,7 @@ ccflags-y += -I${ZEPHYR_BASE}/subsys/net/ip obj-$(CONFIG_NET_L2_DUMMY) += dummy.o obj-${CONFIG_NET_L2_ETHERNET} += ethernet.o obj-$(CONFIG_NET_L2_IEEE802154) += ieee802154/ -obj-$(CONFIG_NET_L2_BLUETOOTH) += bluetooth.o -obj-$(CONFIG_NET_L2_BLUETOOTH_SHELL) += bluetooth_shell.o +obj-$(CONFIG_NET_L2_BT) += bluetooth.o +obj-$(CONFIG_NET_L2_BT_SHELL) += bluetooth_shell.o obj-${CONFIG_NET_ARP} += arp.o diff --git a/subsys/net/ip/l2/bluetooth.c b/subsys/net/ip/l2/bluetooth.c index 92d1c764952..78e235d7430 100644 --- a/subsys/net/ip/l2/bluetooth.c +++ b/subsys/net/ip/l2/bluetooth.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) #define SYS_LOG_DOMAIN "net/bt" #define NET_LOG_ENABLED 1 #endif @@ -39,7 +39,7 @@ #define CHAN_CTXT(_ch) CONTAINER_OF(_ch, struct bt_context, ipsp_chan.chan) -#if defined(CONFIG_NET_L2_BLUETOOTH_MGMT) +#if defined(CONFIG_NET_L2_BT_MGMT) static struct bt_conn *default_conn; #endif @@ -114,7 +114,7 @@ static void ipsp_connected(struct bt_l2cap_chan *chan) struct net_linkaddr ll; struct in6_addr in6; -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) char src[BT_ADDR_LE_STR_LEN]; char dst[BT_ADDR_LE_STR_LEN]; #endif @@ -125,7 +125,7 @@ static void ipsp_connected(struct bt_l2cap_chan *chan) return; } -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) bt_addr_le_to_str(info.le.src, src, sizeof(src)); bt_addr_le_to_str(info.le.dst, dst, sizeof(dst)); @@ -165,7 +165,7 @@ static void ipsp_disconnected(struct bt_l2cap_chan *chan) /* Set iface down */ net_if_down(ctxt->iface); -#if defined(CONFIG_NET_L2_BLUETOOTH_MGMT) +#if defined(CONFIG_NET_L2_BT_MGMT) if (chan->conn != default_conn) { return; } @@ -257,7 +257,7 @@ static void bt_iface_init(struct net_if *iface) ctxt->iface = iface; -#if defined(CONFIG_NET_L2_BLUETOOTH_ZEP1656) +#if defined(CONFIG_NET_L2_BT_ZEP1656) /* Workaround Linux bug, see: * https://jira.zephyrproject.org/browse/ZEP-1656 */ @@ -286,13 +286,13 @@ static int ipsp_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan) static struct bt_l2cap_server server = { .psm = L2CAP_IPSP_PSM, - .sec_level = CONFIG_NET_L2_BLUETOOTH_SEC_LEVEL, + .sec_level = CONFIG_NET_L2_BT_SEC_LEVEL, .accept = ipsp_accept, }; -#if defined(CONFIG_NET_L2_BLUETOOTH_MGMT) +#if defined(CONFIG_NET_L2_BT_MGMT) -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define UNKNOWN_APPEARANCE 0x0000 @@ -351,7 +351,7 @@ static bool eir_found(u8_t type, const u8_t *data, u8_t data_len, void *user_data) { int i; -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) bt_addr_le_t *addr = user_data; char dev[BT_ADDR_LE_STR_LEN]; #endif @@ -372,7 +372,7 @@ static bool eir_found(u8_t type, const u8_t *data, u8_t data_len, continue; } -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) bt_addr_le_to_str(addr, dev, sizeof(dev)); NET_DBG("[DEVICE]: %s", dev); #endif @@ -495,7 +495,7 @@ static int bt_disconnect(u32_t mgmt_request, struct net_if *iface, static void connected(struct bt_conn *conn, u8_t err) { if (err) { -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); @@ -515,7 +515,7 @@ static void connected(struct bt_conn *conn, u8_t err) static void disconnected(struct bt_conn *conn, u8_t reason) { -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) char addr[BT_ADDR_LE_STR_LEN]; #endif @@ -523,7 +523,7 @@ static void disconnected(struct bt_conn *conn, u8_t reason) return; } -#if defined(CONFIG_NET_DEBUG_L2_BLUETOOTH) +#if defined(CONFIG_NET_DEBUG_L2_BT) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); NET_DBG("Disconnected: %s (reason %u)\n", addr, reason); @@ -537,13 +537,13 @@ static struct bt_conn_cb conn_callbacks = { .connected = connected, .disconnected = disconnected, }; -#endif /* CONFIG_NET_L2_BLUETOOTH_MGMT */ +#endif /* CONFIG_NET_L2_BT_MGMT */ static int net_bt_init(struct device *dev) { NET_DBG("dev %p driver_data %p", dev, dev->driver_data); -#if defined(CONFIG_NET_L2_BLUETOOTH_MGMT) +#if defined(CONFIG_NET_L2_BT_MGMT) bt_conn_cb_register(&conn_callbacks); #endif bt_l2cap_server_register(&server); @@ -551,7 +551,7 @@ static int net_bt_init(struct device *dev) return 0; } -#if defined(CONFIG_NET_L2_BLUETOOTH_MGMT) +#if defined(CONFIG_NET_L2_BT_MGMT) NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_BT_ADVERTISE, bt_advertise); NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_BT_CONNECT, bt_connect); NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_BT_SCAN, bt_scan); diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c index 120742ac927..9b19c1babe7 100644 --- a/subsys/net/ip/tcp.c +++ b/subsys/net/ip/tcp.c @@ -126,7 +126,7 @@ static inline u32_t retry_timeout(const struct net_tcp *tcp) #define is_6lo_technology(pkt) \ (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6 && \ - ((IS_ENABLED(CONFIG_NET_L2_BLUETOOTH) && \ + ((IS_ENABLED(CONFIG_NET_L2_BT) && \ net_pkt_ll_dst(pkt)->type == NET_LINK_BLUETOOTH) || \ (IS_ENABLED(CONFIG_NET_L2_IEEE802154) && \ net_pkt_ll_dst(pkt)->type == NET_LINK_IEEE802154))) diff --git a/subsys/net/lib/app/Kconfig b/subsys/net/lib/app/Kconfig index 68f9c3f4224..90e5e86778b 100644 --- a/subsys/net/lib/app/Kconfig +++ b/subsys/net/lib/app/Kconfig @@ -236,16 +236,16 @@ config NET_APP_IEEE802154_SECURITY_LEVEL endif # NET_L2_IEEE802154 || NET_L2_RAW_CHANNEL -if NET_L2_BLUETOOTH +if NET_L2_BT -config NET_APP_BLUETOOTH_NODE +config NET_APP_BT_NODE bool "Enable Bluetooth node support" default n - select NET_L2_BLUETOOTH_MGMT + select NET_L2_BT_MGMT help Enables application to operate in node mode which requires GATT service to be registered and start advertising as peripheral. -endif # NET_L2_BLUETOOTH +endif # NET_L2_BT endif # NET_APP_SETTINGS diff --git a/subsys/net/lib/app/Makefile b/subsys/net/lib/app/Makefile index 5f3da7da867..3463fdf14a7 100644 --- a/subsys/net/lib/app/Makefile +++ b/subsys/net/lib/app/Makefile @@ -17,7 +17,7 @@ endif ifeq ($(CONFIG_NET_APP_SETTINGS),y) obj-$(CONFIG_NET_L2_IEEE802154) += ieee802154_settings.o - obj-$(CONFIG_NET_L2_BLUETOOTH) += bt_settings.o + obj-$(CONFIG_NET_L2_BT) += bt_settings.o endif ccflags-$(CONFIG_NEWLIB_LIBC) += -D__LINUX_ERRNO_EXTENSIONS__ diff --git a/subsys/net/lib/app/bt_settings.c b/subsys/net/lib/app/bt_settings.c index eb31c5de451..94f151b6bb0 100644 --- a/subsys/net/lib/app/bt_settings.c +++ b/subsys/net/lib/app/bt_settings.c @@ -18,7 +18,7 @@ #include #include -#if defined(CONFIG_NET_APP_BLUETOOTH_NODE) +#if defined(CONFIG_NET_APP_BT_NODE) #define ADV_STR "on" static struct bt_gatt_attr attrs[] = { @@ -50,7 +50,7 @@ int _net_app_bt_setup(void) return -EINVAL; } -#if defined(CONFIG_NET_APP_BLUETOOTH_NODE) +#if defined(CONFIG_NET_APP_BT_NODE) bt_gatt_service_register(&ipss_svc); if (net_mgmt(NET_REQUEST_BT_ADVERTISE, iface, ADV_STR, diff --git a/subsys/net/lib/app/bt_settings.h b/subsys/net/lib/app/bt_settings.h index ce103442f86..696f9d8d3dd 100644 --- a/subsys/net/lib/app/bt_settings.h +++ b/subsys/net/lib/app/bt_settings.h @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_NET_L2_BLUETOOTH) && defined(CONFIG_NET_APP_SETTINGS) +#if defined(CONFIG_NET_L2_BT) && defined(CONFIG_NET_APP_SETTINGS) int _net_app_bt_setup(void); #else #define _net_app_bt_setup(...) 0 diff --git a/tests/benchmarks/latency_measure/prj.conf b/tests/benchmarks/latency_measure/prj.conf index 9a010ca0c87..15f86ab2ab5 100644 --- a/tests/benchmarks/latency_measure/prj.conf +++ b/tests/benchmarks/latency_measure/prj.conf @@ -8,7 +8,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=1 CONFIG_IRQ_OFFLOAD=y # Reduce memory/code footprint -CONFIG_BLUETOOTH=n +CONFIG_BT=n #CONFIG_KERNEL_SHELL=y #CONFIG_CONSOLE_SHELL=y #CONFIG_OBJECT_TRACING=y diff --git a/tests/bluetooth/bluetooth/prj.conf b/tests/bluetooth/bluetooth/prj.conf index 3975d759166..3c03382d9a1 100644 --- a/tests/bluetooth/bluetooth/prj.conf +++ b/tests/bluetooth/bluetooth/prj.conf @@ -1,4 +1,4 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_NO_DRIVER=y -CONFIG_BLUETOOTH_DEBUG_LOG=y +CONFIG_BT=y +CONFIG_BT_NO_DRIVER=y +CONFIG_BT_DEBUG_LOG=y CONFIG_UART_INTERRUPT_DRIVEN=n diff --git a/tests/bluetooth/init/prj.conf b/tests/bluetooth/init/prj.conf index 86d640fbc87..44a041269ef 100644 --- a/tests/bluetooth/init/prj.conf +++ b/tests/bluetooth/init/prj.conf @@ -1,2 +1,2 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_DEBUG_LOG=y +CONFIG_BT=y +CONFIG_BT_DEBUG_LOG=y diff --git a/tests/bluetooth/init/prj_0.conf b/tests/bluetooth/init/prj_0.conf index 0b7b8a1193d..9c56e28779b 100644 --- a/tests/bluetooth/init/prj_0.conf +++ b/tests/bluetooth/init/prj_0.conf @@ -1 +1 @@ -CONFIG_BLUETOOTH=y +CONFIG_BT=y diff --git a/tests/bluetooth/init/prj_1.conf b/tests/bluetooth/init/prj_1.conf index dfc40f56195..17117b7d834 100644 --- a/tests/bluetooth/init/prj_1.conf +++ b/tests/bluetooth/init/prj_1.conf @@ -1,2 +1,2 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y diff --git a/tests/bluetooth/init/prj_10.conf b/tests/bluetooth/init/prj_10.conf index 437bb237738..32e46f30549 100644 --- a/tests/bluetooth/init/prj_10.conf +++ b/tests/bluetooth/init/prj_10.conf @@ -1,8 +1,8 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y diff --git a/tests/bluetooth/init/prj_11.conf b/tests/bluetooth/init/prj_11.conf index 8bc7f902e0d..ca97ab393a2 100644 --- a/tests/bluetooth/init/prj_11.conf +++ b/tests/bluetooth/init/prj_11.conf @@ -1,10 +1,10 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_12.conf b/tests/bluetooth/init/prj_12.conf index b2bff54ec0f..a247e2be3b8 100644 --- a/tests/bluetooth/init/prj_12.conf +++ b/tests/bluetooth/init/prj_12.conf @@ -1,9 +1,9 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_13.conf b/tests/bluetooth/init/prj_13.conf index e340a9d1532..cec618b6e21 100644 --- a/tests/bluetooth/init/prj_13.conf +++ b/tests/bluetooth/init/prj_13.conf @@ -1,9 +1,9 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y +CONFIG_BT=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_14.conf b/tests/bluetooth/init/prj_14.conf index 909454243dd..0314811129f 100644 --- a/tests/bluetooth/init/prj_14.conf +++ b/tests/bluetooth/init/prj_14.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_TINYCRYPT_ECC=y diff --git a/tests/bluetooth/init/prj_15.conf b/tests/bluetooth/init/prj_15.conf index 25575e6f472..989afd3bd8d 100644 --- a/tests/bluetooth/init/prj_15.conf +++ b/tests/bluetooth/init/prj_15.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y diff --git a/tests/bluetooth/init/prj_16.conf b/tests/bluetooth/init/prj_16.conf index dbfb4d62aed..9d7925237fb 100644 --- a/tests/bluetooth/init/prj_16.conf +++ b/tests/bluetooth/init/prj_16.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_17.conf b/tests/bluetooth/init/prj_17.conf index b670d8868ba..650e7ff9344 100644 --- a/tests/bluetooth/init/prj_17.conf +++ b/tests/bluetooth/init/prj_17.conf @@ -1,21 +1,21 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEBUG_HCI_CORE=y -CONFIG_BLUETOOTH_DEBUG_CONN=y -CONFIG_BLUETOOTH_DEBUG_KEYS=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_DEBUG_SMP=y -CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y -CONFIG_BLUETOOTH_SMP_SELFTEST=y -CONFIG_BLUETOOTH_DEBUG_ATT=y -CONFIG_BLUETOOTH_DEBUG_GATT=y -CONFIG_BLUETOOTH_BREDR=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEBUG_HCI_CORE=y +CONFIG_BT_DEBUG_CONN=y +CONFIG_BT_DEBUG_KEYS=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_DEBUG_SMP=y +CONFIG_BT_DEBUG_HCI_DRIVER=y +CONFIG_BT_SMP_SELFTEST=y +CONFIG_BT_DEBUG_ATT=y +CONFIG_BT_DEBUG_GATT=y +CONFIG_BT_BREDR=y diff --git a/tests/bluetooth/init/prj_18.conf b/tests/bluetooth/init/prj_18.conf index 52ac39ded70..d0947b2d368 100644 --- a/tests/bluetooth/init/prj_18.conf +++ b/tests/bluetooth/init/prj_18.conf @@ -1,3 +1,3 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_BREDR=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_BREDR=y diff --git a/tests/bluetooth/init/prj_19.conf b/tests/bluetooth/init/prj_19.conf index b64d61daeb0..eb15704b12a 100644 --- a/tests/bluetooth/init/prj_19.conf +++ b/tests/bluetooth/init/prj_19.conf @@ -1,3 +1,3 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_BREDR=y +CONFIG_BT=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_BREDR=y diff --git a/tests/bluetooth/init/prj_2.conf b/tests/bluetooth/init/prj_2.conf index 174407a4539..3e36a999385 100644 --- a/tests/bluetooth/init/prj_2.conf +++ b/tests/bluetooth/init/prj_2.conf @@ -1,2 +1,2 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y +CONFIG_BT=y +CONFIG_BT_CENTRAL=y diff --git a/tests/bluetooth/init/prj_20.conf b/tests/bluetooth/init/prj_20.conf index 6594725a38d..622139d11d0 100644 --- a/tests/bluetooth/init/prj_20.conf +++ b/tests/bluetooth/init/prj_20.conf @@ -1,28 +1,28 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_DEBUG_MONITOR=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_DEBUG_MONITOR=y CONFIG_UART_CONSOLE=n -CONFIG_BLUETOOTH_DEBUG_HCI_CORE=y -CONFIG_BLUETOOTH_DEBUG_CONN=y -CONFIG_BLUETOOTH_DEBUG_KEYS=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_DEBUG_SMP=y -CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y -CONFIG_BLUETOOTH_SMP_SELFTEST=y -CONFIG_BLUETOOTH_DEBUG_ATT=y -CONFIG_BLUETOOTH_DEBUG_GATT=y -CONFIG_BLUETOOTH_BREDR=y -CONFIG_BLUETOOTH_RFCOMM=y -CONFIG_BLUETOOTH_AVDTP=y -CONFIG_BLUETOOTH_DEBUG_AVDTP=y -CONFIG_BLUETOOTH_A2DP=y -CONFIG_BLUETOOTH_HFP_HF=y -CONFIG_BLUETOOTH_DEBUG_HFP_HF=y +CONFIG_BT_DEBUG_HCI_CORE=y +CONFIG_BT_DEBUG_CONN=y +CONFIG_BT_DEBUG_KEYS=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_DEBUG_SMP=y +CONFIG_BT_DEBUG_HCI_DRIVER=y +CONFIG_BT_SMP_SELFTEST=y +CONFIG_BT_DEBUG_ATT=y +CONFIG_BT_DEBUG_GATT=y +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_AVDTP=y +CONFIG_BT_DEBUG_AVDTP=y +CONFIG_BT_A2DP=y +CONFIG_BT_HFP_HF=y +CONFIG_BT_DEBUG_HFP_HF=y diff --git a/tests/bluetooth/init/prj_21.conf b/tests/bluetooth/init/prj_21.conf index 766a519cb99..e5f62e5a196 100644 --- a/tests/bluetooth/init/prj_21.conf +++ b/tests/bluetooth/init/prj_21.conf @@ -1,21 +1,21 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_DEBUG_MONITOR=y -CONFIG_BLUETOOTH_DEBUG_HCI_CORE=y -CONFIG_BLUETOOTH_DEBUG_CONN=y -CONFIG_BLUETOOTH_DEBUG_KEYS=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_DEBUG_SMP=y -CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y -CONFIG_BLUETOOTH_SMP_SELFTEST=y -CONFIG_BLUETOOTH_DEBUG_ATT=y -CONFIG_BLUETOOTH_DEBUG_GATT=y -CONFIG_BLUETOOTH_BREDR=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_DEBUG_MONITOR=y +CONFIG_BT_DEBUG_HCI_CORE=y +CONFIG_BT_DEBUG_CONN=y +CONFIG_BT_DEBUG_KEYS=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_DEBUG_SMP=y +CONFIG_BT_DEBUG_HCI_DRIVER=y +CONFIG_BT_SMP_SELFTEST=y +CONFIG_BT_DEBUG_ATT=y +CONFIG_BT_DEBUG_GATT=y +CONFIG_BT_BREDR=y diff --git a/tests/bluetooth/init/prj_22.conf b/tests/bluetooth/init/prj_22.conf index b0ea1133051..1a495f7f247 100644 --- a/tests/bluetooth/init/prj_22.conf +++ b/tests/bluetooth/init/prj_22.conf @@ -1,4 +1,4 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_BREDR=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_SMP=y +CONFIG_BT=y +CONFIG_BT_BREDR=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SMP=y diff --git a/tests/bluetooth/init/prj_3.conf b/tests/bluetooth/init/prj_3.conf index f4051515831..787d544db27 100644 --- a/tests/bluetooth/init/prj_3.conf +++ b/tests/bluetooth/init/prj_3.conf @@ -1,4 +1,4 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y diff --git a/tests/bluetooth/init/prj_4.conf b/tests/bluetooth/init/prj_4.conf index c866deb2c23..77318d941c3 100644 --- a/tests/bluetooth/init/prj_4.conf +++ b/tests/bluetooth/init/prj_4.conf @@ -1,3 +1,3 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_SMP=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SMP=y diff --git a/tests/bluetooth/init/prj_5.conf b/tests/bluetooth/init/prj_5.conf index 9cbaa0fadde..a95353ed133 100644 --- a/tests/bluetooth/init/prj_5.conf +++ b/tests/bluetooth/init/prj_5.conf @@ -1,3 +1,3 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y +CONFIG_BT=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y diff --git a/tests/bluetooth/init/prj_6.conf b/tests/bluetooth/init/prj_6.conf index 2e894702ea9..8500852f422 100644 --- a/tests/bluetooth/init/prj_6.conf +++ b/tests/bluetooth/init/prj_6.conf @@ -1,4 +1,4 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y diff --git a/tests/bluetooth/init/prj_7.conf b/tests/bluetooth/init/prj_7.conf index 34e3a4d0692..3af5440090f 100644 --- a/tests/bluetooth/init/prj_7.conf +++ b/tests/bluetooth/init/prj_7.conf @@ -1,5 +1,5 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y diff --git a/tests/bluetooth/init/prj_8.conf b/tests/bluetooth/init/prj_8.conf index eda75b95a75..9b906f06dc1 100644 --- a/tests/bluetooth/init/prj_8.conf +++ b/tests/bluetooth/init/prj_8.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y diff --git a/tests/bluetooth/init/prj_9.conf b/tests/bluetooth/init/prj_9.conf index ea314fa2705..79778422923 100644 --- a/tests/bluetooth/init/prj_9.conf +++ b/tests/bluetooth/init/prj_9.conf @@ -1,7 +1,7 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y +CONFIG_BT=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y diff --git a/tests/bluetooth/init/prj_controller.conf b/tests/bluetooth/init/prj_controller.conf index a127241029d..9596169fba1 100644 --- a/tests/bluetooth/init/prj_controller.conf +++ b/tests/bluetooth/init/prj_controller.conf @@ -1,19 +1,19 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y -CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO=0 -CONFIG_BLUETOOTH_CONTROLLER_JOB_PRIO=0 -CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED=y -CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED=y -CONFIG_BLUETOOTH_HCI_ACL_FLOW_CONTROL=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_BREDR=n +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_HCI_ACL_FLOW_CONTROL=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_BREDR=n CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF5=y CONFIG_SOC_FLASH_NRF5_RADIO_SYNC=y diff --git a/tests/bluetooth/init/prj_controller_4_0.conf b/tests/bluetooth/init/prj_controller_4_0.conf index 77b44f59455..58bb6a4f656 100644 --- a/tests/bluetooth/init/prj_controller_4_0.conf +++ b/tests/bluetooth/init/prj_controller_4_0.conf @@ -1,32 +1,32 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y -CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO=0 -CONFIG_BLUETOOTH_CONTROLLER_JOB_PRIO=0 -CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED=y -CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=16 -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW=y -CONFIG_BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST=n -CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION=n -CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY=n -CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_RSSI=n -CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR=n -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_BREDR=n +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_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_BREDR=n CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF5=y CONFIG_SOC_FLASH_NRF5_RADIO_SYNC=y diff --git a/tests/bluetooth/init/prj_controller_dbg.conf b/tests/bluetooth/init/prj_controller_dbg.conf index 86ff59e5572..06e2ffeb34b 100644 --- a/tests/bluetooth/init/prj_controller_dbg.conf +++ b/tests/bluetooth/init/prj_controller_dbg.conf @@ -1,47 +1,47 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y -CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO=0 -CONFIG_BLUETOOTH_CONTROLLER_JOB_PRIO=1 -CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED=n -CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED=n -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=16 -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=y -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=y -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=y -CONFIG_BLUETOOTH_CONTROLLER_PHY=y -CONFIG_BLUETOOTH_CONTROLLER_PHY_2M=y -CONFIG_BLUETOOTH_CONTROLLER_PHY_2M_NRF=y -CONFIG_BLUETOOTH_CONTROLLER_PHY_CODED=y -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=y -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=y -CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW=n -CONFIG_BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST=y -CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC=y -CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI=y -CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION=y -CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY=y -CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_RSSI=y -CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_USE_DEBUG_KEYS=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_DEBUG_MONITOR=y -CONFIG_BLUETOOTH_DEBUG_HCI_CORE=y -CONFIG_BLUETOOTH_DEBUG_CONN=y -CONFIG_BLUETOOTH_DEBUG_KEYS=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_DEBUG_SMP=y -CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y -CONFIG_BLUETOOTH_SMP_SELFTEST=y -CONFIG_BLUETOOTH_DEBUG_ATT=y -CONFIG_BLUETOOTH_DEBUG_GATT=y -CONFIG_BLUETOOTH_BREDR=n +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_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_USE_DEBUG_KEYS=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_DEBUG_MONITOR=y +CONFIG_BT_DEBUG_HCI_CORE=y +CONFIG_BT_DEBUG_CONN=y +CONFIG_BT_DEBUG_KEYS=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_DEBUG_SMP=y +CONFIG_BT_DEBUG_HCI_DRIVER=y +CONFIG_BT_SMP_SELFTEST=y +CONFIG_BT_DEBUG_ATT=y +CONFIG_BT_DEBUG_GATT=y +CONFIG_BT_BREDR=n CONFIG_DEBUG=y CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF5=y diff --git a/tests/bluetooth/init/prj_controller_tiny.conf b/tests/bluetooth/init/prj_controller_tiny.conf index 6fa75938a90..332af8bf18c 100644 --- a/tests/bluetooth/init/prj_controller_tiny.conf +++ b/tests/bluetooth/init/prj_controller_tiny.conf @@ -1,33 +1,33 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CONTROLLER=y -CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO=0 -CONFIG_BLUETOOTH_CONTROLLER_JOB_PRIO=0 -CONFIG_BLUETOOTH_CONTROLLER_XTAL_ADVANCED=n -CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED=n -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_TIFS_HW=y -CONFIG_BLUETOOTH_CONTROLLER_RADIO_ENABLE_FAST=n -CONFIG_BLUETOOTH_CONTROLLER_FAST_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_CONN_RSSI=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_INDICATION=n -CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_NOTIFY=n -CONFIG_BLUETOOTH_CONTROLLER_SCAN_REQ_RSSI=n -CONFIG_BLUETOOTH_CONTROLLER_PROFILE_ISR=n -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_SMP_SC_ONLY=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_BREDR=n +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_PERIPHERAL=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_SMP_SC_ONLY=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_BREDR=n CONFIG_FLASH=y CONFIG_SOC_FLASH_NRF5=y CONFIG_SOC_FLASH_NRF5_RADIO_SYNC=y diff --git a/tests/bluetooth/init/prj_h5.conf b/tests/bluetooth/init/prj_h5.conf index da8f70f0ce8..20a0948f4eb 100644 --- a/tests/bluetooth/init/prj_h5.conf +++ b/tests/bluetooth/init/prj_h5.conf @@ -1,2 +1,2 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_H5=y +CONFIG_BT=y +CONFIG_BT_H5=y diff --git a/tests/bluetooth/init/prj_h5_dbg.conf b/tests/bluetooth/init/prj_h5_dbg.conf index bc93e92f4e5..accd5e32547 100644 --- a/tests/bluetooth/init/prj_h5_dbg.conf +++ b/tests/bluetooth/init/prj_h5_dbg.conf @@ -1,4 +1,4 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_H5=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEBUG_HCI_DRIVER=y +CONFIG_BT=y +CONFIG_BT_H5=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEBUG_HCI_DRIVER=y diff --git a/tests/bluetooth/mesh/dbg.conf b/tests/bluetooth/mesh/dbg.conf index d837cc3daa8..6be65c69dbb 100644 --- a/tests/bluetooth/mesh/dbg.conf +++ b/tests/bluetooth/mesh/dbg.conf @@ -2,61 +2,61 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_PERIPHERAL=y +CONFIG_BT_PERIPHERAL=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=y -CONFIG_BLUETOOTH_MESH_FRIEND=y -CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_LOW_POWER=y +CONFIG_BT_MESH_FRIEND=y +CONFIG_BT_MESH_LOCAL_INTERFACE=y +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=y -CONFIG_BLUETOOTH_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=y +CONFIG_BT_MESH_GATT_PROXY=y -CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +CONFIG_BT_DEBUG_LOG=y -CONFIG_BLUETOOTH_MESH_DEBUG=y -CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -CONFIG_BLUETOOTH_MESH_SELF_TEST=y +CONFIG_BT_MESH_DEBUG=y +CONFIG_BT_MESH_DEBUG_PROV=y +CONFIG_BT_MESH_DEBUG_PROXY=y +CONFIG_BT_MESH_DEBUG_BEACON=y +CONFIG_BT_MESH_DEBUG_NET=y +CONFIG_BT_MESH_DEBUG_TRANS=y +CONFIG_BT_MESH_DEBUG_LOW_POWER=y +CONFIG_BT_MESH_DEBUG_FRIEND=y +CONFIG_BT_MESH_DEBUG_MODEL=y +CONFIG_BT_MESH_DEBUG_ACCESS=y +CONFIG_BT_MESH_DEBUG_CRYPTO=y +CONFIG_BT_MESH_DEBUG_ADV=y +CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/friend.conf b/tests/bluetooth/mesh/friend.conf index 73d82c361d0..6883d8e04c1 100644 --- a/tests/bluetooth/mesh/friend.conf +++ b/tests/bluetooth/mesh/friend.conf @@ -2,55 +2,55 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=n -CONFIG_BLUETOOTH_MESH_FRIEND=y -#CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_LOW_POWER=n +CONFIG_BT_MESH_FRIEND=y +#CONFIG_BT_MESH_LOCAL_INTERFACE=y +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -#CONFIG_BLUETOOTH_MESH_PB_ADV=n +#CONFIG_BT_MESH_PB_ADV=n -#CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -#CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +#CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +#CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_FRIEND=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/gatt.conf b/tests/bluetooth/mesh/gatt.conf index 97c2e3a7f7d..b1348a0f85d 100644 --- a/tests/bluetooth/mesh/gatt.conf +++ b/tests/bluetooth/mesh/gatt.conf @@ -2,61 +2,61 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_PERIPHERAL=y +CONFIG_BT_PERIPHERAL=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=n -CONFIG_BLUETOOTH_MESH_FRIEND=n -CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=n -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_LOW_POWER=n +CONFIG_BT_MESH_FRIEND=n +CONFIG_BT_MESH_LOCAL_INTERFACE=n +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=y -CONFIG_BLUETOOTH_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=y +CONFIG_BT_MESH_GATT_PROXY=y -CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_FRIEND=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/lpn.conf b/tests/bluetooth/mesh/lpn.conf index cb9c51c9fbe..8219532a0aa 100644 --- a/tests/bluetooth/mesh/lpn.conf +++ b/tests/bluetooth/mesh/lpn.conf @@ -2,61 +2,61 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_PERIPHERAL=y +CONFIG_BT_PERIPHERAL=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=n -CONFIG_BLUETOOTH_MESH_LOW_POWER=y -CONFIG_BLUETOOTH_MESH_FRIEND=n -CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=n +CONFIG_BT_MESH_LOW_POWER=y +CONFIG_BT_MESH_FRIEND=n +CONFIG_BT_MESH_LOCAL_INTERFACE=y +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=n -CONFIG_BLUETOOTH_MESH_GATT_PROXY=n +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=n +CONFIG_BT_MESH_GATT_PROXY=n -CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +CONFIG_BT_DEBUG_LOG=y -CONFIG_BLUETOOTH_MESH_DEBUG=y -CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y +CONFIG_BT_MESH_DEBUG=y +CONFIG_BT_MESH_DEBUG_PROV=y +CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_FRIEND=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +CONFIG_BT_MESH_DEBUG_ACCESS=y +CONFIG_BT_MESH_DEBUG_CRYPTO=y +CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/microbit.conf b/tests/bluetooth/mesh/microbit.conf index 3d60c2d8741..ce36d811f96 100644 --- a/tests/bluetooth/mesh/microbit.conf +++ b/tests/bluetooth/mesh/microbit.conf @@ -4,42 +4,42 @@ CONFIG_MICROBIT_DISPLAY=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_GPIO=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_STACK_SIZE=1100 -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RX_SDU_MAX=36 -#CONFIG_BLUETOOTH_MESH_LOW_POWER=y +#CONFIG_BT_MESH_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=1 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=1 +CONFIG_BT_MESH_LABEL_COUNT=0 -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y diff --git a/tests/bluetooth/mesh/microbit_gatt.conf b/tests/bluetooth/mesh/microbit_gatt.conf index e203d6c7018..7a10646a28d 100644 --- a/tests/bluetooth/mesh/microbit_gatt.conf +++ b/tests/bluetooth/mesh/microbit_gatt.conf @@ -4,53 +4,53 @@ CONFIG_MICROBIT_DISPLAY=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_GPIO=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_MESH_GATT_PROXY=y -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=n +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=n -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1400 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=4 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_STACK_SIZE=1400 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 +CONFIG_BT_L2CAP_TX_BUF_COUNT=4 -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RX_SDU_MAX=36 -#CONFIG_BLUETOOTH_MESH_LOW_POWER=y +#CONFIG_BT_MESH_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_SUBNET_COUNT=1 +CONFIG_BT_MESH_APP_KEY_COUNT=1 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=1 +CONFIG_BT_MESH_LABEL_COUNT=0 #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y diff --git a/tests/bluetooth/mesh/nrf51-16k.conf b/tests/bluetooth/mesh/nrf51-16k.conf index 11e863feeea..743d81bd7e6 100644 --- a/tests/bluetooth/mesh/nrf51-16k.conf +++ b/tests/bluetooth/mesh/nrf51-16k.conf @@ -1,35 +1,35 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_STACK_SIZE=1100 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 +CONFIG_BT_OBSERVER=y +CONFIG_BT_BROADCASTER=y +CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=y -CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 -#CONFIG_BLUETOOTH_MESH_RELAY=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +CONFIG_BT_MESH=y +CONFIG_BT_MESH_LOW_POWER=y +CONFIG_BT_MESH_RX_SDU_MAX=36 +#CONFIG_BT_MESH_RELAY=y +#CONFIG_BT_MESH_SELF_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=0 #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y diff --git a/tests/bluetooth/mesh/pb_gatt.conf b/tests/bluetooth/mesh/pb_gatt.conf index 859e0f6dfc7..b6e04dcb17d 100644 --- a/tests/bluetooth/mesh/pb_gatt.conf +++ b/tests/bluetooth/mesh/pb_gatt.conf @@ -2,61 +2,61 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_PERIPHERAL=y +CONFIG_BT_PERIPHERAL=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=n -CONFIG_BLUETOOTH_MESH_FRIEND=y -CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_LOW_POWER=n +CONFIG_BT_MESH_FRIEND=y +CONFIG_BT_MESH_LOCAL_INTERFACE=y +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=n -CONFIG_BLUETOOTH_MESH_GATT_PROXY=n +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=n +CONFIG_BT_MESH_GATT_PROXY=n -CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +#CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +#CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_FRIEND=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/prj.conf b/tests/bluetooth/mesh/prj.conf index c2b8b1c919d..3187dbcaeda 100644 --- a/tests/bluetooth/mesh/prj.conf +++ b/tests/bluetooth/mesh/prj.conf @@ -2,61 +2,61 @@ CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_PERIPHERAL=y +CONFIG_BT_PERIPHERAL=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=y -CONFIG_BLUETOOTH_MESH_LOW_POWER=n -CONFIG_BLUETOOTH_MESH_FRIEND=n -CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=y +CONFIG_BT_MESH_LOW_POWER=n +CONFIG_BT_MESH_FRIEND=n +CONFIG_BT_MESH_LOCAL_INTERFACE=y +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -CONFIG_BLUETOOTH_MESH_PB_GATT=y -CONFIG_BLUETOOTH_MESH_PB_ADV=n -CONFIG_BLUETOOTH_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PB_GATT=y +CONFIG_BT_MESH_PB_ADV=n +CONFIG_BT_MESH_GATT_PROXY=y -CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +CONFIG_BT_DEBUG_LOG=y -CONFIG_BLUETOOTH_MESH_DEBUG=y -CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y +CONFIG_BT_MESH_DEBUG=y +CONFIG_BT_MESH_DEBUG_PROV=y +CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_FRIEND=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +CONFIG_BT_MESH_DEBUG_ACCESS=y +CONFIG_BT_MESH_DEBUG_CRYPTO=y +CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/proxy.conf b/tests/bluetooth/mesh/proxy.conf index 6f3ed80ac03..2b53bc8029d 100644 --- a/tests/bluetooth/mesh/proxy.conf +++ b/tests/bluetooth/mesh/proxy.conf @@ -2,61 +2,61 @@ CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 -CONFIG_BLUETOOTH_OBSERVER=y -CONFIG_BLUETOOTH_BROADCASTER=y -CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 -CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n -CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n -CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n -CONFIG_BLUETOOTH_CONTROLLER_PHY=n -CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n -CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n -CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n +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_BLUETOOTH_PERIPHERAL=y +CONFIG_BT_PERIPHERAL=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_RX_BUF_COUNT=30 -CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 -CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 +CONFIG_BT=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_RX_BUF_COUNT=30 +CONFIG_BT_L2CAP_RX_MTU=69 +CONFIG_BT_L2CAP_TX_MTU=69 -CONFIG_BLUETOOTH_MESH=y -CONFIG_BLUETOOTH_MESH_RELAY=n -#CONFIG_BLUETOOTH_MESH_LOW_POWER=n -#CONFIG_BLUETOOTH_MESH_FRIEND=n -CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y -CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 +CONFIG_BT_MESH=y +CONFIG_BT_MESH_RELAY=n +#CONFIG_BT_MESH_LOW_POWER=n +#CONFIG_BT_MESH_FRIEND=n +CONFIG_BT_MESH_LOCAL_INTERFACE=y +CONFIG_BT_MESH_ADV_BUF_COUNT=20 -CONFIG_BLUETOOTH_MESH_PB_GATT=n -CONFIG_BLUETOOTH_MESH_PB_ADV=y -CONFIG_BLUETOOTH_MESH_GATT_PROXY=y +CONFIG_BT_MESH_PB_GATT=n +CONFIG_BT_MESH_PB_ADV=y +CONFIG_BT_MESH_GATT_PROXY=y -#CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 -#CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 -#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 +#CONFIG_BT_MESH_LPN_SCAN_LATENCY=30 +#CONFIG_BT_MESH_LPN_RECV_DELAY=40 +#CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300 -CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 -CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 -CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 -CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 +CONFIG_BT_MESH_SUBNET_COUNT=2 +CONFIG_BT_MESH_APP_KEY_COUNT=2 +CONFIG_BT_MESH_MODEL_GROUP_COUNT=2 +CONFIG_BT_MESH_LABEL_COUNT=3 -CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y +CONFIG_BT_MESH_IV_UPDATE_TEST=y #CONFIG_UART_CONSOLE=n -#CONFIG_BLUETOOTH_DEBUG_MONITOR=y -#CONFIG_BLUETOOTH_DEBUG_LOG=y +#CONFIG_BT_DEBUG_MONITOR=y +#CONFIG_BT_DEBUG_LOG=y -#CONFIG_BLUETOOTH_MESH_DEBUG=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y -#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y -#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y -CONFIG_BLUETOOTH_MESH_DEBUG_NET=y -#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y -#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y -#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y -#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y -#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y -#CONFIG_BLUETOOTH_MESH_SELF_TEST=y +#CONFIG_BT_MESH_DEBUG=y +#CONFIG_BT_MESH_DEBUG_PROV=y +#CONFIG_BT_MESH_DEBUG_PROXY=y +#CONFIG_BT_MESH_DEBUG_BEACON=y +CONFIG_BT_MESH_DEBUG_NET=y +#CONFIG_BT_MESH_DEBUG_TRANS=y +#CONFIG_BT_MESH_DEBUG_LOW_POWER=y +#CONFIG_BT_MESH_DEBUG_FRIEND=y +#CONFIG_BT_MESH_DEBUG_MODEL=y +#CONFIG_BT_MESH_DEBUG_ACCESS=y +#CONFIG_BT_MESH_DEBUG_CRYPTO=y +#CONFIG_BT_MESH_DEBUG_ADV=y +#CONFIG_BT_MESH_SELF_TEST=y diff --git a/tests/bluetooth/mesh/src/main.c b/tests/bluetooth/mesh/src/main.c index 47946c08336..99c6c249469 100644 --- a/tests/bluetooth/mesh/src/main.c +++ b/tests/bluetooth/mesh/src/main.c @@ -20,8 +20,8 @@ static bool has_reg_fault = true; static struct bt_mesh_cfg cfg_srv = { .relay = BT_MESH_RELAY_DISABLED, .beacon = BT_MESH_BEACON_DISABLED, -#if defined(CONFIG_BLUETOOTH_MESH_FRIEND) -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_FRIEND) +#if defined(CONFIG_BT_MESH_LOW_POWER) .frnd = BT_MESH_FRIEND_DISABLED, #else .frnd = BT_MESH_FRIEND_ENABLED, @@ -29,7 +29,7 @@ static struct bt_mesh_cfg cfg_srv = { #else .frnd = BT_MESH_FRIEND_NOT_SUPPORTED, #endif -#if defined(CONFIG_BLUETOOTH_MESH_GATT_PROXY) +#if defined(CONFIG_BT_MESH_GATT_PROXY) .gatt_proxy = BT_MESH_GATT_PROXY_ENABLED, #else .gatt_proxy = BT_MESH_GATT_PROXY_NOT_SUPPORTED, @@ -156,7 +156,7 @@ static int output_number(bt_mesh_output_action action, uint32_t number) } #endif -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) static struct k_delayed_work timer; static void enable_lpn(struct k_work *work) @@ -171,7 +171,7 @@ static void prov_complete(void) { board_prov_complete(); -#if defined(CONFIG_BLUETOOTH_MESH_LOW_POWER) +#if defined(CONFIG_BT_MESH_LOW_POWER) k_delayed_work_init(&timer, enable_lpn); k_delayed_work_submit(&timer, K_SECONDS(10)); #endif diff --git a/tests/bluetooth/shell/arduino_101.conf b/tests/bluetooth/shell/arduino_101.conf index fa5508237cf..b4b193afeec 100644 --- a/tests/bluetooth/shell/arduino_101.conf +++ b/tests/bluetooth/shell/arduino_101.conf @@ -1,19 +1,19 @@ -CONFIG_BLUETOOTH=y +CONFIG_BT=y CONFIG_CONSOLE_HANDLER=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_PRIVACY=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=2 -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_PRIVACY=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_ATT_PREPARE_COUNT=2 +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_TINYCRYPT_ECC=y CONFIG_CONSOLE_SHELL=y -CONFIG_BLUETOOTH_DEVICE_NAME="test shell" -CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=6 -CONFIG_BLUETOOTH_INTERNAL_STORAGE=y +CONFIG_BT_DEVICE_NAME="test shell" +CONFIG_BT_L2CAP_TX_BUF_COUNT=6 +CONFIG_BT_INTERNAL_STORAGE=y CONFIG_FLASH=y CONFIG_SPI=y CONFIG_GPIO=y diff --git a/tests/bluetooth/shell/prj.conf b/tests/bluetooth/shell/prj.conf index 850ff16ab0a..c0940fc0fea 100644 --- a/tests/bluetooth/shell/prj.conf +++ b/tests/bluetooth/shell/prj.conf @@ -1,16 +1,16 @@ -CONFIG_BLUETOOTH=y +CONFIG_BT=y CONFIG_CONSOLE_HANDLER=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_PRIVACY=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=2 -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_PRIVACY=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_ATT_PREPARE_COUNT=2 +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_TINYCRYPT_ECC=y CONFIG_CONSOLE_SHELL=y -CONFIG_BLUETOOTH_SHELL=y -CONFIG_BLUETOOTH_DEVICE_NAME="test shell" -CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=6 +CONFIG_BT_SHELL=y +CONFIG_BT_DEVICE_NAME="test shell" +CONFIG_BT_L2CAP_TX_BUF_COUNT=6 diff --git a/tests/bluetooth/shell/prj_br.conf b/tests/bluetooth/shell/prj_br.conf index 4f81c4f1a17..0a9ef8af0a7 100644 --- a/tests/bluetooth/shell/prj_br.conf +++ b/tests/bluetooth/shell/prj_br.conf @@ -1,17 +1,17 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_BREDR=y -CONFIG_BLUETOOTH_RFCOMM=y +CONFIG_BT=y +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=y CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_SHELL=y -CONFIG_BLUETOOTH_SHELL=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_PRIVACY=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=2 -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_TINYCRYPT_ECC=y -CONFIG_BLUETOOTH_DEVICE_NAME="test shell" +CONFIG_BT_SHELL=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_PRIVACY=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_ATT_PREPARE_COUNT=2 +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_TINYCRYPT_ECC=y +CONFIG_BT_DEVICE_NAME="test shell" diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c index f7d16268869..67cac620c3c 100644 --- a/tests/bluetooth/shell/src/main.c +++ b/tests/bluetooth/shell/src/main.c @@ -25,7 +25,7 @@ #include -#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME +#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define MY_SHELL_MODULE "btshell" diff --git a/tests/bluetooth/tester/default.conf b/tests/bluetooth/tester/default.conf index a39724e9284..c3d89b037f3 100644 --- a/tests/bluetooth/tester/default.conf +++ b/tests/bluetooth/tester/default.conf @@ -1,13 +1,13 @@ CONFIG_UART_PIPE=y CONFIG_CONSOLE_HANDLER=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=4 -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_PRIVACY=y +CONFIG_BT=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_ATT_PREPARE_COUNT=4 +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_PRIVACY=y CONFIG_UART_CONSOLE=n CONFIG_GPIO=y diff --git a/tests/bluetooth/tester/qemu.conf b/tests/bluetooth/tester/qemu.conf index cbe39fef28f..d25d5b58ec5 100644 --- a/tests/bluetooth/tester/qemu.conf +++ b/tests/bluetooth/tester/qemu.conf @@ -1,22 +1,22 @@ CONFIG_UART_PIPE=y CONFIG_UART_PIPE_ON_DEV_NAME="UART_2" CONFIG_CONSOLE_HANDLER=y -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_CENTRAL=y -CONFIG_BLUETOOTH_PERIPHERAL=y -CONFIG_BLUETOOTH_SMP=y -CONFIG_BLUETOOTH_SIGNING=y -CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=4 -CONFIG_BLUETOOTH_GATT_CLIENT=y -CONFIG_BLUETOOTH_DEBUG_LOG=y -CONFIG_BLUETOOTH_DEBUG_HCI_CORE=y -CONFIG_BLUETOOTH_DEBUG_BUF=y -CONFIG_BLUETOOTH_DEBUG_CONN=y -CONFIG_BLUETOOTH_DEBUG_L2CAP=y -CONFIG_BLUETOOTH_DEBUG_SMP=y -CONFIG_BLUETOOTH_DEBUG_ATT=y -CONFIG_BLUETOOTH_DEBUG_GATT=y -CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BLUETOOTH_PRIVACY=y +CONFIG_BT=y +CONFIG_BT_CENTRAL=y +CONFIG_BT_PERIPHERAL=y +CONFIG_BT_SMP=y +CONFIG_BT_SIGNING=y +CONFIG_BT_ATT_PREPARE_COUNT=4 +CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_DEBUG_LOG=y +CONFIG_BT_DEBUG_HCI_CORE=y +CONFIG_BT_DEBUG_BUF=y +CONFIG_BT_DEBUG_CONN=y +CONFIG_BT_DEBUG_L2CAP=y +CONFIG_BT_DEBUG_SMP=y +CONFIG_BT_DEBUG_ATT=y +CONFIG_BT_DEBUG_GATT=y +CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y +CONFIG_BT_PRIVACY=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/tests/bluetooth/tester/src/Makefile b/tests/bluetooth/tester/src/Makefile index 06e43254e30..621973d1d7f 100644 --- a/tests/bluetooth/tester/src/Makefile +++ b/tests/bluetooth/tester/src/Makefile @@ -2,4 +2,4 @@ ccflags-y +=-I$(ZEPHYR_BASE)/include/drivers obj-y = bttester.o gap.o gatt.o main.o -obj-$(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) += l2cap.o +obj-$(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) += l2cap.o diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c index 73b1adbbc21..2f7c40856b0 100644 --- a/tests/bluetooth/tester/src/bttester.c +++ b/tests/bluetooth/tester/src/bttester.c @@ -53,9 +53,9 @@ static void supported_services(u8_t *data, u16_t len) tester_set_bit(buf, BTP_SERVICE_ID_CORE); tester_set_bit(buf, BTP_SERVICE_ID_GAP); tester_set_bit(buf, BTP_SERVICE_ID_GATT); -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) tester_set_bit(buf, BTP_SERVICE_ID_L2CAP); -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ tester_send(BTP_SERVICE_ID_CORE, CORE_READ_SUPPORTED_SERVICES, BTP_INDEX_NONE, (u8_t *) rp, sizeof(buf)); @@ -77,10 +77,10 @@ static void register_service(u8_t *data, u16_t len) case BTP_SERVICE_ID_GATT: status = tester_init_gatt(); break; -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) case BTP_SERVICE_ID_L2CAP: status = tester_init_l2cap(); -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ break; default: status = BTP_STATUS_FAILED; @@ -143,11 +143,11 @@ static void cmd_handler(void *p1, void *p2, void *p3) tester_handle_gatt(cmd->opcode, cmd->index, cmd->data, len); break; -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) case BTP_SERVICE_ID_L2CAP: tester_handle_l2cap(cmd->opcode, cmd->index, cmd->data, len); -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ break; default: tester_rsp(cmd->service, cmd->opcode, cmd->index, diff --git a/tests/bluetooth/tester/src/bttester.h b/tests/bluetooth/tester/src/bttester.h index 270ca855732..4c7dc8fbc95 100644 --- a/tests/bluetooth/tester/src/bttester.h +++ b/tests/bluetooth/tester/src/bttester.h @@ -631,8 +631,8 @@ u8_t tester_init_gatt(void); void tester_handle_gatt(u8_t opcode, u8_t index, u8_t *data, u16_t len); -#if defined(CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL) +#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) u8_t tester_init_l2cap(void); void tester_handle_l2cap(u8_t opcode, u8_t index, u8_t *data, u16_t len); -#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ +#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */ diff --git a/tests/bluetooth/tester/src/gap.c b/tests/bluetooth/tester/src/gap.c index 35e027a70e3..a7e372b9eb6 100644 --- a/tests/bluetooth/tester/src/gap.c +++ b/tests/bluetooth/tester/src/gap.c @@ -133,11 +133,11 @@ static void controller_info(u8_t *data, u16_t len) * If privacy is used, the device uses random type address, otherwise * static random or public type address is used. */ -#if !defined(CONFIG_BLUETOOTH_PRIVACY) +#if !defined(CONFIG_BT_PRIVACY) if (oob.addr.type == BT_ADDR_LE_RANDOM) { atomic_set_bit(¤t_settings, GAP_SETTINGS_STATIC_ADDRESS); } -#endif /* CONFIG_BLUETOOTH_PRIVACY */ +#endif /* CONFIG_BT_PRIVACY */ supported_settings = BIT(GAP_SETTINGS_POWERED); supported_settings |= BIT(GAP_SETTINGS_CONNECTABLE); @@ -724,9 +724,9 @@ static void tester_init_gap_cb(int err) atomic_set_bit(¤t_settings, GAP_SETTINGS_CONNECTABLE); atomic_set_bit(¤t_settings, GAP_SETTINGS_BONDABLE); atomic_set_bit(¤t_settings, GAP_SETTINGS_LE); -#if defined(CONFIG_BLUETOOTH_PRIVACY) +#if defined(CONFIG_BT_PRIVACY) atomic_set_bit(¤t_settings, GAP_SETTINGS_PRIVACY); -#endif /* CONFIG_BLUETOOTH_PRIVACY */ +#endif /* CONFIG_BT_PRIVACY */ bt_conn_cb_register(&conn_callbacks); diff --git a/tests/kernel/mem_slab/mslab/prj.conf b/tests/kernel/mem_slab/mslab/prj.conf index a3e9d1b519c..5d471b5e718 100644 --- a/tests/kernel/mem_slab/mslab/prj.conf +++ b/tests/kernel/mem_slab/mslab/prj.conf @@ -1,2 +1,2 @@ # nothing yet -CONFIG_BLUETOOTH=n +CONFIG_BT=n diff --git a/tests/kernel/test_build/newlib.conf b/tests/kernel/test_build/newlib.conf index 1134b1fbd0d..87fc5a097c7 100644 --- a/tests/kernel/test_build/newlib.conf +++ b/tests/kernel/test_build/newlib.conf @@ -3,4 +3,4 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_NEWLIB_LIBC=y # turn bluetooth of until we resolve printf formatter # difference between newlib & min-libc -CONFIG_BLUETOOTH=n +CONFIG_BT=n diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf index 048a68e7ed0..201fbb17518 100644 --- a/tests/net/all/prj.conf +++ b/tests/net/all/prj.conf @@ -55,16 +55,16 @@ CONFIG_NET_L2_IEEE802154_SECURITY=y CONFIG_NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME="CRYPTO-DEV" CONFIG_NET_L2_DUMMY=y CONFIG_NET_L2_ETHERNET=y -CONFIG_NET_L2_BLUETOOTH=y -CONFIG_NET_L2_BLUETOOTH_ZEP1656=y -CONFIG_NET_L2_BLUETOOTH_SEC_LEVEL=4 -CONFIG_NET_L2_BLUETOOTH_MGMT=y -CONFIG_NET_L2_BLUETOOTH_SHELL=y +CONFIG_NET_L2_BT=y +CONFIG_NET_L2_BT_ZEP1656=y +CONFIG_NET_L2_BT_SEC_LEVEL=4 +CONFIG_NET_L2_BT_MGMT=y +CONFIG_NET_L2_BT_SHELL=y CONFIG_NET_L2_RAW_CHANNEL=y CONFIG_NET_DEBUG_L2_IEEE802154=y CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y CONFIG_NET_DEBUG_L2_ETHERNET=y -CONFIG_NET_DEBUG_L2_BLUETOOTH=y +CONFIG_NET_DEBUG_L2_BT=y # IP offload support CONFIG_NET_OFFLOAD=y @@ -156,7 +156,7 @@ CONFIG_NET_APP_IEEE802154_CHANNEL=15 CONFIG_NET_APP_IEEE802154_SECURITY_KEY="key" CONFIG_NET_APP_IEEE802154_SECURITY_KEY_MODE=0 CONFIG_NET_APP_IEEE802154_SECURITY_LEVEL=0 -CONFIG_NET_APP_BLUETOOTH_NODE=y +CONFIG_NET_APP_BT_NODE=y # Network management CONFIG_NET_MGMT=y diff --git a/tests/net/arp/testcase.yaml b/tests/net/arp/testcase.yaml index 6c27bbc59f3..933c42710a6 100644 --- a/tests/net/arp/testcase.yaml +++ b/tests/net/arp/testcase.yaml @@ -1,11 +1,11 @@ tests: - test: tags: net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 platform_exclude: qemu_xtensa - test_with_bt: tags: net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 platform_exclude: qemu_xtensa diff --git a/tests/net/context/testcase.yaml b/tests/net/context/testcase.yaml index cdd443f6dd5..c667e556a61 100644 --- a/tests/net/context/testcase.yaml +++ b/tests/net/context/testcase.yaml @@ -1,10 +1,10 @@ tests: - test: tags: net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 platform_exclude: hexiwear_kw40z - test_with_bt: tags: net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 diff --git a/tests/net/icmpv6/testcase.yaml b/tests/net/icmpv6/testcase.yaml index 0b928a6904c..a991b84d446 100644 --- a/tests/net/icmpv6/testcase.yaml +++ b/tests/net/icmpv6/testcase.yaml @@ -1,9 +1,9 @@ tests: - test: tags: net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 - test_with_bt: tags: net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 diff --git a/tests/net/ip-addr/testcase.yaml b/tests/net/ip-addr/testcase.yaml index 0b928a6904c..a991b84d446 100644 --- a/tests/net/ip-addr/testcase.yaml +++ b/tests/net/ip-addr/testcase.yaml @@ -1,9 +1,9 @@ tests: - test: tags: net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 - test_with_bt: tags: net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 diff --git a/tests/net/lib/http_header_fields/testcase.yaml b/tests/net/lib/http_header_fields/testcase.yaml index 14fc03b232b..c8bc7b53079 100644 --- a/tests/net/lib/http_header_fields/testcase.yaml +++ b/tests/net/lib/http_header_fields/testcase.yaml @@ -1,10 +1,10 @@ tests: - test: tags: http net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 platform_exclude: hexiwear_kw40z - test_with_bt: tags: http net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 diff --git a/tests/net/mgmt/testcase.yaml b/tests/net/mgmt/testcase.yaml index 0b928a6904c..a991b84d446 100644 --- a/tests/net/mgmt/testcase.yaml +++ b/tests/net/mgmt/testcase.yaml @@ -1,9 +1,9 @@ tests: - test: tags: net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 - test_with_bt: tags: net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 diff --git a/tests/net/neighbor/testcase.yaml b/tests/net/neighbor/testcase.yaml index 0b928a6904c..a991b84d446 100644 --- a/tests/net/neighbor/testcase.yaml +++ b/tests/net/neighbor/testcase.yaml @@ -1,9 +1,9 @@ tests: - test: tags: net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 - test_with_bt: tags: net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 diff --git a/tests/net/route/testcase.yaml b/tests/net/route/testcase.yaml index cdd443f6dd5..c667e556a61 100644 --- a/tests/net/route/testcase.yaml +++ b/tests/net/route/testcase.yaml @@ -1,10 +1,10 @@ tests: - test: tags: net - filter: not CONFIG_BLUETOOTH + filter: not CONFIG_BT min_ram: 12 platform_exclude: hexiwear_kw40z - test_with_bt: tags: net - filter: CONFIG_BLUETOOTH + filter: CONFIG_BT min_ram: 16 diff --git a/tests/unit/bluetooth/at/prj.conf b/tests/unit/bluetooth/at/prj.conf index dbd4818b198..42737f3052b 100644 --- a/tests/unit/bluetooth/at/prj.conf +++ b/tests/unit/bluetooth/at/prj.conf @@ -1,6 +1,6 @@ -CONFIG_BLUETOOTH=y -CONFIG_BLUETOOTH_BREDR=y -CONFIG_BLUETOOTH_HFP_HF=y +CONFIG_BT=y +CONFIG_BT_BREDR=y +CONFIG_BT_HFP_HF=y CONFIG_NET_BUF=y CONFIG_ZTEST=y CONFIG_SERIAL=y