From fc4cb7d472dad1ea0fa137bb116bd907efc19601 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Mon, 8 May 2017 12:05:42 -0500
Subject: replace the ceiling token with a preemption threshold token

---
 tests/cfail/lock.rs | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

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

diff --git a/tests/cfail/lock.rs b/tests/cfail/lock.rs
index 62d3c6e..64753ac 100644
--- a/tests/cfail/lock.rs
+++ b/tests/cfail/lock.rs
@@ -1,42 +1,36 @@
 extern crate cortex_m_rtfm as rtfm;
 
-use rtfm::{C16, C1, C2, C3, P1, P16, P2, P3, Resource};
+use rtfm::{CMax, C2, P1, P2, P3, PMax, Resource, T1, T2, T3, TMax};
 
 static R1: Resource<i32, C2> = Resource::new(0);
 
-// You CAN'T use `raise` to lower the system 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, ceil: C2) {
-    ceil.raise(&R1, |_| {});
+fn j1(prio: P2, thr: T2) {
+    thr.raise(&R1, |_| {});
     //~^ error
 
     // OK
-    let r1 = R1.access(&prio, &ceil);
+    let r1 = R1.access(&prio, &thr);
 }
 
 // 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, ceil: C1) {
+// if you raise the preemption threshold first
+fn j2(prio: P1, thr: T1) {
     // OK
-    ceil.raise(&R1, |ceil| { let r1 = R1.access(&prio, ceil); })
+    thr.raise(&R1, |thr| { let r1 = R1.access(&prio, thr); })
 }
 
-static R2: Resource<i32, C16> = Resource::new(0);
+static R2: Resource<i32, CMax> = Resource::new(0);
 
-// Tasks with priority less than P16 can't access a resource with ceiling C16
-fn j4(prio: P1, ceil: C1) {
-    ceil.raise(&R2, |ceil| {});
+// Tasks with priority less than P16 can't access a resource with ceiling CMax
+fn j4(prio: P1, thr: T1) {
+    thr.raise(&R2, |thr| {});
     //~^ error
 }
 
-// Only tasks with priority P16 can access a resource with ceiling C16
-fn j5(prio: P16, ceil: C16) {
+// Only tasks with priority P16 can directly access a resource with ceiling CMax
+fn j5(prio: PMax, thr: TMax) {
     // OK
-    let r2 = R2.access(&prio, &ceil);
+    let r2 = R2.access(&prio, &thr);
 }
-- 
cgit v1.2.3