diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-08-28 13:39:56 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-08-28 13:39:56 +0000 |
| commit | fc492c6d190610cc9537360edf44d6dc5d072a2c (patch) | |
| tree | 53fb1786e058f872671fb3adca4e73c708716d54 /os/kernel/src | |
| parent | da23780899ae4b9ce1bbe0cb9109da1c87fe0fa1 (diff) | |
| parent | 663214d0e6728d153fd4118324e69c75c574327c (diff) | |
| download | ChibiOS-fc492c6d190610cc9537360edf44d6dc5d072a2c.tar.gz ChibiOS-fc492c6d190610cc9537360edf44d6dc5d072a2c.tar.bz2 ChibiOS-fc492c6d190610cc9537360edf44d6dc5d072a2c.zip | |
I2C. Merge code from trunk.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3263 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/src')
| -rw-r--r-- | os/kernel/src/chmsg.c | 2 | ||||
| -rw-r--r-- | os/kernel/src/chthreads.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/os/kernel/src/chmsg.c b/os/kernel/src/chmsg.c index 5002a892a..403df1580 100644 --- a/os/kernel/src/chmsg.c +++ b/os/kernel/src/chmsg.c @@ -109,7 +109,7 @@ Thread *chMsgWait(void) { }
/**
- * @brief Releases the thread waiting on top of the messages queue.
+ * @brief Releases a sender thread specifying a response message.
* @pre Invoke this function only after a message has been received
* using @p chMsgWait().
*
diff --git a/os/kernel/src/chthreads.c b/os/kernel/src/chthreads.c index 19accdb55..46039561b 100644 --- a/os/kernel/src/chthreads.c +++ b/os/kernel/src/chthreads.c @@ -80,9 +80,6 @@ Thread *_thread_init(Thread *tp, tprio_t prio) { #if CH_USE_EVENTS
tp->p_epending = 0;
#endif
-#if CH_USE_NESTED_LOCKS
- tp->p_locks = 0;
-#endif
#if CH_DBG_THREADS_PROFILING
tp->p_time = 0;
#endif
|