Skip to content

Commit 21713c1

Browse files
committed
Bluetooth: controller: radio: Fix use of HAL API in radio_nrf5_ppi
Fix compile errors after use of HAL API in radio_nrf5_ppi file. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent 3206427 commit 21713c1

File tree

1 file changed

+2
-29
lines changed

1 file changed

+2
-29
lines changed

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

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -949,33 +949,6 @@ static inline void hal_radio_sw_switch_setup(
949949
HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_REGISTER_TASK(ppi_group_index) =
950950
HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_TASK;
951951

952-
/* Sanity build-time check that
953-
* - SW SWITCH Timer Clear
954-
* - Radio End Capture, and
955-
* - Group Enable
956-
* tasks are all going to be subscribed on the same PPI.
957-
*/
958-
BUILD_ASSERT(
959-
&HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_REGISTER_EVT ==
960-
&HAL_SW_SWITCH_TIMER_CLEAR_PPI_REGISTER_EVT,
961-
"SW SWitch Timer Clear and Group Disable"
962-
" not on the same PPI channel.");
963-
BUILD_ASSERT(
964-
HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_EVT ==
965-
HAL_SW_SWITCH_TIMER_CLEAR_PPI_EVT,
966-
"SW SWitch Timer Clear and Group Disable"
967-
" not on the same PPI channel.");
968-
BUILD_ASSERT(
969-
&HAL_RADIO_END_TIME_CAPTURE_PPI_REGISTER_EVT ==
970-
&HAL_SW_SWITCH_TIMER_CLEAR_PPI_REGISTER_EVT,
971-
"Radio End Timer Capture and Group Disable"
972-
" not on the same PPI channel.");
973-
BUILD_ASSERT(
974-
HAL_RADIO_END_TIME_CAPTURE_PPI_EVT ==
975-
HAL_SW_SWITCH_TIMER_CLEAR_PPI_EVT,
976-
"Radio End Timer Capture and Group Disable"
977-
" not on the same PPI channel.");
978-
979952
/* We need to un-subscribe the other group from the PPI channel. */
980953
if (ppi_group_index == 0) {
981954
HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_REGISTER_TASK(1) = 0;
@@ -1115,8 +1088,8 @@ static inline void hal_radio_sw_switch_ppi_group_setup(void)
11151088
"Radio enable and Group disable not on the same PPI channels.");
11161089

11171090
/* Address nRF5340 Engineering A Errata 16 */
1118-
HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_TASK_TX = 0;
1119-
HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_TASK_RX = 0;
1091+
nrf_radio_subscribe_clear(NRF_RADIO, NRF_RADIO_TASK_TXEN);
1092+
nrf_radio_subscribe_clear(NRF_RADIO, NRF_RADIO_TASK_RXEN);
11201093
}
11211094

11221095
static inline void hal_radio_group_task_disable_ppi_setup(void)

0 commit comments

Comments
 (0)