Oops, checked in wrong version of a file for last commit. Should be fixed now...

[tinyos-2.x.git] / tos / lib / printf / PrintfP.nc

diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc
index 01219e074ab03729faa63ce96a3f856c0c7ef663..a1a81f3beb6a05786d14f20b268ed2cffdadd126 100644 (file)
--- a/tos/lib/printf/PrintfP.nc
+++ b/tos/lib/printf/PrintfP.nc
@@ -80,9 +80,6 @@ static FILE atm128_stdout =
        FDEV_SETUP_STREAM(TCAST(int (*)(char c, FILE *stream), uart_putchar), 
        NULL, _FDEV_SETUP_WRITE);
 #endif
-#ifdef __M16C62PHARDWARE_H__
-       #include "m16c62p_printf.h"
-#endif
 
 module PrintfP @safe() {
   provides {
@@ -164,11 +161,14 @@ implementation {
     else post retrySend();
   }
   
-#ifdef _H_msp430hardware_h
-  int putchar(int c) __attribute__((noinline)) @C() @spontaneous() {
-#endif
 #ifdef _H_atmega128hardware_H
   int uart_putchar(char c, FILE *stream) __attribute__((noinline)) @C() @spontaneous() {
+#else
+#ifdef __M16C62PHARDWARE_H__
+  int lowlevel_putc(int c) __attribute__((noinline)) @C() @spontaneous() {
+#else
+  int putchar(int c) __attribute__((noinline)) @C() @spontaneous() {
+#endif
 #endif
     if((state == S_STARTED) && (call Queue.size() >= ((PRINTF_BUFFER_SIZE)/2))) {
       state = S_FLUSHING;