summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-11-06 22:11:24 +0200
committerFred Sundvik <fsundvik@gmail.com>2016-11-06 22:11:24 +0200
commita377017c95b826d83ac7a46ef176d39a58294b44 (patch)
treeb8f9959f82ae34e80b7413011ddc70444d0dc38d
parentf519b94be7086852f2afe4ec248786b47968f7ff (diff)
Add possibility to control variable trace from make
-rw-r--r--build_keyboard.mk8
-rw-r--r--quantum/variable_trace.c10
-rw-r--r--quantum/variable_trace.h25
3 files changed, 38 insertions, 5 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 461b17cd77..61aebf3935 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -180,7 +180,13 @@ ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
VAPTH += $(SERIAL_PATH)
endif
-SRC += $(QUANTUM_DIR)/variable_trace.c
+ifneq ($(strip $(VARIABLE_TRACE)),)
+ SRC += $(QUANTUM_DIR)/variable_trace.c
+ OPT_DEFS += -DNUM_TRACED_VARIABLES=$(strip $(VARIABLE_TRACE))
+ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),)
+ OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE))
+endif
+endif
# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax
diff --git a/quantum/variable_trace.c b/quantum/variable_trace.c
index dfa37bdef5..de580244c3 100644
--- a/quantum/variable_trace.c
+++ b/quantum/variable_trace.c
@@ -12,7 +12,9 @@
#define NUM_TRACED_VARIABLES 1
-#define MAX_TRACE_SIZE 4
+#ifndef MAX_VARIABLE_TRACE_SIZE
+ #define MAX_VARIABLE_TRACE_SIZE 4
+#endif
typedef struct {
const char* name;
@@ -20,7 +22,7 @@ typedef struct {
unsigned size;
const char* func;
int line;
- uint8_t last_value[MAX_TRACE_SIZE];
+ uint8_t last_value[MAX_VARIABLE_TRACE_SIZE];
} traced_variable_t;
@@ -28,13 +30,13 @@ static traced_variable_t traced_variables[NUM_TRACED_VARIABLES];
void add_traced_variable(const char* name, void* addr, unsigned size, const char* func, int line) {
verify_traced_variables(func, line);
- if (size > MAX_TRACE_SIZE) {
+ if (size > MAX_VARIABLE_TRACE_SIZE) {
#if defined(__AVR__)
xprintf("Traced variable \"%S\" exceeds the maximum size %d\n", name, size);
#else
xprintf("Traced variable \"%s\" exceeds the maximum size %d\n", name, size);
#endif
- size = MAX_TRACE_SIZE;
+ size = MAX_VARIABLE_TRACE_SIZE;
}
int index = -1;
for (int i = 0; i < NUM_TRACED_VARIABLES; i++) {
diff --git a/quantum/variable_trace.h b/quantum/variable_trace.h
new file mode 100644
index 0000000000..9899816f6c
--- /dev/null
+++ b/quantum/variable_trace.h
@@ -0,0 +1,25 @@
+#ifndef VARIABLE_TRACE_H
+#define VARIABLE_TRACE_H
+
+#include "print.h"
+
+#ifdef NUM_TRACED_VARIABLES
+
+#define ADD_TRACED_VARIABLE(name, addr, size) \
+ add_traced_variable(PSTR(name), (void*)addr, size, PSTR(__FILE__), __LINE__)
+#define REMOVE_TRACED_VARIABLE(name) remove_traced_variable(PSTR(name), PSTR(__FILE__), __LINE__)
+#define VERIFY_TRACED_VARIABLES() verify_traced_variables(PSTR(__FILE__), __LINE__)
+
+#else
+
+#define ADD_TRACED_VARIABLE(name, addr, size)
+#define REMOVE_TRACED_VARIABLE(name)
+#define VERIFY_TRACED_VARIABLES()
+
+#endif
+
+// Don't call directly, use the macros instead
+void add_traced_variable(const char* name, void* addr, unsigned size, const char* func, int line);
+void remove_traced_variable(const char* name, const char* func, int line);
+void verify_traced_variables(const char* func, int line);
+#endif