diff options
| author | Hesham ALMatary <heshamelmatary@gmail.com> | 2014-10-10 18:43:08 +0200 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-13 15:59:08 -0500 |
| commit | 393e8eafd1ced15d9ec30f9f7291e87ed23bab07 (patch) | |
| tree | f7c5b12cd7869098d36598550c2c47d03cc4c700 | |
| parent | sparc64: use null in empty argument list (diff) | |
| download | rtems-393e8eafd1ced15d9ec30f9f7291e87ed23bab07.tar.bz2 | |
libbsp/or1ksim: Fix warnings.
| -rw-r--r-- | c/src/lib/libbsp/or1k/or1ksim/clock/clockdrv.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/or1k/or1ksim/console/uart.c | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/or1k/or1ksim/clock/clockdrv.c b/c/src/lib/libbsp/or1k/or1ksim/clock/clockdrv.c index ad49d0744b..4169a11fbb 100644 --- a/c/src/lib/libbsp/or1k/or1ksim/clock/clockdrv.c +++ b/c/src/lib/libbsp/or1k/or1ksim/clock/clockdrv.c @@ -137,8 +137,8 @@ CPU_Counter_ticks _CPU_Counter_difference( #define Clock_driver_support_install_isr(isr, old_isr) \ do { \ - or1ksim_clock_handler_install(isr, old_isr); \ old_isr = NULL; \ + or1ksim_clock_handler_install(isr, old_isr); \ } while (0) #define Clock_driver_support_shutdown_hardware() or1ksim_clock_cleanup() diff --git a/c/src/lib/libbsp/or1k/or1ksim/console/uart.c b/c/src/lib/libbsp/or1k/or1ksim/console/uart.c index 7ceca816a5..31cdce6efd 100644 --- a/c/src/lib/libbsp/or1k/or1ksim/console/uart.c +++ b/c/src/lib/libbsp/or1k/or1ksim/console/uart.c @@ -21,6 +21,14 @@ #include <bsp/uart.h> #include <rtems/score/isr.h> +static void uart_initialize(int minor); +static int uart_first_open(int major, int minor, void *arg); +static int uart_last_close(int major, int minor, void *arg); +static int uart_read_polled(int minor); +static ssize_t uart_write(int minor, const char *buf, size_t len); +static void uart_write_polled(int minor, char c); +static int uart_set_attributes(int minor, const struct termios *t); + static rtems_vector_number uart_get_irq_number(const console_tbl *ct) { return ct->ulIntVector; @@ -86,10 +94,9 @@ static int uart_last_close(int major, int minor, void *arg) return 0; } -static char uart_read_polled(int minor) +static int uart_read_polled(int minor) { unsigned char lsr; - char c; /* Get a character when avaiable */ do { @@ -120,7 +127,7 @@ static void uart_write_polled(int minor, char c) } while ( (lsr & transmit_finished) != transmit_finished ); } -static ssize_t uart_write_support_polled( +static ssize_t uart_write( int minor, const char *s, size_t n @@ -145,7 +152,7 @@ const console_fns or1ksim_uart_fns = { .deviceFirstOpen = uart_first_open, .deviceLastClose = uart_last_close, .deviceRead = uart_read_polled, - .deviceWrite = uart_write_support_polled, + .deviceWrite = uart_write, .deviceInitialize = uart_initialize, .deviceWritePolled = uart_write_polled, .deviceSetAttributes = uart_set_attributes, |