Changed the default to be that all platforms #include stdio.h unless specifically...

diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc
index 0095e501b6c07162dfd51e5af5f7b758be35478c..e59c0a7391e19152eddf6ee12d06a3720dfbb2f0 100644 (file)
--- a/tos/lib/printf/PrintfP.nc
+++ b/tos/lib/printf/PrintfP.nc
@@ -161,9 +161,9 @@ implementation {
     else post retrySend();
   }
   
-#ifdef _H_msp430hardware_h
+//#ifdef _H_msp430hardware_h
   int putchar(int c) __attribute__((noinline)) @C() @spontaneous() {
-#endif
+//#endif
 #ifdef _H_atmega128hardware_H
   int uart_putchar(char c, FILE *stream) __attribute__((noinline)) @C() @spontaneous() {
 #endif

diff --git a/tos/lib/printf/printf.h b/tos/lib/printf/printf.h
index c70a791f7d7f1a91a64a80dd665d2f52c89f30cd..48dc1abc2d491050ff6e4761afb45f4f700da0fd 100644 (file)
--- a/tos/lib/printf/printf.h
+++ b/tos/lib/printf/printf.h
@@ -42,14 +42,17 @@
   #define PrintfQueue  Queue
 #endif
 
-#ifdef _H_msp430hardware_h
-  #include <stdio.h>
-#endif
 #ifdef _H_atmega128hardware_H
   #include "avr_stdio.h"
-#endif
+#else
 #ifdef __M16C62PHARDWARE_H__ 
-#include "m16c62p_printf.h"
+  #include "m16c62p_printf.h"
+#else
+  #include <stdio.h>
+#endif
+#endif
+#ifdef PXA27X_HARDWARE_H
+  #undef putchar
 #endif
 #include "message.h"
 int printfflush();