3 files changed, 75 insertions, 6 deletions
diff --git a/src/include/ch.h b/src/include/ch.h
index 28a3b1bd8..aa6c04cc0 100644
--- a/src/include/ch.h
+++ b/src/include/ch.h
@@ -35,6 +35,7 @@
 #include "scheduler.h"
 #include "semaphores.h"
 #include "mutexes.h"
+#include "condvars.h"
 #include "events.h"
 #include "messages.h"
 #include "heap.h"
diff --git a/src/include/condvars.h b/src/include/condvars.h
new file mode 100644
index 000000000..53bbe4a83
--- /dev/null
+++ b/src/include/condvars.h
@@ -0,0 +1,63 @@
+/*
+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
+
+    This file is part of ChibiOS/RT.
+
+    ChibiOS/RT is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/RT is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/*
+   Concepts and parts of this file are contributed by and Copyright (C) 2008
+   of Leon Woestenberg
+ */
+
+/**
+ * @addtogroup Conditional Variables
+ * @{
+ */
+
+#ifndef _CONDVARS_H_
+#define _CONDVARS_H_
+
+#if defined(CH_USE_CONDVARS) && defined(CH_USE_MUTEXES)
+
+/**
+ * CondVar structure.
+ */
+typedef struct {
+  ThreadsQueue          c_queue;
+} CondVar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void chCondInit(CondVar *cp);
+  void chCondSignal(CondVar *cp);
+  void chCondSignalI(CondVar *cp);
+  void chCondBroadcast(CondVar *cp);
+  void chCondBroadcastI(CondVar *cp);
+  msg_t chCondWait(CondVar *cp);
+  msg_t chCondWaitS(CondVar *cp);
+#ifdef CH_USE_CONDVARS_TIMEOUT
+  msg_t chCondWaitTimeout(CondVar *cp, systime_t time);
+  msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time);
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* defined(CH_USE_CONDVARS) && defined(CH_USE_MUTEXES) */
+
+#endif /* _CONDVARS_H_ */
+
+/** @} */
diff --git a/src/include/threads.h b/src/include/threads.h
index a0b0b362b..d5f82ea9f 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -56,29 +56,34 @@ struct Thread {
    * thread in the system.
    */
   union {
-    /** Thread wakeup code (only valid when exiting the \p PRREADY state). */
+    /** Thread wakeup code (only valid when exiting the \p PRREADY state).*/
     msg_t           p_rdymsg;
     /** The thread exit code (only while in \p PREXIT state).*/
     msg_t           p_exitcode;
 #ifdef CH_USE_SEMAPHORES
-    /** Semaphore where the thread is waiting on (only in \p PRWTSEM state). */
+    /** Semaphore where the thread is waiting on (only in \p PRWTSEM state).*/
     Semaphore       *p_wtsemp;
 #endif
 #ifdef CH_USE_MUTEXES
-    /** Mutex where the thread is waiting on (only in \p PRWTMTX state). */
+    /** Mutex where the thread is waiting on (only in \p PRWTMTX state).*/
     Mutex           *p_wtmtxp;
 #endif
+#ifdef CH_USE_CONDVARS
+    /** CondVar where the thread is waiting on (only in \p PRWTCOND state).*/
+    CondVar         *p_wtcondp;
+#endif
 #ifdef CH_USE_MESSAGES
-    /** Destination thread for message send (only in \p PRSNDMSG state). */
+    /** Destination thread for message send (only in \p PRSNDMSG state).*/
     Thread          *p_wtthdp;
 #endif
 #ifdef CH_USE_EVENTS
-    /** Enabled events mask (only while in \p PRWTEVENT state). */
+    /** Enabled events mask (only while in \p PRWTOREVT or \p PRWTANDEVT
+        states). */
     eventmask_t     p_ewmask;
 #endif
 #ifdef CH_USE_TRACE
     /** Kernel object where the thread is waiting on. It is only valid when
-        the thread is some sleeping states. */
+        the thread is some sleeping states.*/
     void            *p_wtobjp;
 #endif
   };