aboutsummaryrefslogtreecommitdiffstats
path: root/os/kernel/include/chdebug.h
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-08-09 10:15:25 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-08-09 10:15:25 +0000
commit1bcc0f1dc26c3358ca0c17f0b52e8b44dbc89d42 (patch)
treeba16188b80e3ed6bceac77805ff42349987a55d4 /os/kernel/include/chdebug.h
parent0752e9d7e973161c32e4b667c7a8d06c68b0a9eb (diff)
downloadChibiOS-1bcc0f1dc26c3358ca0c17f0b52e8b44dbc89d42.tar.gz
ChibiOS-1bcc0f1dc26c3358ca0c17f0b52e8b44dbc89d42.tar.bz2
ChibiOS-1bcc0f1dc26c3358ca0c17f0b52e8b44dbc89d42.zip
I2C. Syncing with trunk (step 2)
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3216 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/include/chdebug.h')
-rw-r--r--os/kernel/include/chdebug.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/os/kernel/include/chdebug.h b/os/kernel/include/chdebug.h
index 2fb3b2385..b2edf176e 100644
--- a/os/kernel/include/chdebug.h
+++ b/os/kernel/include/chdebug.h
@@ -90,13 +90,15 @@ typedef struct {
*
* @api
*/
+#if !defined(chDbgCheck)
#define chDbgCheck(c, func) { \
if (!(c)) \
- chDbgPanic(__QUOTE_THIS(func)"(), line "__QUOTE_THIS(__LINE__)); \
+ chDbgPanic(__QUOTE_THIS(func)"()"); \
}
+#endif /* !defined(chDbgCheck) */
#else /* !CH_DBG_ENABLE_CHECKS */
#define chDbgCheck(c, func) { \
- (void)(c), (void)__QUOTE_THIS(func)"(), line "__QUOTE_THIS(__LINE__); \
+ (void)(c), (void)__QUOTE_THIS(func)"()"; \
}
#endif /* !CH_DBG_ENABLE_CHECKS */
@@ -118,10 +120,12 @@ typedef struct {
*
* @api
*/
+#if !defined(chDbgAssert)
#define chDbgAssert(c, m, r) { \
if (!(c)) \
chDbgPanic(m); \
}
+#endif /* !defined(chDbgAssert) */
#else /* !CH_DBG_ENABLE_ASSERTS */
#define chDbgAssert(c, m, r) {(void)(c);}
#endif /* !CH_DBG_ENABLE_ASSERTS */