Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / common / print.c

diff --git a/common/print.c b/common/print.c
index 4e36d3935b232803517c2bc34136217de25f8519..783bb4e9bb676a39b979be1405988b2e99991ce6 100644 (file)
--- a/common/print.c
+++ b/common/print.c
@@ -1,3 +1,4 @@
+/* Copyright 2012,2013 Jun Wako <wakojun@gmail.com> */
 /* Very basic print functions, intended to be used with usb_debug_only.c
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2008 PJRC.COM, LLC
@@ -24,78 +25,38 @@
 #include <avr/io.h>
 #include <avr/pgmspace.h>
 #include "print.h"
-#include "sendchar.h"
 
 
-bool print_enable = false;
+#ifndef NO_PRINT
 
-void print_S(const char *s)
-{
-       if (!print_enable) return;
-       char c;
+#define sendchar(c)    xputc(c)
 
-       while (1) {
-               c = *s++;
-               if (!c) break;
-               if (c == '\n') sendchar('\r');
-               sendchar(c);
-       }
-}
 
-void print_P(const char *s)
+void print_set_sendchar(int8_t (*sendchar_func)(uint8_t))
 {
-       if (!print_enable) return;
-       char c;
-
-       while (1) {
-               c = pgm_read_byte(s++);
-               if (!c) break;
-               if (c == '\n') sendchar('\r');
-               sendchar(c);
-       }
+    xdev_out(sendchar_func);
 }
 
-void phex1(unsigned char c)
-{
-       if (!print_enable) return;
-       sendchar(c + ((c < 10) ? '0' : 'A' - 10));
-}
-
-void phex(unsigned char c)
-{
-       if (!print_enable) return;
-       phex1(c >> 4);
-       phex1(c & 15);
-}
-
-void phex16(unsigned int i)
+void print_S(const char *s)
 {
-       if (!print_enable) return;
-       phex(i >> 8);
-       phex(i);
+    uint8_t c;
+    while (1) {
+        c = *s++;
+        if (!c) break;
+        if (c == '\n') sendchar('\r');
+        sendchar(c);
+    }
 }
 
-void pdec(uint8_t i)
+void print_lf(void)
 {
-    if (!print_enable) return;
-    if (i/100) sendchar('0' + (i/100));
-    if (i/100 || i%100/10) sendchar('0' + (i%100/10));
-    sendchar('0' + (i%10));
+    sendchar('\n');
 }
 
-
-void pbin(unsigned char c)
+void print_crlf(void)
 {
-    if (!print_enable) return;
-    for (int i = 7; i >= 0; i--) {
-        sendchar((c & (1<<i)) ? '1' : '0');
-    }
+    sendchar('\r');
+    sendchar('\n');
 }
 
-void pbin_reverse(unsigned char c)
-{
-    if (!print_enable) return;
-    for (int i = 0; i < 8; i++) {
-        sendchar((c & (1<<i)) ? '1' : '0');
-    }
-}
+#endif