Merge commit '28203e909e83b1ac6becb45a3eadae23b190df32' into master-core-pull

[max/tmk_keyboard.git] / tmk_core / common / print.h

diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h
index c0e9e14309d9ca03985097a2fbf95914ff0eceb6..5f491abac96f348aa6a2d0a2e8816509e67135e2 100644 (file)
--- a/tmk_core/common/print.h
+++ b/tmk_core/common/print.h
@@ -47,7 +47,15 @@ extern "C"
 /* function pointer of sendchar to be used by print utility */
 void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
 
-#elif defined(__arm__)
+#elif defined(PROTOCOL_CHIBIOS) /* __AVR__ */
+
+#include "chibios/printf.h"
+
+#define print(s)    printf(s)
+#define println(s)  printf(s "\r\n")
+#define xprintf  printf
+
+#elif defined(__arm__) /* __AVR__ */
 
 #include "mbed/xprintf.h"
 
@@ -91,9 +99,9 @@ void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
 
 #else   /* NO_PRINT */
 
-#define xprintf
-#define print
-#define println
+#define xprintf(s,...)
+#define print(s)
+#define println(s)
 #define print_set_sendchar(func)
 #define print_dec(data)
 #define print_decs(data)
@@ -119,6 +127,7 @@ void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
 #define print_val_bin_reverse8(v)
 #define print_val_bin_reverse16(v)
 #define print_val_bin_reverse32(v)
+#define init_printf(s,ss)
 
 #endif  /* NO_PRINT */