X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-versatile%2Funcompress.h;h=2f57499c7b92baebea5d48e8299cb5221076b431;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=7215133d0514202cb6d4438d46f2a79785c742da;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/include/asm-arm/arch-versatile/uncompress.h b/include/asm-arm/arch-versatile/uncompress.h index 7215133d0..2f57499c7 100644 --- a/include/asm-arm/arch-versatile/uncompress.h +++ b/include/asm-arm/arch-versatile/uncompress.h @@ -25,16 +25,22 @@ /* * This does not append a newline */ -static inline void putc(int c) +static void putstr(const char *s) { - while (AMBA_UART_FR & (1 << 5)) - barrier(); + while (*s) { + while (AMBA_UART_FR & (1 << 5)) + barrier(); - AMBA_UART_DR = c; -} + AMBA_UART_DR = *s; -static inline void flush(void) -{ + if (*s == '\n') { + while (AMBA_UART_FR & (1 << 5)) + barrier(); + + AMBA_UART_DR = '\r'; + } + s++; + } while (AMBA_UART_FR & (1 << 3)) barrier(); }