diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2009-12-17 08:42:17 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2009-12-17 08:42:17 +0000 |
| commit | 39a9f8ea1294518df837c2f6a4586c1ca61945e2 (patch) | |
| tree | bbcca399b1539adf14930593f22a73cd1aea01a9 /c/src/lib/libbsp/m68k/mcf5235 | |
| parent | adaption of calling convention to console my_driver_write function (diff) | |
| download | rtems-39a9f8ea1294518df837c2f6a4586c1ca61945e2.tar.bz2 | |
adapted to new prototype for *_write function
Diffstat (limited to 'c/src/lib/libbsp/m68k/mcf5235')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/console/console.c | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog index 5e54bb5e43..d1d26b96cb 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * console/console.c: adapted to new prototype for *_write + function + 2009-11-16 Alan Cudmore <alan.p.cudmore@nasa.gov> * startup/init5235.c: Add volatile to prevent newer gcc versions from diff --git a/c/src/lib/libbsp/m68k/mcf5235/console/console.c b/c/src/lib/libbsp/m68k/mcf5235/console/console.c index c5ddf8f5c5..0e8fa4c7f1 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/console/console.c +++ b/c/src/lib/libbsp/m68k/mcf5235/console/console.c @@ -22,8 +22,8 @@ MCF5235_UART_USR_PE | \ MCF5235_UART_USR_OE ) -static int IntUartPollWrite(int minor, const char *buf, int len); -static int IntUartInterruptWrite (int minor, const char *buf, int len); +static ssize_t IntUartPollWrite(int minor, const char *buf, size_t len); +static ssize_t IntUartInterruptWrite (int minor, const char *buf, size_t len); static void _BSP_null_char( char c ) @@ -390,8 +390,8 @@ IntUartInitialize(void) to initiate a transmit sequence. Calling this routine enables Tx interrupts. ***************************************************************************/ -static int -IntUartInterruptWrite (int minor, const char *buf, int len) +static ssize_t +IntUartInterruptWrite (int minor, const char *buf, size_t len) { int level; @@ -541,9 +541,10 @@ IntUartPollRead (int minor) appropriate internal uart channel waiting till each one is sucessfully transmitted. ***************************************************************************/ -static int -IntUartPollWrite (int minor, const char *buf, int len) +static ssize_t +IntUartPollWrite (int minor, const char *buf, size_t len) { + size_t retval = len; /* loop over buffer */ while ( len-- ) { @@ -553,7 +554,7 @@ IntUartPollWrite (int minor, const char *buf, int len) /* transmit data byte */ MCF5235_UART_UTB(minor) = *buf++; } - return(0); + return retval; } /*************************************************************************** |