From 197e6e2ba3b02abfeebe56bd9cd8ffb4424ee072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Mon, 7 Aug 2017 13:41:21 +0200 Subject: [PATCH] Kconfig: Move BLUETOOTH_HCI_RESERVE into subsys/bluetooth/host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are two kinds of HCI implementations. Bluetooth drivers in drivers/bluetooth that implement HCI by using a wired serial transport layer to talk to an external controller chip. And a bluetooth controller in subsys/bluetooth/controller that directly talks to an internal on-chip controller node. Currently, when the the subsys/bluetooth/controller is used there still exists exposed to the user a bluetooth driver configuration menu, even though no external bluetooth driver is in use. This is due to a dependency on certain configs in driver/bluetooth that are needed even though no external controller is used. This patch moves one of these configs, BLUETOOTH_HCI_RESERVE, from drivers/bluetooth/hci/Kconfig to subsys/bluetooth/host/Kconfig such that eventually we can omit the entire Bluetooth driver menu option. This re-organization does not change when the config can be enabled. Signed-off-by: Sebastian Bøe --- drivers/bluetooth/hci/Kconfig | 11 ----------- subsys/bluetooth/host/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig index 19e79bef236..3391b97d275 100644 --- a/drivers/bluetooth/hci/Kconfig +++ b/drivers/bluetooth/hci/Kconfig @@ -79,17 +79,6 @@ config BLUETOOTH_SPI_DEV_NAME this device is used to reply back with HCI frames that are sent over the air. -# Headroom that the driver needs for sending and receiving buffers. -# Add a new 'default' entry for each new driver. -config BLUETOOTH_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 - if BLUETOOTH_SPI config BLUETOOTH_SPI_BLUENRG diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig index 823da405f99..201503f9956 100644 --- a/subsys/bluetooth/host/Kconfig +++ b/subsys/bluetooth/host/Kconfig @@ -62,6 +62,17 @@ config BLUETOOTH_HCI_TX_PRIO 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 + 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 + config BLUETOOTH_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