aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@mit.edu>2010-10-07 08:59:17 -0400
committerMarti Bolivar <mbolivar@mit.edu>2010-10-07 08:59:17 -0400
commit06ff573b6d08126fdc99e715ef15d2d7b17a8dd0 (patch)
tree36ce6d17019295b1247c9c920ba377f008ccbc8c /libmaple
parentadde11b099ff5dad176e410279d21feac39d2c7e (diff)
downloadlibrambutan-06ff573b6d08126fdc99e715ef15d2d7b17a8dd0.tar.gz
librambutan-06ff573b6d08126fdc99e715ef15d2d7b17a8dd0.zip
somebody broke assertions
Diffstat (limited to 'libmaple')
-rw-r--r--libmaple/libmaple.h8
-rw-r--r--libmaple/util.h4
2 files changed, 7 insertions, 5 deletions
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h
index 6921b63..fa6c8a1 100644
--- a/libmaple/libmaple.h
+++ b/libmaple/libmaple.h
@@ -34,7 +34,13 @@
#include "libmaple_types.h"
// General configuration
-#define MAPLE_DEBUG 1
+#define DEBUG_NONE 0
+#define DEBUG_FAULT 1
+#define DEBUG_ALL 2
+
+#ifndef DEBUG_LEVEL
+#define DEBUG_LEVEL DEBUG_ALL
+#endif
// MCU-specific configuration
#ifdef MCU_STM32F103RB
diff --git a/libmaple/util.h b/libmaple/util.h
index 2bbd90c..1aa58ec 100644
--- a/libmaple/util.h
+++ b/libmaple/util.h
@@ -77,10 +77,6 @@ void throb(void);
/* Asserts for sanity checks, redefine DEBUG_LEVEL in libmaple.h to
* compile out these checks */
-#define DEBUG_NONE 0
-#define DEBUG_FAULT 1
-#define DEBUG_ALL 2
-
#if DEBUG_LEVEL >= DEBUG_ALL
#define ASSERT(exp) \
if (exp) { \