diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-08 16:04:56 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-10 10:17:09 -0500 |
commit | 62791499ebf0a6161e1541eb7587c57d88407f8b (patch) | |
tree | faaa9f51fdd6d13727c237ddc44e87a9cdd60df4 /c/src/lib/libbsp/arm/gdbarmsim | |
parent | Move Mongoose-V specific devices into BSP. (diff) | |
download | rtems-62791499ebf0a6161e1541eb7587c57d88407f8b.tar.bz2 |
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.
Diffstat (limited to 'c/src/lib/libbsp/arm/gdbarmsim')
-rw-r--r-- | c/src/lib/libbsp/arm/gdbarmsim/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/gdbarmsim/preinstall.am | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am index 9afe11e618..f13ad7de41 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am +++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am @@ -16,6 +16,7 @@ include_bsp_HEADERS += ../../shared/include/irq-info.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/arm/gdbarmsim/console/console-io.c b/c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c index d5ac5e84a1..8bea74d934 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c +++ b/c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c @@ -8,6 +8,7 @@ */ #include <bsp.h> +#include <bsp/console-polled.h> #include <rtems/libio.h> #include <stdlib.h> #include <assert.h> @@ -51,7 +52,7 @@ int console_inbyte_nonblocking( #include <rtems/bspIo.h> -void MyBSP_output_char(char c) { console_outbyte_polled( 0, c ); } +static void MyBSP_output_char(char c) { console_outbyte_polled( 0, c ); } BSP_output_char_function_type BSP_output_char = MyBSP_output_char; BSP_polling_getchar_function_type BSP_poll_char = NULL; diff --git a/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am b/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am index de1cec0aa9..927e8fb52a 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am +++ b/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am @@ -73,6 +73,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 |