aboutsummaryrefslogtreecommitdiff
path: root/examples/generics.rs
diff options
context:
space:
mode:
authorGravatar Daniel Carosone <Daniel.Carosone@gmail.com> 2020-10-07 09:22:38 +1100
committerGravatar Daniel Carosone <Daniel.Carosone@gmail.com> 2020-10-07 09:22:38 +1100
commitf386cb63cb6d3cd6642debfb4dc1bde97b325550 (patch)
tree30b21968997f809dbbba59117db93254607fa22d /examples/generics.rs
parent3d6a0ea64fb2661ee1150a84425f50c18c2de9ad (diff)
parentb1e1abae29591e50ebf345a2bd249a73e564cea9 (diff)
downloadrtic-f386cb63cb6d3cd6642debfb4dc1bde97b325550.tar.gz
rtic-f386cb63cb6d3cd6642debfb4dc1bde97b325550.tar.zst
rtic-f386cb63cb6d3cd6642debfb4dc1bde97b325550.zip
Merge branch 'master'
of https://github.com/rtic-rs/cortex-m-rtic
Diffstat (limited to 'examples/generics.rs')
-rw-r--r--examples/generics.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/examples/generics.rs b/examples/generics.rs
index 40ab81ac..3107dd11 100644
--- a/examples/generics.rs
+++ b/examples/generics.rs
@@ -11,16 +11,19 @@ use panic_semihosting as _;
use rtic::{Exclusive, Mutex};
#[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+ #[resources]
struct Resources {
#[init(0)]
shared: u32,
}
#[init]
- fn init(_: init::Context) {
+ fn init(_: init::Context) -> init::LateResources {
rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1);
+
+ init::LateResources {}
}
#[task(binds = UART0, resources = [shared])]
@@ -49,7 +52,7 @@ const APP: () = {
// second argument has type `Exclusive<u32>`
advance(STATE, Exclusive(c.resources.shared));
}
-};
+}
// the second parameter is generic: it can be any type that implements the `Mutex` trait
fn advance(state: &mut u32, mut shared: impl Mutex<T = u32>) {