diff options
| author | Marti Bolivar <mbolivar@mit.edu> | 2010-10-07 09:20:19 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@mit.edu> | 2010-10-07 09:20:19 -0400 |
| commit | 26bf02d50ec9f231f00d45e66db5799d93654fe8 (patch) | |
| tree | 55e630a5cc7af53c9cc38e69fefa9b5d26b8976f | |
| parent | 4ed840601975a497a57c958b3d9043c21ddf2430 (diff) | |
| parent | 06ff573b6d08126fdc99e715ef15d2d7b17a8dd0 (diff) | |
| download | librambutan-26bf02d50ec9f231f00d45e66db5799d93654fe8.tar.gz librambutan-26bf02d50ec9f231f00d45e66db5799d93654fe8.zip | |
Merge branch 'fix_asserts'
| -rw-r--r-- | libmaple/libmaple.h | 8 | ||||
| -rw-r--r-- | libmaple/util.h | 4 |
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) { \ |