X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-versatile%2Funcompress.h;h=7215133d0514202cb6d4438d46f2a79785c742da;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=148ad3755abfe2cf1ebc0891bcc6ab1aefc642f5;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/include/asm-arm/arch-versatile/uncompress.h b/include/asm-arm/arch-versatile/uncompress.h index 148ad3755..7215133d0 100644 --- a/include/asm-arm/arch-versatile/uncompress.h +++ b/include/asm-arm/arch-versatile/uncompress.h @@ -17,8 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include - #define AMBA_UART_DR (*(volatile unsigned char *)0x101F1000) #define AMBA_UART_LCRH (*(volatile unsigned char *)0x101F102C) #define AMBA_UART_CR (*(volatile unsigned char *)0x101F1030) @@ -27,22 +25,16 @@ /* * This does not append a newline */ -static void puts(const char *s) +static inline void putc(int c) { - while (*s) { - while (AMBA_UART_FR & (1 << 5)) - barrier(); - - AMBA_UART_DR = *s; + while (AMBA_UART_FR & (1 << 5)) + barrier(); - if (*s == '\n') { - while (AMBA_UART_FR & (1 << 5)) - barrier(); + AMBA_UART_DR = c; +} - AMBA_UART_DR = '\r'; - } - s++; - } +static inline void flush(void) +{ while (AMBA_UART_FR & (1 << 3)) barrier(); }