Skip to content

scb: add static version of system_reset as sys_reset #138

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

Merged
merged 2 commits into from
Apr 14, 2019
Merged

scb: add static version of system_reset as sys_reset #138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36535d
scb: add static version of system_reset as system_reset2
hdhoang Mar 21, 2019
3605ad2
deprecate system_reset in favor of static sys_reset
hdhoang Apr 13, 2019
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
20 changes: 20 additions & 0 deletions src/peripheral/scb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ const SCB_AIRCR_SYSRESETREQ: u32 = 1 << 2;

impl SCB {
/// Initiate a system reset request to reset the MCU
#[deprecated(since = "0.6.1", note = "Use `SCB::sys_reset`")]
pub fn system_reset(&mut self) -> ! {
::asm::dsb();
unsafe {
Expand All @@ -619,6 +620,25 @@ impl SCB {
::asm::nop(); // avoid rust-lang/rust#28728
}
}

/// Initiate a system reset request to reset the MCU
pub fn sys_reset() -> ! {
::asm::dsb();
unsafe {
(*Self::ptr()).aircr.modify(
|r| {
SCB_AIRCR_VECTKEY | // otherwise the write is ignored
r & SCB_AIRCR_PRIGROUP_MASK | // keep priority group unchanged
SCB_AIRCR_SYSRESETREQ
}, // set the bit
)
};
::asm::dsb();
loop {
// wait for the reset
::asm::nop(); // avoid rust-lang/rust#28728
}
}
}

const SCB_ICSR_PENDSVSET: u32 = 1 << 28;
Expand Down