X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=blobdiff_plain;f=tos%2Flib%2Fprintf%2FPrintfP.nc;h=b620e5e416f6a8b06caff9ade78afc9bb130ce7e;hp=01219e074ab03729faa63ce96a3f856c0c7ef663;hb=f7425987e3f2cf3cb889dc251cbc0db817f6da62;hpb=58682d81735201c7a22f7768619d3b6f7469d2f0 diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc index 01219e07..b620e5e4 100644 --- a/tos/lib/printf/PrintfP.nc +++ b/tos/lib/printf/PrintfP.nc @@ -80,9 +80,6 @@ static FILE atm128_stdout = FDEV_SETUP_STREAM(TCAST(int (*)(char c, FILE *stream), uart_putchar), NULL, _FDEV_SETUP_WRITE); #endif -#ifdef __M16C62PHARDWARE_H__ - #include "m16c62p_printf.h" -#endif module PrintfP @safe() { provides { @@ -166,9 +163,16 @@ implementation { #ifdef _H_msp430hardware_h int putchar(int c) __attribute__((noinline)) @C() @spontaneous() { -#endif +#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 lowlevel_putc(int c) __attribute__((noinline)) @C() @spontaneous() { +#endif +#endif #endif if((state == S_STARTED) && (call Queue.size() >= ((PRINTF_BUFFER_SIZE)/2))) { state = S_FLUSHING;