diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-01-15 23:30:46 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-01-15 23:30:46 +0000 |
| commit | 22d47dd75e9fb5004e0192666123d28f0a418310 (patch) | |
| tree | 038b76435de6c21dce65dc7a241f376196efba9b /src/peripheral/scb.rs | |
| parent | 465c64dca26b3fbd8137720b1d24b13d56c5d5d8 (diff) | |
| parent | ab8d4634fa34881a97f4c15bb0ecbde946c4107f (diff) | |
| download | cortex-m-22d47dd75e9fb5004e0192666123d28f0a418310.tar.gz cortex-m-22d47dd75e9fb5004e0192666123d28f0a418310.tar.zst cortex-m-22d47dd75e9fb5004e0192666123d28f0a418310.zip | |
Merge #191
191: Remove deprecated APIs and the `const-fn` feature r=adamgreig a=jonas-schievink
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Diffstat (limited to 'src/peripheral/scb.rs')
| -rw-r--r-- | src/peripheral/scb.rs | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/peripheral/scb.rs b/src/peripheral/scb.rs index 9d58b03..b2f45c5 100644 --- a/src/peripheral/scb.rs +++ b/src/peripheral/scb.rs @@ -634,27 +634,6 @@ 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`")] - #[inline] - pub fn system_reset(&mut self) -> ! { - crate::asm::dsb(); - unsafe { - self.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 - ) - }; - crate::asm::dsb(); - loop { - // wait for the reset - crate::asm::nop(); // avoid rust-lang/rust#28728 - } - } - - /// Initiate a system reset request to reset the MCU #[inline] pub fn sys_reset() -> ! { crate::asm::dsb(); |