I2C. Merged code from trunk.

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

1 files changed, 13 insertions, 12 deletions

diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c
index 0ad9d459d..456fc454f 100644
--- a/os/kernel/src/chcond.c
+++ b/os/kernel/src/chcond.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -203,11 +204,11 @@ msg_t chCondWaitS(CondVar *cp) {
  *          mutex, the mutex ownership is lost.

  *

  * @param[in] cp        pointer to the @p CondVar structure

- * @param[in] time      the number of ticks before the operation timeouts,

- *                      the special value @p TIME_INFINITE is allowed.

- *                      It is not possible to specify zero @p TIME_IMMEDIATE

- *                      as timeout specification because it would make no sense

- *                      in this function.

+ * @param[in] time      the number of ticks before the operation timeouts, the

+ *                      special values are handled as follow:

+ *                      - @a TIME_INFINITE no timeout.

+ *                      - @a TIME_IMMEDIATE this value is not allowed.

+ *                      .

  * @return              A message specifying how the invoking thread has been

  *                      released from the condition variable.

  * @retval RDY_OK       if the condvar has been signaled using

@@ -240,11 +241,11 @@ msg_t chCondWaitTimeout(CondVar *cp, systime_t time) {
  *          mutex, the mutex ownership is lost.

  *

  * @param[in] cp        pointer to the @p CondVar structure

- * @param[in] time      the number of ticks before the operation timeouts,

- *                      the special value @p TIME_INFINITE is allowed.

- *                      It is not possible to specify zero @p TIME_IMMEDIATE

- *                      as timeout specification because it would make no sense

- *                      in this function.

+ * @param[in] time      the number of ticks before the operation timeouts, the

+ *                      special values are handled as follow:

+ *                      - @a TIME_INFINITE no timeout.

+ *                      - @a TIME_IMMEDIATE this value is not allowed.

+ *                      .

  * @return              A message specifying how the invoking thread has been

  *                      released from the condition variable.

  * @retval RDY_OK       if the condvar has been signaled using

@@ -260,7 +261,7 @@ msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time) {
   Mutex *mp;

   msg_t msg;

 

-  chDbgCheck(cp != NULL, "chCondWaitTimeoutS");

+  chDbgCheck((cp != NULL) && (time != TIME_IMMEDIATE), "chCondWaitTimeoutS");

   chDbgAssert(currp->p_mtxlist != NULL,

               "chCondWaitTimeoutS(), #1",

               "not owning a mutex");