michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: nRF53: Fix sw switch single timer id regression

Browse source 
Fix regression in sw switch single timer id use for nRF53x
series SoC.

Regression introduced in commit cfcbe5d68e ("Bluetooth:
Controller: Remove redudant header file includes").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2023-09-22 12:42:57 +02:00 • committed by Carles Cufí
commit 8c9ac505db
2 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h
View file

@ -5,6 +5,20 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
/* Override EVENT_TIMER_ID from 4 to 0, as nRF5340 does not have 4 timer
* instances.
*/
#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
#undef EVENT_TIMER_ID
#define EVENT_TIMER_ID 0
#undef EVENT_TIMER
#define EVENT_TIMER _CONCAT(NRF_TIMER, EVENT_TIMER_ID)
#undef SW_SWITCH_TIMER
#define SW_SWITCH_TIMER EVENT_TIMER
#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
/* NRF Radio HW timing constants /* NRF Radio HW timing constants
* - provided in US and NS (for higher granularity) * - provided in US and NS (for higher granularity)
* - based on empirical measurements and sniffer logs * - based on empirical measurements and sniffer logs

13
tests/bluetooth/init/testcase.yaml
View file

@ -122,6 +122,19 @@ tests:
integration_platforms: integration_platforms:
- nrf52840dk_nrf52840 - nrf52840dk_nrf52840
- nrf52dk_nrf52832 - nrf52dk_nrf52832
bluetooth.init.test_ctlr_sw_switch_single_timer:
extra_args:
- CONF_FILE=prj_ctlr.conf
- CONFIG_BT_CTLR_ADVANCED_FEATURES=y
- CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y
platform_allow:
- nrf5340dk_nrf5340_cpunet
- nrf52840dk_nrf52840
- nrf52dk_nrf52832
integration_platforms:
- nrf5340dk_nrf5340_cpunet
- nrf52840dk_nrf52840
- nrf52dk_nrf52832
bluetooth.init.test_ctlr_ticker: bluetooth.init.test_ctlr_ticker:
extra_args: extra_args:
- CONF_FILE=prj_ctlr_ticker.conf - CONF_FILE=prj_ctlr_ticker.conf