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@6316 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2013-09-23 19:16:06 +00:00
parent 4c166f98c7
commit c0372b4344
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/nil/include/nil.h
View File

@ -719,7 +719,6 @@ typedef struct {
#define chVTGetSystemTimeX() port_timer_get_time()
#endif
#if NIL_CFG_ENABLE_ASSERTS || defined(__DOXYGEN__)
/**
* @brief Condition assertion.
* @details If the condition check fails then the kernel panics with a
@ -736,13 +735,10 @@ typedef struct {
*/
#if !defined(chDbgAssert)
#define chDbgAssert(c, r) { \
if (!(c)) \
chSysHalt(__func__); \
if (NIL_CFG_ENABLE_ASSERTS && !(c)) \
chSysHalt(__func__); \
}
#endif /* !defined(chDbgAssert) */
#else /* !NIL_CFG_ENABLE_ASSERTS */
#define chDbgAssert(c, r) {if (0) (void)(c);}
#endif /* !NIL_CFG_ENABLE_ASSERTS */
/** @} */
/*===========================================================================*/

17
os/rt/include/chdebug.h
View File

@ -154,7 +154,6 @@ typedef struct {
* @name Macro Functions
* @{
*/
#if CH_DBG_ENABLE_CHECKS || defined(__DOXYGEN__)
/**
* @brief Function parameters check.
* @details If the condition check fails then the kernel panics and halts.
@ -167,16 +166,11 @@ typedef struct {
*/
#if !defined(chDbgCheck)
#define chDbgCheck(c) { \
if (!(c)) \
chSysHalt(__func__); \
if (CH_DBG_ENABLE_CHECKS && !(c)) \
chSysHalt(__func__); \
}
#endif /* !defined(chDbgCheck) */
#else /* !CH_DBG_ENABLE_CHECKS */
#define chDbgCheck(c) {if (0) (void)(c);}
#endif /* !CH_DBG_ENABLE_CHECKS */
#if CH_DBG_ENABLE_ASSERTS || defined(__DOXYGEN__)
/**
* @brief Condition assertion.
* @details If the condition check fails then the kernel panics with a
@ -193,13 +187,10 @@ typedef struct {
*/
#if !defined(chDbgAssert)
#define chDbgAssert(c, r) { \
if (!(c)) \
chSysHalt(__func__); \
if (CH_DBG_ENABLE_ASSERTS && !(c)) \
chSysHalt(__func__); \
}
#endif /* !defined(chDbgAssert) */
#else /* !CH_DBG_ENABLE_ASSERTS */
#define chDbgAssert(c, r) {if (0) (void)(c);}
#endif /* !CH_DBG_ENABLE_ASSERTS */
/** @} */
/*===========================================================================*/