This patch is a part of the BSP source reorganization.

Update #3285.
---
 .../shared/dev/serial/legacy-console-control.c     |  2 +-
 .../shared/dev/serial/legacy-console-select.c      |  2 +-
 .../shared/dev/serial/legacy-console.c             | 30 ++++++++++++++-
 .../shared/dev/serial/legacy-console.h             |  0
 c/src/lib/libbsp/arm/beagle/Makefile.am            | 10 ++---
 c/src/lib/libbsp/arm/csb337/Makefile.am            |  7 ++--
 c/src/lib/libbsp/arm/edb7312/Makefile.am           |  7 ++--
 c/src/lib/libbsp/arm/gumstix/Makefile.am           |  7 ++--
 c/src/lib/libbsp/arm/lm3s69xx/Makefile.am          |  8 ++--
 c/src/lib/libbsp/arm/raspberrypi/Makefile.am       |  6 +--
 .../arm/raspberrypi/console/console_select.c       |  2 +-
 c/src/lib/libbsp/arm/rtl22xx/Makefile.am           |  9 ++---
 c/src/lib/libbsp/arm/smdk2410/Makefile.am          |  8 ++--
 c/src/lib/libbsp/arm/stm32f4/Makefile.am           |  8 ++--
 c/src/lib/libbsp/i386/pc386/Makefile.am            |  4 +-
 c/src/lib/libbsp/i386/pc386/console/conscfg.c      |  2 +-
 .../libbsp/i386/pc386/console/console_control.c    |  2 +-
 .../lib/libbsp/i386/pc386/console/console_select.c |  2 +-
 c/src/lib/libbsp/i386/pc386/console/exar17d15x.c   |  2 +-
 c/src/lib/libbsp/i386/pc386/console/gdb_select.c   |  2 +-
 .../lib/libbsp/i386/pc386/console/printk_support.c |  2 +-
 c/src/lib/libbsp/i386/pc386/console/rtd316.c       |  2 +-
 .../i386/pc386/console/serial_mouse_config.c       |  2 +-
 c/src/lib/libbsp/i386/pc386/console/uart_bus_pci.c |  2 +-
 c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c |  2 +-
 c/src/lib/libbsp/mips/malta/Makefile.am            |  8 ++--
 c/src/lib/libbsp/or1k/generic_or1k/Makefile.am     |  8 ++--
 c/src/lib/libbsp/powerpc/virtex/Makefile.am        |  7 ++--
 c/src/lib/libbsp/shared/console_read.c             | 44 ----------------------
 c/src/lib/libbsp/shared/console_write.c            | 44 ----------------------
 c/src/lib/libbsp/sparc/erc32/Makefile.am           |  7 ++--
 c/src/lib/libbsp/sparc64/niagara/Makefile.am       |  7 ++--
 c/src/lib/libbsp/sparc64/usiii/Makefile.am         |  7 ++--
 33 files changed, 96 insertions(+), 166 deletions(-)
 rename c/src/lib/libbsp/shared/console_control.c => 
bsps/shared/dev/serial/legacy-console-control.c (96%)
 rename c/src/lib/libbsp/shared/console_select.c => 
bsps/shared/dev/serial/legacy-console-select.c (98%)
 rename c/src/lib/libbsp/shared/console.c => 
bsps/shared/dev/serial/legacy-console.c (94%)
 rename c/src/lib/libbsp/shared/console_private.h => 
bsps/shared/dev/serial/legacy-console.h (100%)
 delete mode 100644 c/src/lib/libbsp/shared/console_read.c
 delete mode 100644 c/src/lib/libbsp/shared/console_write.c

diff --git a/c/src/lib/libbsp/shared/console_control.c 
b/bsps/shared/dev/serial/legacy-console-control.c
similarity index 96%
rename from c/src/lib/libbsp/shared/console_control.c
rename to bsps/shared/dev/serial/legacy-console-control.c
index 9bf029151d..01c6793c67 100644
--- a/c/src/lib/libbsp/shared/console_control.c
+++ b/bsps/shared/dev/serial/legacy-console-control.c
@@ -28,7 +28,7 @@
 #include <rtems/termiostypes.h>
 #include <rtems/console.h>
 #include <libchip/serial.h>
-#include "console_private.h"
+#include "legacy-console.h"
 
 /*
  *  console_control
diff --git a/c/src/lib/libbsp/shared/console_select.c 
b/bsps/shared/dev/serial/legacy-console-select.c
similarity index 98%
rename from c/src/lib/libbsp/shared/console_select.c
rename to bsps/shared/dev/serial/legacy-console-select.c
index f2f2e8b694..8d545e7737 100644
--- a/c/src/lib/libbsp/shared/console_select.c
+++ b/bsps/shared/dev/serial/legacy-console-select.c
@@ -27,7 +27,7 @@
 
 #include <rtems/termiostypes.h>
 #include <libchip/serial.h>
-#include "console_private.h"
+#include "legacy-console.h"
 
 /*
  * Method to return true if the device associated with the
diff --git a/c/src/lib/libbsp/shared/console.c 
b/bsps/shared/dev/serial/legacy-console.c
similarity index 94%
rename from c/src/lib/libbsp/shared/console.c
rename to bsps/shared/dev/serial/legacy-console.c
index 6d287c8726..998e4aa6fd 100644
--- a/c/src/lib/libbsp/shared/console.c
+++ b/bsps/shared/dev/serial/legacy-console.c
@@ -26,7 +26,7 @@
 
 #include <rtems/termiostypes.h>
 #include <libchip/serial.h>
-#include "console_private.h"
+#include "legacy-console.h"
 
 unsigned long               Console_Port_Count  = 0;
 console_tbl               **Console_Port_Tbl    = NULL;
@@ -372,3 +372,31 @@ rtems_device_driver console_initialize(
 
   return RTEMS_SUCCESSFUL;
 }
+
+/*
+ *  console_read
+ *
+ *  This routine uses the termios driver to read a character.
+ */
+rtems_device_driver console_read(
+  rtems_device_major_number major,
+  rtems_device_minor_number minor,
+  void                    * arg
+)
+{
+  return rtems_termios_read (arg);
+}
+
+/*
+ *  console_write
+ *
+ *  this routine uses the termios driver to write a character.
+ */
+rtems_device_driver console_write(
+  rtems_device_major_number major,
+  rtems_device_minor_number minor,
+  void                    * arg
+)
+{
+  return rtems_termios_write (arg);
+}
diff --git a/c/src/lib/libbsp/shared/console_private.h 
b/bsps/shared/dev/serial/legacy-console.h
similarity index 100%
rename from c/src/lib/libbsp/shared/console_private.h
rename to bsps/shared/dev/serial/legacy-console.h
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am 
b/c/src/lib/libbsp/arm/beagle/Makefile.am
index 4cf9b3ca83..a6949b2c2e 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -65,12 +65,10 @@ librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console.c \
-        ../../shared/console_select.c \
-  console/console-config.c \
-        ../../shared/console_read.c \
-        ../../shared/console_write.c \
-        ../../shared/console_control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+librtemsbsp_a_SOURCES += console/console-config.c
 
 # I2C
 librtemsbsp_a_SOURCES += i2c/bbb-i2c.c
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am 
b/c/src/lib/libbsp/arm/csb337/Makefile.am
index e8363840e2..185b875bed 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -39,9 +39,10 @@ librtemsbsp_a_SOURCES += startup/pmc.c
 librtemsbsp_a_SOURCES += clock/clock.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console.c console/uarts.c \
-    ../../shared/console_select.c  ../../shared/console_control.c \
-    ../../shared/console_read.c ../../shared/console_write.c 
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+librtemsbsp_a_SOURCES += console/uarts.c
 librtemsbsp_a_SOURCES += console/dbgu.c
 librtemsbsp_a_SOURCES += console/usart.c
 # IRQ
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am 
b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index a29d129f05..5e09e77b23 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -30,9 +30,10 @@ librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 librtemsbsp_a_SOURCES += clock/clockdrv.c
 librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 # console
-librtemsbsp_a_SOURCES += console/uart.c ../../shared/console.c \
-    ../../shared/console_select.c  ../../shared/console_control.c \
-    ../../shared/console_read.c ../../shared/console_write.c 
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+librtemsbsp_a_SOURCES += console/uart.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am 
b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 310df835a5..5a3b8df927 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -29,9 +29,10 @@ librtemsbsp_a_SOURCES += clock/clock.c
 librtemsbsp_a_SOURCES += timer/timer.c
 
 #console
-librtemsbsp_a_SOURCES += console/uarts.c ../../shared/console.c \
-  ../../shared/console_select.c  ../../shared/console_control.c \
-  ../../shared/console_read.c ../../shared/console_write.c 
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+librtemsbsp_a_SOURCES += console/uarts.c
 librtemsbsp_a_SOURCES += console/ffuart.c
 # IRQ
 librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am 
b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index 7bee557cfd..5d0def4a11 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -56,11 +56,9 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
 librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console.c
-librtemsbsp_a_SOURCES += ../../shared/console_control.c
-librtemsbsp_a_SOURCES += ../../shared/console_read.c
-librtemsbsp_a_SOURCES += ../../shared/console_select.c
-librtemsbsp_a_SOURCES += ../../shared/console_write.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 librtemsbsp_a_SOURCES += console/console-config.c
 librtemsbsp_a_SOURCES += console/uart.c
 
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am 
b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 17afdf293c..0e516751b8 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -69,10 +69,8 @@ librtemsbsp_a_SOURCES += 
../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console.c
-librtemsbsp_a_SOURCES += ../../shared/console_control.c
-librtemsbsp_a_SOURCES += ../../shared/console_read.c
-librtemsbsp_a_SOURCES += ../../shared/console_write.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
 librtemsbsp_a_SOURCES += console/console-config.c
 librtemsbsp_a_SOURCES += console/console_select.c
 librtemsbsp_a_SOURCES += console/usart.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/console_select.c 
b/c/src/lib/libbsp/arm/raspberrypi/console/console_select.c
index 30aaff42e5..42c4944ebe 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/console_select.c
+++ b/c/src/lib/libbsp/arm/raspberrypi/console/console_select.c
@@ -26,7 +26,7 @@
 
 #include <rtems/termiostypes.h>
 #include <libchip/serial.h>
-#include "../../../shared/console_private.h"
+#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
 #include <bsp/rpi-fb.h>
 
 rtems_device_minor_number BSPPrintkPort = 0;
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am 
b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index c196bb41c1..4c7e9714c7 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -31,14 +31,13 @@ librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += clock/clockdrv.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console.c \
-    ../../shared/console_select.c ../../shared/console_control.c \
-    ../../shared/console_read.c ../../shared/console_write.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+librtemsbsp_a_SOURCES += console/uart.c
 # IRQ
 librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
-# debugio
-librtemsbsp_a_SOURCES += console/uart.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am 
b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 4276b21cfb..a7ff6cc74d 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -34,12 +34,10 @@ librtemsbsp_a_SOURCES += timer/timer.c
 librtemsbsp_a_SOURCES += clock/clockdrv.c
 librtemsbsp_a_SOURCES += clock/support.c
 # console
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 librtemsbsp_a_SOURCES += console/uart.c
-librtemsbsp_a_SOURCES += ../../shared/console.c
-librtemsbsp_a_SOURCES += ../../shared/console_select.c
-librtemsbsp_a_SOURCES += ../../shared/console_read.c
-librtemsbsp_a_SOURCES += ../../shared/console_write.c
-librtemsbsp_a_SOURCES += ../../shared/console_control.c
 # IRQ
 librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am 
b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index 39cc782dee..6f8520fa2f 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -56,11 +56,9 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
 librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console.c
-librtemsbsp_a_SOURCES += ../../shared/console_control.c
-librtemsbsp_a_SOURCES += ../../shared/console_read.c
-librtemsbsp_a_SOURCES += ../../shared/console_select.c
-librtemsbsp_a_SOURCES += ../../shared/console_write.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 librtemsbsp_a_SOURCES += console/console-config.c
 librtemsbsp_a_SOURCES += console/usart.c
 
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
 
diff --git a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c 
b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
index b11d960ae1..96105e8a21 100644
--- a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
+++ b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
@@ -12,7 +12,7 @@
 #include <bsp/irq-generic.h>
 #include <libchip/serial.h>
 
-#include "../../../shared/console_private.h"
+#include "../../../../../../../bsps/shared/dev/serial/legacy-console.h"
 
 int  putDebugChar(int ch);     /* write a single character      */
 int  getDebugChar(void);       /* read and return a single char */
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am 
b/c/src/lib/libbsp/mips/malta/Makefile.am
index fd767ccb14..3aaa9ae60c 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -41,13 +41,11 @@ librtemsbsp_a_SOURCES += ../shared/clock/mips_timer.S
 librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 
 # console
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 librtemsbsp_a_SOURCES += console/conscfg.c
 librtemsbsp_a_SOURCES += console/printk_support.c
-librtemsbsp_a_SOURCES += ../../shared/console.c
-librtemsbsp_a_SOURCES += ../../shared/console_select.c
-librtemsbsp_a_SOURCES += ../../shared/console_read.c
-librtemsbsp_a_SOURCES += ../../shared/console_write.c
-librtemsbsp_a_SOURCES += ../../shared/console_control.c
 # timer
 librtemsbsp_a_SOURCES += ../../shared/timerstub.c
 
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am 
b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index feba8f767e..63ce7ae797 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -51,11 +51,9 @@ librtemsbsp_a_SOURCES += ../../shared/sbrk.c
 librtemsbsp_a_SOURCES += ../../shared/src/stackalloc.c
 
 # Console
-librtemsbsp_a_SOURCES += ../../shared/console.c
-librtemsbsp_a_SOURCES += ../../shared/console_control.c
-librtemsbsp_a_SOURCES += ../../shared/console_read.c
-librtemsbsp_a_SOURCES += ../../shared/console_select.c
-librtemsbsp_a_SOURCES += ../../shared/console_write.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 librtemsbsp_a_SOURCES += console/console-config.c
 librtemsbsp_a_SOURCES += console/uart.c
 
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am 
b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index a3b6119422..00ddcda792 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -38,9 +38,10 @@ librtemsbsp_a_SOURCES += ../../shared/bspclean.c 
../../shared/bspgetworkarea.c \
 librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
 
 # bspconsole
-librtemsbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \
-    ../../shared/console_select.c ../../shared/console_control.c \
-    ../../shared/console_read.c ../../shared/console_write.c 
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+librtemsbsp_a_SOURCES += console/consolelite.c
 
 # irq
 librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/shared/console_read.c 
b/c/src/lib/libbsp/shared/console_read.c
deleted file mode 100644
index 407d5e61db..0000000000
--- a/c/src/lib/libbsp/shared/console_read.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @file
- *
- * @ingroup Console
- *
- * @brief Generic libchip console read extension
- */
-
-/*
- *  This file is an extension of the generic console driver
- *  shell used by all console drivers using libchip.
- *
- *  COPYRIGHT (c) 1989-2011.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  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 <bsp.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <termios.h>
-
-#include <rtems/termiostypes.h>
-#include <rtems/console.h>
-#include <libchip/serial.h>
-#include "console_private.h"
-
-/*
- *  console_read
- *
- *  This routine uses the termios driver to read a character.
- */
-rtems_device_driver console_read(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_read (arg);
-}
diff --git a/c/src/lib/libbsp/shared/console_write.c 
b/c/src/lib/libbsp/shared/console_write.c
deleted file mode 100644
index cc69b83b5a..0000000000
--- a/c/src/lib/libbsp/shared/console_write.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @file
- *
- * @ingroup Console
- *
- * @brief Generic libchip console write extension
- */
-
-/*
- *  This file is an extension of the generic console driver
- *  shell used by all console drivers using libchip.
- *
- *  COPYRIGHT (c) 1989-2011.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  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 <bsp.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <termios.h>
-
-#include <rtems/termiostypes.h>
-#include <rtems/console.h>
-#include <libchip/serial.h>
-#include "console_private.h"
-
-/*
- *  console_write
- *
- *  this routine uses the termios driver to write a character.
- */
-rtems_device_driver console_write(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_write (arg);
-}
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am 
b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index ca153f960a..c3f63f03b2 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -42,9 +42,10 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
 librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
 # console
-librtemsbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \
-    ../../shared/console_select.c  ../../shared/console_control.c \
-    ../../shared/console_read.c ../../shared/console_write.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+librtemsbsp_a_SOURCES += console/erc32_console.c
 # debugio
 librtemsbsp_a_SOURCES += console/debugputs.c
 # clock
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am 
b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index ec23824303..a73244877d 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -37,9 +37,10 @@ startup_SOURCES = startup/bspclean.c startup/m5op_sparc.S \
 #clock_SOURCES = ../../shared/clock_driver_simidle.c
 clock_SOURCES = ../shared/clock/ckinit.c
 
-console_SOURCES = ../../shared/console.c  ../shared/console/conscfg.c \
-    ../../shared/console_select.c ../../shared/console_control.c \
-    ../../shared/console_read.c ../../shared/console_write.c
+console_SOURCES = ../shared/console/conscfg.c
+console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
+console_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+console_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 
 timer_SOURCES = ../../shared/timerstub.c
 
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am 
b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 3d5a232338..0cb6995997 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -50,9 +50,10 @@ mmu_SOURCES = \
 #clock_SOURCES = ../../shared/clock_driver_simidle.c
 clock_SOURCES = ../shared/clock/ckinit.c
 
-console_SOURCES = ../../shared/console.c  ../shared/console/conscfg.c \
-    ../../shared/console_select.c  ../../shared/console_control.c \
-    ../../shared/console_read.c ../../shared/console_write.c
+console_SOURCES = ../shared/console/conscfg.c
+console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
+console_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+console_SOURCES += 
../../../../../../bsps/shared/dev/serial/legacy-console-select.c
 
 timer_SOURCES = ../../shared/timerstub.c
 
-- 
2.12.3

_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Reply via email to