diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-02-28 13:32:45 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-02-28 13:32:45 +0000 |
| commit | 15637527154ac52316efcdd81734342fa65718d1 (patch) | |
| tree | 8116f51ca4bf944f6e501e9e6f88dcb186c0cea6 /os/kernel/src/chcond.c | |
| parent | 1aad9e4509193ea3726a2d021beb2421adca0a93 (diff) | |
| download | ChibiOS-15637527154ac52316efcdd81734342fa65718d1.tar.gz ChibiOS-15637527154ac52316efcdd81734342fa65718d1.tar.bz2 ChibiOS-15637527154ac52316efcdd81734342fa65718d1.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1692 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/src/chcond.c')
| -rw-r--r-- | os/kernel/src/chcond.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c index a78ff4ec5..33ffe98b1 100644 --- a/os/kernel/src/chcond.c +++ b/os/kernel/src/chcond.c @@ -206,20 +206,18 @@ msg_t chCondWaitTimeout(CondVar *cp, systime_t time) { * timeout.
*/
msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time) {
- Thread *ctp = currp;
Mutex *mp;
msg_t msg;
chDbgCheck(cp != NULL, "chCondWaitTimeoutS");
- chDbgAssert(ctp->p_mtxlist != NULL,
+ chDbgAssert(currp->p_mtxlist != NULL,
"chCondWaitTimeoutS(), #1",
"not owning a mutex");
mp = chMtxUnlockS();
- ctp->p_u.wtobjp = cp;
- prio_insert(ctp, &cp->c_queue);
+ currp->p_u.wtobjp = cp;
+ prio_insert(currp, &cp->c_queue);
msg = chSchGoSleepTimeoutS(THD_STATE_WTCOND, time);
-// msg = ctp->p_u.rdymsg;
chMtxLockS(mp);
return msg;
}
|