andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
gdisirio 2014-02-12 13:48:38 +00:00
parent 7a3da58ae2
commit c3f2655db9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/rt/RT-STM32F303-DISCOVERY/chconf.h
View File

@ -323,7 +323,7 @@
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_STATISTICS FALSE #define CH_DBG_STATISTICS TRUE
/** /**
* @brief Debug option, system state check. * @brief Debug option, system state check.
@ -332,7 +332,7 @@
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_SYSTEM_STATE_CHECK FALSE #define CH_DBG_SYSTEM_STATE_CHECK TRUE
/** /**
* @brief Debug option, parameters checks. * @brief Debug option, parameters checks.
@ -341,7 +341,7 @@
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_ENABLE_CHECKS FALSE #define CH_DBG_ENABLE_CHECKS TRUE
/** /**
* @brief Debug option, consistency checks. * @brief Debug option, consistency checks.
@ -351,7 +351,7 @@
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_ENABLE_ASSERTS FALSE #define CH_DBG_ENABLE_ASSERTS TRUE
/** /**
* @brief Debug option, trace buffer. * @brief Debug option, trace buffer.
@ -360,7 +360,7 @@
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_ENABLE_TRACE FALSE #define CH_DBG_ENABLE_TRACE TRUE
/** /**
* @brief Debug option, stack checks. * @brief Debug option, stack checks.
@ -372,7 +372,7 @@
* @note The default failure mode is to halt the system with the global * @note The default failure mode is to halt the system with the global
* @p panic_msg variable set to @p NULL. * @p panic_msg variable set to @p NULL.
*/ */
#define CH_DBG_ENABLE_STACK_CHECK FALSE #define CH_DBG_ENABLE_STACK_CHECK TRUE
/** /**
* @brief Debug option, stacks initialization. * @brief Debug option, stacks initialization.
@ -382,7 +382,7 @@
* *
* @note The default is @p FALSE. * @note The default is @p FALSE.
*/ */
#define CH_DBG_FILL_THREADS FALSE #define CH_DBG_FILL_THREADS TRUE
/** /**
* @brief Debug option, threads profiling. * @brief Debug option, threads profiling.

4
os/rt/include/chmtx.h
View File

@ -136,8 +136,10 @@ static inline bool chMtxQueueNotEmptyS(mutex_t *mp) {
* *
* @return A pointer to the next mutex in the stack. * @return A pointer to the next mutex in the stack.
* @retval NULL if the stack is empty. * @retval NULL if the stack is empty.
*
* @sclass
*/ */
static inline mutex_t *chMtxGetNextMutex(void) { static inline mutex_t *chMtxGetNextMutexS(void) {
return chThdGetSelfX()->p_mtxlist; return chThdGetSelfX()->p_mtxlist;
} }

4
os/rt/src/chcond.c
View File

@ -210,7 +210,7 @@ msg_t chCondWaitS(condition_variable_t *cp) {
chDbgCheck(cp != NULL); chDbgCheck(cp != NULL);
chDbgAssert(ctp->p_mtxlist != NULL, "not owning a mutex"); chDbgAssert(ctp->p_mtxlist != NULL, "not owning a mutex");
mp = chMtxGetNextMutex(); mp = chMtxGetNextMutexS();
chMtxUnlockS(mp); chMtxUnlockS(mp);
ctp->p_u.wtobjp = cp; ctp->p_u.wtobjp = cp;
queue_prio_insert(ctp, &cp->c_queue); 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)); chDbgCheck((cp != NULL) && (time != TIME_IMMEDIATE));
chDbgAssert(currp->p_mtxlist != NULL, "not owning a mutex"); chDbgAssert(currp->p_mtxlist != NULL, "not owning a mutex");
mp = chMtxGetNextMutex(); mp = chMtxGetNextMutexS();
chMtxUnlockS(mp); chMtxUnlockS(mp);
currp->p_u.wtobjp = cp; currp->p_u.wtobjp = cp;
queue_prio_insert(currp, &cp->c_queue); queue_prio_insert(currp, &cp->c_queue);