diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-14 11:07:04 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-14 11:07:04 +0000 |
| commit | 1409bd15bd3bfa57c042caaed6d4b755e23ca235 (patch) | |
| tree | f48570162d8e519978a3f50584f37a159c6fb95e /os/rt/src/chsys.c | |
| parent | 79a15865134fdc2522db29995bd5417e7b00a0d6 (diff) | |
| download | ChibiOS-1409bd15bd3bfa57c042caaed6d4b755e23ca235.tar.gz ChibiOS-1409bd15bd3bfa57c042caaed6d4b755e23ca235.tar.bz2 ChibiOS-1409bd15bd3bfa57c042caaed6d4b755e23ca235.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7507 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src/chsys.c')
| -rw-r--r-- | os/rt/src/chsys.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c index 53672e46d..b5c83b95a 100644 --- a/os/rt/src/chsys.c +++ b/os/rt/src/chsys.c @@ -119,7 +119,7 @@ void chSysInit(void) { _stats_init();
#endif
#if CH_DBG_ENABLE_TRACE
- _trace_init();
+ _dbg_trace_init();
#endif
#if !CH_CFG_NO_IDLE_THREAD
@@ -165,16 +165,13 @@ void chSysHalt(const char *reason) { port_disable();
-#if CH_DBG_ENABLED
- ch.dbg_panic_msg = reason;
-#else
- (void)reason;
-#endif
-
#if defined(CH_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__)
CH_CFG_SYSTEM_HALT_HOOK(reason);
#endif
+ /* Pointing to the passed message.*/
+ ch.dbg.panic_msg = reason;
+
/* Harmless infinite loop.*/
while (true)
;
|