diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-09-08 10:38:46 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-09-12 09:57:53 +0200 |
commit | 1bc0ad2e12e9e523a9b9043ac47254a0597826bf (patch) | |
tree | 3ce927bb1e48b6961d64f235162fa823cbac815d /c/src/lib/libbsp/arm | |
parent | posix: Use mutex object itself for condvar (diff) | |
download | rtems-1bc0ad2e12e9e523a9b9043ac47254a0597826bf.tar.bz2 |
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.
Diffstat (limited to 'c/src/lib/libbsp/arm')
14 files changed, 2 insertions, 52 deletions
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c b/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c index 3249bbdcba..5ee02d0bb5 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c @@ -150,10 +150,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/arm/atsam/console/debug-console.c b/c/src/lib/libbsp/arm/atsam/console/debug-console.c index aebc60f8ea..4924e88516 100644 --- a/c/src/lib/libbsp/arm/atsam/console/debug-console.c +++ b/c/src/lib/libbsp/arm/atsam/console/debug-console.c @@ -20,10 +20,6 @@ static void atsam_debug_console_out(char c) { - if (c == '\n') { - DBG_PutChar('\r'); - } - DBG_PutChar((uint8_t) c); } diff --git a/c/src/lib/libbsp/arm/beagle/console/console-config.c b/c/src/lib/libbsp/arm/beagle/console/console-config.c index ec50154641..78af5f6a93 100644 --- a/c/src/lib/libbsp/arm/beagle/console/console-config.c +++ b/c/src/lib/libbsp/arm/beagle/console/console-config.c @@ -136,9 +136,6 @@ static void uart_write_polled( char c ) static void _BSP_put_char( char c ) { uart_write_polled( c ); - if (c == '\n') { - uart_write_polled('\r'); - } } static int _BSP_get_char(void) diff --git a/c/src/lib/libbsp/arm/csb336/console/uart.c b/c/src/lib/libbsp/arm/csb336/console/uart.c index e2e6bc2ab7..7e1bb4d429 100644 --- a/c/src/lib/libbsp/arm/csb336/console/uart.c +++ b/c/src/lib/libbsp/arm/csb336/console/uart.c @@ -461,9 +461,6 @@ static void imx_uart_poll_write_char(int minor, char c) static void _BSP_output_char(char c) { poll_write(c); - if (c == '\n') { - poll_write('\r'); - } } BSP_output_char_function_type BSP_output_char = _BSP_output_char; diff --git a/c/src/lib/libbsp/arm/imx/console/console-config.c b/c/src/lib/libbsp/arm/imx/console/console-config.c index bc9a3d243e..a5b3682dd7 100644 --- a/c/src/lib/libbsp/arm/imx/console/console-config.c +++ b/c/src/lib/libbsp/arm/imx/console/console-config.c @@ -61,15 +61,7 @@ static void imx_uart_write_polled(rtems_termios_device_context *base, char c) static void imx_output_char(char c) { - imx_uart_context *ctx; - - ctx = imx_uart_console; - - if (c == '\n') { - imx_uart_write_polled(&ctx->base, '\r'); - } - - imx_uart_write_polled(&ctx->base, c); + imx_uart_write_polled(&imx_uart_console->base, c); } static void imx_uart_init_context( diff --git a/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c b/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c index c6c4900b9e..b702f0cd66 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c +++ b/c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c @@ -70,9 +70,6 @@ static void output_char(char c) const console_fns *con = Console_Configuration_Ports [Console_Port_Minor].pDeviceFns; - if (c == '\n') { - con->deviceWritePolled((int) Console_Port_Minor, '\r'); - } con->deviceWritePolled((int) Console_Port_Minor, c); } diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/console-config.c b/c/src/lib/libbsp/arm/raspberrypi/console/console-config.c index dfb9826307..d2186c918b 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/console/console-config.c +++ b/c/src/lib/libbsp/arm/raspberrypi/console/console-config.c @@ -60,9 +60,6 @@ static void output_char(char c) const console_fns *con = Console_Configuration_Ports [Console_Port_Minor].pDeviceFns; - if (c == '\n') { - con->deviceWritePolled((int) Console_Port_Minor, '\r'); - } con->deviceWritePolled((int) Console_Port_Minor, c); } diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c b/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c index 1dc77605fe..66dcfa6803 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/console/console-config.c @@ -37,10 +37,6 @@ static arm_pl050_context pl050_context = { static void output_char(char c) { - if (c == '\n') { - arm_pl011_write_polled(&pl011_context.base, '\r'); - } - arm_pl011_write_polled(&pl011_context.base, c); } diff --git a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c b/c/src/lib/libbsp/arm/rtl22xx/console/uart.c index 91f7f325c6..2952e74508 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/console/uart.c @@ -250,9 +250,6 @@ static int uart_set_attributes(int minor, const struct termios *t) static void _BSP_put_char( char c ) { uart_write_polled(0, c); - if (c == '\n') { - uart_write_polled(0, '\r'); - } } BSP_output_char_function_type BSP_output_char = _BSP_put_char; diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.c b/c/src/lib/libbsp/arm/shared/comm/uart.c index 54f0735545..e9528f1634 100644 --- a/c/src/lib/libbsp/arm/shared/comm/uart.c +++ b/c/src/lib/libbsp/arm/shared/comm/uart.c @@ -294,7 +294,6 @@ void BSP_output_char_via_serial(int val) { BSP_uart_polled_write(BSPConsolePort, val); - if (val == '\n') BSP_uart_polled_write(BSPConsolePort,'\r'); } /* diff --git a/c/src/lib/libbsp/arm/smdk2410/console/uart.c b/c/src/lib/libbsp/arm/smdk2410/console/uart.c index 9878c33794..06adecf239 100644 --- a/c/src/lib/libbsp/arm/smdk2410/console/uart.c +++ b/c/src/lib/libbsp/arm/smdk2410/console/uart.c @@ -230,9 +230,6 @@ int uart_poll_read(int minor) */ static void _BSP_put_char( char c ) { uart_write_polled(0, c); - if (c == '\n') { - uart_write_polled(0, '\r'); - } } BSP_output_char_function_type BSP_output_char = _BSP_put_char; diff --git a/c/src/lib/libbsp/arm/stm32f4/console/console-config.c b/c/src/lib/libbsp/arm/stm32f4/console/console-config.c index 96b022d4e9..6bf2d7e3b5 100644 --- a/c/src/lib/libbsp/arm/stm32f4/console/console-config.c +++ b/c/src/lib/libbsp/arm/stm32f4/console/console-config.c @@ -100,10 +100,7 @@ static void output_char(char c) { const console_fns *con = Console_Configuration_Ports [Console_Port_Minor].pDeviceFns; - - if (c == '\n') { - con->deviceWritePolled((int) Console_Port_Minor, '\r'); - } + con->deviceWritePolled((int) Console_Port_Minor, c); } diff --git a/c/src/lib/libbsp/arm/tms570/console/printk-support.c b/c/src/lib/libbsp/arm/tms570/console/printk-support.c index 31e2c19b69..529c5dba20 100644 --- a/c/src/lib/libbsp/arm/tms570/console/printk-support.c +++ b/c/src/lib/libbsp/arm/tms570/console/printk-support.c @@ -65,10 +65,6 @@ static void tms570_debug_console_putc(char ch) */ static void tms570_debug_console_out(char c) { - if ( c == '\n' ) { - tms570_debug_console_putc('\r'); - } - tms570_debug_console_putc(c); } diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/console/debug-console.c b/c/src/lib/libbsp/arm/xilinx-zynq/console/debug-console.c index 887a7ea46c..38c0050e90 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/console/debug-console.c +++ b/c/src/lib/libbsp/arm/xilinx-zynq/console/debug-console.c @@ -24,10 +24,6 @@ static void zynq_debug_console_out(char c) rtems_termios_device_context *base = &zynq_uart_instances[BSP_CONSOLE_MINOR].base; - if (c == '\n') { - zynq_uart_write_polled(base, '\r'); - } - zynq_uart_write_polled(base, c); } |