linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / arch-h720x / uncompress.h

diff --git a/include/asm-arm/arch-h720x/uncompress.h b/include/asm-arm/arch-h720x/uncompress.h
index 18c69e0..9535764 100644 (file)
--- a/include/asm-arm/arch-h720x/uncompress.h
+++ b/include/asm-arm/arch-h720x/uncompress.h
@@ -12,20 +12,22 @@
 #define LSR    0x14
 #define TEMPTY         0x40
 
-static inline void putc(int c)
+static void putstr(const char *s)
 {
+       char c;
        volatile unsigned char *p = (volatile unsigned char *)(IO_PHYS+0x20000);
 
-       /* wait until transmit buffer is empty */
-       while((p[LSR] & TEMPTY) == 0x0)
-               barrier();
-
-       /* write next character */
-       *p = c;
-}
-
-static inline void flush(void)
-{
+       while ( (c = *s++) != '\0') {
+               /* wait until transmit buffer is empty */
+               while((p[LSR] & TEMPTY) == 0x0);
+               /* write next character */
+               *p = c;
+
+               if(c == '\n') {
+                       while((p[LSR] & TEMPTY) == 0x0);
+                       *p = '\r';
+               }
+       }
 }
 
 /*