summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/edb7312
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2010-04-14 09:27:31 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2010-04-14 09:27:31 +0000
commiteb18d28bb6c941ce2b15d1bed07d7dd41ec32f65 (patch)
treeded98b2007ceac9993b32a78003680e534a1def2 /c/src/lib/libbsp/arm/edb7312
parent2010-04-14 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-eb18d28bb6c941ce2b15d1bed07d7dd41ec32f65.tar.bz2
2010-04-10 Ralf Corsépius <ralf.corsepius@rtems.org>
* console/uart.c: Reflect termios API changes.
Diffstat (limited to 'c/src/lib/libbsp/arm/edb7312')
-rw-r--r--c/src/lib/libbsp/arm/edb7312/ChangeLog4
-rw-r--r--c/src/lib/libbsp/arm/edb7312/console/uart.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index 5c7e32ed1c..f58115337b 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -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>
* clock/clockdrv.c, irq/bsp_irq_init.c, irq/irq.h
diff --git a/c/src/lib/libbsp/arm/edb7312/console/uart.c b/c/src/lib/libbsp/arm/edb7312/console/uart.c
index 17a6d4caa1..bcfdc3d952 100644
--- a/c/src/lib/libbsp/arm/edb7312/console/uart.c
+++ b/c/src/lib/libbsp/arm/edb7312/console/uart.c
@@ -26,7 +26,7 @@ int uart_poll_read(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(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_write_polled(int minor, char c);
static int uart_set_attributes(int minor, const struct termios *t);
@@ -107,12 +107,12 @@ int uart_poll_read(int minor)
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 *ctrl_reg1;
volatile uint32_t *ctrl_reg2;
- int i;
+ size_t i;
char c;
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;
}
- return 1;
+ return len;
}
static void uart_init(int minor)