1 files changed, 86 insertions, 41 deletions

diff --git a/common/print.c b/common/print.c
index 4e36d3935..dd73ff59d 100644
--- a/common/print.c
+++ b/common/print.c
@@ -1,3 +1,4 @@
+/* Copyright 2012 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
@@ -21,81 +22,125 @@
  * THE SOFTWARE.
  */
 
+#include <stdio.h>
 #include <avr/io.h>
 #include <avr/pgmspace.h>
 #include "print.h"
-#include "sendchar.h"
+#define sendchar(c)    do { if (print_enable && print_sendchar_func) (print_sendchar_func)(c); } while (0)
 
 
+int8_t (*print_sendchar_func)(uint8_t) = NULL;
 bool print_enable = false;
 
+/* print string stored in data memory(SRAM)
+ *     print_P("hello world");
+ * This consumes precious SRAM memory space for string.
+ */
 void print_S(const char *s)
 {
-        if (!print_enable) return;
-        char c;
-
-        while (1) {
-                c = *s++;
-                if (!c) break;
-                if (c == '\n') sendchar('\r');
-                sendchar(c);
-        }
+    uint8_t c;
+    while (1) {
+        c = *s++;
+        if (!c) break;
+        if (c == '\n') sendchar('\r');
+        sendchar(c);
+    }
 }
 
+/* print string stored in program memory(FLASH)
+ *     print_P(PSTR("hello world");
+ * This consumes relatively abundant FLASH memory area not SRAM.
+ */
 void print_P(const char *s)
 {
-        if (!print_enable) return;
-        char c;
-
-        while (1) {
-                c = pgm_read_byte(s++);
-                if (!c) break;
-                if (c == '\n') sendchar('\r');
-                sendchar(c);
-        }
+    uint8_t c;
+    while (1) {
+        c = pgm_read_byte(s++);
+        if (!c) break;
+        if (c == '\n') sendchar('\r');
+        sendchar(c);
+    }
+}
+
+static inline
+void print_hex4(uint8_t data)
+{
+    sendchar(data + ((data < 10) ? '0' : 'A' - 10));
+}
+
+void print_hex8(uint8_t data)
+{
+    print_hex4(data>>4);
+    print_hex4(data&0x0F);
 }
 
-void phex1(unsigned char c)
+void print_hex16(uint16_t data)
 {
-        if (!print_enable) return;
-        sendchar(c + ((c < 10) ? '0' : 'A' - 10));
+    print_hex8(data>>8);
+    print_hex8(data);
 }
 
-void phex(unsigned char c)
+void print_hex32(uint32_t data)
 {
-        if (!print_enable) return;
-        phex1(c >> 4);
-        phex1(c & 15);
+    print_hex16(data>>16);
+    print_hex16(data);
 }
 
-void phex16(unsigned int i)
+void print_dec8(uint8_t data)
 {
-        if (!print_enable) return;
-        phex(i >> 8);
-        phex(i);
+    if (data/100) sendchar('0' + (data/100));
+    if (data/100 || data%100/10) sendchar('0' + (data%100/10));
+    sendchar('0' + (data%10));
 }
 
-void pdec(uint8_t i)
+void print_dec16(uint16_t data)
 {
-    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));
+    // TODO
 }
 
+void print_dec32(uint32_t data)
+{
+    // TODO
+}
 
-void pbin(unsigned char c)
+void print_bin(uint8_t data)
 {
-    if (!print_enable) return;
     for (int i = 7; i >= 0; i--) {
-        sendchar((c & (1<<i)) ? '1' : '0');
+        sendchar((data & (1<<i)) ? '1' : '0');
     }
 }
 
-void pbin_reverse(unsigned char c)
+void print_bin16(uint16_t data)
+{
+    print_bin8(data>>8);
+    print_bin8(data);
+}
+
+void print_bin32(uint32_t data)
+{
+    print_bin8(data>>24);
+    print_bin8(data>>16);
+    print_bin8(data>>8);
+    print_bin8(data);
+}
+
+void print_bin_reverse8(uint8_t data)
 {
-    if (!print_enable) return;
     for (int i = 0; i < 8; i++) {
-        sendchar((c & (1<<i)) ? '1' : '0');
+        sendchar((data & (1<<i)) ? '1' : '0');
     }
 }
+
+void print_bin_reverse16(uint16_t data)
+{
+    print_bin_reverse8(data);
+    print_bin_reverse8(data>>8);
+}
+
+void print_bin_reverse32(uint32_t data)
+{
+    print_bin_reverse8(data);
+    print_bin_reverse8(data>>8);
+    print_bin_reverse8(data>>16);
+    print_bin_reverse8(data>>24);
+}