michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Kconfig: Rename CONFIG_BLUETOOTH_* to CONFIG_BT_*

Browse source 
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 <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2017-08-09 09:21:11 +03:00 • committed by Johan Hedberg
commit 2975ca0754
286 changed files with 3405 additions and 3421 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig
View file

@ -229,9 +229,9 @@ config ADC_QMSI_SS
def_bool y def_bool y
endif endif
if BLUETOOTH_H4 if BT_H4
config BLUETOOTH_UART_ON_DEV_NAME config BT_UART_ON_DEV_NAME
default UART_QMSI_0_NAME default UART_QMSI_0_NAME
config UART_QMSI_0 config UART_QMSI_0
@ -243,7 +243,7 @@ config UART_QMSI_0_BAUDRATE
config UART_QMSI_0_HW_FC config UART_QMSI_0_HW_FC
def_bool y def_bool y
endif # BLUETOOTH_H4 endif # BT_H4
if UART_QMSI if UART_QMSI

8
arch/x86/soc/atom/Kconfig.defconfig
View file

@ -70,9 +70,9 @@ endif # UART_NS16550_PORT_1
endif # UART_NS16550 endif # UART_NS16550
if BLUETOOTH_UART if BT_UART
config BLUETOOTH_UART_ON_DEV_NAME config BT_UART_ON_DEV_NAME
default "UART_1" default "UART_1"
endif endif
@ -84,7 +84,7 @@ config UART_PIPE_ON_DEV_NAME
endif endif
config BLUETOOTH_MONITOR_ON_DEV_NAME config BT_MONITOR_ON_DEV_NAME
default "UART_1" if BLUETOOTH_DEBUG_MONITOR default "UART_1" if BT_DEBUG_MONITOR
endif endif

8
arch/x86/soc/ia32/Kconfig.defconfig
View file

@ -70,9 +70,9 @@ endif # UART_NS16550_PORT_1
endif # UART_NS16550 endif # UART_NS16550
if BLUETOOTH_UART if BT_UART
config BLUETOOTH_UART_ON_DEV_NAME config BT_UART_ON_DEV_NAME
default "UART_1" default "UART_1"
endif endif
@ -84,7 +84,7 @@ config UART_PIPE_ON_DEV_NAME
endif endif
config BLUETOOTH_MONITOR_ON_DEV_NAME config BT_MONITOR_ON_DEV_NAME
default "UART_1" if BLUETOOTH_DEBUG_MONITOR default "UART_1" if BT_DEBUG_MONITOR
endif endif

6
arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series
View file

@ -196,10 +196,10 @@ config RTC_0_IRQ_PRI
default 2 default 2
endif # RTC endif # RTC
if BLUETOOTH_H4 if BT_H4
if !HAS_DTS if !HAS_DTS
config BLUETOOTH_UART_ON_DEV_NAME config BT_UART_ON_DEV_NAME
default UART_QMSI_0_NAME default UART_QMSI_0_NAME
endif endif
@ -214,7 +214,7 @@ endif
config UART_QMSI_0_HW_FC config UART_QMSI_0_HW_FC
def_bool y def_bool y
endif # BLUETOOTH_H4 endif # BT_H4
if UART_QMSI if UART_QMSI

4
arch/x86/soc/intel_quark/quark_x1000/Kconfig.defconfig.series
View file

@ -265,9 +265,9 @@ config UART_CONSOLE_ON_DEV_NAME
endif endif
if BLUETOOTH_UART if BT_UART
config BLUETOOTH_UART_ON_DEV_NAME config BT_UART_ON_DEV_NAME
default "UART_1" default "UART_1"
endif endif

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

@ -15,8 +15,8 @@ CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y
# spi # spi
CONFIG_SPI=y CONFIG_SPI=y

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

@ -18,5 +18,5 @@ CONFIG_UART_CONSOLE=y
CONFIG_GPIO_AS_PINRESET=y CONFIG_GPIO_AS_PINRESET=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/arduino_101_ble/arduino_101_ble_defconfig
View file

@ -9,5 +9,5 @@ CONFIG_SERIAL=y
CONFIG_UART_NRF5=y CONFIG_UART_NRF5=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/bbc_microbit/bbc_microbit_defconfig
View file

@ -17,5 +17,5 @@ CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/curie_ble/curie_ble_defconfig
View file

@ -9,5 +9,5 @@ CONFIG_SERIAL=y
CONFIG_UART_NRF5=y CONFIG_UART_NRF5=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

2
boards/arm/frdm_k64f/Kconfig.defconfig
View file

@ -28,7 +28,7 @@ config UART_MCUX_0
def_bool y if UART_CONSOLE def_bool y if UART_CONSOLE
config UART_MCUX_3 config UART_MCUX_3
def_bool y if BLUETOOTH_UART def_bool y if BT_UART
endif # UART_MCUX endif # UART_MCUX

2
boards/arm/hexiwear_k64/Kconfig.defconfig
View file

@ -28,7 +28,7 @@ config UART_MCUX_0
def_bool y if UART_CONSOLE def_bool y if UART_CONSOLE
config UART_MCUX_4 config UART_MCUX_4
def_bool y if BLUETOOTH_UART def_bool y if BT_UART
endif # UART_MCUX endif # UART_MCUX

4
boards/arm/nrf51_blenano/nrf51_blenano_defconfig
View file

@ -13,5 +13,5 @@ CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig
View file

@ -13,5 +13,5 @@ CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig
View file

@ -13,5 +13,5 @@ CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig
View file

@ -19,5 +19,5 @@ CONFIG_UART_CONSOLE=y
CONFIG_GPIO_AS_PINRESET=y CONFIG_GPIO_AS_PINRESET=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig
View file

@ -16,5 +16,5 @@ CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
View file

@ -19,5 +19,5 @@ CONFIG_UART_CONSOLE=y
CONFIG_GPIO_AS_PINRESET=y CONFIG_GPIO_AS_PINRESET=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig
View file

@ -19,5 +19,5 @@ CONFIG_UART_CONSOLE=y
CONFIG_GPIO_AS_PINRESET=y CONFIG_GPIO_AS_PINRESET=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig
View file

@ -9,5 +9,5 @@ CONFIG_SERIAL=y
CONFIG_UART_NRF5=y CONFIG_UART_NRF5=y
# bluetooth # bluetooth
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CONTROLLER=y CONFIG_BT_CONTROLLER=y

4
boards/x86/arduino_101/doc/board.rst
View file

@ -495,11 +495,11 @@ building your application:
.. code-block:: console .. code-block:: console
CONFIG_BLUETOOTH_DEBUG_MONITOR=y CONFIG_BT_DEBUG_MONITOR=y
CONFIG_UART_CONSOLE=n CONFIG_UART_CONSOLE=n
CONFIG_UART_QMSI_1_BAUDRATE=1000000 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 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 baudrate with what's used to communicate with the nRF51, in order not to create
a bottleneck. a bottleneck.

8
boards/x86/panther/Kconfig.defconfig
View file

@ -4,9 +4,9 @@ if BOARD_PANTHER
config BOARD config BOARD
default "panther" 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 default UART_QMSI_0_NAME
config UART_QMSI_0_BAUDRATE config UART_QMSI_0_BAUDRATE
@ -24,7 +24,7 @@ config UART_PIPE_ON_DEV_NAME
endif endif
config BLUETOOTH_MONITOR_ON_DEV_NAME config BT_MONITOR_ON_DEV_NAME
default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR default UART_QMSI_1_NAME if BT_DEBUG_MONITOR
endif # BOARD_PANTHER endif # BOARD_PANTHER

8
boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
View file

@ -4,9 +4,9 @@ if BOARD_QUARK_SE_C1000_DEVBOARD
config BOARD config BOARD
default "quark_se_c1000_devboard" 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 default UART_QMSI_0_NAME
config UART_QMSI_0_BAUDRATE config UART_QMSI_0_BAUDRATE
@ -31,8 +31,8 @@ config BUSY_WAIT_USES_ALTERNATE_CLOCK
endif endif
config BLUETOOTH_MONITOR_ON_DEV_NAME config BT_MONITOR_ON_DEV_NAME
default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR default UART_QMSI_1_NAME if BT_DEBUG_MONITOR
if IEEE802154_CC2520 if IEEE802154_CC2520

4
doc/api/bluetooth.rst
View file

@ -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 that the set that will in practice be available for the application
depends on the exact Kconfig options that have been chosen, since most depends on the exact Kconfig options that have been chosen, since most
of the Bluetooth functionality is build-time selectable. E.g. any of the Bluetooth functionality is build-time selectable. E.g. any
connection-related APIs require :option:`CONFIG_BLUETOOTH_CONN` and any connection-related APIs require :option:`CONFIG_BT_CONN` and any
BR/EDR (Bluetooth Classic) APIs require :option:`CONFIG_BLUETOOTH_BREDR`. BR/EDR (Bluetooth Classic) APIs require :option:`CONFIG_BT_BREDR`.
Generic Access Profile (GAP) Generic Access Profile (GAP)
**************************** ****************************

2
doc/subsystems/test/sanitycheck.rst
View file

@ -284,7 +284,7 @@ related to the sample and what is being demonstrated:
- singlethread: - singlethread:
build_only: true build_only: true
extra_args: CONF_FILE=prj_single.conf 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 tags: samples tests
min_ram: 16 min_ram: 16

4
doc/zephyr.doxyfile
View file

@ -277,8 +277,8 @@ PREDEFINED = "CONFIG_SYS_CLOCK_EXISTS=y" \
"CONFIG_UART_DRV_CMD=y" \ "CONFIG_UART_DRV_CMD=y" \
"CONFIG_SYS_POWER_MANAGEMENT=y" \ "CONFIG_SYS_POWER_MANAGEMENT=y" \
"CONFIG_DEVICE_POWER_MANAGEMENT=y" \ "CONFIG_DEVICE_POWER_MANAGEMENT=y" \
"CONFIG_BLUETOOTH_SMP=y" \ "CONFIG_BT_SMP=y" \
"CONFIG_BLUETOOTH_BREDR=y" \ "CONFIG_BT_BREDR=y" \
"__deprecated=" \ "__deprecated=" \
"__printf_like(x, y)=" \ "__printf_like(x, y)=" \
"__attribute(x)__=" "__attribute(x)__="

2
drivers/Makefile
View file

@ -8,7 +8,7 @@ obj-$(CONFIG_SYS_CLOCK_EXISTS) += timer/
obj-y += interrupt_controller/ obj-y += interrupt_controller/
obj-$(CONFIG_GROVE) += grove/ obj-$(CONFIG_GROVE) += grove/
obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_BLUETOOTH) += bluetooth/ obj-$(CONFIG_BT) += bluetooth/
obj-$(CONFIG_SHARED_IRQ) += shared_irq/ obj-$(CONFIG_SHARED_IRQ) += shared_irq/
obj-$(CONFIG_SPI) += spi/ obj-$(CONFIG_SPI) += spi/
obj-$(CONFIG_FLASH) += flash/ obj-$(CONFIG_FLASH) += flash/

16
drivers/bluetooth/Kconfig
View file

@ -10,28 +10,28 @@
# Bluetooth options # Bluetooth options
# #
if BLUETOOTH if BT
menu "Bluetooth Drivers" menu "Bluetooth Drivers"
if BLUETOOTH_HCI if BT_HCI
source "drivers/bluetooth/hci/Kconfig" source "drivers/bluetooth/hci/Kconfig"
endif endif
if BLUETOOTH_CUSTOM if BT_CUSTOM
# Insert here any custom (non-HCI) offload drives # Insert here any custom (non-HCI) offload drives
endif endif
config BLUETOOTH_NRF51_PM config BT_NRF51_PM
bool "nRF51 Power Management [EXPERIMENTAL]" bool "nRF51 Power Management [EXPERIMENTAL]"
depends on BLUETOOTH_H4 depends on BT_H4
help help
Power Management support for Nordic BLE nRF51 chip. Allows to enable, Power Management support for Nordic BLE nRF51 chip. Allows to enable,
disable the chip and handle wakeups. disable the chip and handle wakeups.
config BLUETOOTH_WAIT_NOP config BT_WAIT_NOP
bool "Wait for \"NOP\" Command Complete event during init" bool "Wait for \"NOP\" Command Complete event during init"
depends on BLUETOOTH_HCI depends on BT_HCI
help help
Some controllers emit a Command Complete event for the NOP Some controllers emit a Command Complete event for the NOP
opcode to indicate that they're ready to receive commands. opcode to indicate that they're ready to receive commands.
@ -40,4 +40,4 @@ config BLUETOOTH_WAIT_NOP
endmenu endmenu
endif # BLUETOOTH endif # BT

2
drivers/bluetooth/Makefile
View file

@ -1,4 +1,4 @@
ccflags-y += -I$(srctree)/subsys/bluetooth ccflags-y += -I$(srctree)/subsys/bluetooth
obj-y += hci/ obj-y += hci/
obj-$(CONFIG_BLUETOOTH_NRF51_PM) += nrf51_pm.o obj-$(CONFIG_BT_NRF51_PM) += nrf51_pm.o

54
drivers/bluetooth/hci/Kconfig
View file

@ -10,35 +10,35 @@ comment "Bluetooth HCI Driver Options"
# Controller support is an HCI driver in itself, so these HCI driver # Controller support is an HCI driver in itself, so these HCI driver
# options are only applicable if controller support hasn't been enabled. # options are only applicable if controller support hasn't been enabled.
if !BLUETOOTH_CONTROLLER if !BT_CONTROLLER
config BLUETOOTH_UART config BT_UART
bool bool
choice choice
prompt "Bluetooth HCI driver" prompt "Bluetooth HCI driver"
default BLUETOOTH_H4 default BT_H4
config BLUETOOTH_H4 config BT_H4
bool "H:4 UART" bool "H:4 UART"
select UART_INTERRUPT_DRIVEN select UART_INTERRUPT_DRIVEN
select BLUETOOTH_UART select BT_UART
select BLUETOOTH_RECV_IS_RX_THREAD select BT_RECV_IS_RX_THREAD
depends on SERIAL depends on SERIAL
help help
Bluetooth H:4 UART driver. Requires hardware flow control Bluetooth H:4 UART driver. Requires hardware flow control
lines to be available. lines to be available.
config BLUETOOTH_H5 config BT_H5
bool "H:5 UART [EXPERIMENTAL]" bool "H:5 UART [EXPERIMENTAL]"
select UART_INTERRUPT_DRIVEN select UART_INTERRUPT_DRIVEN
select BLUETOOTH_UART select BT_UART
depends on SERIAL depends on SERIAL
help help
Bluetooth three-wire (H:5) UART driver. Implementation of HCI Bluetooth three-wire (H:5) UART driver. Implementation of HCI
Three-Wire UART Transport Layer. Three-Wire UART Transport Layer.
config BLUETOOTH_SPI config BT_SPI
bool "SPI HCI" bool "SPI HCI"
depends on SPI depends on SPI
help help
@ -48,7 +48,7 @@ config BLUETOOTH_SPI
additional platform specific knowledge may need to be added as additional platform specific knowledge may need to be added as
devices are. devices are.
config BLUETOOTH_NO_DRIVER config BT_NO_DRIVER
bool "No default HCI driver" bool "No default HCI driver"
help help
This is intended for unit tests where no internal driver This is intended for unit tests where no internal driver
@ -56,22 +56,22 @@ config BLUETOOTH_NO_DRIVER
endchoice endchoice
endif # !BLUETOOTH_CONTROLLER endif # !BT_CONTROLLER
if !HAS_DTS if !HAS_DTS
config BLUETOOTH_UART_ON_DEV_NAME config BT_UART_ON_DEV_NAME
string "Device Name of UART Device for Bluetooth" string "Device Name of UART Device for Bluetooth"
default "UART_0" default "UART_0"
depends on BLUETOOTH_UART depends on BT_UART
help help
This option specifies the name of UART device to be used This option specifies the name of UART device to be used
for Bluetooth. for Bluetooth.
endif endif
config BLUETOOTH_SPI_DEV_NAME config BT_SPI_DEV_NAME
string "Device Name of SPI Device for Bluetooth" string "Device Name of SPI Device for Bluetooth"
default "SPI_0" default "SPI_0"
depends on BLUETOOTH_SPI depends on BT_SPI
help help
This option specifies the name of SPI device to be used for Bluetooth. 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 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 this device is used to reply back with HCI frames that are sent over
the air. the air.
if BLUETOOTH_SPI if BT_SPI
config BLUETOOTH_SPI_BLUENRG config BT_SPI_BLUENRG
bool "Enable compatibility with BlueNRG-based devices" bool "Enable compatibility with BlueNRG-based devices"
default n default n
help help
Enable support for devices compatible with the BlueNRG Bluetooth Enable support for devices compatible with the BlueNRG Bluetooth
Stack. Current driver supports: ST X-NUCLEO BLE series. 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" string "Chip Select (CS) line driver name"
depends on BLUETOOTH_SPI_BLUENRG depends on BT_SPI_BLUENRG
help help
This option specifies the name of GPIO driver controlling This option specifies the name of GPIO driver controlling
the Chip Select (CS) line. the Chip Select (CS) line.
config BLUETOOTH_SPI_IRQ_DEV_NAME config BT_SPI_IRQ_DEV_NAME
string "IRQ line driver name" string "IRQ line driver name"
help help
This option specifies the name of GPIO driver controlling This option specifies the name of GPIO driver controlling
the chip's IRQ line. the chip's IRQ line.
config BLUETOOTH_SPI_RESET_DEV_NAME config BT_SPI_RESET_DEV_NAME
string "Reset line driver name" string "Reset line driver name"
help help
This option specifies the name of GPIO driver controlling This option specifies the name of GPIO driver controlling
the chip's Reset line. the chip's Reset line.
config BLUETOOTH_SPI_CHIP_SELECT_PIN config BT_SPI_CHIP_SELECT_PIN
int "SPI Chip Select (CS) line number" int "SPI Chip Select (CS) line number"
depends on BLUETOOTH_SPI_BLUENRG depends on BT_SPI_BLUENRG
help help
This option specifies the Chip Select (CS) line number on the SPI This option specifies the Chip Select (CS) line number on the SPI
device device
config BLUETOOTH_SPI_IRQ_PIN config BT_SPI_IRQ_PIN
int "SPI IRQ line number" int "SPI IRQ line number"
help help
This option specifies the IRQ line number on the SPI device 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" int "SPI Reset line number"
help help
This option specifies the Reset line number on the SPI device 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" int "Maximum clock frequency for the HCI SPI interface"
default 5000000 default 5000000
help help
This option specifies the maximum clock rate the HCI SPI This option specifies the maximum clock rate the HCI SPI
interface is capable of running at. interface is capable of running at.
endif # BLUETOOTH_SPI endif # BT_SPI

6
drivers/bluetooth/hci/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y += -I$(srctree)/subsys/bluetooth ccflags-y += -I$(srctree)/subsys/bluetooth
obj-$(CONFIG_BLUETOOTH_H4) += h4.o obj-$(CONFIG_BT_H4) += h4.o
obj-$(CONFIG_BLUETOOTH_H5) += h5.o obj-$(CONFIG_BT_H5) += h5.o
obj-$(CONFIG_BLUETOOTH_SPI) += spi.o obj-$(CONFIG_BT_SPI) += spi.o

14
drivers/bluetooth/hci/h4.c
View file

@ -22,12 +22,12 @@
#include <bluetooth/hci.h> #include <bluetooth/hci.h>
#include <bluetooth/hci_driver.h> #include <bluetooth/hci_driver.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 "common/log.h"
#include "../util.h" #include "../util.h"
#if defined(CONFIG_BLUETOOTH_NRF51_PM) #if defined(CONFIG_BT_NRF51_PM)
#include "../nrf51_pm.h" #include "../nrf51_pm.h"
#endif #endif
@ -37,7 +37,7 @@
#define H4_SCO 0x03 #define H4_SCO 0x03
#define H4_EVT 0x04 #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 k_thread rx_thread_data;
static struct { static struct {
@ -123,7 +123,7 @@ static inline void get_evt_hdr(void)
rx.remaining++; rx.remaining++;
rx.hdr_len++; rx.hdr_len++;
break; break;
#if defined(CONFIG_BLUETOOTH_BREDR) #if defined(CONFIG_BT_BREDR)
case BT_HCI_EVT_INQUIRY_RESULT_WITH_RSSI: case BT_HCI_EVT_INQUIRY_RESULT_WITH_RSSI:
case BT_HCI_EVT_EXTENDED_INQUIRY_RESULT: case BT_HCI_EVT_EXTENDED_INQUIRY_RESULT:
rx.discardable = true; rx.discardable = true;
@ -429,7 +429,7 @@ static int h4_open(void)
uart_irq_rx_disable(h4_dev); uart_irq_rx_disable(h4_dev);
uart_irq_tx_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) { if (nrf51_init(h4_dev) < 0) {
return -EIO; return -EIO;
} }
@ -442,7 +442,7 @@ static int h4_open(void)
k_thread_create(&rx_thread_data, rx_thread_stack, k_thread_create(&rx_thread_data, rx_thread_stack,
K_THREAD_STACK_SIZEOF(rx_thread_stack), K_THREAD_STACK_SIZEOF(rx_thread_stack),
rx_thread, NULL, NULL, NULL, rx_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO), K_PRIO_COOP(CONFIG_BT_RX_PRIO),
0, K_NO_WAIT); 0, K_NO_WAIT);
return 0; return 0;
@ -459,7 +459,7 @@ static int _bt_uart_init(struct device *unused)
{ {
ARG_UNUSED(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) { if (!h4_dev) {
return -EINVAL; return -EINVAL;
} }

20
drivers/bluetooth/hci/h5.c
View file

@ -24,7 +24,7 @@
#include <bluetooth/hci.h> #include <bluetooth/hci.h>
#include <bluetooth/hci_driver.h> #include <bluetooth/hci_driver.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 "common/log.h"
#include "../util.h" #include "../util.h"
@ -120,12 +120,10 @@ static u8_t conf_req[3] = { 0x03, 0xfc };
static const u8_t conf_rsp[] = { 0x04, 0x7b }; static const u8_t conf_rsp[] = { 0x04, 0x7b };
/* H5 signal buffers pool */ /* H5 signal buffers pool */
#define CONFIG_BLUETOOTH_MAX_SIG_LEN 3 #define MAX_SIG_LEN 3
#define CONFIG_BLUETOOTH_SIGNAL_COUNT 2 #define SIGNAL_COUNT 2
#define SIG_BUF_SIZE (CONFIG_BLUETOOTH_HCI_RESERVE + \ #define SIG_BUF_SIZE (CONFIG_BT_HCI_RESERVE + MAX_SIG_LEN)
CONFIG_BLUETOOTH_MAX_SIG_LEN) NET_BUF_POOL_DEFINE(h5_pool, SIGNAL_COUNT, SIG_BUF_SIZE, 0, NULL);
NET_BUF_POOL_DEFINE(h5_pool, CONFIG_BLUETOOTH_SIGNAL_COUNT, SIG_BUF_SIZE, 0,
NULL);
static struct device *h5_dev; 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) static void hexdump(const char *str, const u8_t *packet, size_t length)
{ {
int n = 0; int n = 0;
@ -720,14 +718,14 @@ static void h5_init(void)
k_thread_create(&tx_thread_data, tx_stack, k_thread_create(&tx_thread_data, tx_stack,
K_THREAD_STACK_SIZEOF(tx_stack), K_THREAD_STACK_SIZEOF(tx_stack),
(k_thread_entry_t)tx_thread, NULL, NULL, NULL, (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); 0, K_NO_WAIT);
k_fifo_init(&h5.rx_queue); k_fifo_init(&h5.rx_queue);
k_thread_create(&rx_thread_data, rx_stack, k_thread_create(&rx_thread_data, rx_stack,
K_THREAD_STACK_SIZEOF(rx_stack), K_THREAD_STACK_SIZEOF(rx_stack),
(k_thread_entry_t)rx_thread, NULL, NULL, NULL, (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); 0, K_NO_WAIT);
/* Unack queue */ /* Unack queue */
@ -767,7 +765,7 @@ static int _bt_uart_init(struct device *unused)
{ {
ARG_UNUSED(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) { if (h5_dev == NULL) {
return -EINVAL; return -EINVAL;

66
drivers/bluetooth/hci/spi.c
View file

@ -14,7 +14,7 @@
#include <bluetooth/hci_driver.h> #include <bluetooth/hci_driver.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 "common/log.h"
#define HCI_CMD 0x01 #define HCI_CMD 0x01
@ -43,11 +43,11 @@
#define CMD_OGF 1 #define CMD_OGF 1
#define CMD_OCF 2 #define CMD_OCF 2
#define GPIO_IRQ_PIN CONFIG_BLUETOOTH_SPI_IRQ_PIN #define GPIO_IRQ_PIN CONFIG_BT_SPI_IRQ_PIN
#define GPIO_RESET_PIN CONFIG_BLUETOOTH_SPI_RESET_PIN #define GPIO_RESET_PIN CONFIG_BT_SPI_RESET_PIN
#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) #if defined(CONFIG_BT_SPI_BLUENRG)
#define GPIO_CS_PIN CONFIG_BLUETOOTH_SPI_CHIP_SELECT_PIN #define GPIO_CS_PIN CONFIG_BT_SPI_CHIP_SELECT_PIN
#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ #endif /* CONFIG_BT_SPI_BLUENRG */
/* Max SPI buffer length for transceive operations. /* 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 u8_t txmsg[SPI_MAX_MSG_LEN];
static struct device *spi_dev; static struct device *spi_dev;
#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) #if defined(CONFIG_BT_SPI_BLUENRG)
static struct device *cs_dev; static struct device *cs_dev;
#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ #endif /* CONFIG_BT_SPI_BLUENRG */
static struct device *irq_dev; static struct device *irq_dev;
static struct device *rst_dev; static struct device *rst_dev;
@ -79,10 +79,10 @@ static struct k_thread rx_thread_data;
static struct spi_config spi_conf = { static struct spi_config spi_conf = {
.config = SPI_WORD(8), .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 <misc/printk.h> #include <misc/printk.h>
static inline void spi_dump_message(const u8_t *pre, u8_t *buf, static inline void spi_dump_message(const u8_t *pre, u8_t *buf,
u8_t size) u8_t size)
@ -149,10 +149,10 @@ static void bt_spi_rx_thread(void)
k_sem_take(&sem_busy, K_FOREVER); k_sem_take(&sem_busy, K_FOREVER);
do { 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, 1);
gpio_pin_write(cs_dev, GPIO_CS_PIN, 0); gpio_pin_write(cs_dev, GPIO_CS_PIN, 0);
#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ #endif /* CONFIG_BT_SPI_BLUENRG */
spi_transceive(spi_dev, spi_transceive(spi_dev,
header_master, 5, header_slave, 5); header_master, 5, header_slave, 5);
} while (header_slave[STATUS_HEADER_TOREAD] == 0 || } while (header_slave[STATUS_HEADER_TOREAD] == 0 ||
@ -164,9 +164,9 @@ static void bt_spi_rx_thread(void)
} while (rxmsg[0] == 0); } while (rxmsg[0] == 0);
gpio_pin_enable_callback(irq_dev, GPIO_IRQ_PIN); 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); gpio_pin_write(cs_dev, GPIO_CS_PIN, 1);
#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ #endif /* CONFIG_BT_SPI_BLUENRG */
k_sem_give(&sem_busy); k_sem_give(&sem_busy);
spi_dump_message("RX:ed", rxmsg, size); 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 */ /* Poll sanity values until device has woken-up */
do { 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, 1);
gpio_pin_write(cs_dev, GPIO_CS_PIN, 0); 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); 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); spi_transceive(spi_dev, buf->data, buf->len, rxmsg, buf->len);
} while (rxmsg[0] == 0); } while (rxmsg[0] == 0);
#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) #if defined(CONFIG_BT_SPI_BLUENRG)
/* Deselect chip */ /* Deselect chip */
gpio_pin_write(cs_dev, GPIO_CS_PIN, 1); gpio_pin_write(cs_dev, GPIO_CS_PIN, 1);
#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ #endif /* CONFIG_BT_SPI_BLUENRG */
k_sem_give(&sem_busy); k_sem_give(&sem_busy);
spi_dump_message("TX:ed", buf->data, buf->len); 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. * Since a RESET has been requested, the chip will now restart.
* Unfortunately the BlueNRG will reply with "reset received" but * 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) { if (bt_spi_get_cmd(buf->data) == BT_HCI_OP_RESET) {
k_sem_take(&sem_initialised, K_FOREVER); k_sem_take(&sem_initialised, K_FOREVER);
} }
#endif /* CONFIG_BLUETOOTH_SPI_BLUENRG */ #endif /* CONFIG_BT_SPI_BLUENRG */
net_buf_unref(buf); net_buf_unref(buf);
@ -302,12 +302,12 @@ static int bt_spi_open(void)
spi_configure(spi_dev, &spi_conf); spi_configure(spi_dev, &spi_conf);
#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) #if defined(CONFIG_BT_SPI_BLUENRG)
/* Configure the CS (Chip Select) pin */ /* Configure the CS (Chip Select) pin */
gpio_pin_configure(cs_dev, GPIO_CS_PIN, gpio_pin_configure(cs_dev, GPIO_CS_PIN,
GPIO_DIR_OUT | GPIO_PUD_PULL_UP); GPIO_DIR_OUT | GPIO_PUD_PULL_UP);
gpio_pin_write(cs_dev, GPIO_CS_PIN, 1); 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 */ /* Configure IRQ pin and the IRQ call-back/handler */
gpio_pin_configure(irq_dev, GPIO_IRQ_PIN, 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_create(&rx_thread_data, rx_stack,
K_THREAD_STACK_SIZEOF(rx_stack), K_THREAD_STACK_SIZEOF(rx_stack),
(k_thread_entry_t)bt_spi_rx_thread, NULL, NULL, NULL, (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); 0, K_NO_WAIT);
/* Take BLE out of reset */ /* Take BLE out of reset */
@ -351,33 +351,33 @@ static int _bt_spi_init(struct device *unused)
{ {
ARG_UNUSED(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) { if (!spi_dev) {
BT_ERR("Failed to initialize SPI driver: %s", BT_ERR("Failed to initialize SPI driver: %s",
CONFIG_BLUETOOTH_SPI_DEV_NAME); CONFIG_BT_SPI_DEV_NAME);
return -EIO; return -EIO;
} }
#if defined(CONFIG_BLUETOOTH_SPI_BLUENRG) #if defined(CONFIG_BT_SPI_BLUENRG)
cs_dev = device_get_binding(CONFIG_BLUETOOTH_SPI_CHIP_SELECT_DEV_NAME); cs_dev = device_get_binding(CONFIG_BT_SPI_CHIP_SELECT_DEV_NAME);
if (!cs_dev) { if (!cs_dev) {
BT_ERR("Failed to initialize GPIO driver: %s", BT_ERR("Failed to initialize GPIO driver: %s",
CONFIG_BLUETOOTH_SPI_CHIP_SELECT_DEV_NAME); CONFIG_BT_SPI_CHIP_SELECT_DEV_NAME);
return -EIO; 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) { if (!irq_dev) {
BT_ERR("Failed to initialize GPIO driver: %s", BT_ERR("Failed to initialize GPIO driver: %s",
CONFIG_BLUETOOTH_SPI_IRQ_DEV_NAME); CONFIG_BT_SPI_IRQ_DEV_NAME);
return -EIO; 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) { if (!rst_dev) {
BT_ERR("Failed to initialize GPIO driver: %s", BT_ERR("Failed to initialize GPIO driver: %s",
CONFIG_BLUETOOTH_SPI_RESET_DEV_NAME); CONFIG_BT_SPI_RESET_DEV_NAME);
return -EIO; return -EIO;
} }

2
drivers/bluetooth/nrf51_pm.c
View file

@ -12,7 +12,7 @@
#include <errno.h> #include <errno.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 "common/log.h"
#define NBLE_SWDIO_PIN 6 #define NBLE_SWDIO_PIN 6

2
drivers/flash/Kconfig
View file

@ -132,7 +132,7 @@ config SOC_FLASH_NRF5_DEV_NAME
config SOC_FLASH_NRF5_RADIO_SYNC config SOC_FLASH_NRF5_RADIO_SYNC
bool "Nordic nRF5x flash driver synchronized with radio" bool "Nordic nRF5x flash driver synchronized with radio"
depends on SOC_FLASH_NRF5 && BLUETOOTH_CONTROLLER depends on SOC_FLASH_NRF5 && BT_CONTROLLER
default y default y
help help
Enable synchronization between flash memory driver and radio. Enable synchronization between flash memory driver and radio.

4
dts/arm/frdm_k64f.dts
View file

@ -30,7 +30,7 @@
zephyr,sram = &sram0; zephyr,sram = &sram0;
zephyr,flash = &flash0; zephyr,flash = &flash0;
zephyr,console = &uart0; zephyr,console = &uart0;
#ifdef CONFIG_BLUETOOTH #ifdef CONFIG_BT
zephyr,bt-uart = &uart3; zephyr,bt-uart = &uart3;
#endif #endif
zephyr,uart-pipe = &uart0; zephyr,uart-pipe = &uart0;
@ -54,7 +54,7 @@
current-speed = <115200>; current-speed = <115200>;
}; };
#ifdef CONFIG_BLUETOOTH #ifdef CONFIG_BT
&uart3 { &uart3 {
status = "ok"; status = "ok";
current-speed = <115200>; current-speed = <115200>;

4
dts/arm/hexiwear_k64.dts
View file

@ -30,7 +30,7 @@
zephyr,sram = &sram0; zephyr,sram = &sram0;
zephyr,flash = &flash0; zephyr,flash = &flash0;
zephyr,console = &uart0; zephyr,console = &uart0;
#ifdef CONFIG_BLUETOOTH #ifdef CONFIG_BT
zephyr,bt-uart = &uart4; zephyr,bt-uart = &uart4;
#endif #endif
}; };
@ -58,7 +58,7 @@
current-speed = <115200>; current-speed = <115200>;
}; };
#ifdef CONFIG_BLUETOOTH #ifdef CONFIG_BT
&uart4 { &uart4 {
status = "ok"; status = "ok";
current-speed = <115200>; current-speed = <115200>;

4
include/bluetooth/att.h
View file

@ -53,9 +53,9 @@ struct bt_att_req {
bt_att_destroy_t destroy; bt_att_destroy_t destroy;
struct net_buf_simple_state state; struct net_buf_simple_state state;
struct net_buf *buf; struct net_buf *buf;
#if defined(CONFIG_BLUETOOTH_SMP) #if defined(CONFIG_BT_SMP)
bool retrying; bool retrying;
#endif /* CONFIG_BLUETOOTH_SMP */ #endif /* CONFIG_BT_SMP */
}; };
#ifdef __cplusplus #ifdef __cplusplus

2
include/bluetooth/bluetooth.h
View file

@ -278,7 +278,7 @@ struct bt_le_oob {
* pairing or connection creation process. * pairing or connection creation process.
* *
* If privacy is enabled this will result in generating new Resolvable Private * 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. * will be used for advertising, active scanning and connection creation.
* *
* @param oob LE related information * @param oob LE related information

3
include/bluetooth/buf.h
View file

@ -38,8 +38,7 @@ enum bt_buf_type {
#define BT_BUF_USER_DATA_MIN 4 #define BT_BUF_USER_DATA_MIN 4
/** Data size neeed for HCI RX buffers */ /** Data size neeed for HCI RX buffers */
#define BT_BUF_RX_SIZE (CONFIG_BLUETOOTH_HCI_RESERVE + \ #define BT_BUF_RX_SIZE (CONFIG_BT_HCI_RESERVE + CONFIG_BT_RX_BUF_LEN)
CONFIG_BLUETOOTH_RX_BUF_LEN)
/** Allocate a buffer for incoming data /** Allocate a buffer for incoming data
* *

10
include/bluetooth/conn.h
View file

@ -346,7 +346,7 @@ struct bt_conn_cb {
*/ */
void (*le_param_updated)(struct bt_conn *conn, u16_t interval, void (*le_param_updated)(struct bt_conn *conn, u16_t interval,
u16_t latency, u16_t timeout); u16_t latency, u16_t timeout);
#if defined(CONFIG_BLUETOOTH_SMP) #if defined(CONFIG_BT_SMP)
/** @brief Remote Identity Address has been resolved. /** @brief Remote Identity Address has been resolved.
* *
* This callback notifies the application that a remote * This callback notifies the application that a remote
@ -359,8 +359,8 @@ struct bt_conn_cb {
void (*identity_resolved)(struct bt_conn *conn, void (*identity_resolved)(struct bt_conn *conn,
const bt_addr_le_t *rpa, const bt_addr_le_t *rpa,
const bt_addr_le_t *identity); const bt_addr_le_t *identity);
#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)
/** @brief The security level of a connection has changed. /** @brief The security level of a connection has changed.
* *
* This callback notifies the application that the security level * 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. * @param level New security level of the connection.
*/ */
void (*security_changed)(struct bt_conn *conn, bt_security_t level); 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; 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 (*passkey_confirm)(struct bt_conn *conn, unsigned int passkey);
void (*cancel)(struct bt_conn *conn); void (*cancel)(struct bt_conn *conn);
void (*pairing_confirm)(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); void (*pincode_entry)(struct bt_conn *conn, bool highsec);
#endif #endif
}; };

3
include/bluetooth/gatt.h
View file

@ -485,8 +485,7 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
.properties = _props, }),\ .properties = _props, }),\
} }
#define BT_GATT_CCC_MAX (CONFIG_BLUETOOTH_MAX_PAIRED + \ #define BT_GATT_CCC_MAX (CONFIG_BT_MAX_PAIRED + CONFIG_BT_MAX_CONN)
CONFIG_BLUETOOTH_MAX_CONN)
/** @brief GATT CCC configuration entry. /** @brief GATT CCC configuration entry.
* @param valid Valid flag * @param valid Valid flag

8
include/bluetooth/l2cap.h
View file

@ -38,7 +38,7 @@ extern "C" {
* *
* @return Needed buffer size to match the requested L2CAP MTU. * @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 + \ BT_HCI_ACL_HDR_SIZE + BT_L2CAP_HDR_SIZE + \
(mtu)) (mtu))
@ -78,14 +78,14 @@ struct bt_l2cap_chan {
bt_l2cap_chan_destroy_t destroy; bt_l2cap_chan_destroy_t destroy;
/* Response Timeout eXpired (RTX) timer */ /* Response Timeout eXpired (RTX) timer */
struct k_delayed_work rtx_work; 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; bt_l2cap_chan_state_t state;
/** Remote PSM to be connected */ /** Remote PSM to be connected */
u16_t psm; u16_t psm;
/** Helps match request context during CoC */ /** Helps match request context during CoC */
u8_t ident; u8_t ident;
bt_security_t required_sec_level; bt_security_t required_sec_level;
#endif /* CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL */ #endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
}; };
/** @brief LE L2CAP Endpoint structure. */ /** @brief LE L2CAP Endpoint structure. */
@ -210,7 +210,7 @@ struct bt_l2cap_chan_ops {
/** @def BT_L2CAP_CHAN_SEND_RESERVE /** @def BT_L2CAP_CHAN_SEND_RESERVE
* @brief Headroom needed for outgoing buffers * @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. */ /** @brief L2CAP Server structure. */
struct bt_l2cap_server { struct bt_l2cap_server {

12
include/bluetooth/mesh.h
View file

@ -209,10 +209,10 @@ struct bt_mesh_model_op {
{ \ { \
.id = (_id), \ .id = (_id), \
.op = _op, \ .op = _op, \
.keys = { [0 ... (CONFIG_BLUETOOTH_MESH_MODEL_KEY_COUNT - 1)] = \ .keys = { [0 ... (CONFIG_BT_MESH_MODEL_KEY_COUNT - 1)] = \
BT_MESH_KEY_UNUSED }, \ BT_MESH_KEY_UNUSED }, \
.pub = _pub, \ .pub = _pub, \
.groups = { [0 ... (CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT - 1)] = \ .groups = { [0 ... (CONFIG_BT_MESH_MODEL_GROUP_COUNT - 1)] = \
BT_MESH_ADDR_UNASSIGNED }, \ BT_MESH_ADDR_UNASSIGNED }, \
.user_data = _user_data, \ .user_data = _user_data, \
} }
@ -223,9 +223,9 @@ struct bt_mesh_model_op {
.vnd.id = (_id), \ .vnd.id = (_id), \
.op = _op, \ .op = _op, \
.pub = _pub, \ .pub = _pub, \
.keys = { [0 ... (CONFIG_BLUETOOTH_MESH_MODEL_KEY_COUNT - 1)] = \ .keys = { [0 ... (CONFIG_BT_MESH_MODEL_KEY_COUNT - 1)] = \
BT_MESH_KEY_UNUSED }, \ 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 }, \ BT_MESH_ADDR_UNASSIGNED }, \
.user_data = _user_data, \ .user_data = _user_data, \
} }
@ -367,10 +367,10 @@ struct bt_mesh_model {
struct bt_mesh_model_pub * const pub; struct bt_mesh_model_pub * const pub;
/* AppKey List */ /* 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) */ /* 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; const struct bt_mesh_model_op * const op;

4
include/bluetooth/uuid.h
View file

@ -530,7 +530,7 @@ struct bt_uuid_128 {
*/ */
int bt_uuid_cmp(const struct bt_uuid *u1, const struct bt_uuid *u2); 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. /** @brief Convert Bluetooth UUID to string.
* *
* Converts Bluetooth UUID to string. UUID has to be in 16 bits or 128 bits * 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 ""; return "";
} }
#endif /* CONFIG_BLUETOOTH_DEBUG */ #endif /* CONFIG_BT_DEBUG */
#ifdef __cplusplus #ifdef __cplusplus
} }

4
include/drivers/bluetooth/hci_driver.h
View file

@ -44,7 +44,7 @@ static inline bool bt_hci_evt_is_prio(u8_t evt)
switch (evt) { switch (evt) {
case BT_HCI_EVT_CMD_COMPLETE: case BT_HCI_EVT_CMD_COMPLETE:
case BT_HCI_EVT_CMD_STATUS: case BT_HCI_EVT_CMD_STATUS:
#if defined(CONFIG_BLUETOOTH_CONN) #if defined(CONFIG_BT_CONN)
case BT_HCI_EVT_NUM_COMPLETED_PACKETS: case BT_HCI_EVT_NUM_COMPLETED_PACKETS:
#endif #endif
return true; return true;
@ -121,7 +121,7 @@ struct bt_hci_driver {
* is safe to start calling the send() handler. * is safe to start calling the send() handler.
* *
* If the driver uses its own RX thread, i.e. * 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. * function is expected to start that thread.
* *
* @return 0 on success or negative error number on failure. * @return 0 on success or negative error number on failure.

4
include/net/net_ip.h
View file

@ -696,7 +696,7 @@ static inline void net_ipv6_addr_create_iid(struct in6_addr *addr,
addr->s6_addr[12] = 0xfe; addr->s6_addr[12] = 0xfe;
memcpy(&addr->s6_addr[13], lladdr->addr + 3, 3); 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. /* Workaround against older Linux kernel BT IPSP code.
* This will be removed eventually. * 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) && !memcmp(&addr->s6_addr[13], &lladdr->addr[3], 3) &&
addr->s6_addr[11] == 0xff && addr->s6_addr[11] == 0xff &&
addr->s6_addr[12] == 0xfe 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 /* Workaround against older Linux kernel BT IPSP
* code. This will be removed eventually. * code. This will be removed eventually.
*/ */

4
include/net/net_l2.h
View file

@ -80,10 +80,10 @@ NET_L2_DECLARE_PUBLIC(ETHERNET_L2);
NET_L2_DECLARE_PUBLIC(IEEE802154_L2); NET_L2_DECLARE_PUBLIC(IEEE802154_L2);
#endif /* CONFIG_NET_L2_IEEE802154 */ #endif /* CONFIG_NET_L2_IEEE802154 */
#ifdef CONFIG_NET_L2_BLUETOOTH #ifdef CONFIG_NET_L2_BT
#define BLUETOOTH_L2 BLUETOOTH #define BLUETOOTH_L2 BLUETOOTH
#define BLUETOOTH_L2_CTX_TYPE void* #define BLUETOOTH_L2_CTX_TYPE void*
#endif /* CONFIG_NET_L2_BLUETOOTH */ #endif /* CONFIG_NET_L2_BT */
#ifdef CONFIG_NET_OFFLOAD #ifdef CONFIG_NET_OFFLOAD
#define OFFLOAD_IP_L2 OFFLOAD_IP #define OFFLOAD_IP_L2 OFFLOAD_IP

6
samples/bluetooth/beacon/prj.conf
View file

@ -1,3 +1,3 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_DEVICE_NAME="Test beacon" CONFIG_BT_DEVICE_NAME="Test beacon"

2
samples/bluetooth/beacon/src/main.c
View file

@ -14,7 +14,7 @@
#include <bluetooth/bluetooth.h> #include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h> #include <bluetooth/hci.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
/* /*

4
samples/bluetooth/bluetooth.rst
View file

@ -25,8 +25,8 @@ down.
Listening on /tmp/bt-server-bredr Listening on /tmp/bt-server-bredr
Running the application in QEMU will connect the second serial line to Running the application in QEMU will connect the second serial line to
``bt-server-bredr`` Unix socket. When Bluetooth (CONFIG_BLUETOOTH) and Bluetooth ``bt-server-bredr`` Unix socket. When Bluetooth (CONFIG_BT) and Bluetooth
HCI UART driver (CONFIG_BLUETOOTH_H4) are enabled, the Bluetooth driver HCI UART driver (CONFIG_BT_H4) are enabled, the Bluetooth driver
registers with the system. registers with the system.
From now on Bluetooth may be used by the application. To run applications in From now on Bluetooth may be used by the application. To run applications in

4
samples/bluetooth/central/prj.conf
View file

@ -1,2 +1,2 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CENTRAL=y CONFIG_BT_CENTRAL=y

10
samples/bluetooth/central_hr/prj.conf
View file

@ -1,5 +1,5 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_GATT_CLIENT=y CONFIG_BT_GATT_CLIENT=y

8
samples/bluetooth/eddystone/prj.conf
View file

@ -1,4 +1,4 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Eddystone" CONFIG_BT_DEVICE_NAME="Zephyr Eddystone"

2
samples/bluetooth/eddystone/src/main.c
View file

@ -21,7 +21,7 @@
#include <bluetooth/uuid.h> #include <bluetooth/uuid.h>
#include <bluetooth/gatt.h> #include <bluetooth/gatt.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
#define NUMBER_OF_SLOTS 1 #define NUMBER_OF_SLOTS 1
#define EDS_VERSION 0x00 #define EDS_VERSION 0x00

2
samples/bluetooth/gatt/ipss.c
View file

@ -22,7 +22,7 @@
#include <bluetooth/uuid.h> #include <bluetooth/uuid.h>
#include <bluetooth/gatt.h> #include <bluetooth/gatt.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
#define UNKNOWN_APPEARANCE 0x0000 #define UNKNOWN_APPEARANCE 0x0000

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

@ -1,8 +1,8 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_BREDR=y CONFIG_BT_BREDR=y
CONFIG_BLUETOOTH_RFCOMM=y CONFIG_BT_RFCOMM=y
CONFIG_BLUETOOTH_HFP_HF=y CONFIG_BT_HFP_HF=y
CONFIG_BLUETOOTH_MAX_HF_CONN=1 CONFIG_BT_MAX_HF_CONN=1
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_RFCOMM_MTU=127 CONFIG_BT_RFCOMM_MTU=127
CONFIG_BLUETOOTH_DEVICE_NAME="test-Handsfree" CONFIG_BT_DEVICE_NAME="test-Handsfree"

4
samples/bluetooth/hci_uart/generic.conf
View file

@ -3,5 +3,5 @@ CONFIG_STDOUT_CONSOLE=n
CONFIG_UART_CONSOLE=n CONFIG_UART_CONSOLE=n
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_HCI_RAW=y CONFIG_BT_HCI_RAW=y

6
samples/bluetooth/hci_uart/microbit.conf
View file

@ -9,6 +9,6 @@ CONFIG_UART_NRF5_FLOW_CONTROL=n
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_IDLE_STACK_SIZE=256 CONFIG_IDLE_STACK_SIZE=256
CONFIG_ISR_STACK_SIZE=512 CONFIG_ISR_STACK_SIZE=512
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_HCI_RAW=y CONFIG_BT_HCI_RAW=y
CONFIG_BLUETOOTH_MAX_CONN=20 CONFIG_BT_MAX_CONN=20

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

@ -8,8 +8,8 @@ CONFIG_UART_NRF5_BAUD_RATE=1000000
CONFIG_UART_NRF5_FLOW_CONTROL=y CONFIG_UART_NRF5_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_HCI_RAW=y CONFIG_BT_HCI_RAW=y
CONFIG_BLUETOOTH_MAX_CONN=16 CONFIG_BT_MAX_CONN=16
CONFIG_BLUETOOTH_CONTROLLER_ASSERT_HANDLER=y CONFIG_BT_CONTROLLER_ASSERT_HANDLER=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=n CONFIG_BT_TINYCRYPT_ECC=n

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

@ -30,26 +30,25 @@
#include "common/log.h" #include "common/log.h"
static struct device *hci_uart_dev; 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; static struct k_thread tx_thread_data;
/* HCI command buffers */ /* HCI command buffers */
#define CMD_BUF_SIZE BT_BUF_RX_SIZE #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); BT_BUF_USER_DATA_MIN, NULL);
#if defined(CONFIG_BLUETOOTH_CONTROLLER) #if defined(CONFIG_BT_CONTROLLER)
#define BT_L2CAP_MTU (CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFER_SIZE - \ #define BT_L2CAP_MTU (CONFIG_BT_CONTROLLER_TX_BUFFER_SIZE - BT_L2CAP_HDR_SIZE)
BT_L2CAP_HDR_SIZE)
#else #else
#define BT_L2CAP_MTU 65 /* 64-byte public key + opcode */ #define BT_L2CAP_MTU 65 /* 64-byte public key + opcode */
#endif /* CONFIG_BLUETOOTH_CONTROLLER */ #endif /* CONFIG_BT_CONTROLLER */
/** Data size needed for ACL buffers */ /** Data size needed for ACL buffers */
#define BT_BUF_ACL_SIZE BT_L2CAP_BUF_SIZE(BT_L2CAP_MTU) #define BT_BUF_ACL_SIZE BT_L2CAP_BUF_SIZE(BT_L2CAP_MTU)
#if defined(CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFERS) #if defined(CONFIG_BT_CONTROLLER_TX_BUFFERS)
#define TX_BUF_COUNT CONFIG_BLUETOOTH_CONTROLLER_TX_BUFFERS #define TX_BUF_COUNT CONFIG_BT_CONTROLLER_TX_BUFFERS
#else #else
#define TX_BUF_COUNT 6 #define TX_BUF_COUNT 6
#endif #endif
@ -273,7 +272,7 @@ static int h4_send(struct net_buf *buf)
return 0; 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) void bt_controller_assert_handle(char *file, u32_t line)
{ {
u32_t len = 0, pos = 0; u32_t len = 0, pos = 0;
@ -318,14 +317,14 @@ void bt_controller_assert_handle(char *file, u32_t line)
while (1) { while (1) {
} }
} }
#endif /* CONFIG_BLUETOOTH_CONTROLLER_ASSERT_HANDLER */ #endif /* CONFIG_BT_CONTROLLER_ASSERT_HANDLER */
static int hci_uart_init(struct device *unused) static int hci_uart_init(struct device *unused)
{ {
SYS_LOG_DBG(""); SYS_LOG_DBG("");
hci_uart_dev = 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) { if (!hci_uart_dev) {
return -EINVAL; return -EINVAL;
} }

4
samples/bluetooth/hci_usb/prj.conf
View file

@ -4,5 +4,5 @@ CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_STACK=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_HCI_RAW=y CONFIG_BT_HCI_RAW=y

4
samples/bluetooth/hci_usb/prj_tinytile.conf
View file

@ -3,8 +3,8 @@ CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_STACK=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_HCI_RAW=y CONFIG_BT_HCI_RAW=y
# USB is used by Bluetooth # USB is used by Bluetooth
CONFIG_CONSOLE=n CONFIG_CONSOLE=n

2
samples/bluetooth/hci_usb/src/main.c
View file

@ -76,7 +76,7 @@ static K_FIFO_DEFINE(rx_queue);
/* HCI command buffers */ /* HCI command buffers */
#define CMD_BUF_SIZE BT_BUF_RX_SIZE #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); sizeof(u8_t), NULL);
#define BT_L2CAP_MTU 64 #define BT_L2CAP_MTU 64

18
samples/bluetooth/ipsp/prj.conf
View file

@ -1,17 +1,17 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BLUETOOTH_DEVICE_NAME="Test IPSP node" CONFIG_BT_DEVICE_NAME="Test IPSP node"
CONFIG_NETWORKING=y CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y CONFIG_NET_IPV6=y
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
CONFIG_NET_UDP=y CONFIG_NET_UDP=y
CONFIG_NET_TCP=y CONFIG_NET_TCP=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_L2_BLUETOOTH=y CONFIG_NET_L2_BT=y
CONFIG_NET_L2_BLUETOOTH_ZEP1656=y CONFIG_NET_L2_BT_ZEP1656=y
CONFIG_INIT_STACKS=y CONFIG_INIT_STACKS=y
CONFIG_NET_PKT_RX_COUNT=10 CONFIG_NET_PKT_RX_COUNT=10
CONFIG_NET_PKT_TX_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_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_BLUETOOTH_NODE=y CONFIG_NET_APP_BT_NODE=y

20
samples/bluetooth/ipsp/prj_dbg.conf
View file

@ -1,9 +1,9 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BLUETOOTH_DEVICE_NAME="Test IPSP node" CONFIG_BT_DEVICE_NAME="Test IPSP node"
CONFIG_NETWORKING=y CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y CONFIG_NET_IPV6=y
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
@ -11,9 +11,9 @@ CONFIG_NET_UDP=y
CONFIG_NET_TCP=y CONFIG_NET_TCP=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y CONFIG_NET_LOG=y
CONFIG_NET_L2_BLUETOOTH=y CONFIG_NET_L2_BT=y
CONFIG_NET_L2_BLUETOOTH_ZEP1656=y CONFIG_NET_L2_BT_ZEP1656=y
CONFIG_NET_DEBUG_L2_BLUETOOTH=y CONFIG_NET_DEBUG_L2_BT=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y CONFIG_INIT_STACKS=y
CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS=y
@ -26,7 +26,7 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2
CONFIG_NET_MAX_CONTEXTS=6 CONFIG_NET_MAX_CONTEXTS=6
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_BLUETOOTH_SHELL=y CONFIG_BT_SHELL=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"

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

@ -4,43 +4,43 @@ CONFIG_MICROBIT_DISPLAY=y
CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_SYS_CLOCK_TICKS_PER_SEC=250
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 CONFIG_BT_RX_STACK_SIZE=1100
CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0
CONFIG_BLUETOOTH_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BLUETOOTH_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n CONFIG_BT_CONTROLLER_LE_ENC=n
CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n CONFIG_BT_CONTROLLER_LE_PING=n
CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n CONFIG_BT_CONTROLLER_DATA_LENGTH=n
CONFIG_BLUETOOTH_CONTROLLER_PHY=n CONFIG_BT_CONTROLLER_PHY=n
CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n CONFIG_BT_CONTROLLER_CHAN_SEL_2=n
CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n CONFIG_BT_CONTROLLER_ADV_EXT=n
CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n CONFIG_BT_CONTROLLER_PRIVACY=n
CONFIG_BLUETOOTH_MESH=y CONFIG_BT_MESH=y
CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 CONFIG_BT_MESH_RX_SDU_MAX=36
CONFIG_BLUETOOTH_MESH_RELAY=y CONFIG_BT_MESH_RELAY=y
#CONFIG_BLUETOOTH_MESH_LOW_POWER=y #CONFIG_BT_MESH_LOW_POWER=y
#CONFIG_BLUETOOTH_MESH_SELF_TEST=y #CONFIG_BT_MESH_SELF_TEST=y
#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y #CONFIG_BT_MESH_IV_UPDATE_TEST=y
CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 CONFIG_BT_MESH_SUBNET_COUNT=1
CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 CONFIG_BT_MESH_APP_KEY_COUNT=1
CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 CONFIG_BT_MESH_MODEL_GROUP_COUNT=1
CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 CONFIG_BT_MESH_LABEL_COUNT=0
#CONFIG_BLUETOOTH_DEBUG_LOG=y #CONFIG_BT_DEBUG_LOG=y
#CONFIG_BLUETOOTH_MESH_DEBUG=y #CONFIG_BT_MESH_DEBUG=y
#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y #CONFIG_BT_MESH_DEBUG_NET=y
#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y #CONFIG_BT_MESH_DEBUG_TRANS=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y #CONFIG_BT_MESH_DEBUG_PROV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y #CONFIG_BT_MESH_DEBUG_BEACON=y
#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y #CONFIG_BT_MESH_DEBUG_CRYPTO=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y #CONFIG_BT_MESH_DEBUG_ADV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y #CONFIG_BT_MESH_DEBUG_ACCESS=y

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

@ -5,56 +5,56 @@ CONFIG_MICROBIT_DISPLAY=y
CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_SYS_CLOCK_TICKS_PER_SEC=250
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_MESH_GATT_PROXY=y CONFIG_BT_MESH_GATT_PROXY=y
CONFIG_BLUETOOTH_MESH_PB_GATT=y CONFIG_BT_MESH_PB_GATT=y
CONFIG_BLUETOOTH_MESH_PB_ADV=n CONFIG_BT_MESH_PB_ADV=n
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Mesh" CONFIG_BT_DEVICE_NAME="Zephyr Mesh"
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BLUETOOTH_RX_STACK_SIZE=1400 CONFIG_BT_RX_STACK_SIZE=1400
CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 CONFIG_BT_L2CAP_TX_MTU=69
CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=5 CONFIG_BT_L2CAP_TX_BUF_COUNT=5
CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0
CONFIG_BLUETOOTH_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BLUETOOTH_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n CONFIG_BT_CONTROLLER_LE_ENC=n
CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n CONFIG_BT_CONTROLLER_LE_PING=n
CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n CONFIG_BT_CONTROLLER_DATA_LENGTH=n
CONFIG_BLUETOOTH_CONTROLLER_PHY=n CONFIG_BT_CONTROLLER_PHY=n
CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n CONFIG_BT_CONTROLLER_CHAN_SEL_2=n
CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n CONFIG_BT_CONTROLLER_ADV_EXT=n
CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n CONFIG_BT_CONTROLLER_PRIVACY=n
CONFIG_BLUETOOTH_MESH=y CONFIG_BT_MESH=y
CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 CONFIG_BT_MESH_RX_SDU_MAX=36
CONFIG_BLUETOOTH_MESH_RELAY=y CONFIG_BT_MESH_RELAY=y
CONFIG_BLUETOOTH_MESH_MSG_CACHE_SIZE=2 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_BT_MESH_SELF_TEST=y
#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y #CONFIG_BT_MESH_IV_UPDATE_TEST=y
CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 CONFIG_BT_MESH_SUBNET_COUNT=1
CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 CONFIG_BT_MESH_APP_KEY_COUNT=1
CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 CONFIG_BT_MESH_MODEL_GROUP_COUNT=1
CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 CONFIG_BT_MESH_LABEL_COUNT=0
#CONFIG_UART_CONSOLE=n #CONFIG_UART_CONSOLE=n
#CONFIG_BLUETOOTH_DEBUG_MONITOR=y #CONFIG_BT_DEBUG_MONITOR=y
#CONFIG_BLUETOOTH_DEBUG_LOG=y #CONFIG_BT_DEBUG_LOG=y
#CONFIG_BLUETOOTH_MESH_DEBUG=y #CONFIG_BT_MESH_DEBUG=y
#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y #CONFIG_BT_MESH_DEBUG_NET=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y #CONFIG_BT_MESH_DEBUG_PROXY=y
#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y #CONFIG_BT_MESH_DEBUG_TRANS=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y #CONFIG_BT_MESH_DEBUG_PROV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y #CONFIG_BT_MESH_DEBUG_BEACON=y
#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y #CONFIG_BT_MESH_DEBUG_CRYPTO=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y #CONFIG_BT_MESH_DEBUG_ADV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y #CONFIG_BT_MESH_DEBUG_ACCESS=y

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

@ -1,44 +1,44 @@
CONFIG_INIT_STACKS=y CONFIG_INIT_STACKS=y
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 CONFIG_BT_RX_STACK_SIZE=1100
CONFIG_BLUETOOTH_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BLUETOOTH_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0
CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n CONFIG_BT_CONTROLLER_LE_ENC=n
CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n CONFIG_BT_CONTROLLER_LE_PING=n
CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n CONFIG_BT_CONTROLLER_DATA_LENGTH=n
CONFIG_BLUETOOTH_CONTROLLER_PHY=n CONFIG_BT_CONTROLLER_PHY=n
CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n CONFIG_BT_CONTROLLER_CHAN_SEL_2=n
CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n CONFIG_BT_CONTROLLER_ADV_EXT=n
CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n CONFIG_BT_CONTROLLER_PRIVACY=n
CONFIG_BLUETOOTH_MESH=y CONFIG_BT_MESH=y
CONFIG_BLUETOOTH_MESH_LOW_POWER=y CONFIG_BT_MESH_LOW_POWER=y
CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 CONFIG_BT_MESH_RX_SDU_MAX=36
CONFIG_BLUETOOTH_MESH_RELAY=y CONFIG_BT_MESH_RELAY=y
CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 CONFIG_BT_MESH_SUBNET_COUNT=1
CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 CONFIG_BT_MESH_APP_KEY_COUNT=1
CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=1 CONFIG_BT_MESH_MODEL_GROUP_COUNT=1
CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 CONFIG_BT_MESH_LABEL_COUNT=0
#CONFIG_UART_CONSOLE=n #CONFIG_UART_CONSOLE=n
#CONFIG_BLUETOOTH_DEBUG_MONITOR=y #CONFIG_BT_DEBUG_MONITOR=y
#CONFIG_BLUETOOTH_DEBUG_LOG=y #CONFIG_BT_DEBUG_LOG=y
#CONFIG_BLUETOOTH_MESH_SELF_TEST=y #CONFIG_BT_MESH_SELF_TEST=y
#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y #CONFIG_BT_MESH_IV_UPDATE_TEST=y
#CONFIG_BLUETOOTH_MESH_DEBUG=y #CONFIG_BT_MESH_DEBUG=y
#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y #CONFIG_BT_MESH_DEBUG_NET=y
#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y #CONFIG_BT_MESH_DEBUG_TRANS=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y #CONFIG_BT_MESH_DEBUG_PROV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y #CONFIG_BT_MESH_DEBUG_BEACON=y
#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y #CONFIG_BT_MESH_DEBUG_CRYPTO=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y #CONFIG_BT_MESH_DEBUG_ADV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y #CONFIG_BT_MESH_DEBUG_ACCESS=y

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

@ -2,62 +2,62 @@ CONFIG_INIT_STACKS=y
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
CONFIG_BLUETOOTH_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BLUETOOTH_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0
CONFIG_BLUETOOTH_CONTROLLER_LE_ENC=n CONFIG_BT_CONTROLLER_LE_ENC=n
CONFIG_BLUETOOTH_CONTROLLER_LE_PING=n CONFIG_BT_CONTROLLER_LE_PING=n
CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH=n CONFIG_BT_CONTROLLER_DATA_LENGTH=n
CONFIG_BLUETOOTH_CONTROLLER_PHY=n CONFIG_BT_CONTROLLER_PHY=n
CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2=n CONFIG_BT_CONTROLLER_CHAN_SEL_2=n
CONFIG_BLUETOOTH_CONTROLLER_ADV_EXT=n CONFIG_BT_CONTROLLER_ADV_EXT=n
CONFIG_BLUETOOTH_CONTROLLER_PRIVACY=n CONFIG_BT_CONTROLLER_PRIVACY=n
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BLUETOOTH_RX_BUF_COUNT=30 CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BLUETOOTH_L2CAP_RX_MTU=69 CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BLUETOOTH_L2CAP_TX_MTU=69 CONFIG_BT_L2CAP_TX_MTU=69
CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=5 CONFIG_BT_L2CAP_TX_BUF_COUNT=5
CONFIG_BLUETOOTH_MESH=y CONFIG_BT_MESH=y
CONFIG_BLUETOOTH_MESH_RELAY=y CONFIG_BT_MESH_RELAY=y
CONFIG_BLUETOOTH_MESH_LOW_POWER=n CONFIG_BT_MESH_LOW_POWER=n
CONFIG_BLUETOOTH_MESH_FRIEND=n CONFIG_BT_MESH_FRIEND=n
CONFIG_BLUETOOTH_MESH_LOCAL_INTERFACE=y CONFIG_BT_MESH_LOCAL_INTERFACE=y
CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=20 CONFIG_BT_MESH_ADV_BUF_COUNT=20
CONFIG_BLUETOOTH_MESH_PB_GATT=y CONFIG_BT_MESH_PB_GATT=y
CONFIG_BLUETOOTH_MESH_PB_ADV=y CONFIG_BT_MESH_PB_ADV=y
CONFIG_BLUETOOTH_MESH_GATT_PROXY=y CONFIG_BT_MESH_GATT_PROXY=y
CONFIG_BLUETOOTH_MESH_LPN_SCAN_LATENCY=30 CONFIG_BT_MESH_LPN_SCAN_LATENCY=30
CONFIG_BLUETOOTH_MESH_LPN_RECV_DELAY=40 CONFIG_BT_MESH_LPN_RECV_DELAY=40
#CONFIG_BLUETOOTH_MESH_LPN_POLL_TIMEOUT=300 #CONFIG_BT_MESH_LPN_POLL_TIMEOUT=300
CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=2 CONFIG_BT_MESH_SUBNET_COUNT=2
CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 CONFIG_BT_MESH_APP_KEY_COUNT=2
CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 CONFIG_BT_MESH_MODEL_GROUP_COUNT=2
CONFIG_BLUETOOTH_MESH_LABEL_COUNT=3 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_UART_CONSOLE=n
#CONFIG_BLUETOOTH_DEBUG_MONITOR=y #CONFIG_BT_DEBUG_MONITOR=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
#CONFIG_BLUETOOTH_MESH_DEBUG=y #CONFIG_BT_MESH_DEBUG=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y #CONFIG_BT_MESH_DEBUG_PROV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROXY=y #CONFIG_BT_MESH_DEBUG_PROXY=y
#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y #CONFIG_BT_MESH_DEBUG_BEACON=y
#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y #CONFIG_BT_MESH_DEBUG_NET=y
#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y #CONFIG_BT_MESH_DEBUG_TRANS=y
#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y #CONFIG_BT_MESH_DEBUG_LOW_POWER=y
#CONFIG_BLUETOOTH_MESH_DEBUG_FRIEND=y #CONFIG_BT_MESH_DEBUG_FRIEND=y
#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y #CONFIG_BT_MESH_DEBUG_MODEL=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y #CONFIG_BT_MESH_DEBUG_ACCESS=y
#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y #CONFIG_BT_MESH_DEBUG_CRYPTO=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y #CONFIG_BT_MESH_DEBUG_ADV=y
#CONFIG_BLUETOOTH_MESH_SELF_TEST=y #CONFIG_BT_MESH_SELF_TEST=y

2
samples/bluetooth/mesh/src/main.c
View file

@ -19,7 +19,7 @@ static struct bt_mesh_cfg cfg_srv = {
.relay = BT_MESH_RELAY_DISABLED, .relay = BT_MESH_RELAY_DISABLED,
.beacon = BT_MESH_BEACON_ENABLED, .beacon = BT_MESH_BEACON_ENABLED,
.frnd = BT_MESH_FRIEND_NOT_SUPPORTED, .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, .gatt_proxy = BT_MESH_GATT_PROXY_ENABLED,
#else #else
.gatt_proxy = BT_MESH_GATT_PROXY_NOT_SUPPORTED, .gatt_proxy = BT_MESH_GATT_PROXY_NOT_SUPPORTED,

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

@ -10,31 +10,31 @@ CONFIG_MICROBIT_DISPLAY=y
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_PWM_NRF5_SW=y CONFIG_PWM_NRF5_SW=y
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_RX_STACK_SIZE=1280 CONFIG_BT_RX_STACK_SIZE=1280
CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0
CONFIG_BLUETOOTH_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BLUETOOTH_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BLUETOOTH_MESH=y CONFIG_BT_MESH=y
CONFIG_BLUETOOTH_MESH_RELAY=y CONFIG_BT_MESH_RELAY=y
CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 CONFIG_BT_MESH_RX_SDU_MAX=36
CONFIG_BLUETOOTH_MESH_TX_SEG_COUNT=3 CONFIG_BT_MESH_TX_SEG_COUNT=3
CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 CONFIG_BT_MESH_SUBNET_COUNT=1
CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=2 CONFIG_BT_MESH_APP_KEY_COUNT=2
CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 CONFIG_BT_MESH_MODEL_GROUP_COUNT=2
CONFIG_BLUETOOTH_MESH_ADV_BUF_COUNT=10 CONFIG_BT_MESH_ADV_BUF_COUNT=10
CONFIG_BLUETOOTH_MESH_PB_ADV=n CONFIG_BT_MESH_PB_ADV=n
#CONFIG_BLUETOOTH_DEBUG_LOG=y #CONFIG_BT_DEBUG_LOG=y
#CONFIG_BLUETOOTH_MESH_DEBUG=y #CONFIG_BT_MESH_DEBUG=y
#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y #CONFIG_BT_MESH_DEBUG_NET=y
#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y #CONFIG_BT_MESH_DEBUG_MODEL=y
#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y #CONFIG_BT_MESH_DEBUG_TRANS=y
#CONFIG_BLUETOOTH_MESH_SELF_TEST=y #CONFIG_BT_MESH_SELF_TEST=y
#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y #CONFIG_BT_MESH_IV_UPDATE_TEST=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y #CONFIG_BT_MESH_DEBUG_PROV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y #CONFIG_BT_MESH_DEBUG_BEACON=y
#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y #CONFIG_BT_MESH_DEBUG_CRYPTO=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y #CONFIG_BT_MESH_DEBUG_ADV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y #CONFIG_BT_MESH_DEBUG_ACCESS=y

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

@ -1,32 +1,32 @@
#CONFIG_INIT_STACKS=y #CONFIG_INIT_STACKS=y
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BLUETOOTH_RX_STACK_SIZE=1100 CONFIG_BT_RX_STACK_SIZE=1100
CONFIG_BLUETOOTH_CONTROLLER_DUP_FILTER_LEN=0 CONFIG_BT_CONTROLLER_DUP_FILTER_LEN=0
CONFIG_BLUETOOTH_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BLUETOOTH_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BLUETOOTH_MESH=y CONFIG_BT_MESH=y
CONFIG_BLUETOOTH_MESH_RELAY=y CONFIG_BT_MESH_RELAY=y
CONFIG_BLUETOOTH_MESH_RX_SDU_MAX=36 CONFIG_BT_MESH_RX_SDU_MAX=36
CONFIG_BLUETOOTH_MESH_TX_SEG_COUNT=3 CONFIG_BT_MESH_TX_SEG_COUNT=3
CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 CONFIG_BT_MESH_SUBNET_COUNT=1
CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 CONFIG_BT_MESH_APP_KEY_COUNT=1
CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 CONFIG_BT_MESH_MODEL_GROUP_COUNT=2
CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 CONFIG_BT_MESH_LABEL_COUNT=0
CONFIG_BLUETOOTH_MESH_PB_ADV=n CONFIG_BT_MESH_PB_ADV=n
#CONFIG_BLUETOOTH_MESH_LOW_POWER=y #CONFIG_BT_MESH_LOW_POWER=y
#CONFIG_BLUETOOTH_MESH_SELF_TEST=y #CONFIG_BT_MESH_SELF_TEST=y
#CONFIG_BLUETOOTH_MESH_IV_UPDATE_TEST=y #CONFIG_BT_MESH_IV_UPDATE_TEST=y
#CONFIG_BLUETOOTH_MESH_DEBUG=y #CONFIG_BT_MESH_DEBUG=y
#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y #CONFIG_BT_MESH_DEBUG_NET=y
#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y #CONFIG_BT_MESH_DEBUG_TRANS=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y #CONFIG_BT_MESH_DEBUG_PROV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y #CONFIG_BT_MESH_DEBUG_BEACON=y
#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y #CONFIG_BT_MESH_DEBUG_CRYPTO=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y #CONFIG_BT_MESH_DEBUG_ADV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y #CONFIG_BT_MESH_DEBUG_ACCESS=y
#CONFIG_BLUETOOTH_DEBUG_LOG=y #CONFIG_BT_DEBUG_LOG=y

44
samples/bluetooth/mesh_demo/prj.conf
View file

@ -2,28 +2,28 @@
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_RX_BUF_COUNT=30 CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
#CONFIG_BLUETOOTH_DEBUG_LOG=y #CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_MESH=y CONFIG_BT_MESH=y
CONFIG_BLUETOOTH_MESH_RELAY=y CONFIG_BT_MESH_RELAY=y
CONFIG_BLUETOOTH_MESH_SUBNET_COUNT=1 CONFIG_BT_MESH_SUBNET_COUNT=1
CONFIG_BLUETOOTH_MESH_APP_KEY_COUNT=1 CONFIG_BT_MESH_APP_KEY_COUNT=1
CONFIG_BLUETOOTH_MESH_MODEL_GROUP_COUNT=2 CONFIG_BT_MESH_MODEL_GROUP_COUNT=2
CONFIG_BLUETOOTH_MESH_LABEL_COUNT=0 CONFIG_BT_MESH_LABEL_COUNT=0
CONFIG_BLUETOOTH_MESH_PB_ADV=n CONFIG_BT_MESH_PB_ADV=n
#CONFIG_BLUETOOTH_MESH_DEBUG=y #CONFIG_BT_MESH_DEBUG=y
#CONFIG_BLUETOOTH_MESH_DEBUG_NET=y #CONFIG_BT_MESH_DEBUG_NET=y
#CONFIG_BLUETOOTH_MESH_DEBUG_MODEL=y #CONFIG_BT_MESH_DEBUG_MODEL=y
#CONFIG_BLUETOOTH_MESH_DEBUG_TRANS=y #CONFIG_BT_MESH_DEBUG_TRANS=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ACCESS=y #CONFIG_BT_MESH_DEBUG_ACCESS=y
#CONFIG_BLUETOOTH_MESH_LOW_POWER=y #CONFIG_BT_MESH_LOW_POWER=y
#CONFIG_BLUETOOTH_MESH_DEBUG_PROV=y #CONFIG_BT_MESH_DEBUG_PROV=y
#CONFIG_BLUETOOTH_MESH_DEBUG_LOW_POWER=y #CONFIG_BT_MESH_DEBUG_LOW_POWER=y
#CONFIG_BLUETOOTH_MESH_DEBUG_BEACON=y #CONFIG_BT_MESH_DEBUG_BEACON=y
#CONFIG_BLUETOOTH_MESH_DEBUG_CRYPTO=y #CONFIG_BT_MESH_DEBUG_CRYPTO=y
#CONFIG_BLUETOOTH_MESH_DEBUG_ADV=y #CONFIG_BT_MESH_DEBUG_ADV=y

18
samples/bluetooth/peripheral/prj.conf
View file

@ -1,9 +1,9 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_SIGNING=y CONFIG_BT_SIGNING=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_ATT_PREPARE_COUNT=2 CONFIG_BT_ATT_PREPARE_COUNT=2
CONFIG_BLUETOOTH_PRIVACY=y CONFIG_BT_PRIVACY=y
CONFIG_BLUETOOTH_DEVICE_NAME="Test peripheral" CONFIG_BT_DEVICE_NAME="Test peripheral"
CONFIG_BLUETOOTH_DEVICE_APPEARANCE=833 CONFIG_BT_DEVICE_APPEARANCE=833

2
samples/bluetooth/peripheral/src/main.c
View file

@ -25,7 +25,7 @@
#include <gatt/bas.h> #include <gatt/bas.h>
#include <gatt/cts.h> #include <gatt/cts.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
/* Custom Service Variables */ /* Custom Service Variables */

8
samples/bluetooth/peripheral_csc/prj.conf
View file

@ -1,6 +1,6 @@
CONFIG_RANDOM_GENERATOR=y CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_DEVICE_NAME="CSC peripheral" CONFIG_BT_DEVICE_NAME="CSC peripheral"
CONFIG_BLUETOOTH_DEVICE_APPEARANCE=1157 CONFIG_BT_DEVICE_APPEARANCE=1157

2
samples/bluetooth/peripheral_csc/src/main.c
View file

@ -24,7 +24,7 @@
#include <gatt/dis.h> #include <gatt/dis.h>
#include <gatt/bas.h> #include <gatt/bas.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
#define CSC_SUPPORTED_LOCATIONS { CSC_LOC_OTHER, \ #define CSC_SUPPORTED_LOCATIONS { CSC_LOC_OTHER, \
CSC_LOC_FRONT_WHEEL, \ CSC_LOC_FRONT_WHEEL, \

6
samples/bluetooth/peripheral_dis/prj.conf
View file

@ -1,3 +1,3 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_DEVICE_NAME="DIS peripheral" CONFIG_BT_DEVICE_NAME="DIS peripheral"

2
samples/bluetooth/peripheral_dis/src/main.c
View file

@ -22,7 +22,7 @@
#include <gatt/dis.h> #include <gatt/dis.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
static const struct bt_data ad[] = { static const struct bt_data ad[] = {

10
samples/bluetooth/peripheral_esp/prj.conf
View file

@ -1,6 +1,6 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_TINYCRYPT=y CONFIG_TINYCRYPT=y
CONFIG_BLUETOOTH_DEVICE_NAME="ESP peripheral" CONFIG_BT_DEVICE_NAME="ESP peripheral"
CONFIG_BLUETOOTH_DEVICE_APPEARANCE=768 CONFIG_BT_DEVICE_APPEARANCE=768

2
samples/bluetooth/peripheral_esp/src/main.c
View file

@ -24,7 +24,7 @@
#include <gatt/dis.h> #include <gatt/dis.h>
#include <gatt/bas.h> #include <gatt/bas.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
#define SENSOR_1_NAME "Temperature Sensor 1" #define SENSOR_1_NAME "Temperature Sensor 1"
#define SENSOR_2_NAME "Temperature Sensor 2" #define SENSOR_2_NAME "Temperature Sensor 2"

12
samples/bluetooth/peripheral_hids/prj.conf
View file

@ -1,6 +1,6 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_DEVICE_NAME="Test HoG mouse" CONFIG_BT_DEVICE_NAME="Test HoG mouse"
CONFIG_BLUETOOTH_DEVICE_APPEARANCE=962 CONFIG_BT_DEVICE_APPEARANCE=962

2
samples/bluetooth/peripheral_hids/src/main.c
View file

@ -24,7 +24,7 @@
#include <gatt/bas.h> #include <gatt/bas.h>
#include <gatt/hog.h> #include <gatt/hog.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
static const struct bt_data ad[] = { static const struct bt_data ad[] = {

12
samples/bluetooth/peripheral_hr/prj.conf
View file

@ -1,6 +1,6 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Heartrate Sensor" CONFIG_BT_DEVICE_NAME="Zephyr Heartrate Sensor"
CONFIG_BLUETOOTH_DEVICE_APPEARANCE=833 CONFIG_BT_DEVICE_APPEARANCE=833

2
samples/bluetooth/peripheral_hr/src/main.c
View file

@ -24,7 +24,7 @@
#include <gatt/dis.h> #include <gatt/dis.h>
#include <gatt/bas.h> #include <gatt/bas.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
struct bt_conn *default_conn; struct bt_conn *default_conn;

14
samples/bluetooth/peripheral_sc_only/prj.conf
View file

@ -1,7 +1,7 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_SMP_SC_ONLY=y CONFIG_BT_SMP_SC_ONLY=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BLUETOOTH_MAX_PAIRED=2 CONFIG_BT_MAX_PAIRED=2
CONFIG_BLUETOOTH_DEVICE_NAME="SC only peripheral" CONFIG_BT_DEVICE_NAME="SC only peripheral"

2
samples/bluetooth/peripheral_sc_only/src/main.c
View file

@ -21,7 +21,7 @@
#include <bluetooth/gatt.h> #include <bluetooth/gatt.h>
#define DEVICE_NAME CONFIG_BLUETOOTH_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
static const struct bt_data ad[] = { static const struct bt_data ad[] = {

8
samples/bluetooth/scan_adv/prj.conf
View file

@ -1,4 +1,4 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BLUETOOTH_OBSERVER=y CONFIG_BT_OBSERVER=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y

8
samples/boards/arduino_101/environmental_sensing/ap/prj.conf
View file

@ -5,8 +5,8 @@ CONFIG_IPM_QUARK_SE=y
CONFIG_IPM_QUARK_SE_MASTER=y CONFIG_IPM_QUARK_SE_MASTER=y
CONFIG_IPM_CONSOLE_SENDER=y CONFIG_IPM_CONSOLE_SENDER=y
CONFIG_TIMESLICE_SIZE=1 CONFIG_TIMESLICE_SIZE=1
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_BLUETOOTH_WAIT_NOP=y CONFIG_BT_WAIT_NOP=y
CONFIG_BLUETOOTH_NRF51_PM=y CONFIG_BT_NRF51_PM=y

10
samples/boards/microbit/pong/prj.conf
View file

@ -1,10 +1,10 @@
CONFIG_SYS_CLOCK_TICKS_PER_SEC=250 CONFIG_SYS_CLOCK_TICKS_PER_SEC=250
CONFIG_ISR_STACK_SIZE=1024 CONFIG_ISR_STACK_SIZE=1024
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_CENTRAL=y CONFIG_BT_CENTRAL=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_GATT_CLIENT=y CONFIG_BT_GATT_CLIENT=y
CONFIG_BLUETOOTH_DEVICE_NAME="Zephyr Pong" CONFIG_BT_DEVICE_NAME="Zephyr Pong"
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_MICROBIT_DISPLAY=y CONFIG_MICROBIT_DISPLAY=y
CONFIG_PWM=y CONFIG_PWM=y

2
samples/boards/microbit/pong/src/ble.c
View file

@ -24,7 +24,7 @@
#define SCAN_TIMEOUT K_SECONDS(2) #define SCAN_TIMEOUT K_SECONDS(2)
#define APPEARANCE 0 #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 DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
#define PONG_SVC_UUID 0x90, 0x6c, 0x55, 0x0f, 0xee, 0x6f, 0x4d, 0x0d, \ #define PONG_SVC_UUID 0x90, 0x6c, 0x55, 0x0f, 0xee, 0x6f, 0x4d, 0x0d, \

2
samples/hello_world/sample.yaml
View file

@ -9,5 +9,5 @@ tests:
- singlethread: - singlethread:
build_only: true build_only: true
extra_args: CONF_FILE=prj_single.conf 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 tags: samples tests

2
samples/net/common/Makefile.common
View file

@ -6,7 +6,7 @@
# Common routines used in net samples # 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/ ccflags-y += -I${ZEPHYR_BASE}/samples/bluetooth/
obj-y += ../../../bluetooth/gatt/ipss.o obj-y += ../../../bluetooth/gatt/ipss.o
endif endif

2
samples/net/echo_client/Makefile
View file

@ -11,7 +11,7 @@ CONF_FILE ?= prj_$(BOARD).conf
include $(ZEPHYR_BASE)/Makefile.inc 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 QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
else else
include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack

20
samples/net/echo_client/prj_bt.conf
View file

@ -1,10 +1,10 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_DEBUG_L2CAP=y CONFIG_BT_DEBUG_L2CAP=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_SIGNING=y CONFIG_BT_SIGNING=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_NETWORKING=y CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y CONFIG_NET_IPV6=y
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
@ -12,8 +12,8 @@ CONFIG_NET_UDP=y
CONFIG_NET_TCP=y CONFIG_NET_TCP=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y CONFIG_NET_LOG=y
CONFIG_NET_L2_BLUETOOTH=y CONFIG_NET_L2_BT=y
CONFIG_NET_DEBUG_L2_BLUETOOTH=y CONFIG_NET_DEBUG_L2_BT=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y CONFIG_PRINTK=y
@ -29,7 +29,7 @@ CONFIG_NET_MGMT=y
CONFIG_NET_MGMT_EVENT=y CONFIG_NET_MGMT_EVENT=y
CONFIG_NET_SHELL=y CONFIG_NET_SHELL=y
CONFIG_NET_L2_BLUETOOTH_SHELL=y CONFIG_NET_L2_BT_SHELL=y
CONFIG_NET_APP=y CONFIG_NET_APP=y
CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_APP_NEED_IPV6=y

2
samples/net/echo_client/prj_nrf5.conf
View file

@ -1,5 +1,5 @@
CONFIG_ARC_INIT=n CONFIG_ARC_INIT=n
CONFIG_BLUETOOTH=n CONFIG_BT=n
CONFIG_NETWORKING=y CONFIG_NETWORKING=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y

2
samples/net/echo_server/Makefile
View file

@ -11,7 +11,7 @@ CONF_FILE ?= prj_$(BOARD).conf
include $(ZEPHYR_BASE)/Makefile.inc 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 QEMU_EXTRA_FLAGS = -serial unix:/tmp/bt-server-bredr
else else
include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack

22
samples/net/echo_server/prj_bt.conf
View file

@ -1,10 +1,10 @@
CONFIG_BLUETOOTH=y CONFIG_BT=y
CONFIG_BLUETOOTH_DEBUG_LOG=y CONFIG_BT_DEBUG_LOG=y
CONFIG_BLUETOOTH_DEBUG_L2CAP=y CONFIG_BT_DEBUG_L2CAP=y
CONFIG_BLUETOOTH_SMP=y CONFIG_BT_SMP=y
CONFIG_BLUETOOTH_SIGNING=y CONFIG_BT_SIGNING=y
CONFIG_BLUETOOTH_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_NETWORKING=y CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y CONFIG_NET_IPV6=y
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n
@ -12,9 +12,9 @@ CONFIG_NET_UDP=y
CONFIG_NET_TCP=y CONFIG_NET_TCP=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y CONFIG_NET_LOG=y
CONFIG_NET_L2_BLUETOOTH=y CONFIG_NET_L2_BT=y
CONFIG_NET_L2_BLUETOOTH_ZEP1656=y CONFIG_NET_L2_BT_ZEP1656=y
CONFIG_NET_DEBUG_L2_BLUETOOTH=y CONFIG_NET_DEBUG_L2_BT=y
CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y CONFIG_PRINTK=y
@ -34,4 +34,4 @@ CONFIG_NET_APP_NEED_IPV6=y
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_APP_BLUETOOTH_NODE=y CONFIG_NET_APP_BT_NODE=y

Some files were not shown because too many files have changed in this diff Show more