X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fprint.c;h=783bb4e9bb676a39b979be1405988b2e99991ce6;hb=b9e265368fde73daff069788dcb58c8230d01b32;hp=6a8a725bca11e2211f2c9fd28f71121f6bef6dea;hpb=9389585d3d16319d5d739eef84f4ff11076235c1;p=tmk_firmware.git

diff --git a/common/print.c b/common/print.c
index 6a8a725..783bb4e 100644
--- a/common/print.c
+++ b/common/print.c
@@ -1,4 +1,4 @@
-/* Copyright 2012 Jun Wako <wakojun@gmail.com> */
+/* 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
@@ -27,155 +27,36 @@
 #include "print.h"
 
 
-#define sendchar(c)    do { if (print_enable && print_sendchar_func) (print_sendchar_func)(c); } while (0)
+#ifndef NO_PRINT
 
+#define sendchar(c)    xputc(c)
 
-int8_t (*print_sendchar_func)(uint8_t) = 0;
-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)
+void print_set_sendchar(int8_t (*sendchar_func)(uint8_t))
 {
-    uint8_t c;
-    while (1) {
-        c = *s++;
-        if (!c) break;
-        if (c == '\n') sendchar('\r');
-        sendchar(c);
-    }
+    xdev_out(sendchar_func);
 }
 
-/* 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)
+void print_S(const char *s)
 {
     uint8_t c;
     while (1) {
-        c = pgm_read_byte(s++);
+        c = *s++;
         if (!c) break;
         if (c == '\n') sendchar('\r');
         sendchar(c);
     }
 }
 
-void print_CRLF(void)
-{
-    sendchar('\r'); sendchar('\n');
-}
-
-
-#define SIGNED  0x80
-#define BIN     2
-#define OCT     8
-#define DEC     10
-#define HEX     16
-
-static inline
-char itoc(uint8_t i)
-{
-    return (i < 10 ? '0' + i : 'A' + i - 10);
-}
-
-static inline
-void print_int(uint16_t data, uint8_t base)
-{
-    char buf[7] = {'\0'};
-    char *p = &buf[6];
-    if ((base & SIGNED) && (data & 0x8000)) {
-        data = -data;
-        buf[0] = '-';
-    }
-    base &= ~SIGNED;
-    uint16_t n;
-    do {
-        n = data;
-        data /= base;
-        *(--p) = itoc(n - data*base);
-    } while (data);
-    if (buf[0]) *(--p) = buf[0];
-    print_S(p);
-}
-
-void print_dec(uint16_t data)
-{
-    print_int(data, DEC);
-}
-
-void print_decs(int16_t data)
-{
-    print_int(data, DEC|SIGNED);
-}
-
-
-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 print_hex16(uint16_t data)
-{
-    print_hex8(data>>8);
-    print_hex8(data);
-}
-
-void print_hex32(uint32_t data)
-{
-    print_hex16(data>>16);
-    print_hex16(data);
-}
-
-
-void print_bin(uint8_t data)
-{
-    for (int i = 7; i >= 0; i--) {
-        sendchar((data & (1<<i)) ? '1' : '0');
-    }
-}
-
-void print_bin16(uint16_t data)
-{
-    print_bin8(data>>8);
-    print_bin8(data);
-}
-
-void print_bin32(uint32_t data)
+void print_lf(void)
 {
-    print_bin8(data>>24);
-    print_bin8(data>>16);
-    print_bin8(data>>8);
-    print_bin8(data);
+    sendchar('\n');
 }
 
-void print_bin_reverse8(uint8_t data)
+void print_crlf(void)
 {
-    for (int i = 0; i < 8; i++) {
-        sendchar((data & (1<<i)) ? '1' : '0');
-    }
+    sendchar('\r');
+    sendchar('\n');
 }
 
-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);
-}
+#endif