diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib.rs | 1 | ||||
| -rw-r--r-- | src/macros.rs | 4 | ||||
| -rw-r--r-- | src/peripheral/dwt.rs | 2 | ||||
| -rw-r--r-- | src/peripheral/mod.rs | 1 | ||||
| -rw-r--r-- | src/peripheral/nvic.rs | 4 | ||||
| -rw-r--r-- | src/peripheral/scb.rs | 4 | ||||
| -rw-r--r-- | src/register/mod.rs | 27 |
7 files changed, 31 insertions, 12 deletions
@@ -33,6 +33,7 @@ #![deny(missing_docs)] #![no_std] #![allow(clippy::identity_op)] +#![allow(clippy::missing_safety_doc)] extern crate aligned; extern crate bare_metal; diff --git a/src/macros.rs b/src/macros.rs index 6b3b269..b578370 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -78,8 +78,6 @@ macro_rules! singleton { /// ``` compile_fail /// use cortex_m::singleton; /// -/// fn main() {} -/// /// fn foo() { /// // check that the call to `uninitialized` requires unsafe /// singleton!(: u8 = std::mem::uninitialized()); @@ -92,8 +90,6 @@ const CFAIL: () = (); /// #![deny(unsafe_code)] /// use cortex_m::singleton; /// -/// fn main() {} -/// /// fn foo() { /// // check that calls to `singleton!` don't trip the `unsafe_code` lint /// singleton!(: u8 = 0); diff --git a/src/peripheral/dwt.rs b/src/peripheral/dwt.rs index b340597..043223a 100644 --- a/src/peripheral/dwt.rs +++ b/src/peripheral/dwt.rs @@ -85,6 +85,6 @@ impl DWT { #[inline] pub fn unlock() { // NOTE(unsafe) atomic write to a stateless, write-only register - unsafe { (*Self::ptr()).lar.write(0xC5ACCE55) } + unsafe { (*Self::ptr()).lar.write(0xC5AC_CE55) } } } diff --git a/src/peripheral/mod.rs b/src/peripheral/mod.rs index 3884942..8854830 100644 --- a/src/peripheral/mod.rs +++ b/src/peripheral/mod.rs @@ -1,3 +1,4 @@ +#![allow(clippy::needless_doctest_main)] //! Core peripherals //! //! # API diff --git a/src/peripheral/nvic.rs b/src/peripheral/nvic.rs index 1a33023..1ecfc6e 100644 --- a/src/peripheral/nvic.rs +++ b/src/peripheral/nvic.rs @@ -171,7 +171,7 @@ impl NVIC { { // NOTE(unsafe) atomic read with no side effects let ipr_n = unsafe { (*Self::ptr()).ipr[Self::ipr_index(&interrupt)].read() }; - let prio = (ipr_n >> Self::ipr_shift(&interrupt)) & 0x000000ff; + let prio = (ipr_n >> Self::ipr_shift(&interrupt)) & 0x0000_00ff; prio as u8 } } @@ -264,7 +264,7 @@ impl NVIC { #[cfg(armv6m)] { self.ipr[Self::ipr_index(&interrupt)].modify(|value| { - let mask = 0x000000ff << Self::ipr_shift(&interrupt); + let mask = 0x0000_00ff << Self::ipr_shift(&interrupt); let prio = u32::from(prio) << Self::ipr_shift(&interrupt); (value & !mask) | prio diff --git a/src/peripheral/scb.rs b/src/peripheral/scb.rs index 3dfa110..0e2eefc 100644 --- a/src/peripheral/scb.rs +++ b/src/peripheral/scb.rs @@ -798,7 +798,7 @@ impl SCB { { // NOTE(unsafe) atomic read with no side effects let shpr = unsafe { (*Self::ptr()).shpr[usize::from((index - 8) / 4)].read() }; - let prio = (shpr >> (8 * (index % 4))) & 0x000000ff; + let prio = (shpr >> (8 * (index % 4))) & 0x0000_00ff; prio as u8 } } @@ -828,7 +828,7 @@ impl SCB { { self.shpr[usize::from((index - 8) / 4)].modify(|value| { let shift = 8 * (index % 4); - let mask = 0x000000ff << shift; + let mask = 0x0000_00ff << shift; let prio = u32::from(prio) << shift; (value & !mask) | prio diff --git a/src/register/mod.rs b/src/register/mod.rs index 854d725..e7879c5 100644 --- a/src/register/mod.rs +++ b/src/register/mod.rs @@ -26,15 +26,36 @@ //! //! - Cortex-M* Devices Generic User Guide - Section 2.1.3 Core registers -#[cfg(not(armv6m))] +#[cfg(all(not(armv6m), not(armv8m_base)))] pub mod basepri; -#[cfg(not(armv6m))] +#[cfg(armv8m_base)] +#[deprecated( + since = "0.6.2", + note = "basepri is unavailable on thumbv8.base, and will be removed in the next release" +)] +pub mod basepri; + +#[cfg(all(not(armv6m), not(armv8m_base)))] +pub mod basepri_max; + +#[cfg(armv8m_base)] +#[deprecated( + since = "0.6.2", + note = "basepri is unavailable on thumbv8m.base, and will be removed in the next release" +)] pub mod basepri_max; pub mod control; -#[cfg(not(armv6m))] +#[cfg(all(not(armv6m), not(armv8m_base)))] +pub mod faultmask; + +#[cfg(armv8m_base)] +#[deprecated( + since = "0.6.2", + note = "faultmask is unavailable on thumbv8m.base, and will be removed in the next release" +)] pub mod faultmask; pub mod msp; |