mspm0: generate interrupt group handlers

13 files changed, 18 insertions, 515 deletions

diff --git a/embassy-mspm0/src/gpio.rs b/embassy-mspm0/src/gpio.rs
index 19a6230b6..738d51928 100644
--- a/embassy-mspm0/src/gpio.rs
+++ b/embassy-mspm0/src/gpio.rs
@@ -1119,24 +1119,36 @@ impl Iterator for BitIter {
     }
 }
 
-// C110x has a dedicated interrupt just for GPIOA, as it does not have a GROUP1 interrupt.
+// C110x and L110x have a dedicated interrupts just for GPIOA.
+//
+// These chips do not have a GROUP1 interrupt.
 #[cfg(all(feature = "rt", any(mspm0c110x, mspm0l110x)))]
 #[interrupt]
 fn GPIOA() {
-    gpioa_interrupt();
+    irq_handler(pac::GPIOA, &PORTA_WAKERS);
 }
 
-#[cfg(feature = "rt")]
-pub(crate) fn gpioa_interrupt() {
+// These symbols are weakly defined as DefaultHandler and are called by the interrupt group implementation.
+//
+// Defining these as no_mangle is required so that the linker will pick these over the default handler.
+
+#[cfg(all(feature = "rt", not(any(mspm0c110x, mspm0l110x))))]
+#[no_mangle]
+#[allow(non_snake_case)]
+fn GPIOA() {
     irq_handler(pac::GPIOA, &PORTA_WAKERS);
 }
 
 #[cfg(all(feature = "rt", gpio_pb))]
-pub(crate) fn gpiob_interrupt() {
+#[no_mangle]
+#[allow(non_snake_case)]
+fn GPIOB() {
     irq_handler(pac::GPIOB, &PORTB_WAKERS);
 }
 
 #[cfg(all(feature = "rt", gpio_pc))]
-pub(crate) fn gpioc_interrupt() {
+#[allow(non_snake_case)]
+#[no_mangle]
+fn GPIOC() {
     irq_handler(pac::GPIOC, &PORTC_WAKERS);
 }
diff --git a/embassy-mspm0/src/int_group/c110x.rs b/embassy-mspm0/src/int_group/c110x.rs
deleted file mode 100644
index e6a9ddb99..000000000
--- a/embassy-mspm0/src/int_group/c110x.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // TODO: Decompose to direct u8
-    let iidx = group.iidx().read().stat().to_bits();
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/g110x.rs b/embassy-mspm0/src/int_group/g110x.rs
deleted file mode 100644
index 9f8ac4d7b..000000000
--- a/embassy-mspm0/src/int_group/g110x.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::WWDT1 => todo!("implement WWDT1"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/g150x.rs b/embassy-mspm0/src/int_group/g150x.rs
deleted file mode 100644
index 706ba2078..000000000
--- a/embassy-mspm0/src/int_group/g150x.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::WWDT1 => todo!("implement WWDT1"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-        Group1::COMP0 => todo!("implement COMP0"),
-        Group1::COMP1 => todo!("implement COMP1"),
-        Group1::COMP2 => todo!("implement COMP2"),
-        Group1::TRNG => todo!("implement TRNG"),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/g151x.rs b/embassy-mspm0/src/int_group/g151x.rs
deleted file mode 100644
index e785018a7..000000000
--- a/embassy-mspm0/src/int_group/g151x.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::WWDT1 => todo!("implement WWDT1"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-        Group1::COMP0 => todo!("implement COMP0"),
-        Group1::COMP1 => todo!("implement COMP1"),
-        Group1::COMP2 => todo!("implement COMP2"),
-        Group1::TRNG => todo!("implement TRNG"),
-        Group1::GPIOC => crate::gpio::gpioc_interrupt(),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/g310x.rs b/embassy-mspm0/src/int_group/g310x.rs
deleted file mode 100644
index ad508d3a2..000000000
--- a/embassy-mspm0/src/int_group/g310x.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::WWDT1 => todo!("implement WWDT1"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-        Group1::TRNG => todo!("implement TRNG"),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/g350x.rs b/embassy-mspm0/src/int_group/g350x.rs
deleted file mode 100644
index 706ba2078..000000000
--- a/embassy-mspm0/src/int_group/g350x.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::WWDT1 => todo!("implement WWDT1"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-        Group1::COMP0 => todo!("implement COMP0"),
-        Group1::COMP1 => todo!("implement COMP1"),
-        Group1::COMP2 => todo!("implement COMP2"),
-        Group1::TRNG => todo!("implement TRNG"),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/g351x.rs b/embassy-mspm0/src/int_group/g351x.rs
deleted file mode 100644
index e785018a7..000000000
--- a/embassy-mspm0/src/int_group/g351x.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::WWDT1 => todo!("implement WWDT1"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-        Group1::COMP0 => todo!("implement COMP0"),
-        Group1::COMP1 => todo!("implement COMP1"),
-        Group1::COMP2 => todo!("implement COMP2"),
-        Group1::TRNG => todo!("implement TRNG"),
-        Group1::GPIOC => crate::gpio::gpioc_interrupt(),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/l11xx.rs b/embassy-mspm0/src/int_group/l11xx.rs
deleted file mode 100644
index 426a80c13..000000000
--- a/embassy-mspm0/src/int_group/l11xx.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/l12xx.rs b/embassy-mspm0/src/int_group/l12xx.rs
deleted file mode 100644
index eeb2ce70d..000000000
--- a/embassy-mspm0/src/int_group/l12xx.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-        Group1::COMP0 => todo!("implement COMP0"),
-        Group1::TRNG => todo!("implement TRNG"),
-        Group1::GPIOC => crate::gpio::gpioc_interrupt(),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/l13xx.rs b/embassy-mspm0/src/int_group/l13xx.rs
deleted file mode 100644
index 8be5adcad..000000000
--- a/embassy-mspm0/src/int_group/l13xx.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::COMP0 => todo!("implement COMP0"),
-    }
-}
diff --git a/embassy-mspm0/src/int_group/l222x.rs b/embassy-mspm0/src/int_group/l222x.rs
deleted file mode 100644
index eeb2ce70d..000000000
--- a/embassy-mspm0/src/int_group/l222x.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use crate::pac;
-use crate::pac::interrupt;
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP0() {
-    use mspm0_metapac::Group0;
-
-    let group = pac::CPUSS.int_group(0);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group0::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 0: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group0::WWDT0 => todo!("implement WWDT0"),
-        Group0::DEBUGSS => todo!("implement DEBUGSS"),
-        Group0::FLASHCTL => todo!("implement FLASHCTL"),
-        Group0::SYSCTL => todo!("implement SYSCTL"),
-    }
-}
-
-#[cfg(feature = "rt")]
-#[interrupt]
-fn GROUP1() {
-    use mspm0_metapac::Group1;
-
-    let group = pac::CPUSS.int_group(1);
-
-    // Must subtract by 1 since NO_INTR is value 0
-    let iidx = group.iidx().read().stat().to_bits() - 1;
-
-    let Ok(group) = pac::Group1::try_from(iidx as u8) else {
-        debug!("Invalid IIDX for group 1: {}", iidx);
-        return;
-    };
-
-    match group {
-        Group1::GPIOA => crate::gpio::gpioa_interrupt(),
-        Group1::GPIOB => crate::gpio::gpiob_interrupt(),
-        Group1::COMP0 => todo!("implement COMP0"),
-        Group1::TRNG => todo!("implement TRNG"),
-        Group1::GPIOC => crate::gpio::gpioc_interrupt(),
-    }
-}
diff --git a/embassy-mspm0/src/lib.rs b/embassy-mspm0/src/lib.rs
index f129e221b..7ff60e946 100644
--- a/embassy-mspm0/src/lib.rs
+++ b/embassy-mspm0/src/lib.rs
@@ -39,20 +39,6 @@ pub mod mode {
 #[cfg(feature = "_time-driver")]
 mod time_driver;
 
-// Interrupt group handlers.
-#[cfg_attr(mspm0c110x, path = "int_group/c110x.rs")]
-#[cfg_attr(mspm0g110x, path = "int_group/g110x.rs")]
-#[cfg_attr(mspm0g150x, path = "int_group/g150x.rs")]
-#[cfg_attr(mspm0g350x, path = "int_group/g350x.rs")]
-#[cfg_attr(mspm0g151x, path = "int_group/g151x.rs")]
-#[cfg_attr(mspm0g351x, path = "int_group/g351x.rs")]
-#[cfg_attr(mspm0g310x, path = "int_group/g310x.rs")]
-#[cfg_attr(mspm0l110x, path = "int_group/l11xx.rs")]
-#[cfg_attr(mspm0l122x, path = "int_group/l12xx.rs")]
-#[cfg_attr(any(mspm0l130x, mspm0l134x), path = "int_group/l13xx.rs")]
-#[cfg_attr(mspm0l222x, path = "int_group/l222x.rs")]
-mod int_group;
-
 pub(crate) mod _generated {
     #![allow(dead_code)]
     #![allow(unused_imports)]