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/moxie/moxiesim/Makefile.am          | 1 +
 c/src/lib/libbsp/moxie/moxiesim/console/console-io.c | 7 +++++--
 c/src/lib/libbsp/moxie/moxiesim/preinstall.am        | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index 8b062801c0..134ae7874d 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -15,6 +15,7 @@ include_HEADERS += ../../shared/include/tm27.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
 
 nodist_include_HEADERS += ../../shared/include/coverhd.h
diff --git a/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c b/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
index b41b59fd4b..de058eba8b 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
+++ b/c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
@@ -1,7 +1,9 @@
 /*
  *  This file contains the hardware specific portions of the TTY driver
  *  for the Moxie GDB simulator.
- *
+ */
+
+/*
  *  COPYRIGHT (c) 2011.
  *  Anthony Green.
  *
@@ -15,6 +17,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/console-polled.h>
 #include <rtems/libio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -60,7 +63,7 @@ int console_inbyte_nonblocking(
 
 #include <rtems/bspIo.h>
 
-void moxiesim_output_char(char c) { console_outbyte_polled( 0, c ); }
+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/preinstall.am b/c/src/lib/libbsp/moxie/moxiesim/preinstall.am
index 347e43d26e..f3d7d235a6 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/preinstall.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/preinstall.am
@@ -53,6 +53,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