diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-07 21:48:14 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-07 21:48:14 +0000 |
| commit | 09d053e8217c1ebfc449bbf9f42fdde47d223f96 (patch) | |
| tree | d615e745c121fb8b47a261a2f2d1de2b3d409765 /c/src/lib/libbsp/arm/csb336 | |
| parent | 2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-09d053e8217c1ebfc449bbf9f42fdde47d223f96.tar.bz2 | |
2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* console/uart.c: Eliminate warnings.
* start/start.S: Verify boot_card() is passed NULL.
Diffstat (limited to 'c/src/lib/libbsp/arm/csb336')
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/console/uart.c | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/start/start.S | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index 7afea2fd2c..acbd1f9137 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/ChangeLog @@ -1,3 +1,8 @@ +2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com> + + * console/uart.c: Eliminate warnings. + * start/start.S: Verify boot_card() is passed NULL. + 2009-12-10 Ralf Corsépius <ralf.corsepius@rtems.org> * console/uart.c: Let _BSP_poll_char return int. diff --git a/c/src/lib/libbsp/arm/csb336/console/uart.c b/c/src/lib/libbsp/arm/csb336/console/uart.c index 2b7f6a06b1..4ef78a7ff6 100644 --- a/c/src/lib/libbsp/arm/csb336/console/uart.c +++ b/c/src/lib/libbsp/arm/csb336/console/uart.c @@ -35,7 +35,7 @@ static int imx_uart_poll_read(int); static int imx_uart_set_attrs(int, const struct termios *); static void imx_uart_init(int minor); static void imx_uart_set_baud(int, int); -static int imx_uart_poll_write(int, const char *, int); +static ssize_t imx_uart_poll_write(int, const char *, size_t); #if defined(USE_INTERRUPTS) static void imx_uart_tx_isr(rtems_irq_hdl_param); @@ -43,7 +43,7 @@ static void imx_uart_rx_isr(rtems_irq_hdl_param); static void imx_uart_isr_on(const rtems_irq_connect_data *irq); static void imx_uart_isr_off(const rtems_irq_connect_data *irq); static int imx_uart_isr_is_on(const rtems_irq_connect_data *irq); -static int imx_uart_intr_write(int, const char *, int); +static ssize_t imx_uart_intr_write(int, const char *, size_t); #endif @@ -278,7 +278,7 @@ static int imx_uart_poll_read(int minor) } -static int imx_uart_poll_write(int minor, const char *buf, int len) +static ssize_t imx_uart_poll_write(int minor, const char *buf, size_t len) { int i; for (i = 0; i < len; i++) { @@ -294,7 +294,7 @@ static int imx_uart_poll_write(int minor, const char *buf, int len) } #if defined(USE_INTERRUPTS) -static int imx_uart_intr_write(int minor, const char *buf, int len) +static ssize_t imx_uart_intr_write(int minor, const char *buf, size_t len) { imx_uart_data[minor].buf = buf; imx_uart_data[minor].len = len; diff --git a/c/src/lib/libbsp/arm/csb336/start/start.S b/c/src/lib/libbsp/arm/csb336/start/start.S index 67c74b114a..9c3c4c8e37 100644 --- a/c/src/lib/libbsp/arm/csb336/start/start.S +++ b/c/src/lib/libbsp/arm/csb336/start/start.S @@ -12,11 +12,6 @@ * $Id$ */ -#warning Call to boot_card has changed and needs checking. -#warning The call is "void boot_card(const char* cmdline);" -#warning You need to pass a NULL. -#warning Please check and remove these warnings. - /* Some standard definitions...*/ .equ PSR_MODE_USR, 0x10 .equ PSR_MODE_FIQ, 0x11 @@ -112,6 +107,7 @@ _bss_init: stmia r0!, {r2-r9} /* Now we are prepared to start the BSP's C code */ + mov r0, #0 bl boot_card /* |