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/build.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'embassy-stm32/build.rs')
| -rw-r--r-- | embassy-stm32/build.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/embassy-stm32/build.rs b/embassy-stm32/build.rs index 730c78f5e..9e597f187 100644 --- a/embassy-stm32/build.rs +++ b/embassy-stm32/build.rs | |||
| @@ -160,13 +160,11 @@ fn main() { | |||
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | g.extend(quote! { | 162 | g.extend(quote! { |
| 163 | pub mod interrupt { | 163 | embassy_hal_common::interrupt_mod!( |
| 164 | use crate::pac::Interrupt as InterruptEnum; | ||
| 165 | use embassy_cortex_m::interrupt::_export::declare; | ||
| 166 | #( | 164 | #( |
| 167 | declare!(#irqs); | 165 | #irqs, |
| 168 | )* | 166 | )* |
| 169 | } | 167 | ); |
| 170 | }); | 168 | }); |
| 171 | 169 | ||
| 172 | // ======== | 170 | // ======== |
| @@ -297,6 +295,7 @@ fn main() { | |||
| 297 | let channels = channels.iter().map(|(_, dma, ch)| format_ident!("{}_{}", dma, ch)); | 295 | let channels = channels.iter().map(|(_, dma, ch)| format_ident!("{}_{}", dma, ch)); |
| 298 | 296 | ||
| 299 | g.extend(quote! { | 297 | g.extend(quote! { |
| 298 | #[cfg(feature = "rt")] | ||
| 300 | #[crate::interrupt] | 299 | #[crate::interrupt] |
| 301 | unsafe fn #irq () { | 300 | unsafe fn #irq () { |
| 302 | #( | 301 | #( |
