Add SPARE_IRQ definitions to RP2040 intctrl.h, and add assertions on competing #defines as these were called USER_IRQs in the SDK 1.x

Author: kilograham

src/rp2040/hardware_regs/include/hardware/regs/intctrl.h

@@ -71,6 +71,12 @@ typedef enum irq_num_rp2040 {
     I2C0_IRQ = 23, ///< Select I2C0's IRQ output
     I2C1_IRQ = 24, ///< Select I2C1's IRQ output
     RTC_IRQ = 25, ///< Select RTC's IRQ output
+    SPARE_IRQ_0 = 26, ///< Select SPARE IRQ 0
+    SPARE_IRQ_1 = 27, ///< Select SPARE IRQ 1
+    SPARE_IRQ_2 = 28, ///< Select SPARE IRQ 2
+    SPARE_IRQ_3 = 29, ///< Select SPARE IRQ 3
+    SPARE_IRQ_4 = 30, ///< Select SPARE IRQ 4
+    SPARE_IRQ_5 = 31, ///< Select SPARE IRQ 5
     IRQ_COUNT
 } irq_num_t;
 #endif
@@ -101,6 +107,12 @@ typedef enum irq_num_rp2040 {
 #define isr_i2c0 isr_irq23
 #define isr_i2c1 isr_irq24
 #define isr_rtc isr_irq25
+#define isr_spare_0 isr_irq26
+#define isr_spare_1 isr_irq27
+#define isr_spare_2 isr_irq28
+#define isr_spare_3 isr_irq29
+#define isr_spare_4 isr_irq30
+#define isr_spare_5 isr_irq31
 
 #endif // _INTCTRL_H
 

src/rp2_common/hardware_irq/irq.c

@@ -15,6 +15,12 @@
 PICO_RUNTIME_INIT_FUNC_PER_CORE(runtime_init_per_core_irq_priorities, PICO_RUNTIME_INIT_PER_CORE_IRQ_PRIORITIES);
 #endif
 
+static_assert(IRQ_COUNT == NUM_IRQS, "");
+// "USER IRQs" use the spare irq numbers
+#if NUM_USER_IRQS
+static_assert(IRQ_COUNT - NUM_USER_IRQS == SPARE_IRQ_0, "");
+#endif
+
 #if PICO_VTABLE_PER_CORE
 static uint8_t user_irq_claimed[NUM_CORES];
 static inline uint8_t *user_irq_claimed_ptr(void) {