From 4ba65d05984e0d804a7eacc7b3cff80fcda1230f Mon Sep 17 00:00:00 2001 From: Marcin Jelinski Date: Thu, 17 Aug 2023 11:24:25 +0200 Subject: [PATCH 1/2] samples: bluetooth: direct_test_mode: Fix EGU configuration Commit fixes the use of functions to configure the EGU. Ref: NCSDK-23047 Signed-off-by: Marcin Jelinski --- samples/bluetooth/direct_test_mode/src/dtm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/samples/bluetooth/direct_test_mode/src/dtm.c b/samples/bluetooth/direct_test_mode/src/dtm.c index 2ae62e1542b..e22902f9c8c 100644 --- a/samples/bluetooth/direct_test_mode/src/dtm.c +++ b/samples/bluetooth/direct_test_mode/src/dtm.c @@ -1100,8 +1100,7 @@ static void errata_191_handle(bool enable) static void radio_ppi_clear(void) { nrfx_gppi_channels_disable(BIT(dtm_inst.ppi_radio_start)); - nrf_egu_event_clear(DTM_EGU, - nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT)); + nrf_egu_event_clear(DTM_EGU, DTM_EGU_EVENT); /* Break connection from timer to radio to stop transmit loop */ nrfx_gppi_event_endpoint_clear(dtm_inst.ppi_radio_start, @@ -1184,10 +1183,8 @@ static void dtm_test_done(void) static void radio_start(bool rx, bool force_egu) { if (IS_ENABLED(CONFIG_FEM) || force_egu) { - nrf_egu_event_clear(DTM_EGU, - nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT)); - nrf_egu_task_trigger(DTM_EGU, - nrf_egu_task_address_get(DTM_EGU, DTM_EGU_TASK)); + nrf_egu_event_clear(DTM_EGU, DTM_EGU_EVENT); + nrf_egu_task_trigger(DTM_EGU, DTM_EGU_TASK); } else { /* Shorts will start radio in RX mode when it is ready */ nrf_radio_task_trigger(NRF_RADIO, rx ? NRF_RADIO_TASK_RXEN : NRF_RADIO_TASK_TXEN); From 00fd61c8ddc27725082594ec1f1b32875ba4b9e0 Mon Sep 17 00:00:00 2001 From: Marcin Jelinski Date: Thu, 17 Aug 2023 11:35:24 +0200 Subject: [PATCH 2/2] samples: radio_test: Fix EGU configuration Commit fixes the use of functions to configure the EGU. Ref: NCSDK-23047 Signed-off-by: Marcin Jelinski --- samples/peripheral/radio_test/src/radio_test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/peripheral/radio_test/src/radio_test.c b/samples/peripheral/radio_test/src/radio_test.c index a268a3fbf4f..64b1a54a715 100644 --- a/samples/peripheral/radio_test/src/radio_test.c +++ b/samples/peripheral/radio_test/src/radio_test.c @@ -212,8 +212,7 @@ static int fem_configure(bool rx, nrf_radio_mode_t mode, static void radio_start(bool rx, bool force_egu) { if (IS_ENABLED(CONFIG_FEM) || force_egu) { - nrf_egu_task_trigger(RADIO_TEST_EGU, - nrf_egu_task_address_get(RADIO_TEST_EGU, RADIO_TEST_EGU_TASK)); + nrf_egu_task_trigger(RADIO_TEST_EGU, RADIO_TEST_EGU_TASK); } else { nrf_radio_task_trigger(NRF_RADIO, rx ? NRF_RADIO_TASK_RXEN : NRF_RADIO_TASK_TXEN); }