diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-13 09:15:05 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-16 14:56:10 +0200 |
commit | 223e22f1ed0b8b65de8c7083d8f22e02e9079fc1 (patch) | |
tree | bf256a3a0678e73abae21fbf445c2e4ed4b225e2 /c/src/lib/libbsp | |
parent | bsps: Move stackalloc.c to bsps (diff) | |
download | rtems-223e22f1ed0b8b65de8c7083d8f22e02e9079fc1.tar.bz2 |
bsps: Move uart-output-char.c to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r-- | c/src/lib/libbsp/arm/lpc176x/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/src/uart-output-char.c | 52 |
4 files changed, 3 insertions, 55 deletions
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am index e1059fe3ac..8817a283c5 100644 --- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am @@ -46,7 +46,7 @@ librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c -librtemsbsp_a_SOURCES += ../../shared/src/uart-output-char.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/uart-output-char.c # Startup librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index ea6f3c36ba..a4b5857244 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -55,7 +55,7 @@ librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c -librtemsbsp_a_SOURCES += ../../shared/src/uart-output-char.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/uart-output-char.c librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c # Startup diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am index bf633287d4..33531d516c 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am @@ -47,7 +47,7 @@ librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c -librtemsbsp_a_SOURCES += ../../shared/src/uart-output-char.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/uart-output-char.c librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c diff --git a/c/src/lib/libbsp/shared/src/uart-output-char.c b/c/src/lib/libbsp/shared/src/uart-output-char.c deleted file mode 100644 index 0831b8d3ed..0000000000 --- a/c/src/lib/libbsp/shared/src/uart-output-char.c +++ /dev/null @@ -1,52 +0,0 @@ -/** - * @file - * - * @ingroup bsp_kit - * - * @brief Output character implementation for standard UARTs. - */ - -/* - * Copyright (c) 2010-2011 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Obere Lagerstr. 30 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#include <rtems/bspIo.h> - -#include <bsp/uart-output-char.h> - -static void uart_output_raw(char c) -{ - while ((CONSOLE_LSR & CONSOLE_LSR_THRE) == 0) { - /* Wait */ - } - - CONSOLE_THR = c; -} - -static void uart_output(char c) -{ - uart_output_raw(c); -} - -static int uart_input(void) -{ - if ((CONSOLE_LSR & CONSOLE_LSR_RDR) != 0) { - return CONSOLE_RBR; - } else { - return -1; - } -} - -BSP_output_char_function_type BSP_output_char = uart_output; - -BSP_polling_getchar_function_type BSP_poll_char = uart_input; |