esb: Make IRQ priorities configurable with Kconfig

IRQ_DIRECT_CONNECT expects now that the IRQ priority is known
compile-time therefore it's no loger possible to set it based on the
config structure at runtime. Fix this by removing the IRQ priorities
from the config structure and making them configurable with Kconfig
instead.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

include/esb.h

@@ -54,8 +54,6 @@ extern "C" {
 		.retransmit_delay = 600,				       \
 		.retransmit_count = 3,					       \
 		.tx_mode = ESB_TXMODE_AUTO,				       \
-		.radio_irq_priority = 1,				       \
-		.event_irq_priority = 2,				       \
 		.payload_length = 32,					       \
 		.selective_auto_ack = false                                    \
 	}
@@ -75,8 +73,6 @@ extern "C" {
 		.retransmit_delay = 600,				       \
 		.retransmit_count = 3,					       \
 		.tx_mode = ESB_TXMODE_AUTO,				       \
-		.radio_irq_priority = 1,				       \
-		.event_irq_priority = 2,				       \
 		.payload_length = 32,					       \
 		.selective_auto_ack = false                                    \
 	}
@@ -238,9 +234,6 @@ struct esb_config {
 	/* Control settings */
 	enum esb_tx_mode tx_mode;	/**< Transmission mode. */
 
-	uint8_t radio_irq_priority;	/**< nRF radio interrupt priority. */
-	uint8_t event_irq_priority;	/**< ESB event interrupt priority. */
-
 	uint8_t payload_length; /**< Length of the payload (maximum length depends
 			       *  on the platforms that are used on each side).
 			       */

subsys/esb/Kconfig

@@ -43,6 +43,18 @@ config ESB_PIPE_COUNT
 	  accidental use of additional pipes, but it's not a problem leaving
 	  this at 8 even if fewer pipes are used.
 
+config ESB_RADIO_IRQ_PRIORITY
+	int "Radio interrupt priority"
+	range 0 5 if ZERO_LATENCY_IRQS
+	range 0 6
+	default 1
+
+config ESB_EVENT_IRQ_PRIORITY
+	int "Event interrupt priority"
+	range 0 5 if ZERO_LATENCY_IRQS
+	range 0 6
+	default 2
+
 menu "Hardware selection (alter with care)"
 
 choice ESB_SYS_TIMER

subsys/esb/esb.c

@@ -1050,11 +1050,11 @@ int esb_init(const struct esb_config *config)
 	sys_timer_init();
 	ppi_init();
 
-	IRQ_DIRECT_CONNECT(RADIO_IRQn, config->radio_irq_priority,
+	IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_ESB_RADIO_IRQ_PRIORITY,
 			   RADIO_IRQHandler, 0);
-	IRQ_DIRECT_CONNECT(ESB_EVT_IRQ, config->event_irq_priority,
+	IRQ_DIRECT_CONNECT(ESB_EVT_IRQ, CONFIG_ESB_EVENT_IRQ_PRIORITY,
 			   ESB_EVT_IRQHandler, 0);
-	IRQ_DIRECT_CONNECT(ESB_SYS_TIMER_IRQn, config->event_irq_priority,
+	IRQ_DIRECT_CONNECT(ESB_SYS_TIMER_IRQn, CONFIG_ESB_EVENT_IRQ_PRIORITY,
 			   ESB_SYS_TIMER_IRQHandler, 0);
 
 	irq_enable(RADIO_IRQn);