michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Shell: Fix shell build dependencies

Browse source 
Fix shell build dependencies, subsys/bluetooth/controller is only added
for CONFIG_BT_LL_SW_SPLIT or CONFIG_BT_LL_SW_LEGACY.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-09-03 11:01:00 +02:00 • committed by Johan Hedberg
commit 8f75cf732d
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsys/bluetooth/shell/CMakeLists.txt
View file

@ -21,12 +21,15 @@ zephyr_library_sources_ifdef(
CONFIG_BT_RFCOMM CONFIG_BT_RFCOMM
rfcomm.c rfcomm.c
) )
zephyr_library_sources_ifdef(
CONFIG_BT_CTLR if(CONFIG_BT_CTLR)
if(CONFIG_BT_LL_SW_LEGACY OR CONFIG_BT_LL_SW_SPLIT)
zephyr_library_sources(
ll.c ll.c
ticker.c ticker.c
) )
zephyr_include_directories_ifdef( zephyr_include_directories(
CONFIG_BT_CTLR
${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/nordic ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/nordic
) )
endif()
endif()

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

@ -1667,6 +1667,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
#if defined(CONFIG_BT_HCI_MESH_EXT) #if defined(CONFIG_BT_HCI_MESH_EXT)
SHELL_CMD(mesh_adv, NULL, "<on, off>", cmd_mesh_adv), SHELL_CMD(mesh_adv, NULL, "<on, off>", cmd_mesh_adv),
#endif /* CONFIG_BT_HCI_MESH_EXT */ #endif /* CONFIG_BT_HCI_MESH_EXT */
#if defined(CONFIG_BT_LL_SW_LEGACY) || defined(CONFIG_BT_LL_SW_SPLIT)
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
#if defined(CONFIG_BT_BROADCASTER) #if defined(CONFIG_BT_BROADCASTER)
SHELL_CMD_ARG(advx, NULL, "<on off> [coded] [anon] [txp]", cmd_advx, SHELL_CMD_ARG(advx, NULL, "<on off> [coded] [anon] [txp]", cmd_advx,
@ -1687,6 +1688,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
4, 0), 4, 0),
SHELL_CMD_ARG(test_end, NULL, HELP_NONE, cmd_test_end, 1, 0), SHELL_CMD_ARG(test_end, NULL, HELP_NONE, cmd_test_end, 1, 0),
#endif /* CONFIG_BT_CTLR_ADV_EXT */ #endif /* CONFIG_BT_CTLR_ADV_EXT */
#endif /* defined(CONFIG_BT_LL_SW_LEGACY) || defined(CONFIG_BT_LL_SW_SPLIT) */
#if defined(CONFIG_BT_LL_SW_SPLIT) #if defined(CONFIG_BT_LL_SW_SPLIT)
SHELL_CMD(ull_reset, NULL, HELP_NONE, cmd_ull_reset), SHELL_CMD(ull_reset, NULL, HELP_NONE, cmd_ull_reset),
#endif /* CONFIG_BT_LL_SW_SPLIT */ #endif /* CONFIG_BT_LL_SW_SPLIT */