summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2010-04-12 16:34:31 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2010-04-12 16:34:31 +0000
commit2daa19ffa39091dcfa77e2e19834b2e4bf4b9d40 (patch)
tree52fff6d307f0dd4083fbf4a3ca71ecaecab65064
parent2010-04-12 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-2daa19ffa39091dcfa77e2e19834b2e4bf4b9d40.tar.bz2
Reflect termios API changes.
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/console.c8
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c2
-rw-r--r--c/src/lib/libbsp/i386/shared/comm/uart.c12
-rw-r--r--c/src/lib/libbsp/i386/shared/comm/uart.h4
4 files changed, 13 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index 49addc8d85..776fa5bc27 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -116,17 +116,17 @@ isr_is_on(const rtems_irq_connect_data *irq)
extern int rtems_kbpoll( void );
-static int
-ibmpc_console_write(int minor, const char *buf, int len)
+static ssize_t
+ibmpc_console_write(int minor, const char *buf, size_t len)
{
- int count;
+ size_t count;
for (count = 0; count < len; count++)
{
_IBMPC_outch( buf[ count ] );
if( buf[ count ] == '\n')
_IBMPC_outch( '\r' ); /* LF = LF + CR */
}
- return 0;
+ return count;
}
int kbd_poll_read( int minor )
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
index 7c5b4bfa17..58694066cc 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
+++ b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
@@ -588,7 +588,7 @@ static int paux_last_close(int major, int minor, void *arg)
* termios framework whenever the "ECHO" feature is on.
* It does nothing write now.
*/
-static int write_aux_echo( int minor, const char * buffer, int count )
+static ssize_t write_aux_echo( int minor, const char * buffer, size_t count )
{
return 0;
}
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c
index afdfcefab5..af6589359d 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.c
+++ b/c/src/lib/libbsp/i386/shared/comm/uart.c
@@ -571,8 +571,8 @@ BSP_uart_termios_read_com2(int uart)
return ( EOF );
}
-int
-BSP_uart_termios_write_com1(int minor, const char *buf, int len)
+ssize_t
+BSP_uart_termios_write_com1(int minor, const char *buf, size_t len)
{
assert(buf != NULL);
@@ -602,11 +602,11 @@ BSP_uart_termios_write_com1(int minor, const char *buf, int len)
uwrite(BSP_UART_COM1, IER, uart_data[BSP_UART_COM1].ier);
}
- return 0;
+ return 1;
}
-int
-BSP_uart_termios_write_com2(int minor, const char *buf, int len)
+ssize_t
+BSP_uart_termios_write_com2(int minor, const char *buf, size_t len)
{
assert(buf != NULL);
@@ -636,7 +636,7 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len)
uwrite(BSP_UART_COM2, IER, uart_data[BSP_UART_COM2].ier);
}
- return 0;
+ return 1;
}
void
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.h b/c/src/lib/libbsp/i386/shared/comm/uart.h
index e0ea6e0ec7..8f89a4338f 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.h
+++ b/c/src/lib/libbsp/i386/shared/comm/uart.h
@@ -24,8 +24,8 @@ int BSP_uart_polled_read(int uart);
void BSP_uart_termios_set(int uart, void *ttyp);
int BSP_uart_termios_read_com1(int uart);
int BSP_uart_termios_read_com2(int uart);
-int BSP_uart_termios_write_com1(int minor, const char *buf, int len);
-int BSP_uart_termios_write_com2(int minor, const char *buf, int len);
+ssize_t BSP_uart_termios_write_com1(int minor, const char *buf, size_t len);
+ssize_t BSP_uart_termios_write_com2(int minor, const char *buf, size_t len);
void BSP_uart_termios_isr_com1();
void BSP_uart_termios_isr_com2();
void BSP_uart_dbgisr_com1(void);