Skip to content

update NVIC to use derive-mmio #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
robamu wants to merge 3 commits into
base: master
Choose a base branch
from
+162 −108
Draft

update NVIC to use derive-mmio #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f627086
rewrite NVIC to use derive-mmio
robamu Apr 27, 2026
2a16f58
move NVIC to nvic module
robamu Jul 29, 2026
b121924
docs correction
robamu Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cortex-m/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ rust-version = "1.85"
[dependencies]
bare-metal = { version = "0.2.4", features = ["const-fn"] }
critical-section = "1.0.0"
derive-mmio = "0.8"
volatile-register = "0.2.2"
bitfield = "0.13.2"
eh0 = { package = "embedded-hal", version = "0.2.4" }
Expand Down
36 changes: 4 additions & 32 deletions cortex-m/src/peripheral/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ pub mod tpiu;
#[cfg(test)]
mod test;

pub use nvic::NVIC;

// NOTE the `PhantomData` used in the peripherals proxy is to make them `Send` but *not* `Sync`

/// Core peripherals
Expand Down Expand Up @@ -131,7 +133,7 @@ pub struct Peripherals {
pub MPU: MPU,

/// Nested Vector Interrupt Controller
pub NVIC: NVIC,
pub NVIC: nvic::OwnedRegisterBlock<{ nvic::BASE_ADDRESS }>,

/// Security Attribution Unit
pub SAU: SAU,
Expand Down Expand Up @@ -213,9 +215,7 @@ impl Peripherals {
MPU: MPU {
_marker: PhantomData,
},
NVIC: NVIC {
_marker: PhantomData,
},
NVIC: nvic::OwnedRegisterBlock::new(),
SAU: SAU {
_marker: PhantomData,
},
Expand Down Expand Up @@ -546,34 +546,6 @@ impl ops::Deref for MPU {
}
}

/// Nested Vector Interrupt Controller
pub struct NVIC {
_marker: PhantomData<*const ()>,
}

unsafe impl Send for NVIC {}

impl NVIC {
/// Pointer to the register block
pub const PTR: *const nvic::RegisterBlock = 0xE000_E100 as *const _;

/// Returns a pointer to the register block
#[inline(always)]
#[deprecated(since = "0.7.5", note = "Use the associated constant `PTR` instead")]
pub const fn ptr() -> *const nvic::RegisterBlock {
Self::PTR
}
}

impl ops::Deref for NVIC {
type Target = self::nvic::RegisterBlock;

#[inline(always)]
fn deref(&self) -> &Self::Target {
unsafe { &*Self::PTR }
}
}

/// Security Attribution Unit
pub struct SAU {
_marker: PhantomData<*const ()>,
Expand Down
Loading