linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / serial / clps711x.c

diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index f27d852..ce7b2e4 100644 (file)
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -25,6 +25,7 @@
  *  $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $
  *
  */
+#include <linux/config.h>
 
 #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
@@ -423,13 +424,6 @@ static struct uart_port clps711x_ports[UART_NR] = {
 };
 
 #ifdef CONFIG_SERIAL_CLPS711X_CONSOLE
-static void clps711xuart_console_putchar(struct uart_port *port, int ch)
-{
-       while (clps_readl(SYSFLG(port)) & SYSFLG_UTXFF)
-               barrier();
-       clps_writel(ch, UARTDR(port));
-}
-
 /*
  *     Print a string to the serial port trying not to disturb
  *     any possible real use of the port...
@@ -444,6 +438,7 @@ clps711xuart_console_write(struct console *co, const char *s,
 {
        struct uart_port *port = clps711x_ports + co->index;
        unsigned int status, syscon;
+       int i;
 
        /*
         *      Ensure that the port is enabled.
@@ -451,7 +446,21 @@ clps711xuart_console_write(struct console *co, const char *s,
        syscon = clps_readl(SYSCON(port));
        clps_writel(syscon | SYSCON_UARTEN, SYSCON(port));
 
-       uart_console_write(port, s, count, clps711xuart_console_putchar);
+       /*
+        *      Now, do each character
+        */
+       for (i = 0; i < count; i++) {
+               do {
+                       status = clps_readl(SYSFLG(port));
+               } while (status & SYSFLG_UTXFF);
+               clps_writel(s[i], UARTDR(port));
+               if (s[i] == '\n') {
+                       do {
+                               status = clps_readl(SYSFLG(port));
+                       } while (status & SYSFLG_UTXFF);
+                       clps_writel('\r', UARTDR(port));
+               }
+       }
 
        /*
         *      Finally, wait for transmitter to become empty