samples: peripheral: 802154_phy_test: align to nrfx_gpiote changes

GPIOTE driver instances are no longer defined within nrfx.

Signed-off-by: Nikodem Kastelik <[email protected]>

Author: nika-nordic

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

@@ -24,6 +24,7 @@
 
 #if IS_ENABLED(CONFIG_PTT_CLK_OUT)
 #include <nrfx_gpiote.h>
+#include <gpiote_nrfx.h>
 #endif /* IS_ENABLED(CONFIG_PTT_CLK_OUT) */
 
 #if defined(CONFIG_PTT_CACHE_MGMT)
@@ -52,26 +53,18 @@ LOG_MODULE_REGISTER(periph);
 static nrfx_timer_t clk_timer = NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET(PTT_CLK_TIMER));
 
 #define GPIOTE_NODE(gpio_node) DT_PHANDLE(gpio_node, gpiote_instance)
-#define GPIOTE_INST_AND_COMMA(gpio_node) \
-	[DT_PROP(gpio_node, port)] = \
-		NRFX_GPIOTE_INSTANCE(DT_PROP(GPIOTE_NODE(gpio_node), instance)),
+#define GPIOTE_INST_AND_COMMA(gpio_node) [DT_PROP(gpio_node, port)] =	 \
+	COND_CODE_1(DT_NODE_HAS_PROP(gpio_node, gpiote_instance),	 \
+		    (&GPIOTE_NRFX_INST_BY_NODE(GPIOTE_NODE(gpio_node))), \
+		    (NULL)),
 
-#define COND_GPIOTE_INST_AND_COMMA(gpio_node) \
-	COND_CODE_1(DT_NODE_HAS_PROP(gpio_node, gpiote_instance), \
-		(GPIOTE_INST_AND_COMMA(gpio_node)), \
-		())
-
-static const nrfx_gpiote_t gpiote_inst[GPIO_COUNT] = {
-	DT_FOREACH_STATUS_OKAY(nordic_nrf_gpio, COND_GPIOTE_INST_AND_COMMA)
+static nrfx_gpiote_t * const gpiote_inst[GPIO_COUNT] = {
+	DT_FOREACH_STATUS_OKAY(nordic_nrf_gpio, GPIOTE_INST_AND_COMMA)
 };
 
-#define NRF_GPIOTE_FOR_GPIO(idx)  &gpiote_inst[idx]
-#define NRF_GPIOTE_FOR_PSEL(psel) &gpiote_inst[psel >> 5]
+#define NRF_GPIOTE_FOR_GPIO(idx)  gpiote_inst[idx]
+#define NRF_GPIOTE_FOR_PSEL(psel) gpiote_inst[NRF_PIN_NUMBER_TO_PORT(psel)]
 
-static inline bool gpiote_is_valid(const nrfx_gpiote_t *gpiote)
-{
-	return gpiote->p_reg != NULL;
-}
 #endif /* IS_ENABLED(CONFIG_PTT_CLK_OUT) */
 
 #define CLOCK_NODE DT_INST(0, nordic_nrf_clock)
@@ -100,7 +93,7 @@ void periph_init(void)
 	int ret;
 
 #if IS_ENABLED(CONFIG_PTT_CLK_OUT)
-	nrfx_err_t err_code;
+	int err_code;
 
 	uint32_t base_frequency = NRF_TIMER_BASE_FREQUENCY_GET(clk_timer.p_reg);
 	nrfx_timer_config_t clk_timer_cfg = NRFX_TIMER_DEFAULT_CONFIG(base_frequency);
@@ -109,15 +102,15 @@ void periph_init(void)
 	NRFX_ASSERT(err_code);
 
 	for (int i = 0; i < GPIO_COUNT; ++i) {
-		const nrfx_gpiote_t *gpiote = NRF_GPIOTE_FOR_GPIO(i);
+		nrfx_gpiote_t *gpiote = NRF_GPIOTE_FOR_GPIO(i);
 
-		if (!gpiote_is_valid(gpiote)) {
+		if (gpiote == NULL) {
 			continue;
 		}
 
 		if (!nrfx_gpiote_init_check(gpiote)) {
 			err_code = nrfx_gpiote_init(gpiote, 0);
-			NRFX_ASSERT(err_code);
+			__ASSERT_NO_MSG(err_code == 0);
 		}
 	}
 #endif
@@ -144,10 +137,10 @@ 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);
+	int err;
+	nrfx_gpiote_t *gpiote = NRF_GPIOTE_FOR_PSEL(pin);
 
-	if (!nrf_gpio_pin_present_check(pin) || !gpiote_is_valid(gpiote)) {
+	if (!nrf_gpio_pin_present_check(pin) || (gpiote == NULL)) {
 		return false;
 	}
 
@@ -156,8 +149,8 @@ bool ptt_clk_out_ext(uint8_t pin, bool mode)
 					    NRF_TIMER_SHORT_COMPARE0_CLEAR_MASK, false);
 
 		err = nrfx_gpiote_channel_alloc(gpiote, &task_channel);
-		if (err != NRFX_SUCCESS) {
-			LOG_ERR("nrfx_gpiote_channel_alloc error: %08x", err);
+		if (err != 0) {
+			LOG_ERR("nrfx_gpiote_channel_alloc error: %d", err);
 			return false;
 		}
 
@@ -172,8 +165,8 @@ bool ptt_clk_out_ext(uint8_t pin, bool mode)
 		 * CLR will turn it off and OUT will toggle it.
 		 */
 		err = nrfx_gpiote_output_configure(gpiote, pin, &config, &out_config);
-		if (err != NRFX_SUCCESS) {
-			LOG_ERR("nrfx_gpiote_output_configure error: %08x", err);
+		if (err != 0) {
+			LOG_ERR("nrfx_gpiote_output_configure error: %d", err);
 			return false;
 		}
 
@@ -206,8 +199,8 @@ bool ptt_clk_out_ext(uint8_t pin, bool mode)
 		nrfx_gpiote_pin_uninit(gpiote, pin);
 		err = nrfx_gpiote_channel_free(gpiote, task_channel);
 
-		if (err != NRFX_SUCCESS) {
-			LOG_ERR("Failed to disable GPIOTE channel, error: %08x", err);
+		if (err != 0) {
+			LOG_ERR("Failed to disable GPIOTE channel, error: %d", err);
 			return false;
 		}
 	}

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

@@ -13,6 +13,7 @@
 
 #if IS_ENABLED(CONFIG_PTT_ANTENNA_DIVERSITY)
 #include <nrfx_gpiote.h>
+#include <gpiote_nrfx.h>
 #endif /* IS_ENABLED(CONFIG_PTT_ANTENNA_DIVERSITY) */
 
 #include <helpers/nrfx_gppi.h>
@@ -34,10 +35,6 @@ static struct rf_rx_pkt_s rf_rx_pool[RF_RX_POOL_N];
 static struct rf_rx_pkt_s ack_packet;
 static uint8_t temp_tx_pkt[RF_PSDU_MAX_SIZE];
 
-#ifdef CONFIG_PTT_ANTENNA_DIVERSITY
-static const nrfx_gpiote_t gpiote = NRFX_GPIOTE_INSTANCE(0);
-#endif
-
 static inline void rf_rx_pool_init(void);
 static void rf_rx_pool_clear(void);
 
@@ -141,7 +138,7 @@ void rf_uninit(void)
 #if CONFIG_PTT_ANTENNA_DIVERSITY
 static void configure_antenna_diversity(void)
 {
-	uint8_t gpiote_channel;
+	nrfx_gpiote_t *gpiote = &GPIOTE_NRFX_INST_BY_NODE(DT_NODELABEL(gpiote0));
 	NRF_TIMER_Type *ad_timer = NRF_TIMER3;
 
 	nrf_802154_sl_ant_div_cfg_t cfg = {
@@ -151,8 +148,7 @@ static void configure_antenna_diversity(void)
 	};
 
 	(void)nrfx_gppi_channel_alloc(0 ,&cfg.ppi_ch);
-	nrfx_gpiote_channel_alloc(&gpiote, &gpiote_channel);
-	cfg.gpiote_ch = gpiote_channel;
+	(void)nrfx_gpiote_channel_alloc(gpiote, &cfg.gpiote_ch);
 	nrf_802154_sl_ant_div_mode_t ant_div_auto = 0x02;
 
 	nrf_802154_antenna_diversity_config_set(&cfg);