michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix missing PHY_CODED cond compile

Browse source 
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 <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2023-09-05 12:44:50 +05:30 • committed by Carles Cufí
commit e8fe144f3a
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
samples/bluetooth/hci_rpmsg/sample.yaml
View file

@ -82,6 +82,16 @@ tests:
platform_allow: nrf5340dk_nrf5340_cpunet platform_allow: nrf5340dk_nrf5340_cpunet
integration_platforms: integration_platforms:
- nrf5340dk_nrf5340_cpunet - nrf5340dk_nrf5340_cpunet
sample.bluetooth.hci_rpmsg.df.no_phy_coded.bt_ll_sw_split:
harness: bluetooth
tags: bluetooth
extra_args:
- CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
- DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
- CONFIG_BT_CTLR_PHY_CODED=n
platform_allow: nrf5340dk_nrf5340_cpunet
integration_platforms:
- nrf5340dk_nrf5340_cpunet
sample.bluetooth.hci_rpmsg.mesh.bt_ll_sw_split: sample.bluetooth.hci_rpmsg.mesh.bt_ll_sw_split:
harness: bluetooth harness: bluetooth
tags: bluetooth tags: bluetooth

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

@ -582,6 +582,7 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en,
BIT(HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI)); BIT(HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI));
} }
#if defined(CONFIG_BT_CTLR_PHY_CODED) && defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)
static inline void hal_radio_sw_switch_coded_config_clear(uint8_t ppi_en, static inline void hal_radio_sw_switch_coded_config_clear(uint8_t ppi_en,
uint8_t ppi_dis, uint8_t cc_reg, uint8_t group_index) uint8_t ppi_dis, uint8_t cc_reg, uint8_t group_index)
{ {
@ -594,6 +595,7 @@ static inline void hal_radio_sw_switch_coded_config_clear(uint8_t ppi_en,
HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT( HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT(
SW_SWITCH_TIMER_S2_EVTS_COMP(group_index)) = 0; SW_SWITCH_TIMER_S2_EVTS_COMP(group_index)) = 0;
} }
#endif /* CONFIG_BT_CTLR_PHY_CODED && CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
static inline void hal_radio_sw_switch_disable_group_clear(uint8_t ppi_dis, uint8_t cc_reg, static inline void hal_radio_sw_switch_disable_group_clear(uint8_t ppi_dis, uint8_t cc_reg,
uint8_t group_index) uint8_t group_index)