Add SPARE_IRQs to the SVD #2271

2025-02-15T12:48:55-06:00

kilograham commented

2025-02-15 12:48:55 -06:00

(Migrated from github.com)

fixes #1898

Wren6991 (Migrated from github.com) reviewed

2025-02-15 12:48:55 -06:00

liamfraser (Migrated from github.com) reviewed

2025-02-15 12:48:55 -06:00

peterharperuk (Migrated from github.com) reviewed

2025-02-15 12:48:55 -06:00

kilograham commented

2025-02-15 12:53:48 -06:00

(Migrated from github.com)

Note, i have not added the extra IRQs to the RP2040 SVD as i don't know if that is rocking the boat too much (as i'd have to change the numInterrupts)

Note, i have not added the extra IRQs to the RP2040 SVD as i don't know if that is rocking the boat too much (as i'd have to change the `numInterrupts`)

kilograham commented

2025-02-15 12:57:08 -06:00

(Migrated from github.com)

cc @jonathanpallant, @pta2002, @jannic

not sure if i want to risk making this change at the last hour for 2.1.1 - LMK... if i don't see lots of happy faces, I'll push it to 2.1.2

cc @jonathanpallant, @pta2002, @jannic not sure if i want to risk making this change at the last hour for 2.1.1 - LMK... if i don't see lots of happy faces, I'll push it to 2.1.2

lurch (Migrated from github.com) reviewed

2025-02-15 17:59:36 -06:00

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

					
				@ -74,2 +84,4 @@

				    SPARE_IRQ_4 = 30, ///< Select SPARE IRQ 4

				    SPARE_IRQ_5 = 31, ///< Select SPARE IRQ 5

				    IRQ_COUNT

				} irq_num_t;

Comparing this to https://github.com/raspberrypi/pico-sdk/blob/develop/src/rp2350/hardware_regs/include/hardware/regs/intctrl.h , do these spare IRQs also need to be added to the #ifdef __ASSEMBLER__ section?

Comparing this to https://github.com/raspberrypi/pico-sdk/blob/develop/src/rp2350/hardware_regs/include/hardware/regs/intctrl.h , do these spare IRQs also need to be added to the `#ifdef __ASSEMBLER__` section?

lurch (Migrated from github.com) reviewed

2025-02-15 18:05:25 -06:00

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

					
				@ -74,2 +84,4 @@

				    SPARE_IRQ_4 = 30, ///< Select SPARE IRQ 4

				    SPARE_IRQ_5 = 31, ///< Select SPARE IRQ 5

				    IRQ_COUNT

				} irq_num_t;

Hmmm, just noticed that https://github.com/raspberrypi/pico-sdk/blob/develop/src/rp2350/hardware_regs/include/hardware/regs/intctrl.h also has:

#define PLL_USB_IRQ 43
#define POWMAN_IRQ_POW 44
#define POWMAN_IRQ_TIMER 45
#define SPAREIRQ_IRQ_0 46
#define SPAREIRQ_IRQ_1 47

and

    PLL_USB_IRQ = 43, ///< Select PLL_USB's IRQ output
    POWMAN_IRQ_POW = 44, ///< Select POWMAN's IRQ_POW output
    POWMAN_IRQ_TIMER = 45, ///< Select POWMAN's IRQ_TIMER output
    SPARE_IRQ_0 = 46, ///< Select SPARE IRQ 0
    SPARE_IRQ_1 = 47, ///< Select SPARE IRQ 1

with the naming of SPAREIRQ_IRQ_0 vs. SPARE_IRQ_0 seeming to be a bit inconsistent? 🤔

Hmmm, just noticed that https://github.com/raspberrypi/pico-sdk/blob/develop/src/rp2350/hardware_regs/include/hardware/regs/intctrl.h also has: ```c #define PLL_USB_IRQ 43 #define POWMAN_IRQ_POW 44 #define POWMAN_IRQ_TIMER 45 #define SPAREIRQ_IRQ_0 46 #define SPAREIRQ_IRQ_1 47 ``` and ```c PLL_USB_IRQ = 43, ///< Select PLL_USB's IRQ output POWMAN_IRQ_POW = 44, ///< Select POWMAN's IRQ_POW output POWMAN_IRQ_TIMER = 45, ///< Select POWMAN's IRQ_TIMER output SPARE_IRQ_0 = 46, ///< Select SPARE IRQ 0 SPARE_IRQ_1 = 47, ///< Select SPARE IRQ 1 ``` with the naming of `SPAREIRQ_IRQ_0` vs. `SPARE_IRQ_0` seeming to be a bit inconsistent? :thinking:

peterharperuk (Migrated from github.com) reviewed

2025-02-17 14:01:55 -06:00

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

					
				@ -74,2 +84,4 @@

				    SPARE_IRQ_4 = 30, ///< Select SPARE IRQ 4

				    SPARE_IRQ_5 = 31, ///< Select SPARE IRQ 5

				    IRQ_COUNT

				} irq_num_t;

der - ignore me

kilograham commented

2025-03-18 13:30:19 -05:00

(Migrated from github.com)

pushing to 2.2.0 since still no feedback

jonathanpallant commented

2025-03-20 03:48:33 -05:00

(Migrated from github.com)

Looks ok to me

kilograham (Migrated from github.com) reviewed

2025-03-22 18:02:24 -05:00

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

					
				@ -74,2 +84,4 @@

				    SPARE_IRQ_4 = 30, ///< Select SPARE IRQ 4

				    SPARE_IRQ_5 = 31, ///< Select SPARE IRQ 5

				    IRQ_COUNT

				} irq_num_t;

Hmmm, just noticed that https://github.com/raspberrypi/pico-sdk/blob/develop/src/rp2350/hardware_regs/include/hardware/regs/intctrl.h also has:
#define PLL_USB_IRQ 43
#define POWMAN_IRQ_POW 44
#define POWMAN_IRQ_TIMER 45
#define SPAREIRQ_IRQ_0 46
#define SPAREIRQ_IRQ_1 47
and
    PLL_USB_IRQ = 43, ///< Select PLL_USB's IRQ output
    POWMAN_IRQ_POW = 44, ///< Select POWMAN's IRQ_POW output
    POWMAN_IRQ_TIMER = 45, ///< Select POWMAN's IRQ_TIMER output
    SPARE_IRQ_0 = 46, ///< Select SPARE IRQ 0
    SPARE_IRQ_1 = 47, ///< Select SPARE IRQ 1
with the naming of SPAREIRQ_IRQ_0 vs. SPARE_IRQ_0 seeming to be a bit inconsistent? 🤔

yes, done.

> Hmmm, just noticed that https://github.com/raspberrypi/pico-sdk/blob/develop/src/rp2350/hardware_regs/include/hardware/regs/intctrl.h also has: > > ```c > #define PLL_USB_IRQ 43 > #define POWMAN_IRQ_POW 44 > #define POWMAN_IRQ_TIMER 45 > #define SPAREIRQ_IRQ_0 46 > #define SPAREIRQ_IRQ_1 47 > ``` > > and > > ```c > PLL_USB_IRQ = 43, ///< Select PLL_USB's IRQ output > POWMAN_IRQ_POW = 44, ///< Select POWMAN's IRQ_POW output > POWMAN_IRQ_TIMER = 45, ///< Select POWMAN's IRQ_TIMER output > SPARE_IRQ_0 = 46, ///< Select SPARE IRQ 0 > SPARE_IRQ_1 = 47, ///< Select SPARE IRQ 1 > ``` > > with the naming of `SPAREIRQ_IRQ_0` vs. `SPARE_IRQ_0` seeming to be a bit inconsistent? 🤔 yes, done.