diff options
Diffstat (limited to 'tests/cfail/race-2.rs')
| -rw-r--r-- | tests/cfail/race-2.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/cfail/race-2.rs b/tests/cfail/race-2.rs index 71f44fb..402a483 100644 --- a/tests/cfail/race-2.rs +++ b/tests/cfail/race-2.rs @@ -1,13 +1,11 @@ extern crate cortex_m_rtfm as rtfm; -use rtfm::{C2, C4, P1, P3, Resource}; +use rtfm::{C1, C2, C3, C4, P1, P3, Resource}; static R1: Resource<i32, C2> = Resource::new(0); static R2: Resource<i32, C4> = Resource::new(0); -fn j1(prio: P1) { - let ceil = prio.as_ceiling(); - +fn j1(prio: P1, ceil: C1) { ceil.raise( &R1, |ceil| { let r1 = R1.access(&prio, ceil); @@ -18,9 +16,7 @@ fn j1(prio: P1) { ); } -fn j2(_task: Task, prio: P3) { - let ceil = prio.as_ceiling(); - +fn j2(_task: Task, prio: P3, ceil: C3) { ceil.raise( &R2, |ceil| { // OK C2 (R1's ceiling) <= C4 (system ceiling) |