From 39a9f8ea1294518df837c2f6a4586c1ca61945e2 Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Thu, 17 Dec 2009 08:42:17 +0000 Subject: adapted to new prototype for *_write function --- c/src/lib/libbsp/powerpc/gen5200/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/gen5200/console/console.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/gen5200') diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog index 1fac04e115..b47db9875a 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-11-04 Ralf Corsépius * ide/pcmcia_ide.c (mpc5200_pcmciaide_write_block, diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/c/src/lib/libbsp/powerpc/gen5200/console/console.c index 8062474c8d..84c38424e6 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c +++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c @@ -551,12 +551,13 @@ int mpc5200_uart_pollRead( } -int mpc5200_uart_pollWrite( +ssize_t mpc5200_uart_pollWrite( int minor, const char *buf, - int len + size_t len ) { + size_t retval = len; const char *tmp_buf = buf; struct mpc5200_psc *psc = (struct mpc5200_psc *)(&mpc5200.psc[psc_minor_to_regset[minor]]); @@ -572,15 +573,14 @@ int mpc5200_uart_pollWrite( tmp_buf++; } - return 0; + return retval; } - -int mpc5200_uart_write( +ssize_t mpc5200_uart_write( int minor, const char *buf, - int len + size_t len ) { int frame_len = len; @@ -648,7 +648,7 @@ static int A_BSP_get_char(void) */ #if !defined(HAS_UBOOT) if (console_initialized == false) - return; + return -1; #endif return mpc5200_uart_pollRead(0); -- cgit v1.2.3