bsps: Move console drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

3 files changed, 3 insertions, 87 deletions

diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index cf68a64180..16ce5b6d5e 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -30,9 +30,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c
-librtemsbsp_a_SOURCES += console/console-io.c
-librtemsbsp_a_SOURCES += console/syscalls.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/moxie/moxiesim/console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/moxie/moxiesim/console/syscalls.S
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 
diff --git a/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c b/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
deleted file mode 100644
index de058eba8b..0000000000
--- a/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  This file contains the hardware specific portions of the TTY driver
- *  for the Moxie GDB simulator.
- */
-
-/*
- *  COPYRIGHT (c) 2011.
- *  Anthony Green.
- *
- *  COPYRIGHT (c) 1989-2008.
- *  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 <bsp/console-polled.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-/*
- *  console_initialize_hardware
- *
- *  This routine initializes the console hardware.
- *
- */
-
-void console_initialize_hardware(void)
-{
-  return;
-}
-
-/*
- *  console_outbyte_polled
- *
- *  This routine transmits a character using polling.
- */
-ssize_t _sys_write(int fd, const void *buf, size_t count);
-void console_outbyte_polled(
-  int  port,
-  char ch
-)
-{
-  _sys_write( 1, &ch, 1 );
-}
-
-/*
- *  console_inbyte_nonblocking
- *
- *  This routine polls for a character.
- */
-
-int console_inbyte_nonblocking(
-  int port
-)
-{
-  return -1;
-}
-
-#include <rtems/bspIo.h>
-
-static void moxiesim_output_char(char c) { console_outbyte_polled( 0, c ); }
-
-BSP_output_char_function_type           BSP_output_char = moxiesim_output_char;
-BSP_polling_getchar_function_type       BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/moxie/moxiesim/console/syscalls.S b/c/src/lib/libbsp/moxie/moxiesim/console/syscalls.S
deleted file mode 100644
index f9a63a29b5..0000000000
--- a/c/src/lib/libbsp/moxie/moxiesim/console/syscalls.S
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- *  System call support for simulator in gdb.
- *
- *  COPYRIGHT (c) 2011 Anthony Green <green@moxielogic.com>
- */
-
-#define SYS_write       5
-
-        .section .text
-        .align 2
-        .global _sys_write
-_sys_write:
-        swi     SYS_write
-        ret
-        .end