diff options
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | examples/multilock.rs | 77 | ||||
| -rw-r--r-- | macros/src/codegen/hardware_tasks.rs | 1 | ||||
| -rw-r--r-- | macros/src/codegen/idle.rs | 1 | ||||
| -rw-r--r-- | macros/src/codegen/module.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen/software_tasks.rs | 1 | ||||
| -rw-r--r-- | src/lib.rs | 2 |
7 files changed, 85 insertions, 2 deletions
@@ -57,7 +57,8 @@ required-features = ["__v7"] [dependencies] cortex-m = "0.6.2" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } -rtic-core = "0.3.0" +# rtic-core = "0.3.0" +rtic-core = { git = "https://github.com/rtic-rs/rtic-core.git", branch = "multilock", version = "0.3.1" } cortex-m-rt = "0.6.9" heapless = "0.5.0" bare-metal = "1.0.0" diff --git a/examples/multilock.rs b/examples/multilock.rs new file mode 100644 index 00000000..99d26ad7 --- /dev/null +++ b/examples/multilock.rs @@ -0,0 +1,77 @@ +//! examples/mutlilock.rs +//! +//! The multi-lock feature example. + +#![deny(unsafe_code)] +#![deny(warnings)] +#![no_main] +#![no_std] + +use panic_semihosting as _; + +#[rtic::app(device = lm3s6965, dispatchers = [GPIOA])] +mod app { + use cortex_m_semihosting::{debug, hprintln}; + + #[resources] + struct Resources { + #[init(0)] + shared1: u32, + #[init(0)] + shared2: u32, + #[init(0)] + shared3: u32, + } + + #[init] + fn init(_: init::Context) -> init::LateResources { + locks::spawn().ok(); + + init::LateResources {} + } + + // when omitted priority is assumed to be `1` + #[task(resources = [shared1, shared2, shared3])] + fn locks(c: locks::Context) { + let mut s1 = c.resources.shared1; + let mut s2 = c.resources.shared2; + let mut s3 = c.resources.shared3; + + hprintln!("Multiple single locks").unwrap(); + s1.lock(|s1| { + s2.lock(|s2| { + s3.lock(|s3| { + *s1 += 1; + *s2 += 1; + *s3 += 1; + + hprintln!( + "Multiple single locks, s1: {}, s2: {}, s3: {}", + *s1, + *s2, + *s3 + ) + .unwrap(); + }) + }) + }); + + hprintln!("Multilock!").unwrap(); + + (s1, s2, s3).lock(|s1, s2, s3| { + *s1 += 1; + *s2 += 1; + *s3 += 1; + + hprintln!( + "Multiple single locks, s1: {}, s2: {}, s3: {}", + *s1, + *s2, + *s3 + ) + .unwrap(); + }); + + debug::exit(debug::EXIT_SUCCESS); + } +} diff --git a/macros/src/codegen/hardware_tasks.rs b/macros/src/codegen/hardware_tasks.rs index c9d0297e..6930d3e0 100644 --- a/macros/src/codegen/hardware_tasks.rs +++ b/macros/src/codegen/hardware_tasks.rs @@ -105,6 +105,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#(#locals_pat,)* #context: #name::Context) { use rtic::Mutex as _; + use rtic::mutex_prelude::*; #(#stmts)* } diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs index c8c8955d..b1d2e00b 100644 --- a/macros/src/codegen/idle.rs +++ b/macros/src/codegen/idle.rs @@ -68,6 +68,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#(#locals_pat,)* #context: #name::Context) -> ! { use rtic::Mutex as _; + use rtic::mutex_prelude::*; #(#stmts)* } diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index 838a989f..2ff4801e 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -219,6 +219,7 @@ pub fn codegen( pub fn spawn(#(#args,)*) -> Result<(), #ty> { // #let_instant // do we need it? use rtic::Mutex as _; + use rtic::mutex_prelude::*; let input = #tupled; @@ -258,6 +259,7 @@ pub fn codegen( ) -> Result<(), #ty> { unsafe { use rtic::Mutex as _; + use rtic::mutex_prelude::*; let input = #tupled; if let Some(index) = rtic::export::interrupt::free(|_| #app_path::#fq.dequeue()) { diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs index 833e338d..9cb5f7a9 100644 --- a/macros/src/codegen/software_tasks.rs +++ b/macros/src/codegen/software_tasks.rs @@ -111,6 +111,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#(#locals_pat,)* #context: #name::Context #(,#inputs)*) { use rtic::Mutex as _; + use rtic::mutex_prelude::*; #(#stmts)* } @@ -43,7 +43,7 @@ use cortex_m::{ }; use cortex_m_rt as _; // vector table pub use cortex_m_rtic_macros::app; -pub use rtic_core::{Exclusive, Mutex}; +pub use rtic_core::{Exclusive, Mutex, prelude as mutex_prelude}; #[cfg(armv7m)] pub mod cyccnt; |