shsim: Add printk() support and move all code to console subdirectory

4 files changed, 55 insertions, 10 deletions

diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index aa4039619f..eb0d4790fc 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -20,30 +20,39 @@ noinst_LIBRARIES = libbspstart.a
 libbspstart_a_SOURCES = start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmds.sim
+dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.sim
 
 noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES =
 
 # startup
-libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../../shared/bsppredriverhook.c ../shared/startup/bspstart.c \
-    ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \
-    ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \
-    ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c
+libbsp_a_SOURCES += ../../shared/bsplibc.c
+libbsp_a_SOURCES += ../../shared/bsppost.c
+libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+libbsp_a_SOURCES += ../shared/startup/bspstart.c
+libbsp_a_SOURCES += ../../shared/bsppretaskinghook.c
+libbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+libbsp_a_SOURCES += ../../shared/bspclean.c
+libbsp_a_SOURCES += ../../shared/sbrk.c ../../shared/bootcard.c
+libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+libbsp_a_SOURCES += ../shared/bsphwinit.c
+
 # clock
 libbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
 
-# trap34
-libbsp_a_SOURCES += trap34/console-io.c trap34/console-support.S \
-    ../../shared/dummy_printk_support.c
 # console
 libbsp_a_SOURCES += ../../shared/console-polled.c
+libbsp_a_SOURCES += console/console-io.c
+libbsp_a_SOURCES += console/console-support.S
+libbsp_a_SOURCES += console/console-debugio.c
+
 # timer
 libbsp_a_SOURCES += ../../shared/timerstub.c
 
 libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel
+    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \
+    ../../../libcpu/@RTEMS_CPU@/cache.rel
 
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/shsim/console/console-debugio.c b/c/src/lib/libbsp/sh/shsim/console/console-debugio.c
new file mode 100644
index 0000000000..38b6c8f698
--- /dev/null
+++ b/c/src/lib/libbsp/sh/shsim/console/console-debugio.c
@@ -0,0 +1,36 @@
+/**
+ *  @file
+ *  @brief Stub printk() support
+ *
+ *  This file contains a stub for the required printk() support.
+ *  It is NOT functional!!!
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
+ *  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.
+ */
+
+/*
+ *  To support printk
+ */
+
+#include <rtems.h>
+#include <rtems/bspIo.h>
+
+void console_outbyte_polled(
+  int  port,
+  char ch
+);
+
+void BSP_output_char_f(char c)
+{
+  console_outbyte_polled( 0, c );
+}
+
+BSP_output_char_function_type           BSP_output_char = BSP_output_char_f;
+BSP_polling_getchar_function_type       BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/sh/shsim/trap34/console-io.c b/c/src/lib/libbsp/sh/shsim/console/console-io.c
index b327192d5d..b327192d5d 100644
--- a/c/src/lib/libbsp/sh/shsim/trap34/console-io.c
+++ b/c/src/lib/libbsp/sh/shsim/console/console-io.c
diff --git a/c/src/lib/libbsp/sh/shsim/trap34/console-support.S b/c/src/lib/libbsp/sh/shsim/console/console-support.S
index 63f72f794b..63f72f794b 100644
--- a/c/src/lib/libbsp/sh/shsim/trap34/console-support.S
+++ b/c/src/lib/libbsp/sh/shsim/console/console-support.S