diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-12-06 15:37:44 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-12-06 15:37:44 +0000 |
| commit | 516d808b54ff4a0bfce97614b4b1c6aac9c4686c (patch) | |
| tree | 41bb8c8404a7474afc2854854f65cd10ded11d4f /c/src/lib/libbsp/arm/shared | |
| parent | 2000-12-06 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-516d808b54ff4a0bfce97614b4b1c6aac9c4686c.tar.bz2 | |
2000-12-06 Joel Sherrill <joel@OARcorp.com>
* comm/console.c: Added casts to eliminate warnings.
* comm/console.c (console_reserve_resources): Removed.
Diffstat (limited to 'c/src/lib/libbsp/arm/shared')
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/comm/console.c | 16 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/irq/irq_init.c | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/arm/shared/ChangeLog b/c/src/lib/libbsp/arm/shared/ChangeLog index 101734ce64..712d394e8e 100644 --- a/c/src/lib/libbsp/arm/shared/ChangeLog +++ b/c/src/lib/libbsp/arm/shared/ChangeLog @@ -1,3 +1,8 @@ +2000-12-06 Joel Sherrill <joel@OARcorp.com> + + * comm/console.c: Added casts to eliminate warnings. + * comm/console.c (console_reserve_resources): Removed. + 2000-08-10 Joel Sherrill <joel@OARcorp.com> * ChangeLog: New file. diff --git a/c/src/lib/libbsp/arm/shared/comm/console.c b/c/src/lib/libbsp/arm/shared/comm/console.c index 2aa30d233e..ff734a0970 100644 --- a/c/src/lib/libbsp/arm/shared/comm/console.c +++ b/c/src/lib/libbsp/arm/shared/comm/console.c @@ -64,8 +64,11 @@ static int isr_is_on(const rtems_irq_connect_data *); * BSP initialization */ -BSP_output_char_function_type BSP_output_char = BSP_output_char_via_serial; -BSP_polling_getchar_function_type BSP_poll_char = BSP_poll_char_via_serial; +/* for printk support */ +BSP_output_char_function_type BSP_output_char = + (BSP_output_char_function_type) BSP_output_char_via_serial; +BSP_polling_getchar_function_type BSP_poll_char = + (BSP_polling_getchar_function_type) BSP_poll_char_via_serial; static rtems_irq_connect_data console_isr_data = {BSP_UART, @@ -95,13 +98,6 @@ isr_is_on(const rtems_irq_connect_data *irq) return 1; } -void console_reserve_resources(rtems_configuration_table *conf) -{ - rtems_termios_reserve_resources(conf, 1); - - return; -} - void __assert (const char *file, int line, const char *msg) { static char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot..."; @@ -184,8 +180,6 @@ console_initialize(rtems_device_major_number major, } /* console_initialize */ -static int console_open_count = 0; - static int console_last_close(int major, int minor, void *arg) { BSP_remove_rtems_irq_handler (&console_isr_data); diff --git a/c/src/lib/libbsp/arm/shared/irq/irq_init.c b/c/src/lib/libbsp/arm/shared/irq/irq_init.c index add12a0e92..d79136085d 100644 --- a/c/src/lib/libbsp/arm/shared/irq/irq_init.c +++ b/c/src/lib/libbsp/arm/shared/irq/irq_init.c @@ -34,7 +34,7 @@ void rtems_irq_mngt_init() long *vectorTable; rtems_interrupt_level level; - vectorTable = VECTOR_TABLE; + vectorTable = (long *) VECTOR_TABLE; _CPU_ISR_Disable(level); |