From 1b4b006bab7ee05e403a4fc48ae751d037f95b1a Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 21 Apr 2019 20:10:40 +0200 Subject: update examples --- examples/generics.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'examples/generics.rs') diff --git a/examples/generics.rs b/examples/generics.rs index c8ce8393..e624da39 100644 --- a/examples/generics.rs +++ b/examples/generics.rs @@ -9,25 +9,25 @@ extern crate panic_semihosting; use cortex_m_semihosting::{debug, hprintln}; use lm3s6965::Interrupt; -use rtfm::{app, Mutex}; +use rtfm::Mutex; -#[app(device = lm3s6965)] +#[rtfm::app(device = lm3s6965)] const APP: () = { static mut SHARED: u32 = 0; #[init] - fn init() { + fn init(_: init::Context) { rtfm::pend(Interrupt::UART0); rtfm::pend(Interrupt::UART1); } #[interrupt(resources = [SHARED])] - fn UART0() { + fn UART0(c: UART0::Context) { static mut STATE: u32 = 0; hprintln!("UART0(STATE = {})", *STATE).unwrap(); - advance(STATE, resources.SHARED); + advance(STATE, c.resources.SHARED); rtfm::pend(Interrupt::UART1); @@ -35,17 +35,17 @@ const APP: () = { } #[interrupt(priority = 2, resources = [SHARED])] - fn UART1() { + fn UART1(mut c: UART1::Context) { static mut STATE: u32 = 0; hprintln!("UART1(STATE = {})", *STATE).unwrap(); // just to show that `SHARED` can be accessed directly and .. - *resources.SHARED += 0; + *c.resources.SHARED += 0; // .. also through a (no-op) `lock` - resources.SHARED.lock(|shared| *shared += 0); + c.resources.SHARED.lock(|shared| *shared += 0); - advance(STATE, resources.SHARED); + advance(STATE, c.resources.SHARED); } }; -- cgit v1.2.3