aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-10-08 13:05:00 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-10-08 13:05:00 +0000
commit13691d8e0c115e1cfe755067c51ca2305e26730d (patch)
tree27b24fd6edcc4cb33635eb7c4e7db951d0e27030 /os
parentf9209b444ed167dc23f114b95031c94318a58f5c (diff)
downloadChibiOS-13691d8e0c115e1cfe755067c51ca2305e26730d.tar.gz
ChibiOS-13691d8e0c115e1cfe755067c51ca2305e26730d.tar.bz2
ChibiOS-13691d8e0c115e1cfe755067c51ca2305e26730d.zip
Fixed bug #895.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10797 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/rt/include/chtrace.h3
-rw-r--r--os/rt/src/chtrace.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/os/rt/include/chtrace.h b/os/rt/include/chtrace.h
index 185ddfe46..591a42fa7 100644
--- a/os/rt/include/chtrace.h
+++ b/os/rt/include/chtrace.h
@@ -54,6 +54,9 @@
#define CH_DBG_TRACE_MASK_ISR 2U
#define CH_DBG_TRACE_MASK_HALT 4U
#define CH_DBG_TRACE_MASK_USER 8U
+#define CH_DBG_TRACE_MASK_SLOW (CH_DBG_TRACE_MASK_SWITCH | \
+ CH_DBG_TRACE_MASK_HALT | \
+ CH_DBG_TRACE_MASK_USER)
#define CH_DBG_TRACE_MASK_ALL (CH_DBG_TRACE_MASK_SWITCH | \
CH_DBG_TRACE_MASK_ISR | \
CH_DBG_TRACE_MASK_HALT | \
diff --git a/os/rt/src/chtrace.c b/os/rt/src/chtrace.c
index 97e265588..c9b9f39b8 100644
--- a/os/rt/src/chtrace.c
+++ b/os/rt/src/chtrace.c
@@ -85,7 +85,7 @@ static NOINLINE void trace_next(void) {
void _trace_init(void) {
unsigned i;
- ch.dbg.trace_buffer.suspended = (uint16_t)CH_DBG_TRACE_MASK;
+ ch.dbg.trace_buffer.suspended = (uint16_t)~CH_DBG_TRACE_MASK;
ch.dbg.trace_buffer.size = CH_DBG_TRACE_BUFFER_SIZE;
ch.dbg.trace_buffer.ptr = &ch.dbg.trace_buffer.buffer[0];
for (i = 0U; i < (unsigned)CH_DBG_TRACE_BUFFER_SIZE; i++) {