implement RFC #212

1 files changed, 40 insertions, 30 deletions

diff --git a/examples/t-resource.rs b/examples/t-resource.rs
index adcc04b3..303340ed 100644
--- a/examples/t-resource.rs
+++ b/examples/t-resource.rs
@@ -9,69 +9,79 @@ use panic_halt as _;
 
 #[rtfm::app(device = lm3s6965)]
 const APP: () = {
-    static mut O1: u32 = 0; // init
-    static mut O2: u32 = 0; // idle
-    static mut O3: u32 = 0; // EXTI0
-    static O4: u32 = 0; // idle
-    static O5: u32 = 0; // EXTI1
-    static O6: u32 = 0; // init
-
-    static mut S1: u32 = 0; // idle & EXTI0
-    static mut S2: u32 = 0; // EXTI0 & EXTI1
-    static S3: u32 = 0;
-
-    #[init(resources = [O1, O4, O5, O6, S3])]
+    struct Resources {
+        #[init(0)]
+        o1: u32, // init
+        #[init(0)]
+        o2: u32, // idle
+        #[init(0)]
+        o3: u32, // EXTI0
+        #[init(0)]
+        o4: u32, // idle
+        #[init(0)]
+        o5: u32, // EXTI1
+        #[init(0)]
+        o6: u32, // init
+        #[init(0)]
+        s1: u32, // idle & uart0
+        #[init(0)]
+        s2: u32, // uart0 & uart1
+        #[init(0)]
+        s3: u32, // idle & uart0
+    }
+
+    #[init(resources = [o1, o4, o5, o6, s3])]
     fn init(c: init::Context) {
         // owned by `init` == `&'static mut`
-        let _: &'static mut u32 = c.resources.O1;
+        let _: &'static mut u32 = c.resources.o1;
 
         // owned by `init` == `&'static` if read-only
-        let _: &'static u32 = c.resources.O6;
+        let _: &'static u32 = c.resources.o6;
 
         // `init` has exclusive access to all resources
-        let _: &mut u32 = c.resources.O4;
-        let _: &mut u32 = c.resources.O5;
-        let _: &mut u32 = c.resources.S3;
+        let _: &mut u32 = c.resources.o4;
+        let _: &mut u32 = c.resources.o5;
+        let _: &mut u32 = c.resources.s3;
     }
 
-    #[idle(resources = [O2, O4, S1, S3])]
+    #[idle(resources = [o2, &o4, s1, &s3])]
     fn idle(mut c: idle::Context) -> ! {
         // owned by `idle` == `&'static mut`
-        let _: &'static mut u32 = c.resources.O2;
+        let _: &'static mut u32 = c.resources.o2;
 
         // owned by `idle` == `&'static` if read-only
-        let _: &'static u32 = c.resources.O4;
+        let _: &'static u32 = c.resources.o4;
 
         // shared with `idle` == `Mutex`
-        c.resources.S1.lock(|_| {});
+        c.resources.s1.lock(|_| {});
 
         // `&` if read-only
-        let _: &u32 = c.resources.S3;
+        let _: &u32 = c.resources.s3;
 
         loop {}
     }
 
-    #[task(binds = UART0, resources = [O3, S1, S2, S3])]
+    #[task(binds = UART0, resources = [o3, s1, s2, &s3])]
     fn uart0(c: uart0::Context) {
         // owned by interrupt == `&mut`
-        let _: &mut u32 = c.resources.O3;
+        let _: &mut u32 = c.resources.o3;
 
         // no `Mutex` proxy when access from highest priority task
-        let _: &mut u32 = c.resources.S1;
+        let _: &mut u32 = c.resources.s1;
 
         // no `Mutex` proxy when co-owned by cooperative (same priority) tasks
-        let _: &mut u32 = c.resources.S2;
+        let _: &mut u32 = c.resources.s2;
 
         // `&` if read-only
-        let _: &u32 = c.resources.S3;
+        let _: &u32 = c.resources.s3;
     }
 
-    #[task(binds = UART1, resources = [S2, O5])]
+    #[task(binds = UART1, resources = [s2, &o5])]
     fn uart1(c: uart1::Context) {
         // owned by interrupt == `&` if read-only
-        let _: &u32 = c.resources.O5;
+        let _: &u32 = c.resources.o5;
 
         // no `Mutex` proxy when co-owned by cooperative (same priority) tasks
-        let _: &mut u32 = c.resources.S2;
+        let _: &mut u32 = c.resources.s2;
     }
 };