usb_usb: Update for new core layout

[tmk_firmware.git] / common / print.h

diff --git a/common/print.h b/common/print.h
index 6a6771f7100acebe523bd9aeaeea2d977bc50255..c0e9e14309d9ca03985097a2fbf95914ff0eceb6 100644 (file)
--- a/common/print.h
+++ b/common/print.h
@@ -35,30 +35,25 @@
 #ifndef NO_PRINT
 
 
-#ifdef __AVR__
+#if defined(__AVR__)
 
-#include "xprintf.h"
-
-
-// TODO: avoid collision with arduino/Print.h
-#ifndef __cplusplus
+#include "avr/xprintf.h"
 #define print(s)    xputs(PSTR(s))
-#endif
-#define println(s)  xputs(PSTR(s "\n"))
+#define println(s)  xputs(PSTR(s "\r\n"))
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
 #endif
 /* function pointer of sendchar to be used by print utility */
 void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
 
-#elif __arm__
+#elif defined(__arm__)
+
+#include "mbed/xprintf.h"
 
-#include "mbed.h"
-Serial ser(UART_TX, UART_RX);
-#define xprintf     ser.printf
 #define print(s)    xprintf(s)
-#define println(s)  xprintf(s "\n")
+#define println(s)  xprintf(s "\r\n")
+
 /* TODO: to select output destinations: UART/USBSerial */
 #define print_set_sendchar(func)