diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /embassy-stm32/src/exti.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'embassy-stm32/src/exti.rs')
| -rw-r--r-- | embassy-stm32/src/exti.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/embassy-stm32/src/exti.rs b/embassy-stm32/src/exti.rs index c2fa31b20..0631ae473 100644 --- a/embassy-stm32/src/exti.rs +++ b/embassy-stm32/src/exti.rs | |||
| @@ -291,6 +291,7 @@ macro_rules! foreach_exti_irq { | |||
| 291 | 291 | ||
| 292 | macro_rules! impl_irq { | 292 | macro_rules! impl_irq { |
| 293 | ($e:ident) => { | 293 | ($e:ident) => { |
| 294 | #[cfg(feature = "rt")] | ||
| 294 | #[interrupt] | 295 | #[interrupt] |
| 295 | unsafe fn $e() { | 296 | unsafe fn $e() { |
| 296 | on_irq() | 297 | on_irq() |
| @@ -354,13 +355,13 @@ impl_exti!(EXTI15, 15); | |||
| 354 | 355 | ||
| 355 | macro_rules! enable_irq { | 356 | macro_rules! enable_irq { |
| 356 | ($e:ident) => { | 357 | ($e:ident) => { |
| 357 | crate::interrupt::$e::enable(); | 358 | crate::interrupt::typelevel::$e::enable(); |
| 358 | }; | 359 | }; |
| 359 | } | 360 | } |
| 360 | 361 | ||
| 361 | /// safety: must be called only once | 362 | /// safety: must be called only once |
| 362 | pub(crate) unsafe fn init() { | 363 | pub(crate) unsafe fn init() { |
| 363 | use crate::interrupt::Interrupt; | 364 | use crate::interrupt::typelevel::Interrupt; |
| 364 | 365 | ||
| 365 | foreach_exti_irq!(enable_irq); | 366 | foreach_exti_irq!(enable_irq); |
| 366 | 367 | ||
