From: klueska <klueska>
Date: Mon, 15 Feb 2010 03:16:14 +0000 (+0000)
Subject: Changed the default to be that all platforms #include stdio.h unless specifically... 
X-Git-Tag: rc_6_tinyos_2_1_1~14
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=738579ccc0bce339be74aad761c7286258433e93;hp=ad0ad7a973011655478e41bc58032deb4676e021

Changed the default to be that all platforms #include stdio.h unless specifically set to include something else, and added support for imote2, hopefully...
---

diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc
index 0095e501..e59c0a73 100644
--- 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 c70a791f..48dc1abc 100644
--- 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();