Merge pull request #142 from rust-embedded/0.5.9

New 0.5.9 which re-exports the CORE_PERIPHERALS static from 0.6.0

Author: adamgreig

Cargo.toml

@@ -7,13 +7,14 @@ keywords = ["arm", "cortex-m", "register", "peripheral"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m"
 readme = "README.md"
-repository = "https://github.com/japaric/cortex-m"
-version = "0.5.8"
+repository = "https://github.com/rust-embedded/cortex-m"
+version = "0.5.9"
 
 [dependencies]
 aligned = "0.2.0"
 bare-metal = "0.2.0"
 volatile-register = "0.2.0"
+cortex_m_0_6 = { package = "cortex-m", version = "0.6.0" }
 
 [features]
 cm7-r0p1 = []

src/lib.rs

@@ -37,15 +37,15 @@
 extern crate aligned;
 extern crate bare_metal;
 extern crate volatile_register;
+extern crate cortex_m_0_6;
 
 #[macro_use]
 mod macros;
 
-pub mod asm;
-pub mod interrupt;
+pub use cortex_m_0_6::{asm, interrupt, register};
 #[cfg(not(armv6m))]
-pub mod itm;
+pub use cortex_m_0_6::itm;
+
 pub mod peripheral;
-pub mod register;
 
 pub use peripheral::Peripherals;

src/peripheral/dwt.rs

@@ -32,17 +32,7 @@ pub struct RegisterBlock {
     pub lsr: RO<u32>,
 }
 
-/// Comparator
-#[repr(C)]
-pub struct Comparator {
-    /// Comparator
-    pub comp: RW<u32>,
-    /// Comparator Mask
-    pub mask: RW<u32>,
-    /// Comparator Function
-    pub function: RW<u32>,
-    reserved: u32,
-}
+pub use cortex_m_0_6::peripheral::dwt::Comparator;
 
 impl DWT {
     /// Enables the cycle counter

src/peripheral/mod.rs

@@ -83,24 +83,16 @@ use core::ops;
 
 use interrupt;
 
-#[cfg(not(armv6m))]
-pub mod cbp;
-pub mod cpuid;
-pub mod dcb;
 pub mod dwt;
-#[cfg(not(armv6m))]
-pub mod fpb;
-// NOTE(target_arch) is for documentation purposes
-#[cfg(any(has_fpu, target_arch = "x86_64"))]
-pub mod fpu;
-#[cfg(not(armv6m))]
-pub mod itm;
-pub mod mpu;
 pub mod nvic;
 pub mod scb;
-pub mod syst;
+
 #[cfg(not(armv6m))]
-pub mod tpiu;
+pub use cortex_m_0_6::peripheral::{cbp, fpb, itm, tpiu};
+// NOTE(target_arch) is for documentation purposes
+#[cfg(any(has_fpu, target_arch = "x86_64"))]
+pub use cortex_m_0_6::peripheral::fpu;
+pub use cortex_m_0_6::peripheral::{cpuid, dcb, mpu, syst};
 
 #[cfg(test)]
 mod test;
@@ -147,10 +139,10 @@ pub struct Peripherals {
     pub TPIU: TPIU,
 }
 
-// NOTE `no_mangle` is used here to prevent linking different minor versions of this crate as that
-// would let you `take` the core peripherals more than once (one per minor version)
-#[no_mangle]
-static mut CORE_PERIPHERALS: bool = false;
+// Re-use the CORE_PERIPHERALS static from cortex-m v0.6.0 to allow interoperation
+extern "C" {
+    static mut CORE_PERIPHERALS: bool;
+}
 
 impl Peripherals {
     /// Returns all the core peripherals *once*
@@ -170,121 +162,11 @@ impl Peripherals {
         debug_assert!(!CORE_PERIPHERALS);
 
         CORE_PERIPHERALS = true;
-
-        Peripherals {
-            CBP: CBP {
-                _marker: PhantomData,
-            },
-            CPUID: CPUID {
-                _marker: PhantomData,
-            },
-            DCB: DCB {
-                _marker: PhantomData,
-            },
-            DWT: DWT {
-                _marker: PhantomData,
-            },
-            FPB: FPB {
-                _marker: PhantomData,
-            },
-            FPU: FPU {
-                _marker: PhantomData,
-            },
-            ITM: ITM {
-                _marker: PhantomData,
-            },
-            MPU: MPU {
-                _marker: PhantomData,
-            },
-            NVIC: NVIC {
-                _marker: PhantomData,
-            },
-            SCB: SCB {
-                _marker: PhantomData,
-            },
-            SYST: SYST {
-                _marker: PhantomData,
-            },
-            TPIU: TPIU {
-                _marker: PhantomData,
-            },
-        }
-    }
-}
-
-/// Cache and branch predictor maintenance operations
-pub struct CBP {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for CBP {}
-
-#[cfg(not(armv6m))]
-impl CBP {
-    pub(crate) unsafe fn new() -> Self {
-        CBP {
-            _marker: PhantomData,
-        }
-    }
-
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const self::cbp::RegisterBlock {
-        0xE000_EF50 as *const _
+        core::mem::transmute(())
     }
 }
 
-#[cfg(not(armv6m))]
-impl ops::Deref for CBP {
-    type Target = self::cbp::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
-/// CPUID
-pub struct CPUID {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for CPUID {}
-
-impl CPUID {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const self::cpuid::RegisterBlock {
-        0xE000_ED00 as *const _
-    }
-}
-
-impl ops::Deref for CPUID {
-    type Target = self::cpuid::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
-/// Debug Control Block
-pub struct DCB {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for DCB {}
-
-impl DCB {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const dcb::RegisterBlock {
-        0xE000_EDF0 as *const _
-    }
-}
-
-impl ops::Deref for DCB {
-    type Target = self::dcb::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*DCB::ptr() }
-    }
-}
+pub use cortex_m_0_6::peripheral::{CBP, CPUID, DCB, FPB, FPU, ITM, MPU, SYST, TPIU};
 
 /// Data Watchpoint and Trace unit
 pub struct DWT {
@@ -308,107 +190,6 @@ impl ops::Deref for DWT {
     }
 }
 
-/// Flash Patch and Breakpoint unit
-pub struct FPB {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for FPB {}
-
-#[cfg(not(armv6m))]
-impl FPB {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const fpb::RegisterBlock {
-        0xE000_2000 as *const _
-    }
-}
-
-#[cfg(not(armv6m))]
-impl ops::Deref for FPB {
-    type Target = self::fpb::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
-/// Floating Point Unit
-pub struct FPU {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for FPU {}
-
-#[cfg(any(has_fpu, target_arch = "x86_64"))]
-impl FPU {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const fpu::RegisterBlock {
-        0xE000_EF30 as *const _
-    }
-}
-
-#[cfg(any(has_fpu, target_arch = "x86_64"))]
-impl ops::Deref for FPU {
-    type Target = self::fpu::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
-/// Instrumentation Trace Macrocell
-pub struct ITM {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for ITM {}
-
-#[cfg(not(armv6m))]
-impl ITM {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *mut itm::RegisterBlock {
-        0xE000_0000 as *mut _
-    }
-}
-
-#[cfg(not(armv6m))]
-impl ops::Deref for ITM {
-    type Target = self::itm::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
-#[cfg(not(armv6m))]
-impl ops::DerefMut for ITM {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        unsafe { &mut *Self::ptr() }
-    }
-}
-
-/// Memory Protection Unit
-pub struct MPU {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for MPU {}
-
-impl MPU {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const mpu::RegisterBlock {
-        0xE000_ED90 as *const _
-    }
-}
-
-impl ops::Deref for MPU {
-    type Target = self::mpu::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
 /// Nested Vector Interrupt Controller
 pub struct NVIC {
     _marker: PhantomData<*const ()>,
@@ -452,49 +233,3 @@ impl ops::Deref for SCB {
         unsafe { &*Self::ptr() }
     }
 }
-
-/// SysTick: System Timer
-pub struct SYST {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for SYST {}
-
-impl SYST {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const syst::RegisterBlock {
-        0xE000_E010 as *const _
-    }
-}
-
-impl ops::Deref for SYST {
-    type Target = self::syst::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
-/// Trace Port Interface Unit
-pub struct TPIU {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for TPIU {}
-
-#[cfg(not(armv6m))]
-impl TPIU {
-    /// Returns a pointer to the register block
-    pub fn ptr() -> *const tpiu::RegisterBlock {
-        0xE004_0000 as *const _
-    }
-}
-
-#[cfg(not(armv6m))]
-impl ops::Deref for TPIU {
-    type Target = self::tpiu::RegisterBlock;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}