Merge branch 'master' into always_late_resources

examples/baseline.rs

@@ -11,7 +11,7 @@ use panic_semihosting as _;
 
 // NOTE: does NOT properly work on QEMU
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
-const APP: () = {
+mod app {
     #[init(spawn = [foo])]
     fn init(cx: init::Context) -> init::LateResources {
         // omitted: initialization of `CYCCNT`
@@ -53,4 +53,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/binds.rs

@@ -11,7 +11,7 @@ use panic_semihosting as _;
 
 // `examples/interrupt.rs` rewritten to use `binds`
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(Interrupt::UART0);
@@ -47,4 +47,4 @@ const APP: () = {
         )
         .unwrap();
     }
-};
+}

examples/capacity.rs

@@ -10,7 +10,7 @@ use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(Interrupt::UART0);
@@ -46,4 +46,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/cfg.rs

@@ -11,7 +11,8 @@ use cortex_m_semihosting::hprintln;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         #[cfg(debug_assertions)] // <- `true` when using the `dev` profile
         #[init(0)]
@@ -68,4 +69,4 @@ const APP: () = {
         fn SSI0();
         fn QEI0();
     }
-};
+}

examples/destructure.rs

@@ -10,7 +10,8 @@ use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         // Some resources to work with
         #[init(0)]
@@ -46,4 +47,4 @@ const APP: () = {
 
         hprintln!("UART0: a = {}, b = {}, c = {}", a, b, c).unwrap();
     }
-};
+}

examples/double_schedule.rs

@@ -9,7 +9,9 @@ use panic_semihosting as _;
 use rtic::cyccnt::U32Ext;
 
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
-const APP: () = {
+mod app {
+
+    #[resources]
     struct Resources {
         nothing: (),
     }
@@ -34,4 +36,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/generics.rs

@@ -11,7 +11,8 @@ use panic_semihosting as _;
 use rtic::{Exclusive, Mutex};
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         #[init(0)]
         shared: u32,
@@ -51,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>) {

examples/hardware.rs

@@ -10,7 +10,7 @@ use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         // Pends the UART0 interrupt but its handler won't run until *after*
@@ -51,4 +51,4 @@ const APP: () = {
         )
         .unwrap();
     }
-};
+}

examples/idle.rs

@@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         hprintln!("init").unwrap();
@@ -32,4 +32,4 @@ const APP: () = {
             cortex_m::asm::nop();
         }
     }
-};
+}

examples/init.rs

@@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965, peripherals = true)]
-const APP: () = {
+mod app {
     #[init]
     fn init(cx: init::Context) -> init::LateResources {
         static mut X: u32 = 0;
@@ -23,10 +23,14 @@ const APP: () = {
         // Safe access to local `static mut` variable
         let _x: &'static mut u32 = X;
 
+        // Access to the critical section token,
+        // to indicate that this is a critical seciton
+        let _cs_token: bare_metal::CriticalSection = cx.cs;
+
         hprintln!("init").unwrap();
 
         debug::exit(debug::EXIT_SUCCESS);
 
         init::LateResources {}
     }
-};
+}

examples/late.rs

@@ -15,8 +15,13 @@ use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    use heapless::{
+        consts::*,
+        spsc::{Consumer, Producer},
+    };
     // Late resources
+    #[resources]
     struct Resources {
         p: Producer<'static, u32, U4>,
         c: Consumer<'static, u32, U4>,
@@ -49,4 +54,4 @@ const APP: () = {
     fn uart0(c: uart0::Context) {
         c.resources.p.enqueue(42).unwrap();
     }
-};
+}

examples/lock.rs

@@ -10,7 +10,8 @@ use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         #[init(0)]
         shared: u32,
@@ -61,4 +62,4 @@ const APP: () = {
     fn gpioc(_: gpioc::Context) {
         hprintln!("C").unwrap();
     }
-};
+}

examples/message.rs

@@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init(spawn = [foo])]
     fn init(c: init::Context) -> init::LateResources {
         c.spawn.foo(/* no message */).unwrap();
@@ -51,4 +51,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/not-send.rs

@@ -16,7 +16,10 @@ pub struct NotSend {
 }
 
 #[app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    use super::NotSend;
+
+    #[resources]
     struct Resources {
         #[init(None)]
         shared: Option<NotSend>,
@@ -62,4 +65,4 @@ const APP: () = {
         fn SSI0();
         fn QEI0();
     }
-};
+}

examples/not-sync.rs

@@ -15,7 +15,11 @@ pub struct NotSync {
 }
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    use super::NotSync;
+    use core::marker::PhantomData;
+
+    #[resources]
     struct Resources {
         #[init(NotSync { _0: PhantomData })]
         shared: NotSync,
@@ -44,4 +48,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/only-shared-access.rs

@@ -10,7 +10,8 @@ use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         key: u32,
     }
@@ -35,4 +36,4 @@ const APP: () = {
     fn uart1(cx: uart1::Context) {
         hprintln!("UART1(key = {:#x})", cx.resources.key).unwrap();
     }
-};
+}

examples/periodic.rs

@@ -13,7 +13,8 @@ const PERIOD: u32 = 8_000_000;
 
 // NOTE: does NOT work on QEMU!
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
-const APP: () = {
+mod app {
+
     #[init(schedule = [foo])]
     fn init(cx: init::Context) -> init::LateResources {
         // omitted: initialization of `CYCCNT`
@@ -37,4 +38,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/peripherals-taken.rs

@@ -7,12 +7,12 @@ use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
-    fn main(_: main::Context) -> main::LateResources {
+    fn init(_: init::Context) -> init::LateResources {
         assert!(cortex_m::Peripherals::take().is_none());
         debug::exit(debug::EXIT_SUCCESS);
 
-        main::LateResources {}
+        init::LateResources {}
     }
-};
+}

examples/pool.rs

@@ -18,7 +18,12 @@ use rtic::app;
 pool!(P: [u8; 128]);
 
 #[app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    use crate::Box;
+
+    // Import the memory pool into scope
+    use super::P;
+
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         static mut MEMORY: [u8; 512] = [0; 512];
@@ -68,4 +73,4 @@ const APP: () = {
         fn SSI0();
         fn QEI0();
     }
-};
+}

examples/preempt.rs

@@ -9,7 +9,7 @@ use panic_semihosting as _;
 use rtic::app;
 
 #[app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(Interrupt::GPIOA);
@@ -36,4 +36,4 @@ const APP: () = {
         rtic::pend(Interrupt::GPIOB);
         hprintln!(" GPIOC - end").unwrap();
     }
-};
+}

examples/ramfunc.rs

@@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init(spawn = [bar])]
     fn init(c: init::Context) -> init::LateResources {
         c.spawn.bar().unwrap();
@@ -40,4 +40,4 @@ const APP: () = {
         #[link_section = ".data.UART1"]
         fn UART1();
     }
-};
+}

examples/resource-user-struct.rs

@@ -0,0 +1,63 @@
+//! examples/resource.rs
+
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use cortex_m_semihosting::{debug, hprintln};
+use lm3s6965::Interrupt;
+use panic_semihosting as _;
+
+#[rtic::app(device = lm3s6965)]
+mod app {
+    #[resources]
+    struct Resources {
+        // A resource
+        #[init(0)]
+        shared: u32,
+    }
+
+    // Should not collide with the struct above
+    #[allow(dead_code)]
+    struct Resources2 {
+        // A resource
+        shared: u32,
+    }
+
+    #[init]
+    fn init(_: init::Context) -> init::LateResources {
+        rtic::pend(Interrupt::UART0);
+        rtic::pend(Interrupt::UART1);
+
+        init::LateResources {}
+    }
+
+    // `shared` cannot be accessed from this context
+    #[idle]
+    fn idle(_cx: idle::Context) -> ! {
+        debug::exit(debug::EXIT_SUCCESS);
+
+        // error: no `resources` field in `idle::Context`
+        // _cx.resources.shared += 1;
+
+        loop {}
+    }
+
+    // `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 = {}", shared).unwrap();
+    }
+
+    // `shared` can be accessed from this context
+    #[task(binds = UART1, resources = [shared])]
+    fn uart1(cx: uart1::Context) {
+        *cx.resources.shared += 1;
+
+        hprintln!("UART1: shared = {}", cx.resources.shared).unwrap();
+    }
+}

examples/resource.rs

@@ -10,7 +10,8 @@ use lm3s6965::Interrupt;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         // A resource
         #[init(0)]
@@ -54,4 +55,4 @@ const APP: () = {
 
         hprintln!("UART1: shared = {}", cx.resources.shared).unwrap();
     }
-};
+}

examples/schedule.rs

@@ -12,7 +12,7 @@ use rtic::cyccnt::{Instant, U32Ext as _};
 
 // NOTE: does NOT work on QEMU!
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
-const APP: () = {
+mod app {
     #[init(schedule = [foo, bar])]
     fn init(mut cx: init::Context) -> init::LateResources {
         // Initialize (enable) the monotonic timer (CYCCNT)
@@ -52,4 +52,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/shared-with-init.rs

@@ -13,7 +13,10 @@ use rtic::app;
 pub struct MustBeSend;
 
 #[app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    use super::MustBeSend;
+
+    #[resources]
     struct Resources {
         #[init(None)]
         shared: Option<MustBeSend>,
@@ -39,4 +42,4 @@ const APP: () = {
             debug::exit(debug::EXIT_SUCCESS);
         }
     }
-};
+}

examples/smallest.rs

@@ -7,4 +7,4 @@ use panic_semihosting as _; // panic handler
 use rtic::app;
 
 #[app(device = lm3s6965)]
-const APP: () = {};
+mod app {}

examples/t-binds.rs

@@ -8,7 +8,7 @@
 use panic_halt as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         init::LateResources {}
@@ -25,7 +25,7 @@ const APP: () = {
     fn bar(c: bar::Context) {
         bar_trampoline(c)
     }
-};
+}
 
 #[allow(dead_code)]
 fn foo_trampoline(_: foo::Context) {}

examples/t-cfg-resources.rs

@@ -6,19 +6,17 @@
 use panic_halt as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         // A resource
         #[init(0)]
         shared: u32,
-
         // A conditionally compiled resource behind feature_x
         #[cfg(feature = "feature_x")]
         x: u32,
-
-        dummy: (),
+        dummy: (), // dummy such that we have at least one late resource
     }
-
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         init::LateResources {
@@ -35,4 +33,4 @@ const APP: () = {
             cortex_m::asm::nop();
         }
     }
-};
+}

examples/t-cfg.rs

@@ -6,7 +6,8 @@
 use panic_halt as _;
 
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         #[cfg(never)]
         #[init(0)]
@@ -54,4 +55,4 @@ const APP: () = {
         fn SSI0();
         fn QEI0();
     }
-};
+}

examples/t-htask-main.rs

@@ -7,7 +7,7 @@ use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         rtic::pend(lm3s6965::Interrupt::UART0);
@@ -16,7 +16,7 @@ const APP: () = {
     }
 
     #[task(binds = UART0)]
-    fn main(_: main::Context) {
+    fn taskmain(_: taskmain::Context) {
         debug::exit(debug::EXIT_SUCCESS);
     }
-};
+}

examples/t-idle-main.rs

@@ -7,17 +7,17 @@ use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
     fn init(_: init::Context) -> init::LateResources {
         init::LateResources {}
     }
 
     #[idle]
-    fn main(_: main::Context) -> ! {
+    fn taskmain(_: taskmain::Context) -> ! {
         debug::exit(debug::EXIT_SUCCESS);
         loop {
             cortex_m::asm::nop();
         }
     }
-};
+}

examples/t-init-main.rs

@@ -7,11 +7,11 @@ use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init]
-    fn main(_: main::Context) -> main::LateResources {
+    fn init(_: init::Context) -> init::LateResources {
         debug::exit(debug::EXIT_SUCCESS);
 
-        main::LateResources {}
+        init::LateResources {}
     }
-};
+}

examples/t-late-not-send.rs

@@ -12,7 +12,10 @@ pub struct NotSend {
 }
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    use super::NotSend;
+
+    #[resources]
     struct Resources {
         x: NotSend,
         #[init(None)]
@@ -35,4 +38,4 @@ const APP: () = {
             cortex_m::asm::nop();
         }
     }
-};
+}

examples/t-resource.rs

@@ -8,7 +8,8 @@
 use panic_halt as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         #[init(0)]
         o1: u32, // init
@@ -88,4 +89,4 @@ const APP: () = {
         // no `Mutex` proxy when co-owned by cooperative (same priority) tasks
         let _: &mut u32 = c.resources.s2;
     }
-};
+}

examples/t-schedule.rs

@@ -9,7 +9,7 @@ use panic_halt as _;
 use rtic::cyccnt::{Instant, U32Ext as _};
 
 #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
-const APP: () = {
+mod app {
     #[init(schedule = [foo, bar, baz])]
     fn init(c: init::Context) -> init::LateResources {
         let _: Result<(), ()> = c.schedule.foo(c.start + 10.cycles());
@@ -63,4 +63,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/t-spawn.rs

@@ -8,7 +8,7 @@
 use panic_halt as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init(spawn = [foo, bar, baz])]
     fn init(c: init::Context) -> init::LateResources {
         let _: Result<(), ()> = c.spawn.foo();
@@ -62,4 +62,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/t-stask-main.rs

@@ -7,16 +7,16 @@ use cortex_m_semihosting::debug;
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
-    #[init(spawn = [main])]
+mod app {
+    #[init(spawn = [taskmain])]
     fn init(cx: init::Context) -> init::LateResources {
-        cx.spawn.main().ok();
+        cx.spawn.taskmain().ok();
 
         init::LateResources {}
     }
 
     #[task]
-    fn main(_: main::Context) {
+    fn taskmain(_: taskmain::Context) {
         debug::exit(debug::EXIT_SUCCESS);
     }
 
@@ -26,4 +26,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}

examples/task.rs

@@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
 use panic_semihosting as _;
 
 #[rtic::app(device = lm3s6965)]
-const APP: () = {
+mod app {
     #[init(spawn = [foo])]
     fn init(c: init::Context) -> init::LateResources {
         c.spawn.foo().unwrap();
@@ -54,4 +54,4 @@ const APP: () = {
         fn SSI0();
         fn QEI0();
     }
-};
+}

examples/types.rs

@@ -10,7 +10,8 @@ use panic_semihosting as _;
 use rtic::cyccnt;
 
 #[rtic::app(device = lm3s6965, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
-const APP: () = {
+mod app {
+    #[resources]
     struct Resources {
         #[init(0)]
         shared: u32,
@@ -62,4 +63,4 @@ const APP: () = {
     extern "C" {
         fn SSI0();
     }
-};
+}