From d86b7080f58264a1952e1cb67b238728c0bdfd71 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 18 Mar 2009 20:14:49 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@854 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- src/chdebug.c | 2 +- src/include/debug.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/chdebug.c b/src/chdebug.c index aa76a13f4..e23cc6acb 100644 --- a/src/chdebug.c +++ b/src/chdebug.c @@ -45,7 +45,7 @@ void trace_init(void) { * @brief Inserts in the circular debug trace buffer a context switch record. * * @param[in] otp the thread being switched out - * @param[in] ntp the thread to be resumed + * @param[in] ntp the thread to be switched in */ void chDbgTrace(Thread *otp, Thread *ntp) { diff --git a/src/include/debug.h b/src/include/debug.h index 19a7cb7d4..67a5d65b4 100644 --- a/src/include/debug.h +++ b/src/include/debug.h @@ -126,22 +126,23 @@ typedef struct { #define chDbgTrace(otp, ntp) {} #endif +#if !defined(__DOXYGEN__) #ifdef __cplusplus extern "C" { #endif -#if !defined(__DOXYGEN__) && CH_DBG_ENABLE_TRACE +#if CH_DBG_ENABLE_TRACE extern TraceBuffer trace_buffer; void trace_init(void); void chDbgTrace(Thread *otp, Thread *ntp); #endif -#if !defined(__DOXYGEN__) && \ - (CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK) +#if CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK extern char *panic_msg; void chDbgPanic(char *msg); #endif #ifdef __cplusplus } #endif +#endif /* !defined(__DOXYGEN__) */ #endif /* _DEBUG_H_ */ -- cgit v1.2.3