samples: bluetooth: direct_test_mode: Adapt to the new GPPI API

Adapt to the new GPPI API.

Signed-off-by: Krzysztof Chruściński <[email protected]>

Author: nordic-krch

samples/bluetooth/direct_test_mode/src/dtm.c

@@ -411,7 +411,7 @@ static struct dtm_instance {
 #endif
 
 	/* Radio Enable PPI channel. */
-	uint8_t ppi_radio_start;
+	nrfx_gppi_handle_t ppi_radio_start;
 
 	/* PPI endpoint status.*/
 	atomic_t endpoint_state;
@@ -849,11 +849,12 @@ static int anomaly_timer_init(void)
 static int gppi_init(void)
 {
 	nrfx_err_t err;
+	uint32_t rad_domain = nrfx_gppi_domain_id_get((uint32_t)NRF_RADIO);
 
-	err = nrfx_gppi_channel_alloc(&dtm_inst.ppi_radio_start);
-	if (err != NRFX_SUCCESS) {
-		printk("nrfx_gppi_channel_alloc failed with: %d\n", err);
-		return -EAGAIN;
+	err = nrfx_gppi_domain_conn_alloc(rad_domain, rad_domain, &dtm_inst.ppi_radio_start);
+	if (err < 0) {
+		printk("nrfx_gppi_domain_conn_alloc failed with: %d\n", err);
+		return err;
 	}
 
 	return 0;
@@ -1144,9 +1145,7 @@ static void radio_tx_power_set(uint8_t channel, int8_t tx_power, nrf_radio_mode_
 
 static void radio_reset(void)
 {
-	if (nrfx_gppi_channel_check(dtm_inst.ppi_radio_start)) {
-		nrfx_gppi_channels_disable(BIT(dtm_inst.ppi_radio_start));
-	}
+	nrfx_gppi_conn_disable(dtm_inst.ppi_radio_start);
 
 	nrf_radio_shorts_set(NRF_RADIO, 0);
 	nrf_radio_event_clear(NRF_RADIO, NRF_RADIO_EVENT_DISABLED);
@@ -1618,34 +1617,27 @@ static void errata_191_handle(bool enable)
 static void endpoints_clear(void)
 {
 	if (atomic_test_and_clear_bit(&dtm_inst.endpoint_state, ENDPOINT_FORK_EGU_TIMER)) {
-		nrfx_gppi_fork_endpoint_clear(dtm_inst.ppi_radio_start,
+		nrfx_gppi_ep_clear(
 			nrf_timer_task_address_get(dtm_inst.timer.p_reg, NRF_TIMER_TASK_START));
 	}
 	if (atomic_test_and_clear_bit(&dtm_inst.endpoint_state, ENDPOINT_EGU_RADIO_TX)) {
-		nrfx_gppi_channel_endpoints_clear(
-			dtm_inst.ppi_radio_start,
-			nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT),
-			nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
+		nrfx_gppi_ep_clear(nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT));
+		nrfx_gppi_ep_clear(nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
 	}
 	if (atomic_test_and_clear_bit(&dtm_inst.endpoint_state, ENDPOINT_EGU_RADIO_RX)) {
-		nrfx_gppi_channel_endpoints_clear(
-			dtm_inst.ppi_radio_start,
-			nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT),
-			nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_RXEN));
+		nrfx_gppi_ep_clear(nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT));
+		nrfx_gppi_ep_clear(nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_RXEN));
 	}
 	if (atomic_test_and_clear_bit(&dtm_inst.endpoint_state, ENDPOINT_TIMER_RADIO_TX)) {
-		nrfx_gppi_channel_endpoints_clear(
-			dtm_inst.ppi_radio_start,
-			nrf_timer_event_address_get(dtm_inst.timer.p_reg, NRF_TIMER_EVENT_COMPARE0),
-			nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
+		nrfx_gppi_ep_clear(
+		   nrf_timer_event_address_get(dtm_inst.timer.p_reg, NRF_TIMER_EVENT_COMPARE0));
+		nrfx_gppi_ep_clear(nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
 	}
 }
 
 static void radio_ppi_clear(void)
 {
-	if (nrfx_gppi_channel_check(dtm_inst.ppi_radio_start)) {
-		nrfx_gppi_channels_disable(BIT(dtm_inst.ppi_radio_start));
-	}
+	nrfx_gppi_conn_disable(dtm_inst.ppi_radio_start);
 
 	nrf_egu_event_clear(DTM_EGU, DTM_EGU_EVENT);
 
@@ -1655,19 +1647,19 @@ static void radio_ppi_clear(void)
 
 static void radio_ppi_configure(bool rx, uint32_t timer_short_mask)
 {
-	nrfx_gppi_channel_endpoints_setup(
-		dtm_inst.ppi_radio_start,
-		nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT),
-		nrf_radio_task_address_get(NRF_RADIO,
+	nrfx_gppi_ep_attach(dtm_inst.ppi_radio_start,
+			    nrf_egu_event_address_get(DTM_EGU, DTM_EGU_EVENT));
+	nrfx_gppi_ep_attach(dtm_inst.ppi_radio_start,
+			    nrf_radio_task_address_get(NRF_RADIO,
 					   rx ? NRF_RADIO_TASK_RXEN : NRF_RADIO_TASK_TXEN));
 	atomic_set_bit(&dtm_inst.endpoint_state,
 		       (rx ? ENDPOINT_EGU_RADIO_RX : ENDPOINT_EGU_RADIO_TX));
 
-	nrfx_gppi_fork_endpoint_setup(dtm_inst.ppi_radio_start,
+	nrfx_gppi_ep_attach(dtm_inst.ppi_radio_start,
 		nrf_timer_task_address_get(dtm_inst.timer.p_reg, NRF_TIMER_TASK_START));
 	atomic_set_bit(&dtm_inst.endpoint_state, ENDPOINT_FORK_EGU_TIMER);
 
-	nrfx_gppi_channels_enable(BIT(dtm_inst.ppi_radio_start));
+	nrfx_gppi_conn_enable(dtm_inst.ppi_radio_start);
 
 	if (timer_short_mask) {
 		nrf_timer_shorts_set(dtm_inst.timer.p_reg, timer_short_mask);
@@ -1676,18 +1668,16 @@ static void radio_ppi_configure(bool rx, uint32_t timer_short_mask)
 
 static void radio_tx_ppi_reconfigure(void)
 {
-	if (nrfx_gppi_channel_check(dtm_inst.ppi_radio_start)) {
-		nrfx_gppi_channels_disable(BIT(dtm_inst.ppi_radio_start));
-	}
+	nrfx_gppi_conn_disable(dtm_inst.ppi_radio_start);
 
 	endpoints_clear();
 
-	nrfx_gppi_channel_endpoints_setup(
-		dtm_inst.ppi_radio_start,
-		nrf_timer_event_address_get(dtm_inst.timer.p_reg, NRF_TIMER_EVENT_COMPARE0),
+	nrfx_gppi_ep_attach(dtm_inst.ppi_radio_start,
+		nrf_timer_event_address_get(dtm_inst.timer.p_reg, NRF_TIMER_EVENT_COMPARE0));
+	nrfx_gppi_ep_attach(dtm_inst.ppi_radio_start,
 		nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
 	atomic_set_bit(&dtm_inst.endpoint_state, ENDPOINT_TIMER_RADIO_TX);
-	nrfx_gppi_channels_enable(BIT(dtm_inst.ppi_radio_start));
+	nrfx_gppi_conn_enable(dtm_inst.ppi_radio_start);
 }
 
 static void dtm_test_done(void)