From 1be43fc489993e63577515063ceb8a83b14423b8 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 11 Jan 2018 20:56:45 +0100 Subject: adapt to changes in the cortex-m crate --- src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index 986a7c9..697dca6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -87,11 +87,12 @@ extern crate cortex_m_rtfm_macros; extern crate rtfm_core; extern crate untagged_option; -use core::u8; +use core::{mem, u8}; -pub use rtfm_core::{Resource, Threshold}; pub use cortex_m::asm::{bkpt, wfi}; +pub use cortex_m::peripheral::NVIC; pub use cortex_m_rtfm_macros::app; +pub use rtfm_core::{Resource, Threshold}; #[doc(hidden)] pub use untagged_option::UntaggedOption; @@ -165,6 +166,6 @@ where I: Nr, { // NOTE(safe) atomic write - let nvic = unsafe { &*cortex_m::peripheral::NVIC::ptr() }; + let mut nvic: NVIC = unsafe { mem::transmute(()) }; nvic.set_pending(interrupt); } -- cgit v1.2.3