Simplify and unify BSP_output_char

The BSP_output_char should output a char and not mingle with high level
processing, e.g. '\n' to '\r\n' translation.  Move this translation to
rtems_putc().  Remove it from all the BSP_output_char implementations.

Close #3122.

13 files changed, 4 insertions, 45 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
index 754a52789a..705769d639 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
@@ -637,9 +637,6 @@ static void A_BSP_output_char(
 #define PRINTK_WRITE mpc5200_uart_pollWrite
 
     PRINTK_WRITE(PRINTK_MINOR, &c, 1 );
-
-    if( c == '\n' )
-      PRINTK_WRITE( PRINTK_MINOR, &cr, 1 );
 }
 
 static int A_BSP_get_char(void)
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c b/c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c
index 8dd7249651..d0071cd220 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c
@@ -99,10 +99,6 @@ static void gen83xx_output_char(char c)
 {
   rtems_termios_device_context *ctx = console_device_table[0].context;
 
-  if (c == '\n') {
-    ns16550_polled_putchar(ctx, '\r');
-  }
-
   ns16550_polled_putchar(ctx, c);
 }
 
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
index 00f44c2532..8facb27ffb 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
@@ -150,8 +150,6 @@ DirectUARTWrite(const char c)
   volatile uint8_t* up = (uint8_t*)(BSP_UART_IOBASE_COM1);
   while ((up[LSR] & THRE) == 0) { ; }
   up[THR] = c;
-  if (c=='\n')
-    DirectUARTWrite('\r');
 }
 
 /* We will provide our own printk output function as it may get used early */
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
index 2c79545f20..71385adf2b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
@@ -37,10 +37,6 @@ static void console_generic_char_out(char c)
   const console_generic_callbacks *cb =
     console_generic_info_table [minor].callbacks;
 
-  if (c == '\n') {
-    (*cb->poll_write)(minor, '\r');
-  }
-
   (*cb->poll_write)(minor, c);
 }
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
index f0ce259b4a..873c38dc3e 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
@@ -193,8 +193,6 @@ static rtems_status_code do_poll_write(
 
 static void _BSP_output_char( char c )
 {
-  char cr = '\r';
-
   /*
    *  Can't rely on console_initialize having been called before this function
    *  is used, so it may fail unless output is done through EPPC-Bug.
@@ -202,9 +200,6 @@ static void _BSP_output_char( char c )
 #define PRINTK_WRITE m8xx_uart_pollWrite
 
   PRINTK_WRITE( PRINTK_MINOR, &c, 1 );
-  if( c == '\n' )
-    PRINTK_WRITE( PRINTK_MINOR, &cr, 1 );
-
 }
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c b/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
index 84868919ab..53e8b5e7c7 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c
@@ -183,10 +183,6 @@ static void output_char(char c)
 {
   rtems_termios_device_context *ctx = console_device_table[0].context;
 
-  if (c == '\n') {
-    ns16550_polled_putchar(ctx, '\r');
-  }
-
   ns16550_polled_putchar(ctx, c);
 }
 
diff --git a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c
index 2ec68d0f0b..1086e59468 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c
@@ -426,8 +426,6 @@ void debug_putc(const u_char c)
 void
 debug_putc_onlcr(const char c)
 {
-	if ('\n'==c)
-		debug_putc('\r');
 	debug_putc(c);
 }
 
@@ -525,7 +523,7 @@ void my_puts(const u_char *s)
         char c;
 
         while ( ( c = *s++ ) != '\0' ) {
-				debug_putc_onlcr((const char)c);
+				rtems_putc(c);
         }
 }
 
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/c/src/lib/libbsp/powerpc/shared/console/uart.c
index cd8657cfda..62212b98db 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/uart.c
@@ -417,7 +417,6 @@ void
 BSP_output_char_via_serial(const char val)
 {
   BSP_uart_polled_write(BSPConsolePort, val);
-  if (val == '\n') BSP_uart_polled_write(BSPConsolePort,'\r');
 }
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/console/console.c b/c/src/lib/libbsp/powerpc/t32mppc/console/console.c
index bc94f8537a..5fbd648765 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/console/console.c
+++ b/c/src/lib/libbsp/powerpc/t32mppc/console/console.c
@@ -123,15 +123,6 @@ rtems_device_driver console_initialize(
   return RTEMS_SUCCESSFUL;
 }
 
-static void t32_output_char(char c)
-{
-  if (c == '\n') {
-    t32_console_write_char_polled('\r');
-  }
-
-  t32_console_write_char_polled(c);
-}
-
-BSP_output_char_function_type BSP_output_char = t32_output_char;
+BSP_output_char_function_type BSP_output_char = t32_console_write_char_polled;
 
 BSP_polling_getchar_function_type BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
index e109303f18..7810bc1bd1 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
@@ -846,14 +846,10 @@ int BSP_output_chan = CONS_CHN_NONE; /* channel used for printk operation */
 static void console_debug_putc_onlcr(const char c)
 {
   rtems_interrupt_level irq_level;
-  static char cr_chr = '\r';
 
   if (BSP_output_chan != CONS_CHN_NONE) {
     rtems_interrupt_disable(irq_level);
 
-    if (c == '\n') {
-      sccPollWrite (BSP_output_chan,&cr_chr,1);
-    }
     sccPollWrite (BSP_output_chan,&c,1);
     rtems_interrupt_enable(irq_level);
   }
diff --git a/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c b/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c
index 6c8e6e3e7c..4d0b2db17f 100644
--- a/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c
+++ b/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c
@@ -411,9 +411,6 @@ unsigned long Console_Configuration_Count =
 
 static void outputChar(char ch)
 {
-  if (ch == '\n') {
-    xlite_write_char_polled( 0, '\r' );
-  }
    xlite_write_char_polled( 0, ch );
 }
 
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/dummy_console.c b/c/src/lib/libbsp/powerpc/virtex4/startup/dummy_console.c
index 6ff24b22bd..642fe45618 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/dummy_console.c
+++ b/c/src/lib/libbsp/powerpc/virtex4/startup/dummy_console.c
@@ -18,7 +18,7 @@ ssize_t __bsp_memory_write(int minor, const char* buf, size_t len)
   const char* const last = buf+len;
   while (buf < last)
   {
-    BSP_output_char(*buf++);
+    rtems_putc(*buf++);
   }
   return len;
 }
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/dummy_console.c b/c/src/lib/libbsp/powerpc/virtex5/startup/dummy_console.c
index 8a35eb9cd3..2cdab33c8c 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/dummy_console.c
+++ b/c/src/lib/libbsp/powerpc/virtex5/startup/dummy_console.c
@@ -15,7 +15,7 @@ ssize_t __bsp_memory_write(int minor, const char* buf, size_t len)
   const char* const last = buf+len;
   while (buf < last)
   {
-    BSP_output_char(*buf++);
+    rtems_putc(*buf++);
   }
   return len;
 }