From e2bde8d21acdfb845554d960536bfb94a7bb1f86 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 27 Apr 2017 19:06:22 -0500
Subject: make the ceiling part of the task signature

remove the P.as_ceiling method
---
 tests/cfail/lock.rs | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'tests/cfail/lock.rs')

diff --git a/tests/cfail/lock.rs b/tests/cfail/lock.rs
index 073e1dd..62d3c6e 100644
--- a/tests/cfail/lock.rs
+++ b/tests/cfail/lock.rs
@@ -1,34 +1,28 @@
 extern crate cortex_m_rtfm as rtfm;
 
-use rtfm::{C16, C2, P1, P16, P2, P3, Resource};
+use rtfm::{C16, C1, C2, C3, P1, P16, P2, P3, Resource};
 
 static R1: Resource<i32, C2> = Resource::new(0);
 
 // You CAN'T use `raise` to lower the system ceiling
-fn j1(prio: P3) {
-    let ceil = prio.as_ceiling();
-
+fn j1(prio: P3, ceil: C3) {
     ceil.raise(&R1, |ceil| {});
     //~^ error
 }
 
 // You don't need to raise the ceiling to access a resource with ceiling equal
 // to the task priority.
-fn j2(prio: P2) {
-    let ceil = prio.as_ceiling();
-
+fn j2(prio: P2, ceil: C2) {
     ceil.raise(&R1, |_| {});
     //~^ error
 
     // OK
-    let r1 = R1.access(&prio, ceil);
+    let r1 = R1.access(&prio, &ceil);
 }
 
 // You CAN access a resource with ceiling C from a task with priority P if C > P
 // and you raise the ceiling first
-fn j3(prio: P1) {
-    let ceil = prio.as_ceiling();
-
+fn j3(prio: P1, ceil: C1) {
     // OK
     ceil.raise(&R1, |ceil| { let r1 = R1.access(&prio, ceil); })
 }
@@ -36,15 +30,13 @@ fn j3(prio: P1) {
 static R2: Resource<i32, C16> = Resource::new(0);
 
 // Tasks with priority less than P16 can't access a resource with ceiling C16
-fn j4(prio: P1) {
-    let ceil = prio.as_ceiling();
-
+fn j4(prio: P1, ceil: C1) {
     ceil.raise(&R2, |ceil| {});
     //~^ error
 }
 
 // Only tasks with priority P16 can access a resource with ceiling C16
-fn j5(prio: P16) {
+fn j5(prio: P16, ceil: C16) {
     // OK
-    let r2 = R2.access(&prio, prio.as_ceiling());
+    let r2 = R2.access(&prio, &ceil);
 }
-- 
cgit v1.2.3