esb: Align to changes in nrfx_timer

Align to changes in nrfx_timer.

Signed-off-by: Michał Bainczyk <[email protected]>

Author: mib1-nordic

subsys/esb/Kconfig

@@ -68,47 +68,47 @@ choice ESB_SYS_TIMER
 config ESB_SYS_TIMER0
 	bool "TIMER0"
 	depends on $(dt_nodelabel_has_compat,timer0,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER0
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER1
 	bool "TIMER1"
 	depends on $(dt_nodelabel_has_compat,timer1,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER1
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER2
 	bool "TIMER2"
 	depends on $(dt_nodelabel_has_compat,timer2,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER2
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER3
 	bool "TIMER3"
 	depends on $(dt_nodelabel_has_compat,timer3,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER3
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER4
 	bool "TIMER4"
 	depends on $(dt_nodelabel_has_compat,timer4,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER4
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER10
 	bool "TIMER10"
 	depends on $(dt_nodelabel_has_compat,timer10,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER10
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER020
 	bool "TIMER020"
 	depends on $(dt_nodelabel_has_compat,timer020,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER020
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER021
 	bool "TIMER021"
 	depends on $(dt_nodelabel_has_compat,timer021,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER021
+	select NRFX_TIMER
 
 config ESB_SYS_TIMER022
 	bool "TIMER022"
 	depends on $(dt_nodelabel_has_compat,timer022,$(DT_COMPAT_NORDIC_NRF_TIMER))
-	select NRFX_TIMER022
+	select NRFX_TIMER
 
 endchoice
 

subsys/esb/esb.c

@@ -244,7 +244,8 @@ struct esb_address {
 	atomic_t rf_channel_flags;	/* Flags for setting the channel. */
 };
 
-static nrfx_timer_t esb_timer = ESB_NRFX_TIMER_INSTANCE;
+static nrfx_timer_t esb_timer = NRFX_TIMER_INSTANCE(ESB_NRFX_TIMER_INSTANCE_REG);
+NRFX_INSTANCE_IRQ_HANDLER_DEFINE(timer, ESB_TIMER_INSTANCE_NO, &esb_timer);
 
 static bool esb_initialized;
 static struct esb_config esb_cfg;
@@ -1827,7 +1828,7 @@ static void evt_dynamic_irq_handler(const void *args)
 static void timer_dynamic_irq_handler(const void *args)
 {
 	ARG_UNUSED(args);
-	ESB_TIMER_IRQ_HANDLER();
+	nrfx_timer_irq_handler(&esb_timer);
 	ISR_DIRECT_PM();
 }
 

subsys/esb/esb_peripherals.h

@@ -104,8 +104,7 @@ extern "C" {
 	NRFX_CONCAT_2(NRF_TIMER, ESB_TIMER_INSTANCE_NO)
 
 /** ESB nrfx timer instance. */
-#define ESB_NRFX_TIMER_INSTANCE NRFX_TIMER_INSTANCE(ESB_TIMER_INSTANCE_NO)
-
+#define ESB_NRFX_TIMER_INSTANCE_REG NRF_TIMER_INST_GET(ESB_TIMER_INSTANCE_NO)
 #if !defined(CONFIG_NRFX_DPPI)
 /** Use fixed DPPI channels and groups if nrfx_dppi is not available. */
 #define ESB_DPPI_FIXED