diff options
| author | Jorge Aparicio <jorge@japaric.io> | 2017-04-27 19:06:22 -0500 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io> | 2017-04-27 19:28:27 -0500 |
| commit | e2bde8d21acdfb845554d960536bfb94a7bb1f86 (patch) | |
| tree | e44c57d9f018039fda1a0845b8d5a6310903725b /tests/cfail/race-1.rs | |
| parent | ec2df608ca4c35f044c383b7a4c8ba268657aa15 (diff) | |
make the ceiling part of the task signature
remove the P.as_ceiling method
Diffstat (limited to 'tests/cfail/race-1.rs')
| -rw-r--r-- | tests/cfail/race-1.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/cfail/race-1.rs b/tests/cfail/race-1.rs index 9d08f42..167802d 100644 --- a/tests/cfail/race-1.rs +++ b/tests/cfail/race-1.rs @@ -1,12 +1,10 @@ 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); -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); @@ -17,7 +15,7 @@ fn j1(prio: P1) { ); } -fn j2(_task: Task, prio: P3) { +fn j2(_task: Task, prio: P3, ceil: C3) { rtfm::atomic( |ceil| { // OK C2 (R1's ceiling) <= C16 (system ceiling) |