RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Add console-polled.h and update all BSPs that should use it.

Browse Source 
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.
This commit is contained in:
Joel Sherrill
2014-10-08 16:04:56 -05:00
parent 8536b67bab
commit 62791499eb
44 changed files with 179 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
View File

@@ -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 =

3
c/src/lib/libbsp/arm/gdbarmsim/console/console-io.c
View File

@@ -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;

4
c/src/lib/libbsp/arm/gdbarmsim/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/avr/avrtest/Makefile.am
View File

@@ -12,6 +12,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
noinst_PROGRAMS =

9
c/src/lib/libbsp/avr/avrtest/console/console-io.c
View File

@@ -1,7 +1,9 @@
/*
* This file contains the hardware specific portions of the TTY driver
* for the serial ports on the erc32.
*
* for the serial ports on the avr.
*/
/*
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
@@ -11,6 +13,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
@@ -59,7 +62,7 @@ int console_inbyte_nonblocking(
#include <rtems/bspIo.h>
void AVRsimBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
static void AVRsimBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = AVRsimBSP_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

4
c/src/lib/libbsp/avr/avrtest/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/h8300/h8sim/Makefile.am
View File

@@ -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
nodist_include_HEADERS += ../../shared/include/coverhd.h

5
c/src/lib/libbsp/h8300/h8sim/console/console-io.c
View File

@@ -1,6 +1,6 @@
/*
* This file contains the hardware specific portions of the TTY driver
* for the serial ports on the erc32.
* for the serial ports on the h8300 simulator in gdb.
*/
/*
@@ -13,6 +13,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
@@ -58,7 +59,7 @@ int console_inbyte_nonblocking(
#include <rtems/bspIo.h>
void H8simBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
static void H8simBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = H8simBSP_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

4
c/src/lib/libbsp/h8300/h8sim/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
View File

@@ -12,6 +12,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
noinst_PROGRAMS =

9
c/src/lib/libbsp/m32c/m32cbsp/console/console-io.c
View File

@@ -1,7 +1,9 @@
/*
* This file contains the hardware specific portions of the TTY driver
* for the serial ports on the erc32.
*
* for the serial ports on the m32c simulator in gdb.
*/
/*
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
@@ -11,6 +13,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
@@ -56,7 +59,7 @@ int console_inbyte_nonblocking(
#include <rtems/bspIo.h>
void M32CsimBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
static void M32CsimBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = M32CsimBSP_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

4
c/src/lib/libbsp/m32c/m32cbsp/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/m32r/m32rsim/Makefile.am
View File

@@ -12,6 +12,7 @@ include_HEADERS += 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
noinst_PROGRAMS =

3
c/src/lib/libbsp/m32r/m32rsim/console/console-io.c
View File

@@ -8,6 +8,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
@@ -53,7 +54,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;

4
c/src/lib/libbsp/m32r/m32rsim/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/m68k/csb360/Makefile.am
View File

@@ -11,6 +11,7 @@ include_HEADERS += 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 += include/coverhd.h

7
c/src/lib/libbsp/m68k/csb360/console/console-io.c
View File

@@ -1,7 +1,9 @@
/*
* This file contains the hardware specific portions of the TTY driver
* for the serial ports on the mcf5272
*
*/
/*
* COPYRIGHT (c) 1989-2000.
* On-Line Applications Research Corporation (OAR).
*
@@ -11,6 +13,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <mcf5272/mcf5272.h>
@@ -87,7 +90,7 @@ int console_inbyte_nonblocking(
#include <rtems/bspIo.h>
void mcf5272_output_char(char c) { console_outbyte_polled( 0, c ); }
static void mcf5272_output_char(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = mcf5272_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

4
c/src/lib/libbsp/m68k/csb360/preinstall.am
View File

@@ -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: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h

1
c/src/lib/libbsp/mips/csb350/Makefile.am
View File

@@ -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

9
c/src/lib/libbsp/mips/csb350/console/console-io.c
View File

@@ -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);
}

4
c/src/lib/libbsp/mips/csb350/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/mips/jmr3904/Makefile.am
View File

@@ -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

7
c/src/lib/libbsp/mips/jmr3904/console/console-io.c
View File

@@ -3,7 +3,9 @@
* for the serial ports on the jmr3904.
*
* 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 +15,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
@@ -114,7 +117,7 @@ int console_inbyte_nonblocking(
#include <rtems/bspIo.h>
void JMR3904_output_char(char c) { console_outbyte_polled( 0, c ); }
static void JMR3904_output_char(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = JMR3904_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

4
c/src/lib/libbsp/mips/jmr3904/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/moxie/moxiesim/Makefile.am
View File

@@ -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

7
c/src/lib/libbsp/moxie/moxiesim/console/console-io.c
View File

@@ -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;

4
c/src/lib/libbsp/moxie/moxiesim/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
View File

@@ -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

8
c/src/lib/libbsp/nios2/nios2_iss/console/console.c
View File

@@ -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;

4
c/src/lib/libbsp/nios2/nios2_iss/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/powerpc/psim/Makefile.am
View File

@@ -14,6 +14,7 @@ include_bsp_HEADERS = ../shared/include/linker-symbols.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 += include/coverhd.h

3
c/src/lib/libbsp/powerpc/psim/console/console-io.c
View File

@@ -13,6 +13,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
@@ -71,7 +72,7 @@ int console_inbyte_nonblocking(
#include <rtems/bspIo.h>
void PSIM_output_char(char c) { console_outbyte_polled( 0, c ); }
static void PSIM_output_char(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = PSIM_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

4
c/src/lib/libbsp/powerpc/psim/preinstall.am
View File

@@ -61,6 +61,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: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h

1
c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
View File

@@ -12,6 +12,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
noinst_PROGRAMS =

9
c/src/lib/libbsp/powerpc/qemuppc/console/console-io.c
View File

@@ -1,7 +1,9 @@
/*
* This file contains the hardware specific portions of the TTY driver
* for the serial ports on the erc32.
*
* for the serial ports on the qemuppc.
*/
/*
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
@@ -11,6 +13,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
@@ -68,7 +71,7 @@ int console_inbyte_nonblocking(
#include <rtems/bspIo.h>
void simBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
static void simBSP_output_char(char c) { console_outbyte_polled( 0, c ); }
BSP_output_char_function_type BSP_output_char = simBSP_output_char;
BSP_polling_getchar_function_type BSP_poll_char = NULL;

4
c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
View File

@@ -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

1
c/src/lib/libbsp/sh/shsim/Makefile.am
View File

@@ -12,6 +12,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

7
c/src/lib/libbsp/sh/shsim/console/console-io.c
View File

@@ -1,9 +1,9 @@
/*
* This file contains the hardware specific portions of the TTY driver
* for the simulators stdin/out.
*
* Logic based on newlib-1.8.2/newlib/libc/sys/sh/syscalls.c
*
*/
/*
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
@@ -13,6 +13,7 @@
*/
#include <bsp.h>
#include <bsp/console-polled.h>
#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>

4
c/src/lib/libbsp/sh/shsim/preinstall.am
View File

@@ -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

13
c/src/lib/libbsp/shared/console-polled.c
View File

@@ -2,7 +2,9 @@
* This file contains the hardware independent portion of a polled
* console device driver. If a BSP chooses to use this, then it
* only has to provide a few board dependent routines.
*
*/
/*
* COPYRIGHT (c) 1989-1997.
* On-Line Applications Research Corporation (OAR).
*
@@ -16,10 +18,11 @@
#include <stdlib.h>
#include <assert.h>
/* external prototypes for monitor interface routines */
void console_outbyte_polled(int port, char ch);
int console_inbyte_nonblocking(int port);
void console_initialize_hardware(void);
#include <bsp/console-polled.h>
/*
* Prototypes
*/
ssize_t console_write_support(int, const char *, size_t);
/*

43
c/src/lib/libbsp/shared/include/console-polled.h Normal file
View File

@@ -0,0 +1,43 @@
/**
* @file
*
* @ingroup Console
*
* This file defines the interfaces between the single port
* polled console framework and the BSP.
*/
/*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
*/
#ifndef __BSP_CONSOLE_POLLED_h
#define __BSP_CONSOLE_POLLED_h
/**
* This method polls the specified character @a ch to the specified
* console @a port.
*
* @param[in] port is the output port
* @param[in] ch is the character to print
*/
void console_outbyte_polled(int port, char ch);
/**
* This method polls the specified @a port for an input character.
* console @a port.
*
* @param[in] port is the input port
*
* @return This method returns the character read of -1 if there is no data.
*/
int console_inbyte_nonblocking(int port);
/**
* This method is invoked to initialize the console hardware device(s).
*/
void console_initialize_hardware(void);
#endif

1
c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
View File

@@ -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 =

3
c/src/lib/libbsp/v850/gdbv850sim/console/console-io.c
View File

@@ -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;

4
c/src/lib/libbsp/v850/gdbv850sim/preinstall.am
View File

@@ -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