diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-19 14:41:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-19 14:41:23 +0000 |
| commit | 2d7d605fdfde31394a46a9bc57f39f20e2f39334 (patch) | |
| tree | e3f9b09eab63d5d02f8b04f8b843b7b3b228f96f /c/src/lib/libbsp/i386/pc386/console/console.c | |
| parent | Patches from Ralf Corsepius <corsepiu@faw.uni-ulm.de> and myself to (diff) | |
| download | rtems-2d7d605fdfde31394a46a9bc57f39f20e2f39334.tar.bz2 | |
Patch from Aleksey <qqi@world.std.com>:
It fixes netboot build problem, KA9Q configuration
for pc386, some compiler wardning, it also removed some stuff
ifdef'ed with '#if 0'.
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386/console/console.c')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/console.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c index f67072a3c4..e57d077bcd 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console.c +++ b/c/src/lib/libbsp/i386/pc386/console/console.c @@ -40,6 +40,7 @@ #include <rtems/libio.h> #include <termios.h> #include <pc386uart.h> +#include <libcpu/cpuModel.h> int PC386ConsolePort = PC386_CONSOLE_PORT_CONSOLE; @@ -61,8 +62,8 @@ static rtems_irq_connect_data console_isr_data = {PC_386_KEYBOARD, extern rtems_boolean _IBMPC_scankey(char *); /* defined in 'inch.c' */ -extern BSP_polling_getchar_function_type BSP_wait_polled_input(); -extern void _IBMPC_initVideo(); +extern char BSP_wait_polled_input(void); +extern void _IBMPC_initVideo(void); void console_reserve_resources(rtems_configuration_table *conf) { @@ -169,9 +170,9 @@ console_initialize(rtems_device_major_number major, { /* Install keyboard interrupt handler */ - status = pc386_install_rtems_irq_handler(&console_isr_data); + status = pc386_install_rtems_irq_handler(&console_isr_data); - if (!status) + if (!status) { printk("Error installing keyboard interrupt handler!\n"); rtems_fatal_error_occurred(status); @@ -481,8 +482,11 @@ conSetAttr(int minor, const struct termios *t) * BSP initialization */ -BSP_output_char_function_type BSP_output_char = (BSP_output_char_function_type) _IBMPC_outch; -BSP_polling_getchar_function_type BSP_poll_char = BSP_wait_polled_input; +BSP_output_char_function_type BSP_output_char = + (BSP_output_char_function_type) _IBMPC_outch; + +BSP_polling_getchar_function_type BSP_poll_char = BSP_wait_polled_input; + void BSP_emergency_output_init() { _IBMPC_initVideo(); |