Merge pull request #205 from japaric/heterogeneous

rtfm-syntax refactor + heterogeneous multi-core support

1 files changed, 21 insertions, 17 deletions

diff --git a/examples/resource.rs b/examples/resource.rs
index 06bdf395..8632525e 100644
--- a/examples/resource.rs
+++ b/examples/resource.rs
@@ -5,15 +5,17 @@
 #![no_main]
 #![no_std]
 
-extern crate panic_semihosting;
-
 use cortex_m_semihosting::{debug, hprintln};
 use lm3s6965::Interrupt;
+use panic_semihosting as _;
 
 #[rtfm::app(device = lm3s6965)]
 const APP: () = {
-    // A resource
-    static mut SHARED: u32 = 0;
+    struct Resources {
+        // A resource
+        #[init(0)]
+        shared: u32,
+    }
 
     #[init]
     fn init(_: init::Context) {
@@ -21,29 +23,31 @@ const APP: () = {
         rtfm::pend(Interrupt::UART1);
     }
 
+    // `shared` cannot be accessed from this context
     #[idle]
-    fn idle(_: idle::Context) -> ! {
+    fn idle(_cx: idle::Context) -> ! {
         debug::exit(debug::EXIT_SUCCESS);
 
-        // error: `SHARED` can't be accessed from this context
-        // SHARED += 1;
+        // error: no `resources` field in `idle::Context`
+        // _cx.resources.shared += 1;
 
         loop {}
     }
 
-    // `SHARED` can be access from this context
-    #[interrupt(resources = [SHARED])]
-    fn UART0(mut c: UART0::Context) {
-        *c.resources.SHARED += 1;
+    // `shared` can be accessed from this context
+    #[task(binds = UART0, resources = [shared])]
+    fn uart0(cx: uart0::Context) {
+        let shared: &mut u32 = cx.resources.shared;
+        *shared += 1;
 
-        hprintln!("UART0: SHARED = {}", c.resources.SHARED).unwrap();
+        hprintln!("UART0: shared = {}", shared).unwrap();
     }
 
-    // `SHARED` can be access from this context
-    #[interrupt(resources = [SHARED])]
-    fn UART1(mut c: UART1::Context) {
-        *c.resources.SHARED += 1;
+    // `shared` can be accessed from this context
+    #[task(binds = UART1, resources = [shared])]
+    fn uart1(cx: uart1::Context) {
+        *cx.resources.shared += 1;
 
-        hprintln!("UART1: SHARED = {}", c.resources.SHARED).unwrap();
+        hprintln!("UART1: shared = {}", cx.resources.shared).unwrap();
     }
 };