Improve naming of interrupt vectors for new AVR MCUs

Signed-off-by: trembel <silvano.cortesi@hotmail.com>
Rahix · Nov 24, 2020 · ce2ecb1 · ce2ecb1
1 parent 3f0003c
commit ce2ecb1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/atdf/interrupt.rs b/src/atdf/interrupt.rs
@@ -5,7 +5,12 @@ use crate::ElementExt;
 pub fn parse(interrupt: &xmltree::Element) -> crate::Result<chip::Interrupt> {
     interrupt.check_name("interrupt")?;
 
-    let name = interrupt.attr("name")?.clone();
+    let name = {
+        let inst_name = interrupt.attr("name")?;
+        interrupt
+            .attr("module-instance")
+            .map_or_else(|_| inst_name.clone(), |s| format!("{}_{}", s, inst_name))
+    };
     let index = util::parse_int(interrupt.attr("index")?)?;
     let description = interrupt
         .attributes