mirror of
https://github.com/rtic-rs/rtic.git
synced 2025-12-20 06:45:36 +01:00
make the ceiling part of the task signature
remove the P.as_ceiling method
This commit is contained in:
parent
ec2df608ca
commit
e2bde8d21a
14 changed files with 325 additions and 80 deletions
|
|
@ -5,7 +5,7 @@
|
|||
#[macro_use]
|
||||
extern crate cortex_m_rtfm as rtfm;
|
||||
|
||||
use rtfm::{C1, P0, P1};
|
||||
use rtfm::{C0, C1, C16, P0, P1};
|
||||
use device::interrupt::Exti0;
|
||||
|
||||
tasks!(device, {
|
||||
|
|
@ -19,11 +19,11 @@ tasks!(device, {
|
|||
// WRONG. `init` must have signature `fn(P0, &C16)`
|
||||
fn init(_: P0, _: &C1) {}
|
||||
|
||||
fn idle(_: P0) -> ! {
|
||||
fn idle(_: P0, _: C0) -> ! {
|
||||
loop {}
|
||||
}
|
||||
|
||||
fn j1(_task: Exti0, _prio: P1) {}
|
||||
fn j1(_task: Exti0, _prio: P1, _ceil: C1) {}
|
||||
|
||||
// fake device crate
|
||||
extern crate core;
|
||||
|
|
@ -31,6 +31,7 @@ extern crate cortex_m;
|
|||
|
||||
mod device {
|
||||
pub mod interrupt {
|
||||
use cortex_m::ctxt::Context;
|
||||
use cortex_m::interrupt::Nr;
|
||||
|
||||
extern "C" fn default_handler<T>(_: T) {}
|
||||
|
|
@ -38,14 +39,17 @@ mod device {
|
|||
pub struct Handlers {
|
||||
pub Exti0: extern "C" fn(Exti0),
|
||||
pub Exti1: extern "C" fn(Exti1),
|
||||
pub Exti2: extern "C" fn(Exti2),
|
||||
}
|
||||
|
||||
pub struct Exti0;
|
||||
pub struct Exti1;
|
||||
pub struct Exti2;
|
||||
|
||||
pub enum Interrupt {
|
||||
Exti0,
|
||||
Exti1,
|
||||
Exti2,
|
||||
}
|
||||
|
||||
unsafe impl Nr for Interrupt {
|
||||
|
|
@ -54,9 +58,34 @@ mod device {
|
|||
}
|
||||
}
|
||||
|
||||
unsafe impl Context for Exti0 {}
|
||||
|
||||
unsafe impl Nr for Exti0 {
|
||||
fn nr(&self) -> u8 {
|
||||
0
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Context for Exti1 {}
|
||||
|
||||
unsafe impl Nr for Exti1 {
|
||||
fn nr(&self) -> u8 {
|
||||
0
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Context for Exti2 {}
|
||||
|
||||
unsafe impl Nr for Exti2 {
|
||||
fn nr(&self) -> u8 {
|
||||
0
|
||||
}
|
||||
}
|
||||
|
||||
pub const DEFAULT_HANDLERS: Handlers = Handlers {
|
||||
Exti0: default_handler,
|
||||
Exti1: default_handler,
|
||||
Exti2: default_handler,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue