Skip to content

Commit 120b33f

Browse files
cvinayakde-nordic
authored andcommitted
[nrf fromtree] Bluetooth: Controller: Fix missing PHY_CODED cond compile
Fix missing Coded PHY implementation conditional compile causing compile error when disabling Coded PHY support in SoCs that have radio that support Coded PHY. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> (cherry picked from commit e8fe144) Signed-off-by: Dominik Ermel <[email protected]>
1 parent ed131f2 commit 120b33f

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

samples/bluetooth/hci_rpmsg/sample.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@ tests:
8282
platform_allow: nrf5340dk_nrf5340_cpunet
8383
integration_platforms:
8484
- nrf5340dk_nrf5340_cpunet
85+
sample.bluetooth.hci_rpmsg.df.no_phy_coded.bt_ll_sw_split:
86+
harness: bluetooth
87+
tags: bluetooth
88+
extra_args:
89+
- CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
90+
- DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
91+
- CONFIG_BT_CTLR_PHY_CODED=n
92+
platform_allow: nrf5340dk_nrf5340_cpunet
93+
integration_platforms:
94+
- nrf5340dk_nrf5340_cpunet
8595
sample.bluetooth.hci_rpmsg.mesh.bt_ll_sw_split:
8696
harness: bluetooth
8797
tags: bluetooth

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en,
582582
BIT(HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI));
583583
}
584584

585+
#if defined(CONFIG_BT_CTLR_PHY_CODED) && defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)
585586
static inline void hal_radio_sw_switch_coded_config_clear(uint8_t ppi_en,
586587
uint8_t ppi_dis, uint8_t cc_reg, uint8_t group_index)
587588
{
@@ -594,6 +595,7 @@ static inline void hal_radio_sw_switch_coded_config_clear(uint8_t ppi_en,
594595
HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT(
595596
SW_SWITCH_TIMER_S2_EVTS_COMP(group_index)) = 0;
596597
}
598+
#endif /* CONFIG_BT_CTLR_PHY_CODED && CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
597599

598600
static inline void hal_radio_sw_switch_disable_group_clear(uint8_t ppi_dis, uint8_t cc_reg,
599601
uint8_t group_index)

0 commit comments

Comments
 (0)