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/nios2 | |
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/nios2')
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/console/console.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/preinstall.am | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 6f6b939741..3022c1486b 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -11,6 +11,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 include_HEADERS += ../../shared/include/coverhd.h diff --git a/c/src/lib/libbsp/nios2/nios2_iss/console/console.c b/c/src/lib/libbsp/nios2/nios2_iss/console/console.c index fc3223efde..7e50874072 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/console/console.c +++ b/c/src/lib/libbsp/nios2/nios2_iss/console/console.c @@ -1,7 +1,8 @@ /* * This file implements simple console IO via JTAG UART. - * - * Based on no_cpu/console.c + */ + +/* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -16,6 +17,7 @@ #define NO_BSP_INIT #include <bsp.h> +#include <bsp/console-polled.h> #include <rtems/libio.h> /* #define JTAG_UART_REGS ((altera_avalon_jtag_uart_regs*)NIOS2_IO_BASE(JTAG_UART_BASE)) */ @@ -113,7 +115,7 @@ void console_outbyte_polled( #include <rtems/bspIo.h> -void ISS_output_char(char c) { console_outbyte_polled( 0, c ); } +static void ISS_output_char(char c) { console_outbyte_polled( 0, c ); } BSP_output_char_function_type BSP_output_char = ISS_output_char; BSP_polling_getchar_function_type BSP_poll_char = NULL; diff --git a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am index eaeeefe2bc..b01172ef5b 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/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 |