summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Wako <wakojun@gmail.com>2014-12-12 06:05:05 +0100
committerJun Wako <wakojun@gmail.com>2015-01-04 09:21:42 +0100
commit8f1e311cd7624d765901c69e61837db33a51928b (patch)
tree641c06cd3043cae76f8198a3fbdf9361c19884c7
parent06527bde4f873ffc6eb8e359fb3b150e880b89ba (diff)
downloadqmk_firmware-8f1e311cd7624d765901c69e61837db33a51928b.tar.gz
qmk_firmware-8f1e311cd7624d765901c69e61837db33a51928b.tar.xz
Ad hoc fix of print and debug for mbed
-rw-r--r--common/print.c12
-rw-r--r--tool/mbed/common.mk2
2 files changed, 12 insertions, 2 deletions
diff --git a/common/print.c b/common/print.c
index c13a29f31..ca94e1e5d 100644
--- a/common/print.c
+++ b/common/print.c
@@ -22,13 +22,14 @@
* THE SOFTWARE.
*/
-#include <avr/io.h>
-#include <avr/pgmspace.h>
+#include <stdint.h>
#include "print.h"
#ifndef NO_PRINT
+#if defined(__AVR__)
+
#define sendchar(c) xputc(c)
@@ -37,4 +38,11 @@ void print_set_sendchar(int8_t (*sendchar_func)(uint8_t))
xdev_out(sendchar_func);
}
+#elif defined(__arm__)
+
+// TODO
+//void print_set_sendchar(int8_t (*sendchar_func)(uint8_t)) { }
+
+#endif
+
#endif
diff --git a/tool/mbed/common.mk b/tool/mbed/common.mk
index 93a927a3e..403da9ac8 100644
--- a/tool/mbed/common.mk
+++ b/tool/mbed/common.mk
@@ -7,6 +7,8 @@ OBJECTS += \
$(OBJDIR)/common/host.o \
$(OBJDIR)/common/keymap.o \
$(OBJDIR)/common/keyboard.o \
+ $(OBJDIR)/common/print.o \
+ $(OBJDIR)/common/debug.o \
$(OBJDIR)/common/util.o \
$(OBJDIR)/common/mbed/suspend.o \
$(OBJDIR)/common/mbed/timer.o \