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

2010-04-10 Ralf Corsépius <ralf.corsepius@rtems.org>

Browse Source 
* console/uart.c: Reflect termios API changes.
This commit is contained in:
Ralf Corsepius
2010-04-14 09:27:31 +00:00
parent 96bb0f4036
commit eb18d28bb6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/arm/edb7312/ChangeLog
View File

@@ -1,3 +1,7 @@
2010-04-10 Ralf Corsépius <ralf.corsepius@rtems.org>
* console/uart.c: Reflect termios API changes.
2010-04-09 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> 2010-04-09 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* clock/clockdrv.c, irq/bsp_irq_init.c, irq/irq.h * clock/clockdrv.c, irq/bsp_irq_init.c, irq/irq.h

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

@@ -26,7 +26,7 @@ int uart_poll_read(int minor);
static int uart_first_open(int major, int minor, void *arg); 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_last_close(int major, int minor, void *arg);
static int uart_read(int minor); static int uart_read(int minor);
static int uart_write(int minor, const char *buf, int len); static ssize_t uart_write(int minor, const char *buf, size_t len);
static void uart_init(int minor); static void uart_init(int minor);
static void uart_write_polled(int minor, char c); static void uart_write_polled(int minor, char c);
static int uart_set_attributes(int minor, const struct termios *t); static int uart_set_attributes(int minor, const struct termios *t);
@@ -107,12 +107,12 @@ int uart_poll_read(int minor)
return c; return c;
} }
static int uart_write(int minor, const char *buf, int len) static ssize_t uart_write(int minor, const char *buf, size_t len)
{ {
volatile uint32_t *data_reg; volatile uint32_t *data_reg;
volatile uint32_t *ctrl_reg1; volatile uint32_t *ctrl_reg1;
volatile uint32_t *ctrl_reg2; volatile uint32_t *ctrl_reg2;
int i; size_t i;
char c; char c;
data_reg = (uint32_t*)Console_Port_Tbl[minor].ulDataPort; data_reg = (uint32_t*)Console_Port_Tbl[minor].ulDataPort;
@@ -129,7 +129,7 @@ static int uart_write(int minor, const char *buf, int len)
*data_reg = c; *data_reg = c;
} }
return 1; return len;
} }
static void uart_init(int minor) static void uart_init(int minor)