Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/lib/printf/printf.h b/tos/lib/printf/printf.h
index a8cf26193433754283cf7f119539145d76e5e1ff..0f2f051746d70b088a4ebb843e911dd13d871f23 100644 (file)
--- a/tos/lib/printf/printf.h
+++ b/tos/lib/printf/printf.h
@@ -44,14 +44,23 @@
 
 #ifdef _H_msp430hardware_h
   #include <stdio.h>
-#endif
+#else
 #ifdef _H_atmega128hardware_H
   #include "avr_stdio.h"
+#else
+#ifdef __M16C62PHARDWARE_H__ 
+  #include "m16c62p_printf.h"
+#else
+  #include "generic_printf.h"
+#endif
+#endif
 #endif
 #include "message.h"
 int printfflush();
 
+#ifndef PRINTF_MSG_LENGTH
 #define PRINTF_MSG_LENGTH      28
+#endif
 typedef nx_struct printf_msg {
   nx_uint8_t buffer[PRINTF_MSG_LENGTH];
 } printf_msg_t;