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

2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* console/uart.c: Eliminate warnings.
	* start/start.S: Verify boot_card() is passed NULL.
This commit is contained in:
Joel Sherrill
2010-04-07 21:48:14 +00:00
parent 2583672ca3
commit 09d053e821
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/arm/csb336/ChangeLog
View File

@@ -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> 2009-12-10 Ralf Corsépius <ralf.corsepius@rtems.org>
* console/uart.c: Let _BSP_poll_char return int. * console/uart.c: Let _BSP_poll_char return int.

8
c/src/lib/libbsp/arm/csb336/console/uart.c
View File

@@ -35,7 +35,7 @@ static int imx_uart_poll_read(int);
static int imx_uart_set_attrs(int, const struct termios *); static int imx_uart_set_attrs(int, const struct termios *);
static void imx_uart_init(int minor); static void imx_uart_init(int minor);
static void imx_uart_set_baud(int, int); 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) #if defined(USE_INTERRUPTS)
static void imx_uart_tx_isr(rtems_irq_hdl_param); 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_on(const rtems_irq_connect_data *irq);
static void imx_uart_isr_off(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_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 #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; int i;
for (i = 0; i < len; 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) #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].buf = buf;
imx_uart_data[minor].len = len; imx_uart_data[minor].len = len;

6
c/src/lib/libbsp/arm/csb336/start/start.S
View File

@@ -12,11 +12,6 @@
* $Id$ * $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...*/ /* Some standard definitions...*/
.equ PSR_MODE_USR, 0x10 .equ PSR_MODE_USR, 0x10
.equ PSR_MODE_FIQ, 0x11 .equ PSR_MODE_FIQ, 0x11
@@ -112,6 +107,7 @@ _bss_init:
stmia r0!, {r2-r9} stmia r0!, {r2-r9}
/* Now we are prepared to start the BSP's C code */ /* Now we are prepared to start the BSP's C code */
mov r0, #0
bl boot_card bl boot_card
/* /*