ESP32P4: Rename GPIO_INT0 -> GPIO (#201)

esp-rs · Mar 5, 2024 · e394c25 · e394c25
1 parent 35de99f
commit e394c25
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/esp32p4/device.x b/esp32p4/device.x
@@ -60,7 +60,7 @@ PROVIDE(RSA = DefaultHandler);
 PROVIDE(AES = DefaultHandler);
 PROVIDE(SHA = DefaultHandler);
 PROVIDE(ECC = DefaultHandler);
-PROVIDE(GPIO_INT0 = DefaultHandler);
+PROVIDE(GPIO = DefaultHandler);
 PROVIDE(GPIO_INT1 = DefaultHandler);
 PROVIDE(GPIO_INT2 = DefaultHandler);
 PROVIDE(GPIO_INT3 = DefaultHandler);

diff --git a/esp32p4/src/interrupt.rs b/esp32p4/src/interrupt.rs
@@ -126,8 +126,8 @@ pub enum Interrupt {
     SHA = 70,
     #[doc = "71 - ECC"]
     ECC = 71,
-    #[doc = "74 - GPIO_INT0"]
-    GPIO_INT0 = 74,
+    #[doc = "74 - GPIO"]
+    GPIO = 74,
     #[doc = "75 - GPIO_INT1"]
     GPIO_INT1 = 75,
     #[doc = "76 - GPIO_INT2"]
@@ -263,7 +263,7 @@ impl Interrupt {
             69 => Ok(Interrupt::AES),
             70 => Ok(Interrupt::SHA),
             71 => Ok(Interrupt::ECC),
-            74 => Ok(Interrupt::GPIO_INT0),
+            74 => Ok(Interrupt::GPIO),
             75 => Ok(Interrupt::GPIO_INT1),
             76 => Ok(Interrupt::GPIO_INT2),
             77 => Ok(Interrupt::GPIO_INT3),

diff --git a/esp32p4/src/lib.rs b/esp32p4/src/lib.rs
@@ -75,7 +75,7 @@ extern "C" {
     fn AES();
     fn SHA();
     fn ECC();
-    fn GPIO_INT0();
+    fn GPIO();
     fn GPIO_INT1();
     fn GPIO_INT2();
     fn GPIO_INT3();
@@ -230,9 +230,7 @@ pub static __EXTERNAL_INTERRUPTS: [Vector; 128] = [
     Vector { _handler: ECC },
     Vector { _reserved: 0 },
     Vector { _reserved: 0 },
-    Vector {
-        _handler: GPIO_INT0,
-    },
+    Vector { _handler: GPIO },
     Vector {
         _handler: GPIO_INT1,
     },

diff --git a/esp32p4/svd/patches/esp32p4.yaml b/esp32p4/svd/patches/esp32p4.yaml
@@ -1 +1,7 @@
 _svd: "../esp32p4.base.svd"
+
+GPIO:
+  _modify:
+    _interrupts:
+      GPIO_INT0:
+        name: GPIO