esb: Fix timer configuration

Corrected the timer configuration for the nRF54 series.

Replaced the deprecated TASKS_SHUTDOWN in the nRF52 series with
TASKS_STOP and TASKS_CLEAR, following the approach used for the nRF54
series.

Added clearing of timer before counting the ACK wait time and
retransmission time.

Ref: NCSDK-30802

Signed-off-by: Marcin Jelinski <[email protected]>

Author: maje-emb

subsys/esb/esb.c

@@ -445,11 +445,8 @@ static void esb_fem_for_tx_ack(void)
 
 static void esb_fem_reset(void)
 {
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
-	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_SHUTDOWN);
-#else
 	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_STOP);
-#endif
+	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_CLEAR);
 
 	mpsl_fem_lna_configuration_clear();
 	mpsl_fem_pa_configuration_clear();
@@ -462,11 +459,8 @@ static void esb_fem_reset(void)
 
 static void esb_fem_lna_reset(void)
 {
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
-	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_SHUTDOWN);
-#else
 	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_STOP);
-#endif
+	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_CLEAR);
 
 	esb_ppi_for_fem_clear();
 
@@ -478,11 +472,9 @@ static void esb_fem_pa_reset(void)
 {
 	mpsl_fem_pa_configuration_clear();
 
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
-	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_SHUTDOWN);
-#else
 	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_STOP);
-#endif
+	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_CLEAR);
+
 	esb_ppi_for_fem_clear();
 
 	mpsl_fem_disable();
@@ -1236,6 +1228,7 @@ static void on_radio_disabled_tx(void)
 	 * received by the time defined in wait_for_ack_timeout_us
 	 */
 
+	nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_CLEAR);
 	nrfx_timer_compare(&esb_timer, NRF_TIMER_CC_CHANNEL0,
 			   (wait_for_ack_timeout_us + ADDR_EVENT_LATENCY_US), false);
 
@@ -1301,11 +1294,8 @@ static void on_radio_disabled_tx_wait_for_ack(void)
 		}
 	} else {
 		if (retransmits_remaining-- == 0) {
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
-			nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_SHUTDOWN);
-#else
 			nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_STOP);
-#endif
+			nrf_timer_task_trigger(esb_timer.p_reg, NRF_TIMER_TASK_CLEAR);
 
 			/* All retransmits are expended, and the TX operation is
 			 * suspended

subsys/esb/esb_dppi.c

@@ -150,13 +150,8 @@ void esb_ppi_for_wait_for_ack_set(void)
 	nrf_timer_publish_set(ESB_NRF_TIMER_INSTANCE, NRF_TIMER_EVENT_COMPARE0,
 			      timer_compare0_radio_disable);
 
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
-	nrf_timer_subscribe_set(ESB_NRF_TIMER_INSTANCE, NRF_TIMER_TASK_SHUTDOWN,
-				radio_address_timer_stop);
-#else
 	nrf_timer_subscribe_set(ESB_NRF_TIMER_INSTANCE, NRF_TIMER_TASK_STOP,
 				radio_address_timer_stop);
-#endif
 
 	nrf_radio_subscribe_set(NRF_RADIO, NRF_RADIO_TASK_DISABLE, timer_compare0_radio_disable);
 
@@ -178,12 +173,7 @@ void esb_ppi_for_wait_for_ack_clear(void)
 	nrf_radio_publish_clear(NRF_RADIO, NRF_RADIO_EVENT_ADDRESS);
 	nrf_timer_publish_clear(ESB_NRF_TIMER_INSTANCE, NRF_TIMER_EVENT_COMPARE0);
 
-#if defined(TIMER_TASKS_SHUTDOWN_TASKS_SHUTDOWN_Msk)
-	nrf_timer_subscribe_clear(ESB_NRF_TIMER_INSTANCE, NRF_TIMER_TASK_SHUTDOWN);
-#else
-	nrf_timer_subscribe_set(ESB_NRF_TIMER_INSTANCE, NRF_TIMER_TASK_STOP,
-				radio_address_timer_stop);
-#endif
+	nrf_timer_subscribe_clear(ESB_NRF_TIMER_INSTANCE, NRF_TIMER_TASK_STOP);
 
 	nrf_radio_subscribe_clear(NRF_RADIO, NRF_RADIO_TASK_DISABLE);
 }