update examples and tests

This commit is contained in:
Jorge Aparicio 2019-02-12 15:08:46 +01:00
parent 88599780e0
commit 89c922079e
10 changed files with 23 additions and 17 deletions

View file

@ -22,7 +22,7 @@ const APP: () = {
static mut C: Consumer<'static, u32, U4> = ();
#[init]
fn init() {
fn init() -> init::LateResources {
// NOTE: we use `Option` here to work around the lack of
// a stable `const` constructor
static mut Q: Option<Queue<u32, U4>> = None;
@ -31,8 +31,7 @@ const APP: () = {
let (p, c) = Q.as_mut().unwrap().split();
// Initialization of late resources
P = p;
C = c;
init::LateResources { P: p, C: c }
}
#[idle(resources = [C])]

View file

@ -20,10 +20,12 @@ const APP: () = {
static mut P: Pool<M> = ();
#[init(resources = [M])]
fn init() {
fn init() -> init::LateResources {
rtfm::pend(Interrupt::I2C0);
P = Pool::new(resources.M);
init::LateResources {
P: Pool::new(resources.M),
}
}
#[interrupt(

View file

@ -16,11 +16,11 @@ const APP: () = {
static KEY: u32 = ();
#[init]
fn init() {
fn init() -> init::LateResources {
rtfm::pend(Interrupt::UART0);
rtfm::pend(Interrupt::UART1);
KEY = 0xdeadbeef;
init::LateResources { KEY: 0xdeadbeef }
}
#[interrupt(resources = [KEY])]