Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SPARE_IRQs to the SVD #2271

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add SPARE_IRQs to the SVD #2271

wants to merge 2 commits into from

Conversation

kilograham
Copy link
Contributor

@kilograham kilograham commented Feb 15, 2025

fixes #1898

…e with a size of zero is not a legal SVD, so including something hopefully harmless
…competing #defines as these were called USER_IRQs in the SDK 1.x
@kilograham kilograham added this to the 2.1.1 milestone Feb 15, 2025
@kilograham
Copy link
Contributor Author

kilograham commented Feb 15, 2025

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
Copy link
Contributor Author

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

@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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? 🤔

Copy link
Contributor

@peterharperuk peterharperuk Feb 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

der - ignore me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants