avoided dragging logging into the cRIO code
diff --git a/aos/common/Configuration.cpp b/aos/common/Configuration.cpp
index 90de05d..2d7095b 100644
--- a/aos/common/Configuration.cpp
+++ b/aos/common/Configuration.cpp
@@ -15,9 +15,32 @@
#include <ifaddrs.h>
#endif
-#include "aos/aos_core.h"
#ifndef __VXWORKS__
+#include "aos/common/logging/logging.h"
#include "aos/common/unique_malloc_ptr.h"
+#else
+#include <taskLib.h>
+#undef ERROR
+enum LogLevel {
+ DEBUG,
+ INFO,
+ WARNING,
+ ERROR = -1,
+ FATAL,
+};
+#define LOG(level, format, args...) do { \
+ fprintf(stderr, #level ": " format, ##args); \
+ if (level == FATAL) { \
+ printf("I am 0x%x suspending for debugging purposes.\n", taskIdSelf()); \
+ printf("\t`tt 0x%x` will give you a stack trace.\n", taskIdSelf()); \
+ fputs("\t`lkAddr` will reverse lookup a symbol for you.\n", stdout); \
+ fputs("\t`dbgHelp` and `help` have some useful commands in them.\n", stdout); \
+ taskSuspend(0); \
+ printf("You weren't supposed to resume 0x%x!!. Going to really die now.\n", \
+ taskIdSelf()); \
+ abort(); \
+ } \
+} while (0)
#endif
#include "aos/common/once.h"
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 7ae3f61..2151064 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -47,7 +47,6 @@
'Configuration.cpp',
],
'dependencies': [
- '<(AOS)/build/aos.gyp:logging',
'once',
],
'export_dependent_settings': [
@@ -57,7 +56,12 @@
['OS=="crio"', {
'dependencies': [
'<(EXTERNALS):WPILib',
- ]}],
+ ],
+ }, {
+ 'dependencies': [
+ '<(AOS)/build/aos.gyp:logging',
+ ],
+ }],
],
},
{