adapted to new prototype for *_write function

5 files changed, 12 insertions, 11 deletions

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 <Thomas.Doerfler@embedded-brains.de>
+
+	* 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 <ralf.corsepius@rtems.org>
 
 	* 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);