Skip to content

Commit 111c9dc

Browse files
committed
Add updated files after running update.sh
1 parent 91ca327 commit 111c9dc

File tree

4 files changed

+49
-73
lines changed

4 files changed

+49
-73
lines changed

src/inner/interrupt.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,17 @@ pub enum Interrupt {
9191
#[doc = "45 - POWMAN_IRQ_TIMER"]
9292
POWMAN_IRQ_TIMER = 45,
9393
#[doc = "46 - Spare IRQ 0"]
94-
SPAREIRQ_IRQ_0 = 46,
94+
SW0_IRQ = 46,
9595
#[doc = "47 - Spare IRQ 1"]
96-
SPAREIRQ_IRQ_1 = 47,
96+
SW1_IRQ = 47,
9797
#[doc = "48 - Spare IRQ 2"]
98-
SPAREIRQ_IRQ_2 = 48,
98+
SW2_IRQ = 48,
9999
#[doc = "49 - Spare IRQ 3"]
100-
SPAREIRQ_IRQ_3 = 49,
100+
SW3_IRQ = 49,
101101
#[doc = "50 - Spare IRQ 4"]
102-
SPAREIRQ_IRQ_4 = 50,
102+
SW4_IRQ = 50,
103103
#[doc = "51 - Spare IRQ 5"]
104-
SPAREIRQ_IRQ_5 = 51,
104+
SW5_IRQ = 51,
105105
}
106106
#[doc = r" TryFromInterruptError"]
107107
#[derive(Debug, Copy, Clone)]
@@ -155,12 +155,12 @@ impl Interrupt {
155155
43 => Ok(Interrupt::PLL_USB_IRQ),
156156
44 => Ok(Interrupt::POWMAN_IRQ_POW),
157157
45 => Ok(Interrupt::POWMAN_IRQ_TIMER),
158-
46 => Ok(Interrupt::SPAREIRQ_IRQ_0),
159-
47 => Ok(Interrupt::SPAREIRQ_IRQ_1),
160-
48 => Ok(Interrupt::SPAREIRQ_IRQ_2),
161-
49 => Ok(Interrupt::SPAREIRQ_IRQ_3),
162-
50 => Ok(Interrupt::SPAREIRQ_IRQ_4),
163-
51 => Ok(Interrupt::SPAREIRQ_IRQ_5),
158+
46 => Ok(Interrupt::SW0_IRQ),
159+
47 => Ok(Interrupt::SW1_IRQ),
160+
48 => Ok(Interrupt::SW2_IRQ),
161+
49 => Ok(Interrupt::SW3_IRQ),
162+
50 => Ok(Interrupt::SW4_IRQ),
163+
51 => Ok(Interrupt::SW5_IRQ),
164164
_ => Err(TryFromInterruptError(())),
165165
}
166166
}

src/inner/mod_cortex_m.rs

+18-30
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ extern "C" {
6666
fn PLL_USB_IRQ();
6767
fn POWMAN_IRQ_POW();
6868
fn POWMAN_IRQ_TIMER();
69-
fn SPAREIRQ_IRQ_0();
70-
fn SPAREIRQ_IRQ_1();
71-
fn SPAREIRQ_IRQ_2();
72-
fn SPAREIRQ_IRQ_3();
73-
fn SPAREIRQ_IRQ_4();
74-
fn SPAREIRQ_IRQ_5();
69+
fn SW0_IRQ();
70+
fn SW1_IRQ();
71+
fn SW2_IRQ();
72+
fn SW3_IRQ();
73+
fn SW4_IRQ();
74+
fn SW5_IRQ();
7575
}
7676
#[doc(hidden)]
7777
#[repr(C)]
@@ -206,24 +206,12 @@ pub static __INTERRUPTS: [Vector; 52] = [
206206
Vector {
207207
_handler: POWMAN_IRQ_TIMER,
208208
},
209-
Vector {
210-
_handler: SPAREIRQ_IRQ_0,
211-
},
212-
Vector {
213-
_handler: SPAREIRQ_IRQ_1,
214-
},
215-
Vector {
216-
_handler: SPAREIRQ_IRQ_2,
217-
},
218-
Vector {
219-
_handler: SPAREIRQ_IRQ_3,
220-
},
221-
Vector {
222-
_handler: SPAREIRQ_IRQ_4,
223-
},
224-
Vector {
225-
_handler: SPAREIRQ_IRQ_5,
226-
},
209+
Vector { _handler: SW0_IRQ },
210+
Vector { _handler: SW1_IRQ },
211+
Vector { _handler: SW2_IRQ },
212+
Vector { _handler: SW3_IRQ },
213+
Vector { _handler: SW4_IRQ },
214+
Vector { _handler: SW5_IRQ },
227215
];
228216
#[doc = r"Enumeration of all the interrupts."]
229217
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -318,17 +306,17 @@ pub enum Interrupt {
318306
#[doc = "45 - POWMAN_IRQ_TIMER"]
319307
POWMAN_IRQ_TIMER = 45,
320308
#[doc = "46 - Spare IRQ 0"]
321-
SPAREIRQ_IRQ_0 = 46,
309+
SW0_IRQ = 46,
322310
#[doc = "47 - Spare IRQ 1"]
323-
SPAREIRQ_IRQ_1 = 47,
311+
SW1_IRQ = 47,
324312
#[doc = "48 - Spare IRQ 2"]
325-
SPAREIRQ_IRQ_2 = 48,
313+
SW2_IRQ = 48,
326314
#[doc = "49 - Spare IRQ 3"]
327-
SPAREIRQ_IRQ_3 = 49,
315+
SW3_IRQ = 49,
328316
#[doc = "50 - Spare IRQ 4"]
329-
SPAREIRQ_IRQ_4 = 50,
317+
SW4_IRQ = 50,
330318
#[doc = "51 - Spare IRQ 5"]
331-
SPAREIRQ_IRQ_5 = 51,
319+
SW5_IRQ = 51,
332320
}
333321
unsafe impl cortex_m::interrupt::InterruptNumber for Interrupt {
334322
#[inline(always)]

src/inner/mod_risc_v.rs

+12-24
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ extern "C" {
6262
fn PLL_USB_IRQ();
6363
fn POWMAN_IRQ_POW();
6464
fn POWMAN_IRQ_TIMER();
65-
fn SPAREIRQ_IRQ_0();
66-
fn SPAREIRQ_IRQ_1();
67-
fn SPAREIRQ_IRQ_2();
68-
fn SPAREIRQ_IRQ_3();
69-
fn SPAREIRQ_IRQ_4();
70-
fn SPAREIRQ_IRQ_5();
65+
fn SW0_IRQ();
66+
fn SW1_IRQ();
67+
fn SW2_IRQ();
68+
fn SW3_IRQ();
69+
fn SW4_IRQ();
70+
fn SW5_IRQ();
7171
}
7272
#[doc(hidden)]
7373
#[repr(C)]
@@ -201,24 +201,12 @@ pub static __EXTERNAL_INTERRUPTS: [Vector; 52] = [
201201
Vector {
202202
_handler: POWMAN_IRQ_TIMER,
203203
},
204-
Vector {
205-
_handler: SPAREIRQ_IRQ_0,
206-
},
207-
Vector {
208-
_handler: SPAREIRQ_IRQ_1,
209-
},
210-
Vector {
211-
_handler: SPAREIRQ_IRQ_2,
212-
},
213-
Vector {
214-
_handler: SPAREIRQ_IRQ_3,
215-
},
216-
Vector {
217-
_handler: SPAREIRQ_IRQ_4,
218-
},
219-
Vector {
220-
_handler: SPAREIRQ_IRQ_5,
221-
},
204+
Vector { _handler: SW0_IRQ },
205+
Vector { _handler: SW1_IRQ },
206+
Vector { _handler: SW2_IRQ },
207+
Vector { _handler: SW3_IRQ },
208+
Vector { _handler: SW4_IRQ },
209+
Vector { _handler: SW5_IRQ },
222210
];
223211
#[doc(hidden)]
224212
pub mod interrupt;

svd/RP2350.svd.patched

+7-7
Original file line numberDiff line numberDiff line change
@@ -64617,36 +64617,36 @@
6461764617
</registers>
6461864618
</peripheral>
6461964619
<peripheral>
64620-
<name>SWP_IRQ</name>
64620+
<name>SW_IRQ</name>
6462164621
<description>Virtual Peripheral to access unused NVIC software interrupts</description>
6462264622
<baseAddress>0x00000000</baseAddress>
6462364623
<interrupt>
64624-
<name>spareirq_irq_0</name>
64624+
<name>sw0_irq</name>
6462564625
<description>Spare IRQ 0</description>
6462664626
<value>46</value>
6462764627
</interrupt>
6462864628
<interrupt>
64629-
<name>spareirq_irq_1</name>
64629+
<name>sw1_irq</name>
6463064630
<description>Spare IRQ 1</description>
6463164631
<value>47</value>
6463264632
</interrupt>
6463364633
<interrupt>
64634-
<name>spareirq_irq_2</name>
64634+
<name>sw2_irq</name>
6463564635
<description>Spare IRQ 2</description>
6463664636
<value>48</value>
6463764637
</interrupt>
6463864638
<interrupt>
64639-
<name>spareirq_irq_3</name>
64639+
<name>sw3_irq</name>
6464064640
<description>Spare IRQ 3</description>
6464164641
<value>49</value>
6464264642
</interrupt>
6464364643
<interrupt>
64644-
<name>spareirq_irq_4</name>
64644+
<name>sw4_irq</name>
6464564645
<description>Spare IRQ 4</description>
6464664646
<value>50</value>
6464764647
</interrupt>
6464864648
<interrupt>
64649-
<name>spareirq_irq_5</name>
64649+
<name>sw5_irq</name>
6465064650
<description>Spare IRQ 5</description>
6465164651
<value>51</value>
6465264652
</interrupt>

0 commit comments

Comments
 (0)