LP & ULP cores - Fix C6 LP interrupt numbers, add GPIO_INT interrupt to ULP cores, collect S3-ULP pins into an array.

esp32c6-lp/build.rs

@@ -1,8 +1,5 @@
 #![doc = r" Builder file for Peripheral access crate generated by svd2rust tool"]
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
+use std::{env, fs::File, io::Write, path::PathBuf};
 fn main() {
     if env::var_os("CARGO_FEATURE_RT").is_some() {
         let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());

esp32c6-lp/device.x

@@ -1,9 +1,6 @@
-PROVIDE(LP_TIMER = DefaultHandler);
-PROVIDE(PMU = DefaultHandler);
-PROVIDE(LP_UART = DefaultHandler);
-PROVIDE(LP_I2C = DefaultHandler);
-PROVIDE(LP_WDT = DefaultHandler);
-PROVIDE(LP_PERI_TIMEOUT = DefaultHandler);
-PROVIDE(LP_APM_M0 = DefaultHandler);
-PROVIDE(LP_APM_M1 = DefaultHandler);
+PROVIDE(LP_IO_INT = DefaultHandler);
+PROVIDE(LP_I2C_INT = DefaultHandler);
+PROVIDE(LP_UART_INT = DefaultHandler);
+PROVIDE(LP_TIMER_INT = DefaultHandler);
+PROVIDE(PMU_LP_INT = DefaultHandler);
 

esp32c6-lp/src/interrupt.rs

@@ -3,22 +3,16 @@
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[repr(u16)]
 pub enum Interrupt {
-    #[doc = "7 - LP_TIMER"]
-    LP_TIMER = 7,
-    #[doc = "13 - PMU"]
-    PMU = 13,
-    #[doc = "16 - LP_UART"]
-    LP_UART = 16,
-    #[doc = "17 - LP_I2C"]
-    LP_I2C = 17,
-    #[doc = "18 - LP_WDT"]
-    LP_WDT = 18,
-    #[doc = "19 - LP_PERI_TIMEOUT"]
-    LP_PERI_TIMEOUT = 19,
-    #[doc = "20 - LP_APM_M0"]
-    LP_APM_M0 = 20,
-    #[doc = "21 - LP_APM_M1"]
-    LP_APM_M1 = 21,
+    #[doc = "0 - LP_IO_INT"]
+    LP_IO_INT    = 0,
+    #[doc = "1 - LP_I2C_INT"]
+    LP_I2C_INT   = 1,
+    #[doc = "2 - LP_UART_INT"]
+    LP_UART_INT  = 2,
+    #[doc = "3 - LP_TIMER_INT"]
+    LP_TIMER_INT = 3,
+    #[doc = "5 - PMU_LP_INT"]
+    PMU_LP_INT   = 5,
 }
 #[doc = r" TryFromInterruptError"]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
@@ -29,14 +23,11 @@ impl Interrupt {
     #[inline]
     pub fn try_from(value: u8) -> Result<Self, TryFromInterruptError> {
         match value {
-            7 => Ok(Interrupt::LP_TIMER),
-            13 => Ok(Interrupt::PMU),
-            16 => Ok(Interrupt::LP_UART),
-            17 => Ok(Interrupt::LP_I2C),
-            18 => Ok(Interrupt::LP_WDT),
-            19 => Ok(Interrupt::LP_PERI_TIMEOUT),
-            20 => Ok(Interrupt::LP_APM_M0),
-            21 => Ok(Interrupt::LP_APM_M1),
+            0 => Ok(Interrupt::LP_IO_INT),
+            1 => Ok(Interrupt::LP_I2C_INT),
+            2 => Ok(Interrupt::LP_UART_INT),
+            3 => Ok(Interrupt::LP_TIMER_INT),
+            5 => Ok(Interrupt::PMU_LP_INT),
             _ => Err(TryFromInterruptError(())),
         }
     }

esp32c6-lp/src/lib.rs

@@ -1,4 +1,4 @@
-#![doc = "Peripheral access API for ESP32-C6-LP microcontrollers (generated using svd2rust v0.37.0 ( ))\n\nYou can find an overview of the generated API [here].\n\nAPI features to be included in the [next] svd2rust release can be generated by cloning the svd2rust [repository], checking out the above commit, and running `cargo doc --open`.\n\n[here]: https://docs.rs/svd2rust/0.37.0/svd2rust/#peripheral-api\n[next]: https://github.com/rust-embedded/svd2rust/blob/master/CHANGELOG.md#unreleased\n[repository]: https://github.com/rust-embedded/svd2rust"]
+#![doc = "Peripheral access API for ESP32-C6-LP microcontrollers (generated using svd2rust v0.37.1 (f74f0b3 2026-04-17))\n\nYou can find an overview of the generated API [here].\n\nAPI features to be included in the [next] svd2rust release can be generated by cloning the svd2rust [repository], checking out the above commit, and running `cargo doc --open`.\n\n[here]: https://docs.rs/svd2rust/0.37.1/svd2rust/#peripheral-api\n[next]: https://github.com/rust-embedded/svd2rust/blob/master/CHANGELOG.md#unreleased\n[repository]: https://github.com/rust-embedded/svd2rust"]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![doc(html_logo_url = "https://avatars.githubusercontent.com/u/46717278")]
@@ -12,14 +12,11 @@ use generic::*;
 pub mod generic;
 #[cfg(feature = "rt")]
 extern "C" {
-    fn LP_TIMER();
-    fn PMU();
-    fn LP_UART();
-    fn LP_I2C();
-    fn LP_WDT();
-    fn LP_PERI_TIMEOUT();
-    fn LP_APM_M0();
-    fn LP_APM_M1();
+    fn LP_IO_INT();
+    fn LP_I2C_INT();
+    fn LP_UART_INT();
+    fn LP_TIMER_INT();
+    fn PMU_LP_INT();
 }
 #[doc(hidden)]
 #[repr(C)]
@@ -31,34 +28,22 @@ pub union Vector {
 #[doc(hidden)]
 #[link_section = ".rwtext"]
 #[no_mangle]
-pub static __EXTERNAL_INTERRUPTS: [Vector; 22] = [
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _handler: LP_TIMER },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _handler: PMU },
-    Vector { _reserved: 0 },
-    Vector { _reserved: 0 },
-    Vector { _handler: LP_UART },
-    Vector { _handler: LP_I2C },
-    Vector { _handler: LP_WDT },
+pub static __EXTERNAL_INTERRUPTS: [Vector; 6] = [
     Vector {
-        _handler: LP_PERI_TIMEOUT,
+        _handler: LP_IO_INT,
     },
     Vector {
-        _handler: LP_APM_M0,
+        _handler: LP_I2C_INT,
     },
     Vector {
-        _handler: LP_APM_M1,
+        _handler: LP_UART_INT,
+    },
+    Vector {
+        _handler: LP_TIMER_INT,
+    },
+    Vector { _reserved: 0 },
+    Vector {
+        _handler: PMU_LP_INT,
     },
 ];
 #[doc(hidden)]

esp32c6-lp/src/lp_tee/m_mode_ctrl.rs

@@ -8,7 +8,7 @@ pub type W = crate::W<M_MODE_CTRL_SPEC>;
 #[repr(u8)]
 pub enum SECURITY_MODE {
     #[doc = "0: Tee mode"]
-    Tee = 0,
+    Tee  = 0,
     #[doc = "1: Ree0 mode"]
     Ree0 = 1,
     #[doc = "2: Ree1 mode"]

esp32c6-lp/svd/esp32c6-lp.base.svd

@@ -44,8 +44,8 @@
         <usage>registers</usage>
       </addressBlock>
       <interrupt>
-        <name>LP_I2C</name>
-        <value>17</value>
+        <name>LP_I2C_INT</name>
+        <value>1</value>
       </interrupt>
       <registers>
         <register>
@@ -1368,10 +1368,6 @@ Information.</description>
         <size>0x28</size>
         <usage>registers</usage>
       </addressBlock>
-      <interrupt>
-        <name>LP_PERI_TIMEOUT</name>
-        <value>19</value>
-      </interrupt>
       <registers>
         <register>
           <name>CLK_EN</name>
@@ -2456,14 +2452,6 @@ Information.</description>
         <size>0x64</size>
         <usage>registers</usage>
       </addressBlock>
-      <interrupt>
-        <name>LP_APM_M0</name>
-        <value>20</value>
-      </interrupt>
-      <interrupt>
-        <name>LP_APM_M1</name>
-        <value>21</value>
-      </interrupt>
       <registers>
         <register>
           <name>REGION_FILTER_EN</name>
@@ -3709,6 +3697,10 @@ Information.</description>
         <size>0x7C</size>
         <usage>registers</usage>
       </addressBlock>
+      <interrupt>
+        <name>LP_IO_INT</name>
+        <value>0</value>
+      </interrupt>
       <registers>
         <register>
           <name>OUT_DATA</name>
@@ -5141,8 +5133,8 @@ Information.</description>
         <usage>registers</usage>
       </addressBlock>
       <interrupt>
-        <name>LP_TIMER</name>
-        <value>7</value>
+        <name>LP_TIMER_INT</name>
+        <value>3</value>
       </interrupt>
       <registers>
         <register>
@@ -5542,8 +5534,8 @@ Information.</description>
         <usage>registers</usage>
       </addressBlock>
       <interrupt>
-        <name>LP_UART</name>
-        <value>16</value>
+        <name>LP_UART_INT</name>
+        <value>2</value>
       </interrupt>
       <registers>
         <register>
@@ -6998,10 +6990,6 @@ Information.</description>
         <size>0x38</size>
         <usage>registers</usage>
       </addressBlock>
-      <interrupt>
-        <name>LP_WDT</name>
-        <value>18</value>
-      </interrupt>
       <registers>
         <register>
           <name>CONFIG0</name>
@@ -7377,4 +7365,4 @@ Information.</description>
       </registers>
     </peripheral>
   </peripherals>
-</device>
+</device>

esp32c6-lp/svd/patches/_pmu.yml

@@ -9,3 +9,9 @@ PMU:
       size: 0x20
       access: read-write
       resetValue: 0x0
+
+  _modify:
+    _interrupts:
+        PMU:
+            name: PMU_LP_INT
+            value: 5

esp32s2-ulp/build.rs

@@ -1,8 +1,5 @@
 #![doc = r" Builder file for Peripheral access crate generated by svd2rust tool"]
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
+use std::{env, fs::File, io::Write, path::PathBuf};
 fn main() {
     if env::var_os("CARGO_FEATURE_RT").is_some() {
         let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());

esp32s2-ulp/device.x

@@ -7,4 +7,5 @@ PROVIDE(TSENS_DONE_INT = DefaultHandler);
 PROVIDE(RISCV_START_INT = DefaultHandler);
 PROVIDE(SW_INT = DefaultHandler);
 PROVIDE(SWD_INT = DefaultHandler);
+PROVIDE(GPIO_INT = DefaultHandler);
 

esp32s2-ulp/src/interrupt.rs

@@ -4,23 +4,25 @@
 #[repr(u16)]
 pub enum Interrupt {
     #[doc = "0 - TOUCH_DONE_INT"]
-    TOUCH_DONE_INT = 0,
+    TOUCH_DONE_INT     = 0,
     #[doc = "1 - TOUCH_INACTIVE_INT"]
     TOUCH_INACTIVE_INT = 1,
     #[doc = "2 - TOUCH_ACTIVE_INT"]
-    TOUCH_ACTIVE_INT = 2,
+    TOUCH_ACTIVE_INT   = 2,
     #[doc = "3 - SARADC1_DONE_INT"]
-    SARADC1_DONE_INT = 3,
+    SARADC1_DONE_INT   = 3,
     #[doc = "4 - SARADC2_DONE_INT"]
-    SARADC2_DONE_INT = 4,
+    SARADC2_DONE_INT   = 4,
     #[doc = "5 - TSENS_DONE_INT"]
-    TSENS_DONE_INT = 5,
+    TSENS_DONE_INT     = 5,
     #[doc = "6 - RISCV_START_INT"]
-    RISCV_START_INT = 6,
+    RISCV_START_INT    = 6,
     #[doc = "7 - SW_INT"]
-    SW_INT = 7,
+    SW_INT             = 7,
     #[doc = "8 - SWD_INT"]
-    SWD_INT = 8,
+    SWD_INT            = 8,
+    #[doc = "9 - GPIO_INT"]
+    GPIO_INT           = 9,
 }
 #[doc = r" TryFromInterruptError"]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
@@ -40,6 +42,7 @@ impl Interrupt {
             6 => Ok(Interrupt::RISCV_START_INT),
             7 => Ok(Interrupt::SW_INT),
             8 => Ok(Interrupt::SWD_INT),
+            9 => Ok(Interrupt::GPIO_INT),
             _ => Err(TryFromInterruptError(())),
         }
     }

esp32s2-ulp/src/lib.rs

@@ -1,4 +1,4 @@
-#![doc = "Peripheral access API for ESP32-S2-ULP microcontrollers (generated using svd2rust v0.37.0 ( ))\n\nYou can find an overview of the generated API [here].\n\nAPI features to be included in the [next] svd2rust release can be generated by cloning the svd2rust [repository], checking out the above commit, and running `cargo doc --open`.\n\n[here]: https://docs.rs/svd2rust/0.37.0/svd2rust/#peripheral-api\n[next]: https://github.com/rust-embedded/svd2rust/blob/master/CHANGELOG.md#unreleased\n[repository]: https://github.com/rust-embedded/svd2rust"]
+#![doc = "Peripheral access API for ESP32-S2-ULP microcontrollers (generated using svd2rust v0.37.1 (f74f0b3 2026-04-17))\n\nYou can find an overview of the generated API [here].\n\nAPI features to be included in the [next] svd2rust release can be generated by cloning the svd2rust [repository], checking out the above commit, and running `cargo doc --open`.\n\n[here]: https://docs.rs/svd2rust/0.37.1/svd2rust/#peripheral-api\n[next]: https://github.com/rust-embedded/svd2rust/blob/master/CHANGELOG.md#unreleased\n[repository]: https://github.com/rust-embedded/svd2rust"]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![doc(html_logo_url = "https://avatars.githubusercontent.com/u/46717278")]
@@ -21,6 +21,7 @@ extern "C" {
     fn RISCV_START_INT();
     fn SW_INT();
     fn SWD_INT();
+    fn GPIO_INT();
 }
 #[doc(hidden)]
 #[repr(C)]
@@ -32,7 +33,7 @@ pub union Vector {
 #[doc(hidden)]
 #[link_section = ".rwtext"]
 #[no_mangle]
-pub static __EXTERNAL_INTERRUPTS: [Vector; 9] = [
+pub static __EXTERNAL_INTERRUPTS: [Vector; 10] = [
     Vector {
         _handler: TOUCH_DONE_INT,
     },
@@ -56,6 +57,7 @@ pub static __EXTERNAL_INTERRUPTS: [Vector; 9] = [
     },
     Vector { _handler: SW_INT },
     Vector { _handler: SWD_INT },
+    Vector { _handler: GPIO_INT },
 ];
 #[doc(hidden)]
 pub mod interrupt;