From 7c6588e6bdacf7de161fd5e6bcd7ab969d10a240 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 28 Sep 2021 10:18:43 +0200
Subject: Fix export of SYST

---
 macros/src/codegen/module.rs      | 3 +--
 macros/src/codegen/pre_init.rs    | 2 +-
 macros/src/codegen/timer_queue.rs | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'macros/src')

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))
             };
-- 
cgit v1.2.3