git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-arm
/
arch-integrator
/
uncompress.h
diff --git
a/include/asm-arm/arch-integrator/uncompress.h
b/include/asm-arm/arch-integrator/uncompress.h
index
f61825c
..
3957402
100644
(file)
--- a/
include/asm-arm/arch-integrator/uncompress.h
+++ b/
include/asm-arm/arch-integrator/uncompress.h
@@
-28,18
+28,21
@@
/*
* This does not append a newline
*/
/*
* This does not append a newline
*/
-static void put
c(int c
)
+static void put
str(const char *s
)
{
{
- while (
AMBA_UART_FR & (1 << 5))
-
barrier(
);
+ while (
*s) {
+
while (AMBA_UART_FR & (1 << 5)
);
- AMBA_UART_DR = c;
-}
+ AMBA_UART_DR = *s;
-static inline void flush(void)
-{
- while (AMBA_UART_FR & (1 << 3))
- barrier();
+ if (*s == '\n') {
+ while (AMBA_UART_FR & (1 << 5));
+
+ AMBA_UART_DR = '\r';
+ }
+ s++;
+ }
+ while (AMBA_UART_FR & (1 << 3));
}
/*
}
/*