aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorokhsunrog <[email protected]>2025-05-21 09:28:31 +0300
committerokhsunrog <[email protected]>2025-05-21 09:28:31 +0300
commitaa951e7fd67901473cdcd4926ef81c3e9f6da805 (patch)
treeee852b51bfcfbe274bfadcf0f5361853fffded7a
parentbc265b98b7597ffb90fe4e951beee5d65c6c481f (diff)
parent7cbc9058bc726900571a7858c581f60cd8cb0266 (diff)
Merge remote-tracking branch 'origin/main' into adding_eeprom
-rw-r--r--embassy-mspm0/src/gpio.rs4
-rw-r--r--embassy-mspm0/src/int_group/l12xx.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/embassy-mspm0/src/gpio.rs b/embassy-mspm0/src/gpio.rs
index 3c824b0e6..19a6230b6 100644
--- a/embassy-mspm0/src/gpio.rs
+++ b/embassy-mspm0/src/gpio.rs
@@ -10,7 +10,7 @@ use embassy_sync::waitqueue::AtomicWaker;
10 10
11use crate::pac::gpio::vals::*; 11use crate::pac::gpio::vals::*;
12use crate::pac::gpio::{self}; 12use crate::pac::gpio::{self};
13#[cfg(all(feature = "rt", mspm0c110x))] 13#[cfg(all(feature = "rt", any(mspm0c110x, mspm0l110x)))]
14use crate::pac::interrupt; 14use crate::pac::interrupt;
15use crate::pac::{self}; 15use crate::pac::{self};
16 16
@@ -1120,7 +1120,7 @@ impl Iterator for BitIter {
1120} 1120}
1121 1121
1122// C110x has a dedicated interrupt just for GPIOA, as it does not have a GROUP1 interrupt. 1122// C110x has a dedicated interrupt just for GPIOA, as it does not have a GROUP1 interrupt.
1123#[cfg(all(feature = "rt", mspm0c110x))] 1123#[cfg(all(feature = "rt", any(mspm0c110x, mspm0l110x)))]
1124#[interrupt] 1124#[interrupt]
1125fn GPIOA() { 1125fn GPIOA() {
1126 gpioa_interrupt(); 1126 gpioa_interrupt();
diff --git a/embassy-mspm0/src/int_group/l12xx.rs b/embassy-mspm0/src/int_group/l12xx.rs
index 833771eea..eeb2ce70d 100644
--- a/embassy-mspm0/src/int_group/l12xx.rs
+++ b/embassy-mspm0/src/int_group/l12xx.rs
@@ -41,9 +41,9 @@ fn GROUP1() {
41 41
42 match group { 42 match group {
43 Group1::GPIOA => crate::gpio::gpioa_interrupt(), 43 Group1::GPIOA => crate::gpio::gpioa_interrupt(),
44 Group1::GPIOB => todo!("implement GPIOB"), 44 Group1::GPIOB => crate::gpio::gpiob_interrupt(),
45 Group1::COMP0 => todo!("implement COMP0"), 45 Group1::COMP0 => todo!("implement COMP0"),
46 Group1::TRNG => todo!("implement TRNG"), 46 Group1::TRNG => todo!("implement TRNG"),
47 Group1::GPIOC => todo!("implement GPIOC"), 47 Group1::GPIOC => crate::gpio::gpioc_interrupt(),
48 } 48 }
49} 49}