diff options
author | 2019-05-01 19:50:50 +0000 | |
---|---|---|
committer | 2019-05-01 19:50:50 +0000 | |
commit | bc024f197929be1ce7dac9e6cbf6672c3980437e (patch) | |
tree | c0839773ab356bac429cbc69e4f6b5654d162d6e /examples/cfg.rs | |
parent | e6fb2f216fccc09d8e996525dcef3ffb2004f1ec (diff) | |
parent | ccd7f4586b63841c4bac51f24dc38570c9f89726 (diff) | |
download | rtic-bc024f197929be1ce7dac9e6cbf6672c3980437e.tar.gz rtic-bc024f197929be1ce7dac9e6cbf6672c3980437e.tar.zst rtic-bc024f197929be1ce7dac9e6cbf6672c3980437e.zip |
Merge #176
176: implement RFCs 147 and 155, fix #141, etc. r=japaric a=japaric
This PR:
- Implements RFC 147: "all functions must be safe"
- Implements RFC 155: "explicit Context parameter"
- Implements the pending breaking change #141: reject assign syntax in `init`
(which was used to initialize late resources)
- Refactors code generation to make it more readable -- there are no more random
identifiers in the output -- and align it with the book description of RTFM
internals (see PR #175).
- Makes the framework hard depend on `core::mem::MaybeUninit` and thus will
require nightly until that API is stabilized.
- Fixes a ceiling analysis bug where the priority of the system timer was not
considered in the analysis (TODO backport this into the v0.4.x branch).
- Shrinks the size of all the internal queues by turning `AtomicUsize` indices
into `AtomicU8`s.
- Removes the integration with `owned_singleton`.
closes #141
closes #147
closes #155
Additionally:
- This changes CI to push v0.5.x docs to
https://japaric.github.io/rtfm5/book/en/ -- we need to do this because our
official docs are hosted on https://japaric.github.io/cortex-m-rtfm and we
need to keep them on v0.4.x until we release v0.5.0
- I propose that we use the master branch to develop the upcoming v0.5.0.
- I have created a branch v0.4.x for backports; new v0.4.x releases will come
from that branch.
r? @korken89 @texitoi, sorry for doing all the impl work in a single commit --
I know that makes things harder to review for you.
Suggestions for compile-pass and compile-fail tests are welcome
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Diffstat (limited to 'examples/cfg.rs')
-rw-r--r-- | examples/cfg.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/examples/cfg.rs b/examples/cfg.rs index 3f4ca904..03f9dbdc 100644 --- a/examples/cfg.rs +++ b/examples/cfg.rs @@ -9,25 +9,24 @@ extern crate panic_semihosting; #[cfg(debug_assertions)] use cortex_m_semihosting::hprintln; -use rtfm::app; -#[app(device = lm3s6965)] +#[rtfm::app(device = lm3s6965)] const APP: () = { #[cfg(debug_assertions)] // <- `true` when using the `dev` profile static mut COUNT: u32 = 0; #[init] - fn init() { + fn init(_: init::Context) { // .. } #[task(priority = 3, resources = [COUNT], spawn = [log])] - fn foo() { + fn foo(c: foo::Context) { #[cfg(debug_assertions)] { - *resources.COUNT += 1; + *c.resources.COUNT += 1; - spawn.log(*resources.COUNT).ok(); + c.spawn.log(*c.resources.COUNT).ok(); } // this wouldn't compile in `release` mode @@ -38,7 +37,7 @@ const APP: () = { #[cfg(debug_assertions)] #[task] - fn log(n: u32) { + fn log(_: log::Context, n: u32) { hprintln!( "foo has been called {} time{}", n, |