aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-02-12 13:48:38 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-02-12 13:48:38 +0000
commitc3f2655db931f2a166a3a5d9b8ba4f2be184522e (patch)
tree29a8b580567fe0ad83c59f29d3cb3ee7f8653373
parent7a3da58ae2c6defd58e77bb4a5d3ba7034c642cc (diff)
downloadChibiOS-c3f2655db931f2a166a3a5d9b8ba4f2be184522e.tar.gz
ChibiOS-c3f2655db931f2a166a3a5d9b8ba4f2be184522e.tar.bz2
ChibiOS-c3f2655db931f2a166a3a5d9b8ba4f2be184522e.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6708 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/rt/RT-STM32F303-DISCOVERY/chconf.h14
-rw-r--r--os/rt/include/chmtx.h4
-rw-r--r--os/rt/src/chcond.c4
3 files changed, 12 insertions, 10 deletions
diff --git a/demos/rt/RT-STM32F303-DISCOVERY/chconf.h b/demos/rt/RT-STM32F303-DISCOVERY/chconf.h
index 491c2dfdd..47e40b877 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/chconf.h
+++ b/demos/rt/RT-STM32F303-DISCOVERY/chconf.h
@@ -323,7 +323,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_STATISTICS FALSE
+#define CH_DBG_STATISTICS TRUE
/**
* @brief Debug option, system state check.
@@ -332,7 +332,7 @@
*
* @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.
@@ -341,7 +341,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_ENABLE_CHECKS FALSE
+#define CH_DBG_ENABLE_CHECKS TRUE
/**
* @brief Debug option, consistency checks.
@@ -351,7 +351,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_ENABLE_ASSERTS FALSE
+#define CH_DBG_ENABLE_ASSERTS TRUE
/**
* @brief Debug option, trace buffer.
@@ -360,7 +360,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_ENABLE_TRACE FALSE
+#define CH_DBG_ENABLE_TRACE TRUE
/**
* @brief Debug option, stack checks.
@@ -372,7 +372,7 @@
* @note The default failure mode is to halt the system with the global
* @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.
@@ -382,7 +382,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_FILL_THREADS FALSE
+#define CH_DBG_FILL_THREADS TRUE
/**
* @brief Debug option, threads profiling.
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);