From 52b8dbd75d4d9d25c20591043c625680af90397e Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 20 Jan 2009 21:53:29 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@653
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 src/chschd.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/chschd.c')

diff --git a/src/chschd.c b/src/chschd.c
index 913cac83d..e568ac64a 100644
--- a/src/chschd.c
+++ b/src/chschd.c
@@ -96,12 +96,20 @@ void chSchGoSleepS(tstate_t newstate) {
  * Timeout wakeup callback.
  */
 static void wakeup(void *p) {
+  Thread *tp = (Thread *)p;
 
+  switch (tp->p_state) {
 #ifdef CH_USE_SEMAPHORES
-  if (((Thread *)p)->p_state == PRWTSEM)
-    chSemFastSignalI(((Thread *)p)->p_wtsemp);
+  case PRWTSEM:
+    chSemFastSignalI(tp->p_wtsemp);
+    /* Falls into, intentional.*/
 #endif
-  chSchReadyI(p)->p_rdymsg = RDY_TIMEOUT;
+  case PRWTCOND:
+    chSchReadyI(dequeue(tp))->p_rdymsg = RDY_TIMEOUT;
+    break;
+  default:
+    chSchReadyI(tp)->p_rdymsg = RDY_TIMEOUT;
+  }
 }
 
 /**
-- 
cgit v1.2.3