diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-28 09:24:33 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-28 09:24:33 (GMT) |
| commit | a081568d7016061ed848696984e3acf1ba0b3054 (patch) | |
| tree | 5a6cd28d51e3c0b694499f4d0795b22a3d020eba /include/asm-arm/arch-ebsa285 | |
| parent | 3747b36eeab93d8969e86987bbc1d44971229b26 (diff) | |
| download | linux-a081568d7016061ed848696984e3acf1ba0b3054.tar.xz | |
[ARM] Fix decompressor serial IO to give CRLF not LFCR
As per the corresponding change to the serial drivers, arrange
for ARM decompressors to give CRLF. Move the common putstr code
into misc.c such that machines only need to supply "putc" and
"flush" functions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-ebsa285')
| -rw-r--r-- | include/asm-arm/arch-ebsa285/uncompress.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/asm-arm/arch-ebsa285/uncompress.h b/include/asm-arm/arch-ebsa285/uncompress.h index c2fd84e..86142c8 100644 --- a/include/asm-arm/arch-ebsa285/uncompress.h +++ b/include/asm-arm/arch-ebsa285/uncompress.h @@ -15,10 +15,11 @@ #define DC21285_BASE ((volatile unsigned int *)0x42000160) #define SER0_BASE ((volatile unsigned char *)0x7c0003f8) -static __inline__ void putc(char c) +static inline void putc(char c) { if (machine_is_netwinder()) { - while ((SER0_BASE[5] & 0x60) != 0x60); + while ((SER0_BASE[5] & 0x60) != 0x60) + barrier(); SER0_BASE[0] = c; } else { while (DC21285_BASE[6] & 8); @@ -26,17 +27,8 @@ static __inline__ void putc(char c) } } -/* - * This does not append a newline - */ -static void putstr(const char *s) +static inline void flush(void) { - while (*s) { - putc(*s); - if (*s == '\n') - putc('\r'); - s++; - } } /* |