aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2019-09-15 18:36:00 +0200
committerGravatar Jorge Aparicio <jorge@japaric.io> 2019-09-15 18:36:00 +0200
commit7aa270cb92180abfc9102a69efdde378c3396b5e (patch)
tree7d9770cd357e584d85ef6ddc32bddd1a937d1020
parentda675dc35f373a38ab97cdc9813162e9d87507f9 (diff)
downloadrtic-7aa270cb92180abfc9102a69efdde378c3396b5e.tar.gz
rtic-7aa270cb92180abfc9102a69efdde378c3396b5e.tar.zst
rtic-7aa270cb92180abfc9102a69efdde378c3396b5e.zip
don't use deprecated API
-rw-r--r--macros/src/codegen/pre_init.rs2
-rw-r--r--src/export.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index 948dae54..605171b8 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -75,7 +75,7 @@ pub fn codegen(
// NOTE unmask the interrupt *after* setting its priority: changing the priority of a pended
// interrupt is implementation defined
- stmts.push(quote!(core.NVIC.enable(#device::#interrupt::#name);));
+ stmts.push(quote!(rtfm::export::NVIC::unmask(#device::#interrupt::#name);));
}
// cross-spawn barriers: now that priorities have been set and the interrupts have been unmasked
diff --git a/src/export.rs b/src/export.rs
index 572068ce..96c444bf 100644
--- a/src/export.rs
+++ b/src/export.rs
@@ -9,7 +9,7 @@ pub use cortex_m::register::basepri;
pub use cortex_m::{
asm::wfi,
interrupt,
- peripheral::{scb::SystemHandler, syst::SystClkSource, DWT},
+ peripheral::{scb::SystemHandler, syst::SystClkSource, DWT, NVIC},
Peripherals,
};
use heapless::spsc::{MultiCore, SingleCore};