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/mcf52235 | |
| 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/mcf52235')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mcf52235/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mcf52235/console/console.c | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog index bb4c5a92b2..41e190fe7d 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf52235/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-10-21 Ralf Corsépius <ralf.corsepius@rtems.org> * make/custom/mcf52235.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/m68k/mcf52235/console/console.c b/c/src/lib/libbsp/m68k/mcf52235/console/console.c index dcacee4e1a..b0ac4f9949 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/console/console.c +++ b/c/src/lib/libbsp/m68k/mcf52235/console/console.c @@ -22,8 +22,8 @@ MCF_UART_USR_PE | \ MCF_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); #define MAX_UART_INFO 3 #define RX_BUFFER_SIZE 512 @@ -339,7 +339,7 @@ static void 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; @@ -472,8 +472,9 @@ static int 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--) { /* block until we can transmit */ @@ -482,7 +483,7 @@ static int IntUartPollWrite(int minor, const char *buf, int len) /* transmit data byte */ MCF_UART_UTB(minor) = *buf++; } - return (0); + return retval; } /*************************************************************************** |