Rename RTFM to RTIC

This commit is contained in:
Henrik Tjäder 2020-06-11 17:18:29 +00:00
parent 4a0393f756
commit 602a5b4374
129 changed files with 454 additions and 454 deletions

View file

@ -10,7 +10,7 @@ use lm3s6965::Interrupt;
use panic_semihosting as _;
// NOTE: does NOT properly work on QEMU
#[rtfm::app(device = lm3s6965, monotonic = rtfm::cyccnt::CYCCNT)]
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = {
#[init(spawn = [foo])]
fn init(cx: init::Context) {
@ -31,7 +31,7 @@ const APP: () = {
if *ONCE {
*ONCE = false;
rtfm::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART0);
} else {
debug::exit(debug::EXIT_SUCCESS);
}

View file

@ -10,11 +10,11 @@ use lm3s6965::Interrupt;
use panic_semihosting as _;
// `examples/interrupt.rs` rewritten to use `binds`
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART0);
hprintln!("init").unwrap();
}
@ -23,7 +23,7 @@ const APP: () = {
fn idle(_: idle::Context) -> ! {
hprintln!("idle").unwrap();
rtfm::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART0);
debug::exit(debug::EXIT_SUCCESS);

View file

@ -9,11 +9,11 @@ use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART0);
}
#[task(binds = UART0, spawn = [foo, bar])]

View file

@ -10,7 +10,7 @@ use cortex_m_semihosting::debug;
use cortex_m_semihosting::hprintln;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
#[cfg(debug_assertions)] // <- `true` when using the `dev` profile

View file

@ -9,7 +9,7 @@ use cortex_m_semihosting::hprintln;
use lm3s6965::Interrupt;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
// Some resources to work with
@ -23,8 +23,8 @@ const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(Interrupt::UART0);
rtfm::pend(Interrupt::UART1);
rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1);
}
// Direct destructure

View file

@ -8,9 +8,9 @@
use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use panic_semihosting as _;
use rtfm::{Exclusive, Mutex};
use rtic::{Exclusive, Mutex};
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
#[init(0)]
@ -19,8 +19,8 @@ const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(Interrupt::UART0);
rtfm::pend(Interrupt::UART1);
rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1);
}
#[task(binds = UART0, resources = [shared])]
@ -32,7 +32,7 @@ const APP: () = {
// second argument has type `resources::shared`
advance(STATE, c.resources.shared);
rtfm::pend(Interrupt::UART1);
rtic::pend(Interrupt::UART1);
debug::exit(debug::EXIT_SUCCESS);
}

View file

@ -9,13 +9,13 @@ use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {
// Pends the UART0 interrupt but its handler won't run until *after*
// `init` returns because interrupts are disabled
rtfm::pend(Interrupt::UART0); // equivalent to NVIC::pend
rtic::pend(Interrupt::UART0); // equivalent to NVIC::pend
hprintln!("init").unwrap();
}
@ -26,7 +26,7 @@ const APP: () = {
hprintln!("idle").unwrap();
rtfm::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART0);
debug::exit(debug::EXIT_SUCCESS);

View file

@ -8,7 +8,7 @@
use cortex_m_semihosting::{debug, hprintln};
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {

View file

@ -8,7 +8,7 @@
use cortex_m_semihosting::{debug, hprintln};
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965, peripherals = true)]
#[rtic::app(device = lm3s6965, peripherals = true)]
const APP: () = {
#[init]
fn init(cx: init::Context) {

View file

@ -14,7 +14,7 @@ use heapless::{
use lm3s6965::Interrupt;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
// Late resources
struct Resources {
@ -40,7 +40,7 @@ const APP: () = {
debug::exit(debug::EXIT_SUCCESS);
} else {
rtfm::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART0);
}
}
}

View file

@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
#[init(0)]
@ -18,7 +18,7 @@ const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(Interrupt::GPIOA);
rtic::pend(Interrupt::GPIOA);
}
// when omitted priority is assumed to be `1`
@ -32,12 +32,12 @@ const APP: () = {
*shared += 1;
// GPIOB will *not* run right now due to the critical section
rtfm::pend(Interrupt::GPIOB);
rtic::pend(Interrupt::GPIOB);
hprintln!("B - shared = {}", *shared).unwrap();
// GPIOC does not contend for `shared` so it's allowed to run now
rtfm::pend(Interrupt::GPIOC);
rtic::pend(Interrupt::GPIOC);
});
// critical section is over: GPIOB can now start

View file

@ -8,7 +8,7 @@
use cortex_m_semihosting::{debug, hprintln};
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [foo])]
fn init(c: init::Context) {

View file

@ -9,7 +9,7 @@ use core::marker::PhantomData;
use cortex_m_semihosting::debug;
use panic_halt as _;
use rtfm::app;
use rtic::app;
pub struct NotSend {
_0: PhantomData<*const ()>,

View file

@ -14,7 +14,7 @@ pub struct NotSync {
_0: PhantomData<*const ()>,
}
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
#[init(NotSync { _0: PhantomData })]

View file

@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
key: u32,
@ -17,8 +17,8 @@ const APP: () = {
#[init]
fn init(_: init::Context) -> init::LateResources {
rtfm::pend(Interrupt::UART0);
rtfm::pend(Interrupt::UART1);
rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1);
init::LateResources { key: 0xdeadbeef }
}

View file

@ -7,12 +7,12 @@
use cortex_m_semihosting::hprintln;
use panic_semihosting as _;
use rtfm::cyccnt::{Instant, U32Ext};
use rtic::cyccnt::{Instant, U32Ext};
const PERIOD: u32 = 8_000_000;
// NOTE: does NOT work on QEMU!
#[rtfm::app(device = lm3s6965, monotonic = rtfm::cyccnt::CYCCNT)]
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = {
#[init(schedule = [foo])]
fn init(cx: init::Context) {

View file

@ -12,7 +12,7 @@ use heapless::{
};
use lm3s6965::Interrupt;
use panic_semihosting as _;
use rtfm::app;
use rtic::app;
// Declare a pool of 128-byte memory blocks
pool!(P: [u8; 128]);
@ -26,7 +26,7 @@ const APP: () = {
// Increase the capacity of the memory pool by ~4
P::grow(MEMORY);
rtfm::pend(Interrupt::I2C0);
rtic::pend(Interrupt::I2C0);
}
#[task(binds = I2C0, priority = 2, spawn = [foo, bar])]

View file

@ -6,19 +6,19 @@
use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use panic_semihosting as _;
use rtfm::app;
use rtic::app;
#[app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(Interrupt::GPIOA);
rtic::pend(Interrupt::GPIOA);
}
#[task(binds = GPIOA, priority = 1)]
fn gpioa(_: gpioa::Context) {
hprintln!("GPIOA - start").unwrap();
rtfm::pend(Interrupt::GPIOC);
rtic::pend(Interrupt::GPIOC);
hprintln!("GPIOA - end").unwrap();
debug::exit(debug::EXIT_SUCCESS);
}
@ -31,7 +31,7 @@ const APP: () = {
#[task(binds = GPIOC, priority = 2)]
fn gpioc(_: gpioc::Context) {
hprintln!(" GPIOC - start").unwrap();
rtfm::pend(Interrupt::GPIOB);
rtic::pend(Interrupt::GPIOB);
hprintln!(" GPIOC - end").unwrap();
}
};

View file

@ -8,7 +8,7 @@
use cortex_m_semihosting::{debug, hprintln};
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [bar])]
fn init(c: init::Context) {

View file

@ -9,7 +9,7 @@ use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
// A resource
@ -19,8 +19,8 @@ const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(Interrupt::UART0);
rtfm::pend(Interrupt::UART1);
rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1);
}
// `shared` cannot be accessed from this context

View file

@ -8,10 +8,10 @@
use cortex_m::peripheral::DWT;
use cortex_m_semihosting::hprintln;
use panic_halt as _;
use rtfm::cyccnt::{Instant, U32Ext as _};
use rtic::cyccnt::{Instant, U32Ext as _};
// NOTE: does NOT work on QEMU!
#[rtfm::app(device = lm3s6965, monotonic = rtfm::cyccnt::CYCCNT)]
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = {
#[init(schedule = [foo, bar])]
fn init(mut cx: init::Context) {

View file

@ -8,7 +8,7 @@
use cortex_m_semihosting::debug;
use lm3s6965::Interrupt;
use panic_halt as _;
use rtfm::app;
use rtic::app;
pub struct MustBeSend;
@ -25,7 +25,7 @@ const APP: () = {
let message = MustBeSend;
*c.resources.shared = Some(message);
rtfm::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART0);
}
#[task(binds = UART0, resources = [shared])]

View file

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

View file

@ -7,7 +7,7 @@
use panic_halt as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {}

View file

@ -5,7 +5,7 @@
use panic_halt as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
// A resource

View file

@ -5,7 +5,7 @@
use panic_halt as _;
#[rtfm::app(device = lm3s6965, monotonic = rtfm::cyccnt::CYCCNT)]
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = {
struct Resources {
#[cfg(never)]

View file

@ -6,11 +6,11 @@
use cortex_m_semihosting::debug;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {
rtfm::pend(lm3s6965::Interrupt::UART0)
rtic::pend(lm3s6965::Interrupt::UART0)
}
#[task(binds = UART0)]

View file

@ -6,7 +6,7 @@
use cortex_m_semihosting::debug;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn init(_: init::Context) {}

View file

@ -6,7 +6,7 @@
use cortex_m_semihosting::debug;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init]
fn main(_: main::Context) {

View file

@ -11,7 +11,7 @@ pub struct NotSend {
_0: PhantomData<*const ()>,
}
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
x: NotSend,

View file

@ -7,7 +7,7 @@
use panic_halt as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
struct Resources {
#[init(0)]

View file

@ -6,9 +6,9 @@
#![no_std]
use panic_halt as _;
use rtfm::cyccnt::{Instant, U32Ext as _};
use rtic::cyccnt::{Instant, U32Ext as _};
#[rtfm::app(device = lm3s6965, monotonic = rtfm::cyccnt::CYCCNT)]
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = {
#[init(schedule = [foo, bar, baz])]
fn init(c: init::Context) {

View file

@ -7,7 +7,7 @@
use panic_halt as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [foo, bar, baz])]
fn init(c: init::Context) {

View file

@ -6,7 +6,7 @@
use cortex_m_semihosting::debug;
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [main])]
fn init(cx: init::Context) {

View file

@ -8,7 +8,7 @@
use cortex_m_semihosting::{debug, hprintln};
use panic_semihosting as _;
#[rtfm::app(device = lm3s6965)]
#[rtic::app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [foo])]
fn init(c: init::Context) {

View file

@ -7,9 +7,9 @@
use cortex_m_semihosting::debug;
use panic_semihosting as _;
use rtfm::cyccnt;
use rtic::cyccnt;
#[rtfm::app(device = lm3s6965, peripherals = true, monotonic = rtfm::cyccnt::CYCCNT)]
#[rtic::app(device = lm3s6965, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = {
struct Resources {
#[init(0)]
@ -19,7 +19,7 @@ const APP: () = {
#[init(schedule = [foo], spawn = [foo])]
fn init(cx: init::Context) {
let _: cyccnt::Instant = cx.start;
let _: rtfm::Peripherals = cx.core;
let _: rtic::Peripherals = cx.core;
let _: lm3s6965::Peripherals = cx.device;
let _: init::Schedule = cx.schedule;
let _: init::Spawn = cx.spawn;