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/mvme167 | |
| 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/mvme167')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/console/console.c | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 03280ff37f..42a9af95ad 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/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-12-08 Eric Norum <wenorum@lbl.gov> PR 1479/bsps diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console.c b/c/src/lib/libbsp/m68k/mvme167/console/console.c index 66d8882953..11b546ed0a 100644 --- a/c/src/lib/libbsp/m68k/mvme167/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme167/console/console.c @@ -153,10 +153,10 @@ int cd2401_lastClose( int major, int minor, void *arg ); int cd2401_setAttributes( int minor, const struct termios *t ); int cd2401_startRemoteTx( int minor ); int cd2401_stopRemoteTx( int minor ); -int cd2401_write( int minor, const char *buf, int len ); +ssize_t cd2401_write( int minor, const char *buf, size_t len ); int cd2401_drainOutput( int minor ); int _167Bug_pollRead( int minor ); -int _167Bug_pollWrite( int minor, const char *buf, int len ); +ssize_t _167Bug_pollWrite( int minor, const char *buf, size_t len ); /* Printk function */ static void _BSP_output_char( char c ); @@ -1134,10 +1134,10 @@ int cd2401_stopRemoteTx( * console_write(). The processor is necessarily at interrupt level 1 in * cd2401_tx_isr(). */ -int cd2401_write( +ssize_t cd2401_write( int minor, const char *buf, - int len + size_t len ) { cd2401->car = minor; /* Select channel */ @@ -1173,7 +1173,7 @@ int cd2401_write( cd2401->ier |= 0x01; /* Return something */ - return RTEMS_SUCCESSFUL; + return len; } #if 0 @@ -1287,10 +1287,10 @@ int _167Bug_pollRead( * * CANNOT BE COMBINED WITH INTERRUPT DRIVEN I/O! */ -int _167Bug_pollWrite( +ssize_t _167Bug_pollWrite( int minor, const char *buf, - int len + size_t len ) { const char *endbuf = buf + len; @@ -1304,7 +1304,7 @@ int _167Bug_pollWrite( :: "a" (endbuf), "a" (buf), "d" (minor) ); /* Return something */ - return RTEMS_SUCCESSFUL; + return len; } /* |