samples: peripheral: 802154_phy_test: Align to the new GPPI API

Align sample to the new GPPI API.

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

Author: nordic-krch

samples/peripheral/802154_phy_test/src/periph_proc.c

@@ -84,7 +84,7 @@ static const struct device *gpio_port1_dev = DEVICE_DT_GET(DT_NODELABEL(gpio1));
 #endif
 
 #if IS_ENABLED(CONFIG_PTT_CLK_OUT)
-uint8_t ppi_channel;
+nrfx_gppi_handle_t ppi_handle;
 uint8_t task_channel;
 #endif /* IS_ENABLED(CONFIG_PTT_CLK_OUT) */
 
@@ -143,6 +143,7 @@ bool ptt_clk_out_ext(uint8_t pin, bool mode)
 {
 #if IS_ENABLED(CONFIG_PTT_CLK_OUT)
 	uint32_t compare_evt_addr;
+	uint32_t tep;
 	nrfx_err_t err;
 	const nrfx_gpiote_t *gpiote = NRF_GPIOTE_FOR_PSEL(pin);
 
@@ -178,35 +179,30 @@ bool ptt_clk_out_ext(uint8_t pin, bool mode)
 
 		compare_evt_addr =
 			nrfx_timer_event_address_get(&clk_timer, NRF_TIMER_EVENT_COMPARE0);
-
+		tep = nrfx_gpiote_out_task_address_get(gpiote, pin);
 		nrfx_gpiote_out_task_enable(gpiote, pin);
 
 		/* Allocate a (D)PPI channel. */
-		err = nrfx_gppi_channel_alloc(&ppi_channel);
-
-		if (err != NRFX_SUCCESS) {
+		err = nrfx_gppi_conn_alloc(compare_evt_addr, tep, &ppi_handle);
+		if (err < 0) {
 			LOG_ERR("(D)PPI channel allocation error: %08x", err);
 			return false;
 		}
 
-		nrfx_gppi_channel_endpoints_setup(
-			ppi_channel, compare_evt_addr,
-			nrf_gpiote_task_address_get(gpiote->p_reg,
-						    nrfx_gpiote_in_event_get(gpiote, pin)));
-
 		/* Enable (D)PPI channel. */
-		nrfx_gppi_channels_enable(BIT(ppi_channel));
+		nrfx_gppi_conn_enable(ppi_handle);
 
 		nrfx_timer_enable(&clk_timer);
 	} else {
 		nrfx_timer_disable(&clk_timer);
 		nrfx_gpiote_out_task_disable(gpiote, pin);
-		err = nrfx_gppi_channel_free(ppi_channel);
 
-		if (err != NRFX_SUCCESS) {
-			LOG_ERR("Failed to disable (D)PPI channel, error: %08x", err);
-			return false;
-		}
+		compare_evt_addr =
+			nrfx_timer_event_address_get(&clk_timer, NRF_TIMER_EVENT_COMPARE0);
+		tep = nrfx_gpiote_out_task_address_get(gpiote, pin);
+		nrfx_gppi_conn_disable(ppi_handle);
+		nrfx_gppi_conn_free(compare_evt_addr, tep, ppi_handle);
+
 		nrfx_gpiote_pin_uninit(gpiote, pin);
 		err = nrfx_gpiote_channel_free(gpiote, task_channel);
 

samples/peripheral/802154_phy_test/src/rf_proc.c

@@ -15,11 +15,7 @@
 #include <nrfx_gpiote.h>
 #endif /* IS_ENABLED(CONFIG_PTT_ANTENNA_DIVERSITY) */
 
-#if defined(DPPI_PRESENT)
-#include <nrfx_dppi.h>
-#else
-#include <nrfx_ppi.h>
-#endif
+#include <helpers/nrfx_gppi.h>
 
 #include "nrf_802154.h"
 #include "nrf_802154_sl_ant_div.h"
@@ -145,7 +141,6 @@ void rf_uninit(void)
 #if CONFIG_PTT_ANTENNA_DIVERSITY
 static void configure_antenna_diversity(void)
 {
-	nrf_ppi_channel_t ppi_channel;
 	uint8_t gpiote_channel;
 	NRF_TIMER_Type *ad_timer = NRF_TIMER3;
 
@@ -155,8 +150,7 @@ static void configure_antenna_diversity(void)
 		.p_timer = ad_timer
 	};
 
-	nrfx_ppi_channel_alloc(&ppi_channel);
-	cfg.ppi_ch = (uint8_t)ppi_channel;
+	(void)nrfx_gppi_channel_alloc(0 ,&cfg.ppi_ch);
 	nrfx_gpiote_channel_alloc(&gpiote, &gpiote_channel);
 	cfg.gpiote_ch = gpiote_channel;
 	nrf_802154_sl_ant_div_mode_t ant_div_auto = 0x02;