mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-26 05:29:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #294

Browse source 
294: use the safe DWT::unlock API r=korken89 a=japaric

instead of a unsafe write_volatile call

Co-authored-by: Jorge Aparicio <jorge@japaric.io>
This commit is contained in:
bors[bot] 2020-01-24 15:45:14 +00:00 committed by GitHub
commit 60c14ef680
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -47,7 +47,7 @@ name = "types"
required-features = ["__v7"] required-features = ["__v7"]
[dependencies] [dependencies]
cortex-m = "0.6.0" cortex-m = "0.6.2"
cortex-m-rtfm-macros = { path = "macros", version = "0.5.0" } cortex-m-rtfm-macros = { path = "macros", version = "0.5.0" }
rtfm-core = "0.3.0" rtfm-core = "0.3.0"
cortex-m-rt = "0.6.9" cortex-m-rt = "0.6.9"

6
examples/schedule.rs
View file

@ -1,9 +1,11 @@
//! examples/schedule.rs //! examples/schedule.rs
#![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![no_main] #![no_main]
#![no_std] #![no_std]
use cortex_m::peripheral::DWT;
use cortex_m_semihosting::hprintln; use cortex_m_semihosting::hprintln;
use panic_halt as _; use panic_halt as _;
use rtfm::cyccnt::{Instant, U32Ext as _}; use rtfm::cyccnt::{Instant, U32Ext as _};
@ -15,8 +17,8 @@ const APP: () = {
fn init(mut cx: init::Context) { fn init(mut cx: init::Context) {
// Initialize (enable) the monotonic timer (CYCCNT) // Initialize (enable) the monotonic timer (CYCCNT)
cx.core.DCB.enable_trace(); cx.core.DCB.enable_trace();
// required on devices that software lock the DWT (e.g. STM32F7) // required on Cortex-M7 devices that software lock the DWT (e.g. STM32F7)
unsafe { cx.core.DWT.lar.write(0xC5ACCE55) } DWT::unlock();
cx.core.DWT.enable_cycle_counter(); cx.core.DWT.enable_cycle_counter();
// semantically, the monotonic timer is frozen at time "zero" during `init` // semantically, the monotonic timer is frozen at time "zero" during `init`