From: klueska <klueska>
Date: Mon, 22 Feb 2010 05:29:55 +0000 (+0000)
Subject: Updated to use generic printf functionality if none provided easily by their native... 
X-Git-Tag: rc_6_tinyos_2_1_1~6
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=f7425987e3f2cf3cb889dc251cbc0db817f6da62

Updated to use generic printf functionality if none provided easily by their native libc
---

diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc
index a1a81f3b..b620e5e4 100644
--- a/tos/lib/printf/PrintfP.nc
+++ b/tos/lib/printf/PrintfP.nc
@@ -161,13 +161,17 @@ implementation {
     else post retrySend();
   }
   
+#ifdef _H_msp430hardware_h
+  int putchar(int c) __attribute__((noinline)) @C() @spontaneous() {
+#else
 #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() {
+  int lowlevel_putc(int c) __attribute__((noinline)) @C() @spontaneous() {
+#endif
 #endif
 #endif
     if((state == S_STARTED) && (call Queue.size() >= ((PRINTF_BUFFER_SIZE)/2))) {
diff --git a/tos/lib/printf/printf.h b/tos/lib/printf/printf.h
index 48dc1abc..0f2f0517 100644
--- a/tos/lib/printf/printf.h
+++ b/tos/lib/printf/printf.h
@@ -42,17 +42,18 @@
   #define PrintfQueue	Queue
 #endif
 
+#ifdef _H_msp430hardware_h
+  #include <stdio.h>
+#else
 #ifdef _H_atmega128hardware_H
   #include "avr_stdio.h"
 #else
 #ifdef __M16C62PHARDWARE_H__ 
   #include "m16c62p_printf.h"
 #else
-  #include <stdio.h>
+  #include "generic_printf.h"
 #endif
 #endif
-#ifdef PXA27X_HARDWARE_H
-  #undef putchar
 #endif
 #include "message.h"
 int printfflush();