git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@366 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 6 insertions, 62 deletions

diff --git a/src/include/ch.h b/src/include/ch.h
index 4cf9c157f..cafcf2f75 100644
--- a/src/include/ch.h
+++ b/src/include/ch.h
@@ -35,7 +35,6 @@
 #include "scheduler.h"

 #include "semaphores.h"

 #include "mutexes.h"

-#include "condvars.h"

 #include "events.h"

 #include "messages.h"

 #include "threads.h"

diff --git a/src/include/condvars.h b/src/include/condvars.h
deleted file mode 100644
index 30e40fc10..000000000
--- a/src/include/condvars.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT and Copyright (C) 2008 Leon Woestenberg.

-

-    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/>.

-*/

-

-/**

- * @addtogroup CondVars

- * @{

- */

-

-#ifndef _CONDVARS_H_

-#define _CONDVARS_H_

-

-#ifdef CH_USE_CONDVARS

-

-typedef struct CondVar {

-  /** Queue of the threads sleeping on this CondVar. */

-  ThreadsQueue  c_queue;

-} CondVar;

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-  void chCondInit(CondVar *cp);

-  void chCondSignal(CondVar *cp);

-  void chCondSignalS(CondVar *cp);

-  void chCondBroadcast(CondVar *cp);

-  void chCondBroadcastS(CondVar *cp);

-  msg_t chCondWait(CondVar *cp, Mutex *mp);

-  msg_t chCondWaitS(CondVar *cp, Mutex *mp);

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* CH_USE_CONDVARS */

-

-#endif /* _CONDVARS_H_ */

-

-/** @} */

diff --git a/src/include/threads.h b/src/include/threads.h
index 76e8d480e..1572417d6 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -122,20 +122,18 @@ struct Thread {
 #define PRWTSEM     3
 /** Thread state: Waiting on a mutex. */
 #define PRWTMTX     4
-/** Thread state: Waiting on a condition variable. */
-#define PRWTCOND     5
 /** Thread state: Waiting in \p chThdSleep() or \p chThdSleepUntil(). */
-#define PRSLEEP     6
+#define PRSLEEP     5
 /** Thread state: Waiting in \p chThdWait(). */
-#define PRWAIT      7
+#define PRWAIT      6
 /** Thread state: Waiting in \p chEvtWait(). */
-#define PRWTEVENT   8
+#define PRWTEVENT   7
 /** Thread state: Waiting in \p chMsgSend(). */
-#define PRSNDMSG    9
+#define PRSNDMSG    8
 /** Thread state: Waiting in \p chMsgWait(). */
-#define PRWTMSG     10
+#define PRWTMSG     9
 /** Thread state: After termination.*/
-#define PREXIT      11
+#define PREXIT      10
 
 #ifdef CH_USE_TERMINATE
 /** Thread option: Termination requested flag.*/