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/mips/csb350 | |
| 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/mips/csb350')
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/console/console-io.c | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/preinstall.am | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index ac31d1627e..edca0cca99 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -16,6 +16,7 @@ include_bsp_HEADERS += include/irq.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/mips/csb350/console/console-io.c b/c/src/lib/libbsp/mips/csb350/console/console-io.c index b3450c3a03..aa991adeee 100644 --- a/c/src/lib/libbsp/mips/csb350/console/console-io.c +++ b/c/src/lib/libbsp/mips/csb350/console/console-io.c @@ -1,9 +1,9 @@ /* * This file contains the hardware specific portions of the TTY driver * for the serial ports on the csb350. - * - * Logic based on the jmr3904-io.c file in newlib 1.8.2 - * + */ + +/* * COPYRIGHT (c) 1989-2000. * On-Line Applications Research Corporation (OAR). * @@ -13,6 +13,7 @@ */ #include <bsp.h> +#include <bsp/console-polled.h> #include <rtems/libio.h> #include <libcpu/au1x00.h> @@ -80,7 +81,7 @@ void csb250_output_char(char c) } } -int csb250_get_char(void) +static int csb250_get_char(void) { return console_inbyte_nonblocking(0); } diff --git a/c/src/lib/libbsp/mips/csb350/preinstall.am b/c/src/lib/libbsp/mips/csb350/preinstall.am index d05c8022fd..74b875096f 100644 --- a/c/src/lib/libbsp/mips/csb350/preinstall.am +++ b/c/src/lib/libbsp/mips/csb350/preinstall.am @@ -69,6 +69,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 |