michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: remove Kconfig options CONFIG_BT_*_ON_DEV_NAME

Browse source 
Follow up on commit bfd45e5b8c
("drivers: remove Kconfig option CONFIG_UART_CONSOLE_ON_DEV_NAME")
Remove Kconfig options
CONFIG_BT_UART_ON_DEV_NAME and CONFIG_BT_MONITOR_ON_DEV_NAME
since all UART drivers are converted to devicetree and we can just use
DEVICE_DT_GET(DT_CHOSEN(zephyr_bt_uart)) and
DEVICE_DT_GET(DT_CHOSEN(zephyr_bt_mon_uart)).

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-08-24 19:34:48 +02:00 • committed by Anas Nashif
commit 9ad610d1a7
8 changed files with 12 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/reference/devicetree/api.rst
View file

@ -308,9 +308,9 @@ device.
- Selects the UART used for host communication in the
:ref:`bluetooth-hci-uart-sample`
* - zephyr,bt-mon-uart
- Sets default :kconfig:`CONFIG_BT_MONITOR_ON_DEV_NAME`
- Sets UART device used for the Bluetooth monitor logging
* - zephyr,bt-uart
- Sets default :kconfig:`CONFIG_BT_UART_ON_DEV_NAME`
- Sets UART device used by Bluetooth
* - zephyr,can-primary
- Sets the primary CAN controller
* - zephyr,ccm

4
doc/releases/release-notes-2.7.rst
View file

@ -50,6 +50,10 @@ Removed APIs in this release
* Removed ``CONFIG_OPENTHREAD_COPROCESSOR_SPINEL_ON_UART_ACM`` and
``CONFIG_OPENTHREAD_COPROCESSOR_SPINEL_ON_UART_DEV_NAME`` Kconfig options
in favor of chosen node ``zephyr,ot-uart``.
* Removed ``CONFIG_BT_UART_ON_DEV_NAME`` Kconfig option
in favor of direct use of chosen node ``zephyr,bt-uart``.
* Removed ``CONFIG_BT_MONITOR_ON_DEV_NAME`` Kconfig option
in favor of direct use of chosen node ``zephyr,bt-mon-uart``.
* Removed ``CONFIG_UART_MCUMGR_ON_DEV_NAME`` Kconfig option
in favor of direct use of chosen node ``zephyr,uart-mcumgr``.
* Removed ``CONFIG_UART_CONSOLE_ON_DEV_NAME`` Kconfig option

12
drivers/bluetooth/hci/Kconfig
View file

@ -76,18 +76,6 @@ config BT_NO_DRIVER
endchoice
# Workaround for not being able to have commas in macro arguments
DT_CHOSEN_Z_BT_UART := zephyr,bt-uart
config BT_UART_ON_DEV_NAME
string "Device Name of UART Device for Bluetooth"
default "$(dt_chosen_label,$(DT_CHOSEN_Z_BT_UART))" if HAS_DTS
default "UART_0"
depends on BT_UART
help
This option specifies the name of UART device to be used
for Bluetooth.
if BT_SPI
config BT_SPI_INIT_PRIORITY

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

@ -510,8 +510,8 @@ static int bt_uart_init(const struct device *unused)
{
ARG_UNUSED(unused);
h4_dev = device_get_binding(CONFIG_BT_UART_ON_DEV_NAME);
if (!h4_dev) {
h4_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_bt_uart));
if (!device_is_ready(h4_dev)) {
return -EINVAL;
}

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

@ -769,9 +769,8 @@ static int bt_uart_init(const struct device *unused)
{
ARG_UNUSED(unused);
h5_dev = device_get_binding(CONFIG_BT_UART_ON_DEV_NAME);
if (h5_dev == NULL) {
h5_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_bt_uart));
if (!device_is_ready(h5_dev)) {
return -EINVAL;
}

3
soc/x86/atom/Kconfig.defconfig
View file

@ -17,9 +17,6 @@ config UART_PIPE_ON_DEV_NAME
default "UART_1"
depends on UART_PIPE
config BT_MONITOR_ON_DEV_NAME
default "UART_1" if BT_DEBUG_MONITOR_UART
endif
endif

12
subsys/bluetooth/common/Kconfig
View file

@ -348,18 +348,6 @@ endchoice # Bluetooth debug type
if BT_DEBUG
# Workaround for not being able to have commas in macro arguments
DT_CHOSEN_Z_BT_MON_UART := zephyr,bt-mon-uart
config BT_MONITOR_ON_DEV_NAME
string "Device Name of Bluetooth monitor logging UART"
depends on BT_DEBUG_MONITOR_UART
default "$(dt_chosen_label,$(DT_CHOSEN_Z_BT_MON_UART))" if HAS_DTS
default "UART_0"
help
This option specifies the name of UART device to be used
for the Bluetooth monitor logging.
config BT_DEBUG_HCI_DRIVER
bool "Bluetooth HCI driver debug"
help

8
subsys/bluetooth/host/monitor.c
View file

@ -233,10 +233,6 @@ 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_BT_MONITOR_ON_DEV_NAME)
#define CONFIG_BT_MONITOR_ON_DEV_NAME DT_LABEL(DT_CHOSEN(zephyr_console))
#endif
#ifndef CONFIG_LOG_MINIMAL
struct monitor_log_ctx {
size_t total_len;
@ -347,9 +343,9 @@ static int bt_monitor_init(const struct device *d)
{
ARG_UNUSED(d);
monitor_dev = device_get_binding(CONFIG_BT_MONITOR_ON_DEV_NAME);
monitor_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_bt_mon_uart));
__ASSERT_NO_MSG(monitor_dev);
__ASSERT_NO_MSG(device_is_ready(monitor_dev));
#if defined(CONFIG_UART_INTERRUPT_DRIVEN)
uart_irq_rx_disable(monitor_dev);