samples: peripheral: radio_test: Adapt to the new GPPI

Adapt radio_test sample to the new GPPI API.

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

Author: nordic-krch

samples/peripheral/radio_test/src/radio_test.c

@@ -432,57 +432,56 @@ static void radio_power_set(nrf_radio_mode_t mode, uint8_t channel, int8_t power
 static void endpoints_clear(void)
 {
 	if (atomic_test_and_clear_bit(&endpoint_state, ENDPOINT_FORK_EGU_TIMER)) {
-		nrfx_gppi_fork_endpoint_clear(ppi_radio_start,
-			nrf_timer_task_address_get(timer.p_reg, NRF_TIMER_TASK_START));
+		nrfx_gppi_ep_clear(nrf_timer_task_address_get(timer.p_reg, NRF_TIMER_TASK_START));
 	}
 	if (atomic_test_and_clear_bit(&endpoint_state, ENDPOINT_EGU_RADIO_TX)) {
-		nrfx_gppi_channel_endpoints_clear(ppi_radio_start,
-			nrf_egu_event_address_get(RADIO_TEST_EGU, RADIO_TEST_EGU_EVENT),
-			nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
+		nrfx_gppi_ep_clear(
+				nrf_egu_event_address_get(RADIO_TEST_EGU, RADIO_TEST_EGU_EVENT));
+		nrfx_gppi_ep_clear(nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
 	}
 	if (atomic_test_and_clear_bit(&endpoint_state, ENDPOINT_EGU_RADIO_RX)) {
-		nrfx_gppi_channel_endpoints_clear(ppi_radio_start,
-			nrf_egu_event_address_get(RADIO_TEST_EGU, RADIO_TEST_EGU_EVENT),
-			nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_RXEN));
+		nrfx_gppi_ep_clear(
+				nrf_egu_event_address_get(RADIO_TEST_EGU, RADIO_TEST_EGU_EVENT));
+		nrfx_gppi_ep_clear(nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_RXEN));
 	}
 	if (atomic_test_and_clear_bit(&endpoint_state, ENDPOINT_TIMER_RADIO_TX)) {
-		nrfx_gppi_channel_endpoints_clear(ppi_radio_start,
-			nrf_timer_event_address_get(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(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_config(bool rx)
 {
 	endpoints_clear();
 
-	nrfx_gppi_channel_endpoints_setup(ppi_radio_start,
-			nrf_egu_event_address_get(RADIO_TEST_EGU, RADIO_TEST_EGU_EVENT),
+	nrfx_gppi_ep_attach(ppi_radio_start,
+			nrf_egu_event_address_get(RADIO_TEST_EGU, RADIO_TEST_EGU_EVENT));
+	nrfx_gppi_ep_attach(ppi_radio_start,
 			nrf_radio_task_address_get(NRF_RADIO,
 						   rx ? NRF_RADIO_TASK_RXEN : NRF_RADIO_TASK_TXEN));
 	atomic_set_bit(&endpoint_state, (rx ? ENDPOINT_EGU_RADIO_RX : ENDPOINT_EGU_RADIO_TX));
 
-	nrfx_gppi_fork_endpoint_setup(ppi_radio_start,
+	nrfx_gppi_ep_attach(ppi_radio_start,
 			nrf_timer_task_address_get(timer.p_reg, NRF_TIMER_TASK_START));
 	atomic_set_bit(&endpoint_state, ENDPOINT_FORK_EGU_TIMER);
 
-	nrfx_gppi_channels_enable(BIT(ppi_radio_start));
+	nrfx_gppi_conn_enable(ppi_radio_start);
 }
 
 static void radio_ppi_tx_reconfigure(void)
 {
-	if (nrfx_gppi_channel_check(ppi_radio_start)) {
-		nrfx_gppi_channels_disable(BIT(ppi_radio_start));
-	}
+	nrfx_gppi_conn_disable(ppi_radio_start);
 
 	endpoints_clear();
 
-	nrfx_gppi_channel_endpoints_setup(ppi_radio_start,
-		nrf_timer_event_address_get(timer.p_reg, NRF_TIMER_EVENT_COMPARE1),
+	nrfx_gppi_ep_attach(ppi_radio_start,
+		nrf_timer_event_address_get(timer.p_reg, NRF_TIMER_EVENT_COMPARE1));
+	nrfx_gppi_ep_attach(ppi_radio_start,
 		nrf_radio_task_address_get(NRF_RADIO, NRF_RADIO_TASK_TXEN));
 	atomic_set_bit(&endpoint_state, ENDPOINT_TIMER_RADIO_TX);
 
-	nrfx_gppi_channels_enable(BIT(ppi_radio_start));
+	nrfx_gppi_conn_enable(ppi_radio_start);
 }
 
 #if CONFIG_FEM
@@ -1106,10 +1105,7 @@ static void cancel(void)
 
 	sweep_processing = false;
 
-	if (nrfx_gppi_channel_check(ppi_radio_start)) {
-		nrfx_gppi_channels_disable(BIT(ppi_radio_start));
-	}
-
+	nrfx_gppi_conn_disable(ppi_radio_start);
 	endpoints_clear();
 	radio_disable();
 
@@ -1301,6 +1297,7 @@ void radio_handler(const void *context)
 int radio_test_init(struct radio_test_config *config)
 {
 	nrfx_err_t nrfx_err;
+	uint32_t rad_domain = nrfx_gppi_domain_id_get((uint32_t)NRF_RADIO);
 
 	timer_init(config);
 	IRQ_CONNECT(RADIO_TEST_TIMER_IRQn, IRQ_PRIO_LOWEST,
@@ -1309,7 +1306,7 @@ int radio_test_init(struct radio_test_config *config)
 	irq_connect_dynamic(RADIO_TEST_RADIO_IRQn, IRQ_PRIO_LOWEST, radio_handler, config, 0);
 	irq_enable(RADIO_TEST_RADIO_IRQn);
 
-	nrfx_err = nrfx_gppi_channel_alloc(&ppi_radio_start);
+	nrfx_err = nrfx_gppi_domain_conn_alloc(rad_domain, rad_domain, &ppi_radio_start);
 	if (nrfx_err != NRFX_SUCCESS) {
 		printk("Failed to allocate gppi channel.\n");
 		return -EFAULT;