From c3f2655db931f2a166a3a5d9b8ba4f2be184522e Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 12 Feb 2014 13:48:38 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6708 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/rt/include/chmtx.h | 4 +++- os/rt/src/chcond.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'os') diff --git a/os/rt/include/chmtx.h b/os/rt/include/chmtx.h index 30367a1ab..9a7f2163d 100644 --- a/os/rt/include/chmtx.h +++ b/os/rt/include/chmtx.h @@ -136,8 +136,10 @@ static inline bool chMtxQueueNotEmptyS(mutex_t *mp) { * * @return A pointer to the next mutex in the stack. * @retval NULL if the stack is empty. + * + * @sclass */ -static inline mutex_t *chMtxGetNextMutex(void) { +static inline mutex_t *chMtxGetNextMutexS(void) { return chThdGetSelfX()->p_mtxlist; } diff --git a/os/rt/src/chcond.c b/os/rt/src/chcond.c index 18c0e1c8c..f56f508b0 100644 --- a/os/rt/src/chcond.c +++ b/os/rt/src/chcond.c @@ -210,7 +210,7 @@ msg_t chCondWaitS(condition_variable_t *cp) { chDbgCheck(cp != NULL); chDbgAssert(ctp->p_mtxlist != NULL, "not owning a mutex"); - mp = chMtxGetNextMutex(); + mp = chMtxGetNextMutexS(); chMtxUnlockS(mp); ctp->p_u.wtobjp = cp; queue_prio_insert(ctp, &cp->c_queue); @@ -294,7 +294,7 @@ msg_t chCondWaitTimeoutS(condition_variable_t *cp, systime_t time) { chDbgCheck((cp != NULL) && (time != TIME_IMMEDIATE)); chDbgAssert(currp->p_mtxlist != NULL, "not owning a mutex"); - mp = chMtxGetNextMutex(); + mp = chMtxGetNextMutexS(); chMtxUnlockS(mp); currp->p_u.wtobjp = cp; queue_prio_insert(currp, &cp->c_queue); -- cgit v1.2.3