mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-25 21:19:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

simplify the tasks! macro, make the request function more straightforward

Browse source 
in its meaning
This commit is contained in:
Jorge Aparicio 2017-04-09 23:18:00 -05:00
parent 595404c5ff
commit 5ae7d5f6e0
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib.rs
View file

@ -13,7 +13,7 @@ use cortex_m::interrupt::Nr;
use cortex_m::register::{basepri, basepri_max}; use cortex_m::register::{basepri, basepri_max};
use typenum::{Cmp, Equal, Greater, Less, Unsigned}; use typenum::{Cmp, Equal, Greater, Less, Unsigned};
pub use cortex_m::ctxt::Local; pub use cortex_m::ctxt::{Context, Local};
#[doc(hidden)] #[doc(hidden)]
pub use cortex_m::peripheral::NVIC; pub use cortex_m::peripheral::NVIC;
#[doc(hidden)] #[doc(hidden)]
@ -213,16 +213,18 @@ where
} }
/// Requests the execution of the task `task` /// Requests the execution of the task `task`
pub fn request<T>(task: T) pub fn request<T, P>(_task: fn(T, P))
where where
T: Nr, T: Context + Nr,
P: Priority,
{ {
let nvic = unsafe { &*NVIC.get() }; let nvic = unsafe { &*NVIC.get() };
match () { match () {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
() => { () => {
let task = unsafe { core::ptr::read(&task) }; // NOTE(safe) zero sized type
let task = unsafe { core::ptr::read(0x0 as *const T) };
// NOTE(safe) atomic read // NOTE(safe) atomic read
assert!(!nvic.is_pending(task), assert!(!nvic.is_pending(task),
"Task is already in the pending state"); "Task is already in the pending state");
@ -231,6 +233,8 @@ where
() => {} () => {}
} }
// NOTE(safe) zero sized type
let task = unsafe { core::ptr::read(0x0 as *const T) };
// NOTE(safe) atomic write // NOTE(safe) atomic write
nvic.set_pending(task); nvic.set_pending(task);
} }
@ -291,7 +295,7 @@ unsafe impl Priority for P0 {}
#[macro_export] #[macro_export]
macro_rules! tasks { macro_rules! tasks {
($krate:ident, { ($krate:ident, {
$($task:ident: ($interrupt:ident, $Interrupt:ident, $P:ident),)* $($task:ident: ($Interrupt:ident, $P:ident),)*
}) => { }) => {
fn main() { fn main() {
$crate::free(|_| { $crate::free(|_| {
@ -343,7 +347,7 @@ macro_rules! tasks {
static INTERRUPTS: ::$krate::interrupt::Handlers = static INTERRUPTS: ::$krate::interrupt::Handlers =
::$krate::interrupt::Handlers { ::$krate::interrupt::Handlers {
$( $(
$interrupt: { $Interrupt: {
extern "C" fn $task( extern "C" fn $task(
task: ::$krate::interrupt::$Interrupt task: ::$krate::interrupt::$Interrupt
) { ) {