Skip to content

Commit f79bb54

Browse files
thomas-m-johansennordicjm
authored andcommitted
driver: switch to new sdc_support_channel_sounding function
In order to allow users to configure their own antenna switch logic, we needed to update the sdc_support_channel_sounding function. This should change the default logic to use the new function. Also fixed a bug in the kconfig dependency to compile with the cs antenna switch logic. Signed-off-by: Thomas Johansen <thomas.johansen@nordicsemi.no>
1 parent b4c1917 commit f79bb54

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

subsys/bluetooth/controller/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ zephyr_library_sources_ifdef(
2323
)
2424

2525
zephyr_library_sources_ifdef(
26-
CONFIG_BT_CHANNEL_SOUNDING
26+
CONFIG_BT_CTLR_CHANNEL_SOUNDING
2727
cs_antenna_switch.c
2828
)
2929

subsys/bluetooth/controller/hci_driver.c

-4
Original file line numberDiff line numberDiff line change
@@ -984,15 +984,11 @@ static int configure_supported_features(void)
984984
if (err) {
985985
return -ENOTSUP;
986986
}
987-
#ifdef CS_ANTENNA_SWITCH_CALLBACK_TYPE_DEFINED
988987
#if CONFIG_BT_CTLR_SDC_CS_NUM_ANTENNAS > 1
989988
err = sdc_support_channel_sounding(cs_antenna_switch_func);
990989
cs_antenna_switch_enable();
991990
#else
992991
err = sdc_support_channel_sounding(NULL);
993-
#endif
994-
#else
995-
err = sdc_support_channel_sounding();
996992
#endif
997993
if (err) {
998994
return -ENOTSUP;

0 commit comments

Comments
 (0)