From 62791499ebf0a6161e1541eb7587c57d88407f8b Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Wed, 8 Oct 2014 16:04:56 -0500
Subject: Add console-polled.h and update all BSPs that should use it.

The file console-polled.h provides the prototypes for the three
required methods when implementing a single port polled console
driver. This paradigm is common on simulators and simple hardware.

+ Updated the BSPs Makefile.am to make console-polled.h available.
+ Regenerated the BSPs preinstall.sm.
+ Updated console support files to include <bsp/console-polled.h>.
+ Updated console support files to make printk() support method static.
---
 c/src/lib/libbsp/v850/gdbv850sim/Makefile.am          | 1 +
 c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c | 3 ++-
 c/src/lib/libbsp/v850/gdbv850sim/preinstall.am        | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'c/src/lib/libbsp/v850')

diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index 8e648c8c77..5b61b45b14 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -16,6 +16,7 @@ include_bsp_HEADERS = include/syscall.h
 
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
+nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c b/c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c
index c1781975b8..c1f51a34d7 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c
+++ b/c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c
@@ -8,6 +8,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/console-polled.h>
 #include <rtems/libio.h>
 #include <bsp/syscall.h>
 
@@ -55,7 +56,7 @@ int console_inbyte_nonblocking(
 
 #include <rtems/bspIo.h>
 
-void console_output_char(char c) { console_outbyte_polled( 0, c ); }
+static void console_output_char(char c) { console_outbyte_polled( 0, c ); }
 
 BSP_output_char_function_type           BSP_output_char = console_output_char;
 BSP_polling_getchar_function_type       BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am b/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am
index 38d42ac7c1..dab51fb108 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am
@@ -57,6 +57,10 @@ $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
 
+$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
+
 $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
-- 
cgit v1.2.3