From a054e9599dc5290a07464542530324f87000690c Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 3 Sep 2008 12:43:02 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@422
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 docs/Doxyfile         | 7 ++-----
 readme.txt            | 1 +
 src/include/threads.h | 4 ----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/Doxyfile b/docs/Doxyfile
index 4df239ac5..901be54dc 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -240,12 +240,10 @@ PREDEFINED             = __JUST_STUBS__ \
                          __DOXIGEN__ \
                          CH_USE_VIRTUAL_TIMERS \
                          CH_USE_SYSTEMTIME \
-                         CH_USE_SLEEP \
-                         CH_USE_RESUME \
-                         CH_USE_SUSPEND \
-                         CH_USE_TERMINATE \
                          CH_USE_WAITEXIT \
                          CH_USE_SEMAPHORES \
+                         CH_USE_SEMSW \
+                         CH_USE_SEMAPHORES_TIMEOUT \
                          CH_USE_MUTEXES \
                          CH_USE_EVENTS \
                          CH_USE_EVENTS_TIMEOUT \
@@ -260,7 +258,6 @@ PREDEFINED             = __JUST_STUBS__ \
                          CH_USE_MESSAGES \
                          CH_USE_MESSAGES_EVENT \
                          CH_USE_MESSAGES_PRIORITY \
-                         CH_USE_SEMSW \
                          CH_USE_DEBUG \
                          CH_USE_TRACE
 EXPAND_AS_DEFINED      = 
diff --git a/readme.txt b/readme.txt
index 088e4fc5f..e1c5fbf92 100644
--- a/readme.txt
+++ b/readme.txt
@@ -90,6 +90,7 @@ Win32-MinGW            - ChibiOS/RT simulator and demo into a WIN32 process,
   to use the allocators in order to use dynamic system objects.
   Both the allocators can be disabled and removed from the memory image.
 - FIX: Corrected the wrong definition of the chThdResumeI() macro.
+- FIX: The API chSemWaitTimeout() was missing in the documentation.
 - CHANGE: Now the chThdResume() asserts that the thread is in PRSUSPEND state
   rather than test it.
 - CHANGE: Removed the CH_USE_TERMINATE, CH_USE_SLEEP, CH_USE_SUSPEND and
diff --git a/src/include/threads.h b/src/include/threads.h
index 89acd9add..2a53cb1fd 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -67,10 +67,6 @@ struct Thread {
     /** 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). */
     Thread          *p_wtthdp;