From f6e46bac2e7d9a62b54deac25b09b7f26bee40b1 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 29 Nov 2007 16:31:44 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@120
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 readme.txt               | 1 +
 src/chevents.c           | 4 +---
 src/chinit.c             | 1 -
 src/include/ch.h         | 2 ++
 src/include/semaphores.h | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/readme.txt b/readme.txt
index 60770c779..6be900b93 100644
--- a/readme.txt
+++ b/readme.txt
@@ -51,6 +51,7 @@ AVR-AT90CANx-GCC       - Port on AVR AT90CAN128, not complete yet.
 - Minor improvement in the LPC214x serial driver, unneeded events were
   generated in some rare cases.
 - Fixed a chSysInit() documentation error.
+- Fixed a chEvtWaitTimeout() documentation error.
 - Added a new debug switch: CH_USE_TRACE, previously the trace functionality
   was associated to the CH_USE_DEBUG switch.
 
diff --git a/src/chevents.c b/src/chevents.c
index f8d7d971f..f301fd106 100644
--- a/src/chevents.c
+++ b/src/chevents.c
@@ -161,9 +161,7 @@ static void wakeup(void *p) {
  *                 identifier. The array can be NULL or contain NULL elements
  *                 (no callback specified).
  * @param time the number of ticks before the operation timouts
- * @return the event identifier or \p RDY_TIMEOUT the specified time expired or
- *         if the timeout was set to zero and no serviceable pending events
- *         were present
+ * @return the event identifier or \p RDY_TIMEOUT if the specified time expired
  * @note Only a single event is served in the function, the one with the
  *       lowest event id. The function is meant to be invoked into a loop so
  *       that all events are received and served.<br>
diff --git a/src/chinit.c b/src/chinit.c
index b1b6bd7d1..9fa079e2c 100644
--- a/src/chinit.c
+++ b/src/chinit.c
@@ -24,7 +24,6 @@
 
 #include <ch.h>
 
-
 /**
  * ChibiOS/RT initialization. After executing this function the current
  * instructions stream becomes the main thread.
diff --git a/src/include/ch.h b/src/include/ch.h
index 1102f4013..0ef78fbf4 100644
--- a/src/include/ch.h
+++ b/src/include/ch.h
@@ -25,6 +25,8 @@
 #ifndef _CH_H_
 #define _CH_H_
 
+#define _CHIBIOS_RT_
+
 #ifndef __DOXIGEN__
 #ifndef _CHCONF_H_
 #include <chconf.h>
diff --git a/src/include/semaphores.h b/src/include/semaphores.h
index dfee499f0..4ffb3dc0d 100644
--- a/src/include/semaphores.h
+++ b/src/include/semaphores.h
@@ -45,8 +45,10 @@ extern "C" {
   void chSemResetI(Semaphore *sp, t_cnt n);
   void chSemWait(Semaphore *sp);
   void chSemWaitS(Semaphore *sp);
+#ifdef CH_USE_SEMAPHORES_TIMEOUT
   t_msg chSemWaitTimeout(Semaphore *sp, t_time time);
   t_msg chSemWaitTimeoutS(Semaphore *sp, t_time time);
+#endif
   void chSemSignal(Semaphore *sp);
   void chSemSignalI(Semaphore *sp);
   void chSemSignalWait(Semaphore *sps, Semaphore *spw);