diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-23 13:03:56 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-23 13:03:56 +0000 |
| commit | ca516fd8e648681b1e729c0191604b10106f3f44 (patch) | |
| tree | fc8947ccf6e83104903d5a3361b6659d112ae755 /os/rt/include | |
| parent | 3d30779fd790358d280b4b61b5d1aaa0e697b554 (diff) | |
| download | ChibiOS-ca516fd8e648681b1e729c0191604b10106f3f44.tar.gz ChibiOS-ca516fd8e648681b1e729c0191604b10106f3f44.tar.bz2 ChibiOS-ca516fd8e648681b1e729c0191604b10106f3f44.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6314 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/include')
| -rw-r--r-- | os/rt/include/chdebug.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h index 0fdc865eb..63440e4ee 100644 --- a/os/rt/include/chdebug.h +++ b/os/rt/include/chdebug.h @@ -121,8 +121,6 @@ typedef struct { /* Module macros. */
/*===========================================================================*/
-#define __QUOTE_THIS(p) #p
-
#if CH_DBG_SYSTEM_STATE_CHECK
#define _dbg_enter_lock() (ch.dbg_lock_cnt = 1)
#define _dbg_leave_lock() (ch.dbg_lock_cnt = 0)
@@ -170,12 +168,12 @@ typedef struct { #if !defined(chDbgCheck)
#define chDbgCheck(c) { \
if (!(c)) \
- chSysHalt("C:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
+ chSysHalt(__func__); \
}
#endif /* !defined(chDbgCheck) */
#else /* !CH_DBG_ENABLE_CHECKS */
-#define chDbgCheck(c) /*{(void)(c);}*/
+#define chDbgCheck(c) {if (0) (void)(c);}
#endif /* !CH_DBG_ENABLE_CHECKS */
#if CH_DBG_ENABLE_ASSERTS || defined(__DOXYGEN__)
@@ -196,11 +194,11 @@ typedef struct { #if !defined(chDbgAssert)
#define chDbgAssert(c, r) { \
if (!(c)) \
- chSysHalt("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
+ chSysHalt(__func__); \
}
#endif /* !defined(chDbgAssert) */
#else /* !CH_DBG_ENABLE_ASSERTS */
-#define chDbgAssert(c, r) /*{(void)(c);}*/
+#define chDbgAssert(c, r) {if (0) (void)(c);}
#endif /* !CH_DBG_ENABLE_ASSERTS */
/** @} */
|