From 3ed964f90d8ac21862f6226e3617912eccc974d1 Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Fri, 9 Apr 2010 22:44:05 +0000 Subject: adapt _write_ functions to new prototype --- c/src/ChangeLog | 7 +++++++ c/src/libchip/serial/mc68681.c | 10 +++++----- c/src/libchip/serial/mc68681_p.h | 8 ++++---- c/src/libchip/serial/ns16550.c | 8 ++++---- c/src/libchip/serial/ns16550_p.h | 8 ++++---- c/src/libchip/serial/serial.h | 2 +- c/src/libchip/serial/z85c30.c | 10 +++++----- c/src/libchip/serial/z85c30_p.h | 8 ++++---- 8 files changed, 34 insertions(+), 27 deletions(-) (limited to 'c/src') diff --git a/c/src/ChangeLog b/c/src/ChangeLog index ce734588b5..465dd5a46b 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2010-04-10 Thomas Doerfler + + * libchip/serial/serial.h, serial/mc68681.c, serial/mc68681_p.h, + serial/ns16550.c, serial/ns16550_p.h, serial/serial.h, + serial/z85c30.c, serial/z85c30_p.h: adapt _write_ functions to new + prototype + 2010-04-08 Joel Sherrill * libchip/ide/ata.c: Change missed use of ATA_USE_OLD_EXCEPTIONS to diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c index 2d2bf86c87..e273ef0e8b 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -448,10 +448,10 @@ MC68681_STATIC void mc68681_initialize_interrupts(int minor) * Console Termios output entry point when using interrupt driven output. */ -MC68681_STATIC int mc68681_write_support_int( +MC68681_STATIC ssize_t mc68681_write_support_int( int minor, const char *buf, - int len + size_t len ) { uint32_t Irql; @@ -481,7 +481,7 @@ MC68681_STATIC int mc68681_write_support_int( (*setReg)(pMC68681_port, MC68681_TX_BUFFER, *buf); rtems_interrupt_enable(Irql); - return 1; + return 0; } /* @@ -491,10 +491,10 @@ MC68681_STATIC int mc68681_write_support_int( * */ -MC68681_STATIC int mc68681_write_support_polled( +MC68681_STATIC ssize_t mc68681_write_support_polled( int minor, const char *buf, - int len + size_t len ) { int nwrite = 0; diff --git a/c/src/libchip/serial/mc68681_p.h b/c/src/libchip/serial/mc68681_p.h index 88304a0133..209196c2fc 100644 --- a/c/src/libchip/serial/mc68681_p.h +++ b/c/src/libchip/serial/mc68681_p.h @@ -279,16 +279,16 @@ MC68681_STATIC void mc68681_write_polled( MC68681_STATIC void mc68681_initialize_interrupts(int minor); -MC68681_STATIC int mc68681_write_support_int( +MC68681_STATIC ssize_t mc68681_write_support_int( int minor, const char *buf, - int len + size_t len ); -MC68681_STATIC int mc68681_write_support_polled( +MC68681_STATIC ssize_t mc68681_write_support_polled( int minor, const char *buf, - int len + size_t len ); MC68681_STATIC int mc68681_inbyte_nonblocking_polled( diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index a50d245224..37a24e1bc6 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -531,10 +531,10 @@ NS16550_STATIC void ns16550_process( int minor) * * Returns always zero. */ -NS16550_STATIC int ns16550_write_support_int( +NS16550_STATIC ssize_t ns16550_write_support_int( int minor, const char *buf, - int len + size_t len ) { console_tbl *c = &Console_Port_Tbl [minor]; @@ -659,10 +659,10 @@ NS16550_STATIC void ns16550_initialize_interrupts( int minor) * */ -NS16550_STATIC int ns16550_write_support_polled( +NS16550_STATIC ssize_t ns16550_write_support_polled( int minor, const char *buf, - int len + size_t len ) { int nwrite = 0; diff --git a/c/src/libchip/serial/ns16550_p.h b/c/src/libchip/serial/ns16550_p.h index a32b46f969..6e328ef06e 100644 --- a/c/src/libchip/serial/ns16550_p.h +++ b/c/src/libchip/serial/ns16550_p.h @@ -171,16 +171,16 @@ NS16550_STATIC int ns16550_negate_DTR( NS16550_STATIC void ns16550_initialize_interrupts(int minor); -NS16550_STATIC int ns16550_write_support_int( +NS16550_STATIC ssize_t ns16550_write_support_int( int minor, const char *buf, - int len + size_t len ); -NS16550_STATIC int ns16550_write_support_polled( +NS16550_STATIC ssize_t ns16550_write_support_polled( int minor, const char *buf, - int len + size_t len ); NS16550_STATIC int ns16550_inbyte_nonblocking_polled( diff --git a/c/src/libchip/serial/serial.h b/c/src/libchip/serial/serial.h index 7d906965d0..3630cb81b0 100644 --- a/c/src/libchip/serial/serial.h +++ b/c/src/libchip/serial/serial.h @@ -35,7 +35,7 @@ typedef struct _console_fns { int (*deviceFirstOpen)(int major, int minor, void *arg); int (*deviceLastClose)(int major, int minor, void *arg); int (*deviceRead)(int minor); - int (*deviceWrite)(int minor, const char *buf, int len); + ssize_t (*deviceWrite)(int minor, const char *buf, size_t len); void (*deviceInitialize)(int minor); void (*deviceWritePolled)(int minor, char cChar); int (*deviceSetAttributes)(int minor, const struct termios *t); diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c index 3dedcd0d10..cc82b17ff1 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -743,10 +743,10 @@ Z85C30_STATIC void z85c30_initialize_interrupts( * */ -Z85C30_STATIC int z85c30_write_support_int( +Z85C30_STATIC ssize_t z85c30_write_support_int( int minor, const char *buf, - int len) + size_t len) { uint32_t Irql; uint32_t ulCtrlPort; @@ -778,7 +778,7 @@ Z85C30_STATIC int z85c30_write_support_int( (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR8, *buf); rtems_interrupt_enable(Irql); - return 1; + return 0; } /* @@ -820,10 +820,10 @@ Z85C30_STATIC int z85c30_inbyte_nonblocking_polled( * */ -Z85C30_STATIC int z85c30_write_support_polled( +Z85C30_STATIC ssize_t z85c30_write_support_polled( int minor, const char *buf, - int len) + size_t len) { int nwrite=0; diff --git a/c/src/libchip/serial/z85c30_p.h b/c/src/libchip/serial/z85c30_p.h index f5a8ae33b2..e649f0cf5a 100644 --- a/c/src/libchip/serial/z85c30_p.h +++ b/c/src/libchip/serial/z85c30_p.h @@ -381,16 +381,16 @@ Z85C30_STATIC int z85c30_negate_DTR( Z85C30_STATIC void z85c30_initialize_interrupts(int minor); -Z85C30_STATIC int z85c30_write_support_int( +Z85C30_STATIC ssize_t z85c30_write_support_int( int minor, const char *buf, - int len + size_t len ); -Z85C30_STATIC int z85c30_write_support_polled( +Z85C30_STATIC ssize_t z85c30_write_support_polled( int minor, const char *buf, - int len + size_t len ); Z85C30_STATIC int z85c30_inbyte_nonblocking_polled( -- cgit v1.2.3