michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Rename BT_LL_SW to BT_LL_SW_LEGACY

Browse source 
Rename the controller Kconfig option BT_LL_SW to
BT_LL_SW_LEGACY in preparation towards switch to new Link
Layer implementation.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-07-16 21:17:17 +05:30 • committed by Carles Cufí
commit f4eb03c538
17 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/guides/bluetooth/bluetooth-arch.rst
View file

@ -110,7 +110,7 @@ BLE-enabled builds that can be produced from the Zephyr project codebase:
* :option:`CONFIG_BT_HCI` ``=y`` * :option:`CONFIG_BT_HCI` ``=y``
* :option:`CONFIG_BT_HCI_RAW` ``=y`` * :option:`CONFIG_BT_HCI_RAW` ``=y``
* :option:`CONFIG_BT_CTLR` ``=y`` * :option:`CONFIG_BT_CTLR` ``=y``
* :option:`CONFIG_BT_LL_SW` ``=y`` (if using the open source Link Layer) * :option:`CONFIG_BT_LL_SW_SPLIT` ``=y`` (if using the open source Link Layer)
* **Host-only build**: A Zephyr OS Host build will contain the Application and * **Host-only build**: A Zephyr OS Host build will contain the Application and
the BLE Host, along with an HCI driver (UART or SPI) to interface with an the BLE Host, along with an HCI driver (UART or SPI) to interface with an
@ -131,7 +131,7 @@ BLE-enabled builds that can be produced from the Zephyr project codebase:
* :option:`CONFIG_BT` ``=y`` * :option:`CONFIG_BT` ``=y``
* :option:`CONFIG_BT_HCI` ``=y`` * :option:`CONFIG_BT_HCI` ``=y``
* :option:`CONFIG_BT_CTLR` ``=y`` * :option:`CONFIG_BT_CTLR` ``=y``
* :option:`CONFIG_BT_LL_SW` ``=y`` (if using the open source Link Layer) * :option:`CONFIG_BT_LL_SW_SPLIT` ``=y`` (if using the open source Link Layer)
All of the samples located in ``samples/bluetooth`` except for the ones All of the samples located in ``samples/bluetooth`` except for the ones
used for Controller-only builds can be built as Combined used for Controller-only builds can be built as Combined

4
drivers/counter/Kconfig.nrfx
View file

@ -13,7 +13,7 @@ config COUNTER_NRF_RTC
config COUNTER_TIMER0 config COUNTER_TIMER0
bool "Enable Counter on TIMER0" bool "Enable Counter on TIMER0"
depends on HAS_HW_NRF_TIMER0 depends on HAS_HW_NRF_TIMER0
depends on !BT_LL_SW depends on !BT_LL_SW_LEGACY && !BT_LL_SW_SPLIT
select COUNTER_NRF_TIMER select COUNTER_NRF_TIMER
select NRFX_TIMER0 select NRFX_TIMER0
@ -44,7 +44,7 @@ config COUNTER_TIMER4
config COUNTER_RTC0 config COUNTER_RTC0
bool "Enable Counter on RTC0" bool "Enable Counter on RTC0"
depends on HAS_HW_NRF_RTC0 depends on HAS_HW_NRF_RTC0
depends on !BT_LL_SW depends on !BT_LL_SW_LEGACY && !BT_LL_SW_SPLIT
select COUNTER_NRF_RTC select COUNTER_NRF_RTC
select NRFX_RTC0 select NRFX_RTC0

2
subsys/bluetooth/CMakeLists.txt
View file

@ -11,7 +11,7 @@ add_subdirectory_ifdef(CONFIG_BT_CONN services)
add_subdirectory_ifdef(CONFIG_BT_MESH mesh) add_subdirectory_ifdef(CONFIG_BT_MESH mesh)
if(CONFIG_BT_CTLR) if(CONFIG_BT_CTLR)
if(CONFIG_BT_LL_SW OR CONFIG_BT_LL_SW_SPLIT) if(CONFIG_BT_LL_SW_LEGACY OR CONFIG_BT_LL_SW_SPLIT)
add_subdirectory(controller) add_subdirectory(controller)
endif() endif()
endif() endif()

2
subsys/bluetooth/controller/CMakeLists.txt
View file

@ -18,7 +18,7 @@ zephyr_library_sources_ifdef(
crypto/crypto.c crypto/crypto.c
) )
if(CONFIG_BT_LL_SW) if(CONFIG_BT_LL_SW_LEGACY)
zephyr_library_sources( zephyr_library_sources(
ll_sw/ctrl.c ll_sw/ctrl.c
ll_sw/ll.c ll_sw/ll.c

6
subsys/bluetooth/controller/Kconfig
View file

@ -20,7 +20,7 @@ choice BT_LL_CHOICE
help help
Select the Bluetooth Link Layer to compile. Select the Bluetooth Link Layer to compile.
config BT_LL_SW config BT_LL_SW_LEGACY
bool "Software-based BLE Link Layer" bool "Software-based BLE Link Layer"
select BT_RECV_IS_RX_THREAD select BT_RECV_IS_RX_THREAD
select BT_HAS_HCI_VS select BT_HAS_HCI_VS
@ -399,7 +399,7 @@ config BT_CTLR_PHY_CODED
Enable support for Bluetooth 5.0 Coded PHY in the Controller. Enable support for Bluetooth 5.0 Coded PHY in the Controller.
endif # BT_PHY_UPDATE endif # BT_PHY_UPDATE
if BT_LL_SW if BT_LL_SW_LEGACY
config BT_CTLR_WORKER_PRIO config BT_CTLR_WORKER_PRIO
int "Radio and Ticker's Worker IRQ priority" int "Radio and Ticker's Worker IRQ priority"
@ -419,7 +419,7 @@ config BT_CTLR_JOB_PRIO
The interrupt priority for Ticker's Job (SWI4) IRQ. This value shall The interrupt priority for Ticker's Job (SWI4) IRQ. This value shall
be greater than or equal to the Ticker's Worker IRQ priority value. be greater than or equal to the Ticker's Worker IRQ priority value.
endif # BT_LL_SW endif # BT_LL_SW_LEGACY
config BT_CTLR_XTAL_ADVANCED config BT_CTLR_XTAL_ADVANCED
bool "Advanced event preparation" bool "Advanced event preparation"

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

@ -167,13 +167,13 @@ static inline struct net_buf *encode_node(struct node_rx_pdu *node_rx,
break; break;
} }
#if defined(CONFIG_BT_LL_SW) #if defined(CONFIG_BT_LL_SW_LEGACY)
{ {
extern u8_t radio_rx_fc_set(u16_t handle, u8_t fc); extern u8_t radio_rx_fc_set(u16_t handle, u8_t fc);
radio_rx_fc_set(node_rx->hdr.handle, 0); radio_rx_fc_set(node_rx->hdr.handle, 0);
} }
#endif /* CONFIG_BT_LL_SW */ #endif /* CONFIG_BT_LL_SW_LEGACY */
node_rx->hdr.next = NULL; node_rx->hdr.next = NULL;
ll_rx_mem_release((void **)&node_rx); ll_rx_mem_release((void **)&node_rx);

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

@ -17,7 +17,7 @@
#include "pdu.h" #include "pdu.h"
#include "lll.h" #include "lll.h"
#if defined(CONFIG_BT_LL_SW) #if defined(CONFIG_BT_LL_SW_LEGACY)
#include <sys/slist.h> #include <sys/slist.h>
#include "ctrl.h" #include "ctrl.h"
#define ull_adv_is_enabled ll_adv_is_enabled #define ull_adv_is_enabled ll_adv_is_enabled

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

@ -17,7 +17,7 @@
#include "hal/ccm.h" #include "hal/ccm.h"
#include "hal/radio.h" #include "hal/radio.h"
#if defined(CONFIG_BT_LL_SW) #if defined(CONFIG_BT_LL_SW_LEGACY)
#include "util/util.h" #include "util/util.h"
#include "util/memq.h" #include "util/memq.h"
#include "pdu.h" #include "pdu.h"

4
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/mayfly.c
View file

@ -15,7 +15,7 @@
#include "common/log.h" #include "common/log.h"
#include "hal/debug.h" #include "hal/debug.h"
#if defined(CONFIG_BT_LL_SW) #if defined(CONFIG_BT_LL_SW_LEGACY)
#define MAYFLY_CALL_ID_WORKER MAYFLY_CALL_ID_0 #define MAYFLY_CALL_ID_WORKER MAYFLY_CALL_ID_0
#define MAYFLY_CALL_ID_JOB MAYFLY_CALL_ID_1 #define MAYFLY_CALL_ID_JOB MAYFLY_CALL_ID_1
#elif defined(CONFIG_BT_LL_SW_SPLIT) #elif defined(CONFIG_BT_LL_SW_SPLIT)
@ -67,7 +67,7 @@ u32_t mayfly_is_enabled(u8_t caller_id, u8_t callee_id)
u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id) u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id)
{ {
return (caller_id == callee_id) || return (caller_id == callee_id) ||
#if defined(CONFIG_BT_LL_SW) #if defined(CONFIG_BT_LL_SW_LEGACY)
#if (CONFIG_BT_CTLR_WORKER_PRIO == CONFIG_BT_CTLR_JOB_PRIO) #if (CONFIG_BT_CTLR_WORKER_PRIO == CONFIG_BT_CTLR_JOB_PRIO)
((caller_id == MAYFLY_CALL_ID_WORKER) && ((caller_id == MAYFLY_CALL_ID_WORKER) &&
(callee_id == MAYFLY_CALL_ID_JOB)) || (callee_id == MAYFLY_CALL_ID_JOB)) ||

2
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c
View file

@ -20,7 +20,7 @@
#include "common/log.h" #include "common/log.h"
#include "hal/debug.h" #include "hal/debug.h"
#if defined(CONFIG_BT_LL_SW) #if defined(CONFIG_BT_LL_SW_LEGACY)
#define TICKER_MAYFLY_CALL_ID_TRIGGER MAYFLY_CALL_ID_0 #define TICKER_MAYFLY_CALL_ID_TRIGGER MAYFLY_CALL_ID_0
#define TICKER_MAYFLY_CALL_ID_WORKER MAYFLY_CALL_ID_0 #define TICKER_MAYFLY_CALL_ID_WORKER MAYFLY_CALL_ID_0
#define TICKER_MAYFLY_CALL_ID_JOB MAYFLY_CALL_ID_1 #define TICKER_MAYFLY_CALL_ID_JOB MAYFLY_CALL_ID_1

6
subsys/bluetooth/host/Kconfig
View file

@ -69,9 +69,9 @@ config BT_HCI_TX_STACK_SIZE
default 512 if BT_H4 default 512 if BT_H4
default 512 if BT_H5 default 512 if BT_H5
default 416 if BT_SPI default 416 if BT_SPI
default 940 if BT_CTLR && (BT_LL_SW || BT_LL_SW_SPLIT) && NO_OPTIMIZATIONS default 940 if BT_CTLR && (BT_LL_SW_LEGACY || BT_LL_SW_SPLIT) && NO_OPTIMIZATIONS
default 1024 if BT_CTLR && (BT_LL_SW || BT_LL_SW_SPLIT) && BT_CENTRAL default 1024 if BT_CTLR && (BT_LL_SW_LEGACY || BT_LL_SW_SPLIT) && BT_CENTRAL
default 640 if BT_CTLR && (BT_LL_SW || BT_LL_SW_SPLIT) default 640 if BT_CTLR && (BT_LL_SW_LEGACY || BT_LL_SW_SPLIT)
default 512 if BT_USERCHAN default 512 if BT_USERCHAN
default 640 if BT_STM32_IPM default 640 if BT_STM32_IPM
# Even if no driver is selected the following default is still # Even if no driver is selected the following default is still

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

@ -1395,7 +1395,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
2, 1), 2, 1),
#endif /* CONFIG_BT_OBSERVER */ #endif /* CONFIG_BT_OBSERVER */
#endif /* CONFIG_BT_CTLR_ADV_EXT */ #endif /* CONFIG_BT_CTLR_ADV_EXT */
#if defined(CONFIG_BT_LL_SW) #if defined(CONFIG_BT_LL_SW_LEGACY)
SHELL_CMD_ARG(ll-addr, NULL, "<random|public>", cmd_ll_addr_get, 2, 0), SHELL_CMD_ARG(ll-addr, NULL, "<random|public>", cmd_ll_addr_get, 2, 0),
#endif #endif
#if defined(CONFIG_BT_CTLR_DTM) #if defined(CONFIG_BT_CTLR_DTM)

2
tests/bluetooth/bsim_bt/bsim_test_app/prj.conf
View file

@ -14,4 +14,4 @@ CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_DEVICE_NAME="bsim_test" CONFIG_BT_DEVICE_NAME="bsim_test"
CONFIG_BT_L2CAP_TX_BUF_COUNT=6 CONFIG_BT_L2CAP_TX_BUF_COUNT=6
CONFIG_BT_LL_SW=y CONFIG_BT_LL_SW_LEGACY=y

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

@ -1,6 +1,6 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_CTLR=y CONFIG_BT_CTLR=y
CONFIG_BT_LL_SW=y CONFIG_BT_LL_SW_LEGACY=y
CONFIG_BT_HCI_ACL_FLOW_CONTROL=y CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y CONFIG_BT_CENTRAL=y

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

@ -1,6 +1,6 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_CTLR=y CONFIG_BT_CTLR=y
CONFIG_BT_LL_SW=y CONFIG_BT_LL_SW_LEGACY=y
CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_DUP_FILTER_LEN=16
CONFIG_BT_CTLR_CONN_PARAM_REQ=n CONFIG_BT_CTLR_CONN_PARAM_REQ=n
CONFIG_BT_CTLR_LE_PING=n CONFIG_BT_CTLR_LE_PING=n

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

@ -1,6 +1,6 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_CTLR=y CONFIG_BT_CTLR=y
CONFIG_BT_LL_SW=y CONFIG_BT_LL_SW_LEGACY=y
CONFIG_BT_CTLR_DUP_FILTER_LEN=16 CONFIG_BT_CTLR_DUP_FILTER_LEN=16
CONFIG_BT_CTLR_CONN_PARAM_REQ=y CONFIG_BT_CTLR_CONN_PARAM_REQ=y
CONFIG_BT_CTLR_LE_PING=y CONFIG_BT_CTLR_LE_PING=y

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

@ -1,6 +1,6 @@
CONFIG_BT=y CONFIG_BT=y
CONFIG_BT_CTLR=y CONFIG_BT_CTLR=y
CONFIG_BT_LL_SW=y CONFIG_BT_LL_SW_LEGACY=y
CONFIG_BT_CTLR_DUP_FILTER_LEN=0 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
CONFIG_BT_CTLR_CONN_PARAM_REQ=n CONFIG_BT_CTLR_CONN_PARAM_REQ=n
CONFIG_BT_CTLR_EXT_REJ_IND=n CONFIG_BT_CTLR_EXT_REJ_IND=n