diff options
| author |  Emil Fresk <emil.fresk@gmail.com>
| 2021-09-28 10:18:43 +0200 |
|---|---|---|
| committer | Emil Fresk <emil.fresk@gmail.com>
| 2021-09-28 10:38:22 +0200 |
| commit | 7c6588e6bdacf7de161fd5e6bcd7ab969d10a240 (patch) | |
| tree | ee03041cdb9f872118d9fa8d35f4ca356abe8f81 /macros/src | |
| parent | 5e5a4c117c696c36c6bd4b02f66e9b9e793c3e64 (diff) | |
| download | rtic-7c6588e6bdacf7de161fd5e6bcd7ab969d10a240.tar.gz rtic-7c6588e6bdacf7de161fd5e6bcd7ab969d10a240.tar.zst rtic-7c6588e6bdacf7de161fd5e6bcd7ab969d10a240.zip | |
Fix export of SYST
Diffstat (limited to 'macros/src')
| -rw-r--r-- | macros/src/codegen/module.rs | 3 | ||||
| -rw-r--r-- | macros/src/codegen/pre_init.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen/timer_queue.rs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index 6011c9bc..5e0827ca 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -274,8 +274,7 @@ pub fn codegen( let (enable_interrupt, pend) = if &*m_isr.to_string() == "SysTick" { ( - quote!(core::mem::transmute::<_, cortex_m::peripheral::SYST>(()) - .enable_interrupt()), + quote!(core::mem::transmute::<_, rtic::export::SYST>(()).enable_interrupt()), quote!(rtic::export::SCB::set_pendst()), ) } else { diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs index eb216d86..3017c08e 100644 --- a/macros/src/codegen/pre_init.rs +++ b/macros/src/codegen/pre_init.rs @@ -104,7 +104,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream // Always enable monotonic interrupts if they should never be off if !<#mono_type as rtic::Monotonic>::DISABLE_INTERRUPT_ON_EMPTY_QUEUE { - core::mem::transmute::<_, cortex_m::peripheral::SYST>(()) + core::mem::transmute::<_, rtic::export::SYST>(()) .enable_interrupt(); } )); diff --git a/macros/src/codegen/timer_queue.rs b/macros/src/codegen/timer_queue.rs index fdfa6381..896b3a83 100644 --- a/macros/src/codegen/timer_queue.rs +++ b/macros/src/codegen/timer_queue.rs @@ -127,7 +127,7 @@ pub fn codegen(app: &App, analysis: &Analysis, _extra: &Extra) -> Vec<TokenStrea let bound_interrupt = &monotonic.args.binds; let disable_isr = if &*bound_interrupt.to_string() == "SysTick" { - quote!(core::mem::transmute::<_, cortex_m::peripheral::SYST>(()).disable_interrupt()) + quote!(core::mem::transmute::<_, rtic::export::SYST>(()).disable_interrupt()) } else { quote!(rtic::export::NVIC::mask(#rt_err::#enum_::#bound_interrupt)) }; |