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/m68k/av5282/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/av5282/console/console.c | 15 +++++----- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 6 ++++ c/src/lib/libbsp/m68k/gen68340/console/console.c | 8 ++--- c/src/lib/libbsp/m68k/gen68340/console/m340uart.c | 5 ++-- c/src/lib/libbsp/m68k/gen68340/include/m340uart.h | 2 +- c/src/lib/libbsp/m68k/gen68340/timer/timer.c | 2 -- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 9 ++++-- c/src/lib/libbsp/m68k/gen68360/console/console.c | 11 +++---- c/src/lib/libbsp/m68k/genmcf548x/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/genmcf548x/console/console.c | 13 +++++---- c/src/lib/libbsp/m68k/idp/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/idp/console/console.c | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 5 ++++ .../lib/libbsp/m68k/mcf5206elite/console/console.c | 8 ++--- c/src/lib/libbsp/m68k/mcf52235/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/mcf52235/console/console.c | 11 +++---- c/src/lib/libbsp/m68k/mcf5235/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/mcf5235/console/console.c | 15 +++++----- c/src/lib/libbsp/m68k/mcf5329/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/mcf5329/console/console.c | 11 +++---- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/mrm332/console/sci.c | 34 +++++++++++----------- c/src/lib/libbsp/m68k/mvme162/console/console.c | 2 +- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/mvme167/console/console.c | 16 +++++----- c/src/lib/libbsp/m68k/uC5282/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/uC5282/console/console.c | 24 ++++++++------- 28 files changed, 154 insertions(+), 90 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index 624957a90a..2dae246e2d 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-10-21 Ralf Corsépius * make/custom/av5282.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/m68k/av5282/console/console.c b/c/src/lib/libbsp/m68k/av5282/console/console.c index 51cddbfea1..a82652fb2c 100644 --- a/c/src/lib/libbsp/m68k/av5282/console/console.c +++ b/c/src/lib/libbsp/m68k/av5282/console/console.c @@ -22,8 +22,8 @@ MCF5282_UART_USR_PE | \ MCF5282_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 */ MCF5282_UART_UTB(minor) = *buf++; } - return(0); + return retval; } /*************************************************************************** diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index b917d9c05e..e3760dce25 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,9 @@ +2009-12-16 Thomas Doerfler + + * console/console.c, console/m340uart.c, include/m340uart.h, + timer/timer.c: + adapted to new prototype for *_write function + 2009-10-21 Ralf Corsépius * make/custom/gen68340.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c index daaa2833ea..bebf2951be 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c @@ -171,8 +171,8 @@ InterruptHandler (rtems_vector_number v) may be called by either console_write or rtems_termios_enqueue_raw_characters *****************************************************/ -static int -InterruptWrite (int minor, const char *buf, int len) +static ssize_t +InterruptWrite (int minor, const char *buf, size_t len) { if (minor==UART_CHANNEL_A) { if (len>0) DUTBA=*buf; @@ -296,8 +296,6 @@ dbugInitialise (void) rtems_isr_entry old_handler; rtems_status_code sc; - extern void _Debug_ISR_Handler_Console(void); - sc = rtems_interrupt_catch (InterruptHandler, CONSOLE_VECTOR, &old_handler); @@ -382,8 +380,6 @@ dbugInitialise (void) rtems_isr_entry old_handler; rtems_status_code sc; - extern void _Debug_ISR_Handler_Console(void); - sc = rtems_interrupt_catch (InterruptHandler, CONSOLE_VECTOR, &old_handler); diff --git a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c index 276b9e83ba..757caced5e 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c +++ b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c @@ -266,15 +266,16 @@ int dbugRead (int minor) Output parameters: always successfull Description: polled write *****************************************************/ -int dbugWrite (int minor, const char *buf, int len) +ssize_t dbugWrite (int minor, const char *buf, size_t len) { static char txBuf; + size_t retval = len; while (len--) { txBuf = *buf++; dbug_out_char( minor, (int)txBuf ); } - return 0; + return retval; } static void fmt_num( int minor, unsigned long, unsigned ); diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h b/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h index beade96da7..670e91fd11 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h @@ -81,7 +81,7 @@ Find_Right_m340_UART_Config(float ChannelA_ReceiverBaudRate, float ChannelA_Tran extern rtems_isr InterruptHandler (rtems_vector_number v); extern int dbugRead (int minor); -extern int dbugWrite (int minor, const char *buf, int len); +extern ssize_t dbugWrite (int minor, const char *buf, size_t len); extern float m340_Baud_Rates_Table[16][2]; diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c index 3331385976..c14e85769a 100644 --- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c @@ -188,8 +188,6 @@ void Fifo_Full_benchmark_timer_initialize (void) rtems_isr_entry old_handler; rtems_status_code sc; - extern void _Debug_ISR_Handler_Console(void); - sc = rtems_interrupt_catch (InterruptHandler, TIMER1_VECTOR, &old_handler); diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index c735c9b8a2..2b2a510f7f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-10-21 Ralf Corsépius * make/custom/gen68360.cfg: Remove RTEMS_BSP_FAMILY. @@ -44,8 +49,8 @@ 2008-10-21 Thomas Doerfler - * spi/mc68360_spidrv.h: - removed orphaned file + * spi/mc68360_spidrv.h: + removed orphaned file 2008-10-02 Ralf Corsépius diff --git a/c/src/lib/libbsp/m68k/gen68360/console/console.c b/c/src/lib/libbsp/m68k/gen68360/console/console.c index 19bbf91c90..38e4f243e5 100644 --- a/c/src/lib/libbsp/m68k/gen68360/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68360/console/console.c @@ -231,8 +231,8 @@ smc1PollRead (int minor) * Polling devices: * Transmit all characters. */ -static int -smc1InterruptWrite (int minor, const char *buf, int len) +static ssize_t +smc1InterruptWrite (int minor, const char *buf, size_t len) { smcTxBd->buffer = (char *)buf; smcTxBd->length = len; @@ -240,9 +240,10 @@ smc1InterruptWrite (int minor, const char *buf, int len) return 0; } -static int -smc1PollWrite (int minor, const char *buf, int len) +static ssize_t +smc1PollWrite (int minor, const char *buf, size_t len) { + size_t retval = len; while (len--) { static char txBuf; while (smcTxBd->status & M360_BD_READY) @@ -252,7 +253,7 @@ smc1PollWrite (int minor, const char *buf, int len) smcTxBd->length = 1; smcTxBd->status = M360_BD_READY | M360_BD_WRAP; } - return 0; + return retval; } /* diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog index 680bc3ca04..87d4ce7c17 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog +++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-12-14 Thomas Doerfler * console/console.c, include/bsp.h, network/network.c: get vital diff --git a/c/src/lib/libbsp/m68k/genmcf548x/console/console.c b/c/src/lib/libbsp/m68k/genmcf548x/console/console.c index 1cb1a57f9f..616892bc74 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/console/console.c +++ b/c/src/lib/libbsp/m68k/genmcf548x/console/console.c @@ -68,7 +68,7 @@ MCF548X_PSC_SR_PE_CRCERR | \ MCF548X_PSC_SR_OE ) -static int IntUartPollWrite(int minor, const char *buf, int len); +static ssize_t IntUartPollWrite(int minor, const char *buf, size_t len); static int IntUartPollRead (int minor); static void @@ -525,8 +525,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; @@ -674,9 +674,10 @@ if (!((MCF548X_PSC_SR(minor) & MCF548X_PSC_SR_RXRDY))) 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-- ) { @@ -686,7 +687,7 @@ IntUartPollWrite (int minor, const char *buf, int len) /* transmit data byte */ *((uint8_t *)&MCF548X_PSC_TB(minor)) = *buf++; } - return 0; + return retval; } /*************************************************************************** diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 8d236a5abb..f6091ebf94 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-10-21 Ralf Corsépius * make/custom/idp.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/m68k/idp/console/console.c b/c/src/lib/libbsp/m68k/idp/console/console.c index 264ec4a36a..2709325d5d 100644 --- a/c/src/lib/libbsp/m68k/idp/console/console.c +++ b/c/src/lib/libbsp/m68k/idp/console/console.c @@ -135,7 +135,7 @@ char inbyte( int port ) { - unsigned char tmp_char; + char tmp_char; /* If you come into this routine without checking is_character_ready() first and you want nonblocking code, then it's your own fault */ diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 14b1aa0ea8..ecb53afcef 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-12-08 Ralf Corsépius * startup/init5206e.c: Make prototype of CopyDataClearBSSAndStart diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c b/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c index e4f7075154..a613abecc9 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c @@ -63,8 +63,8 @@ console_poll_read(int minor) * RETURNS: * result code */ -static int -console_interrupt_write(int minor, const char *buf, int len) +static ssize_t +console_interrupt_write(int minor, const char *buf, size_t len) { return mcfuart_interrupt_write(&uart[minor], buf, len); } @@ -80,8 +80,8 @@ console_interrupt_write(int minor, const char *buf, int len) * RETURNS: * result code */ -static int -console_poll_write(int minor, const char *buf, int len) +static ssize_t +console_poll_write(int minor, const char *buf, size_t len) { return mcfuart_poll_write(&uart[minor], buf, len); } 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 + + * console/console.c: adapted to new prototype for *_write + function + 2009-10-21 Ralf Corsépius * 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; } /*************************************************************************** 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 + + * console/console.c: adapted to new prototype for *_write + function + 2009-11-16 Alan Cudmore * 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; } /*************************************************************************** diff --git a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog index 40721e8b02..9f69a54064 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-11-03 Ralf Corsépius * startup/cfinit.c: Remove init_vbr (Unused). diff --git a/c/src/lib/libbsp/m68k/mcf5329/console/console.c b/c/src/lib/libbsp/m68k/mcf5329/console/console.c index 3041068147..3590e05aae 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/console/console.c +++ b/c/src/lib/libbsp/m68k/mcf5329/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); static void _BSP_null_char(char c) { @@ -353,7 +353,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; @@ -486,8 +486,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 */ @@ -496,7 +497,7 @@ static int IntUartPollWrite(int minor, const char *buf, int len) /* transmit data byte */ MCF_UART_UTB(minor) = *buf++; } - return (0); + return retval; } /*************************************************************************** diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 54866faea0..e9eed33adb 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/sci.c: adapted to new prototype for *_write + function + 2009-10-21 Ralf Corsépius * make/custom/mrm332.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.c b/c/src/lib/libbsp/m68k/mrm332/console/sci.c index c41f480e86..3460d567f7 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/sci.c +++ b/c/src/lib/libbsp/m68k/mrm332/console/sci.c @@ -154,15 +154,15 @@ rtems_device_driver SciControl( /* device driver api */ rtems_device_driver SciRead ( rtems_device_major_number, rtems_device_minor_number, void *); -int SciInterruptOpen(int, int, void *); /* termios api */ -int SciInterruptClose(int, int, void *); /* termios api */ -int SciInterruptWrite(int, const char *, int); /* termios api */ +int SciInterruptOpen(int, int, void *); /* termios api */ +int SciInterruptClose(int, int, void *); /* termios api */ +ssize_t SciInterruptWrite(int, const char *, size_t); /* termios api */ -int SciSetAttributes(int, const struct termios*); /* termios api */ -int SciPolledOpen(int, int, void *); /* termios api */ -int SciPolledClose(int, int, void *); /* termios api */ -int SciPolledRead(int); /* termios api */ -int SciPolledWrite(int, const char *, int); /* termios api */ +int SciSetAttributes(int, const struct termios*); /* termios api */ +int SciPolledOpen(int, int, void *); /* termios api */ +int SciPolledClose(int, int, void *); /* termios api */ +int SciPolledRead(int); /* termios api */ +ssize_t SciPolledWrite(int, const char *, size_t); /* termios api */ static void SciSetBaud(uint32_t rate); /* hardware routine */ static void SciSetDataBits(uint16_t bits); /* hardware routine */ @@ -615,10 +615,10 @@ int SciInterruptClose( * Scope: public API ****************************************************************************/ -int SciInterruptWrite( +ssize_t SciInterruptWrite( int minor, const char *buf, - int len + size_t len ) { /* We are using interrupt driven output so termios only sends us */ @@ -626,17 +626,17 @@ int SciInterruptWrite( if ( !len ) /* no data? */ { - return 0; /* return error */ + return -1; /* return error */ } if ( minor != SCI_MINOR ) /* check the minor dev num */ { - return 0; /* return error */ + return -1; /* return error */ } if ( SciOpened == DRIVER_OPENED ) /* is the driver api open? */ { - return 1; /* yep, throw this away */ + return -1; /* yep, throw this away */ } SciWriteCharNoWait(*buf); /* try to send a char */ @@ -645,7 +645,7 @@ int SciInterruptWrite( SciEnableTransmitInterrupts(); /* enable the tx interrupt */ - return 1; /* return success */ + return 0; /* return success */ } @@ -860,13 +860,13 @@ int SciPolledRead( * Scope: public termios API ****************************************************************************/ -int SciPolledWrite( +ssize_t SciPolledWrite( int minor, const char *buf, - int len + size_t len ) { - int32_t written = 0; + ssize_t written = 0; if ( minor != SCI_MINOR ) /* check minor device num */ { diff --git a/c/src/lib/libbsp/m68k/mvme162/console/console.c b/c/src/lib/libbsp/m68k/mvme162/console/console.c index 3d87edabe2..6ace676400 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme162/console/console.c @@ -126,7 +126,7 @@ bool char_ready(int port, char *ch) char inbyte(int port) { - unsigned char tmp_char; + char tmp_char; while ( !char_ready(port, &tmp_char) ); return tmp_char; 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 + + * console/console.c: adapted to new prototype for *_write + function + 2009-12-08 Eric Norum 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; } /* diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index d1cbafcff7..4fb6a23196 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,8 @@ +2009-12-16 Thomas Doerfler + + * console/console.c: adapted to new prototype for *_write + function + 2009-11-03 Ralf Corsépius * startup/bspstart.c: Add missing prototype. diff --git a/c/src/lib/libbsp/m68k/uC5282/console/console.c b/c/src/lib/libbsp/m68k/uC5282/console/console.c index 96ad4b095a..a213cbca2f 100644 --- a/c/src/lib/libbsp/m68k/uC5282/console/console.c +++ b/c/src/lib/libbsp/m68k/uC5282/console/console.c @@ -32,8 +32,8 @@ MCF5282_UART_USR_PE | \ MCF5282_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 ) @@ -406,8 +406,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; @@ -421,7 +421,7 @@ IntUartInterruptWrite (int minor, const char *buf, int len) MCF5282_UART_UIMR(minor) = IntUartInfo[minor].uimr; rtems_interrupt_enable(level); - return( 0 ); + return 0; } /*************************************************************************** @@ -447,9 +447,10 @@ IntUartInterruptOpen(int major, int minor, void *arg) MCF5282_GPIO_PUAPAR |= MCF5282_GPIO_PUAPAR_PUAPA3|MCF5282_GPIO_PUAPAR_PUAPA2; break; case 2: - MCF5282_GPIO_PASPAR = MCF5282_GPIO_PASPAR - & ~(MCF5282_GPIO_PASPAR_PASPA3(3)|MCF5282_GPIO_PASPAR_PASPA2(3)) - | (MCF5282_GPIO_PASPAR_PASPA3(2)|MCF5282_GPIO_PASPAR_PASPA2(2)); + MCF5282_GPIO_PASPAR = + (MCF5282_GPIO_PASPAR + & ~(MCF5282_GPIO_PASPAR_PASPA3(3)|MCF5282_GPIO_PASPAR_PASPA2(3))) + | (MCF5282_GPIO_PASPAR_PASPA3(2)|MCF5282_GPIO_PASPAR_PASPA2(2)); break; } rtems_interrupt_enable(level); @@ -576,9 +577,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-- ) { @@ -588,7 +590,7 @@ IntUartPollWrite (int minor, const char *buf, int len) /* transmit data byte */ MCF5282_UART_UTB(minor) = *buf++; } - return(0); + return retval; } /*************************************************************************** -- cgit v1.2.3