[nrf fromlist] samples: subsys: usb: explicit_feedback: Use new GPPI API

Convert to use the new GPPI API.

Upstream PR #: 98327

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

Author: nordic-krch

samples/subsys/usb/uac2_explicit_feedback/src/feedback_nrf.c

@@ -8,7 +8,6 @@
 #include <zephyr/logging/log.h>
 #include "feedback.h"
 
-#include <nrfx_dppi.h>
 #include <nrfx_gpiote.h>
 #include <nrfx_timer.h>
 #include <hal/nrf_gpio.h>
@@ -122,7 +121,7 @@ static nrfx_err_t feedback_edge_counter_setup(void)
 {
 	nrfx_err_t err;
 	uint8_t feedback_gpiote_channel;
-	uint8_t feedback_gppi_channel;
+	nrfx_gppi_handle_t feedback_gppi_handle;
 	nrfx_gpiote_trigger_config_t trigger_config = {
 		.trigger = NRFX_GPIOTE_TRIGGER_TOGGLE,
 		.p_in_channel = &feedback_gpiote_channel,
@@ -132,6 +131,7 @@ static nrfx_err_t feedback_edge_counter_setup(void)
 		.p_pull_config = &pull,
 		.p_trigger_config = &trigger_config,
 	};
+	int rv;
 
 	err = nrfx_gpiote_channel_alloc(&gpiote, &feedback_gpiote_channel);
 	if (err != NRFX_SUCCESS) {
@@ -157,17 +157,16 @@ static nrfx_err_t feedback_edge_counter_setup(void)
 	}
 
 	/* Subscribe TIMER COUNT task to GPIOTE IN event */
-	err = nrfx_gppi_channel_alloc(&feedback_gppi_channel);
-	if (err != NRFX_SUCCESS) {
-		LOG_ERR("gppi_channel_alloc failed with: %d\n", err);
-		return err;
-	}
+	uint32_t eep = nrfx_gpiote_in_event_address_get(&gpiote, FEEDBACK_PIN);
+	uint32_t tep = nrfx_timer_task_address_get(&feedback_timer_instance, NRF_TIMER_TASK_COUNT);
 
-	nrfx_gppi_channel_endpoints_setup(feedback_gppi_channel,
-		nrfx_gpiote_in_event_address_get(&gpiote, FEEDBACK_PIN),
-		nrfx_timer_task_address_get(&feedback_timer_instance, NRF_TIMER_TASK_COUNT));
+	rv = nrfx_gppi_conn_alloc(eep, tep, &feedback_gppi_handle);
+	if (rv < 0) {
+		LOG_ERR("gppi_conn_alloc failed with: %d\n", rv);
+		return rv;
+	}
 
-	nrfx_gppi_channels_enable(BIT(feedback_gppi_channel));
+	nrfx_gppi_conn_enable(feedback_gppi_handle);
 
 	return NRFX_SUCCESS;
 }
@@ -194,8 +193,9 @@ static nrfx_err_t feedback_relative_timer_setup(void)
 struct feedback_ctx *feedback_init(void)
 {
 	nrfx_err_t err;
-	uint8_t usbd_sof_gppi_channel;
-	uint8_t i2s_framestart_gppi_channel;
+	nrfx_gppi_handle_t usbd_sof_gppi_handle;
+	nrfx_gppi_handle_t i2s_framestart_gppi_handle;
+	int rv;
 
 	feedback_target_init();
 
@@ -212,35 +212,31 @@ struct feedback_ctx *feedback_init(void)
 	}
 
 	/* Subscribe TIMER CAPTURE task to USBD SOF event */
-	err = nrfx_gppi_channel_alloc(&usbd_sof_gppi_channel);
-	if (err != NRFX_SUCCESS) {
-		LOG_ERR("gppi_channel_alloc failed with: %d\n", err);
+	uint32_t tsk1 = nrfx_timer_capture_task_address_get(&feedback_timer_instance,
+							    FEEDBACK_TIMER_USBD_SOF_CAPTURE);
+	uint32_t tsk2 = nrfx_timer_capture_task_address_get(&feedback_timer_instance,
+							    FEEDBACK_TIMER_I2S_FRAMESTART_CAPTURE);
+
+	rv = nrfx_gppi_conn_alloc(USB_SOF_EVENT_ADDRESS, tsk1, &usbd_sof_gppi_handle);
+	if (rv < 0) {
+		LOG_ERR("gppi_conn_alloc failed with: %d\n", rv);
 		return &fb_ctx;
 	}
 
-	nrfx_gppi_channel_endpoints_setup(usbd_sof_gppi_channel,
-		USB_SOF_EVENT_ADDRESS,
-		nrfx_timer_capture_task_address_get(&feedback_timer_instance,
-			FEEDBACK_TIMER_USBD_SOF_CAPTURE));
-	nrfx_gppi_fork_endpoint_setup(usbd_sof_gppi_channel,
-		nrfx_timer_task_address_get(&feedback_timer_instance,
-			NRF_TIMER_TASK_CLEAR));
+	nrfx_gppi_ep_attach(usbd_sof_gppi_handle,
+			    nrfx_timer_task_address_get(&feedback_timer_instance,
+							NRF_TIMER_TASK_CLEAR));
 
-	nrfx_gppi_channels_enable(BIT(usbd_sof_gppi_channel));
+	nrfx_gppi_conn_enable(usbd_sof_gppi_handle);
 
 	/* Subscribe TIMER CAPTURE task to I2S FRAMESTART event */
-	err = nrfx_gppi_channel_alloc(&i2s_framestart_gppi_channel);
-	if (err != NRFX_SUCCESS) {
-		LOG_ERR("gppi_channel_alloc failed with: %d\n", err);
+	rv = nrfx_gppi_conn_alloc(I2S_FRAMESTART_EVENT_ADDRESS, tsk2, &i2s_framestart_gppi_handle);
+	if (rv < 0) {
+		LOG_ERR("gppi_conn_alloc failed with: %d\n", rv);
 		return &fb_ctx;
 	}
 
-	nrfx_gppi_channel_endpoints_setup(i2s_framestart_gppi_channel,
-		I2S_FRAMESTART_EVENT_ADDRESS,
-		nrfx_timer_capture_task_address_get(&feedback_timer_instance,
-			FEEDBACK_TIMER_I2S_FRAMESTART_CAPTURE));
-
-	nrfx_gppi_channels_enable(BIT(i2s_framestart_gppi_channel));
+	nrfx_gppi_conn_enable(i2s_framestart_gppi_handle);
 
 	/* Enable feedback timer */
 	nrfx_timer_enable(&feedback_timer_instance);