diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-05 17:07:20 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-12 07:09:10 +0200 |
commit | b43ea9fed2ce52997933704a522fc28ebcd27968 (patch) | |
tree | 9e8b521394df11aecba4c44feb801b1cca412adf /c/src/lib/libbsp/i386/pc386 | |
parent | bsps: Remove unused console_select_simple.c (diff) | |
download | rtems-b43ea9fed2ce52997933704a522fc28ebcd27968.tar.bz2 |
bsps: Move legacy console driver to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386')
10 files changed, 10 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index 64e62e00d9..1051c4b67b 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -81,10 +81,8 @@ librtemsbsp_a_SOURCES += console/serial_mouse_config.c librtemsbsp_a_SOURCES += ../../i386/shared/comm/uart.c librtemsbsp_a_SOURCES += ../../i386/shared/comm/tty_drv.c librtemsbsp_a_SOURCES += ../../i386/shared/realmode_int/realmode_int.c -librtemsbsp_a_SOURCES += ../../shared/console.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c librtemsbsp_a_SOURCES += console/console_select.c -librtemsbsp_a_SOURCES += ../../shared/console_read.c -librtemsbsp_a_SOURCES += ../../shared/console_write.c librtemsbsp_a_SOURCES += console/console_control.c librtemsbsp_a_SOURCES += console/conscfg.c librtemsbsp_a_SOURCES += console/printk_support.c diff --git a/c/src/lib/libbsp/i386/pc386/console/conscfg.c b/c/src/lib/libbsp/i386/pc386/console/conscfg.c index d320031418..07602a3436 100644 --- a/c/src/lib/libbsp/i386/pc386/console/conscfg.c +++ b/c/src/lib/libbsp/i386/pc386/console/conscfg.c @@ -23,7 +23,7 @@ #include <rtems/vgacons.h> #endif #include <bsp/irq.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" #if BSP_ENABLE_VGA #define VGA_CONSOLE_FUNCTIONS &vgacons_fns diff --git a/c/src/lib/libbsp/i386/pc386/console/console_control.c b/c/src/lib/libbsp/i386/pc386/console/console_control.c index 344a53facb..2d1912d3b1 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console_control.c +++ b/c/src/lib/libbsp/i386/pc386/console/console_control.c @@ -30,7 +30,7 @@ #if BSP_ENABLE_VGA #include <rtems/keyboard.h> #endif -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" /* * console_control diff --git a/c/src/lib/libbsp/i386/pc386/console/console_select.c b/c/src/lib/libbsp/i386/pc386/console/console_select.c index 15f4ee2955..bde99a4c51 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console_select.c +++ b/c/src/lib/libbsp/i386/pc386/console/console_select.c @@ -29,7 +29,7 @@ #include <rtems/termiostypes.h> #include <bsp/bspimpl.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" #ifdef RTEMS_RUNTIME_CONSOLE_SELECT #include <crt.h> #endif diff --git a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.c b/c/src/lib/libbsp/i386/pc386/console/exar17d15x.c index 83cb0298d4..d9929c36b4 100644 --- a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.c +++ b/c/src/lib/libbsp/i386/pc386/console/exar17d15x.c @@ -27,7 +27,7 @@ #include <rtems/bspIo.h> #include <rtems/pci.h> #include <bsp/exar17d15x.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" #define MAX_BOARDS 4 diff --git a/c/src/lib/libbsp/i386/pc386/console/gdb_select.c b/c/src/lib/libbsp/i386/pc386/console/gdb_select.c index 1a8baf4e6b..adc996913b 100644 --- a/c/src/lib/libbsp/i386/pc386/console/gdb_select.c +++ b/c/src/lib/libbsp/i386/pc386/console/gdb_select.c @@ -30,7 +30,7 @@ #include <libchip/ns16550.h> #include <bsp/bspimpl.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" /* * Used in the stub to print output. diff --git a/c/src/lib/libbsp/i386/pc386/console/printk_support.c b/c/src/lib/libbsp/i386/pc386/console/printk_support.c index d5447adef0..f6ef656583 100644 --- a/c/src/lib/libbsp/i386/pc386/console/printk_support.c +++ b/c/src/lib/libbsp/i386/pc386/console/printk_support.c @@ -25,7 +25,7 @@ #include <bsp.h> #include <libchip/serial.h> #include <libchip/ns16550.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" rtems_device_minor_number BSPPrintkPort = 0; diff --git a/c/src/lib/libbsp/i386/pc386/console/rtd316.c b/c/src/lib/libbsp/i386/pc386/console/rtd316.c index cac0a16c5c..3b4e3c6ab4 100644 --- a/c/src/lib/libbsp/i386/pc386/console/rtd316.c +++ b/c/src/lib/libbsp/i386/pc386/console/rtd316.c @@ -26,7 +26,7 @@ #include <rtems/bspIo.h> #include <bsp/rtd316.h> #include <rtems/score/i386.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" #define RTD_CLOCK_RATE (460800 * 32) diff --git a/c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c b/c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c index a6d60196ed..492d038bd4 100644 --- a/c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c +++ b/c/src/lib/libbsp/i386/pc386/console/serial_mouse_config.c @@ -15,7 +15,7 @@ #include <fcntl.h> #include <libchip/serial.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" /* select which serial port the mouse is connected to */ #if defined(SERIAL_MOUSE_COM2) diff --git a/c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c b/c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c index e90eb57b7e..ac0c3bf86e 100644 --- a/c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c +++ b/c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c @@ -236,7 +236,7 @@ DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, NULL, NULL); #include <libchip/ns16550.h> #include <rtems/bspIo.h> #include <rtems/pci.h> -#include "../../../shared/console_private.h" +#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h" #define MAX_BOARDS 4 |