From: klueska <klueska>
Date: Mon, 15 Feb 2010 03:18:24 +0000 (+0000)
Subject: Oops, checked in wrong version of a file for last commit.  Should be fixed now...
X-Git-Tag: rc_6_tinyos_2_1_1~13
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=32d57e66807cbea2aedfda37461a891b3168d422

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

diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc
index e59c0a73..a1a81f3b 100644
--- a/tos/lib/printf/PrintfP.nc
+++ b/tos/lib/printf/PrintfP.nc
@@ -161,14 +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() {
-#endif
+#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;