adapted to new prototype for *_write function

15 files changed, 84 insertions, 51 deletions

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index fc6477cc3b..963d354a31 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-16      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+	* shared/console/uart.c, shared/console/uart.h: adapted to new
+	prototype for *_write function
+
 2009-12-11	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	PR 1483/cpukit
diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
index 77c7191bee..2b09c410a1 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ep1a/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-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* Makefile.am, preinstall.am: Update for exception support changes.
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c b/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c
index ede9133864..e9f07a6a50 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c
+++ b/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c
@@ -859,15 +859,15 @@ int mc68360_scc_inbyte_nonblocking_polled(
  *
  */
 
-int mc68360_scc_write_support_polled(
+ssize_t mc68360_scc_write_support_polled(
   int         minor,
   const char *buf,
-  int         len
+  size_t      len
 )
 {
   printk("mc68360_scc_write_support_polled: minor %d char %c len %d\n",
          minor, buf, len );
-  return 0;
+  return len;
 }
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
index 1fac04e115..b47db9875a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen5200/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-04	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* ide/pcmcia_ide.c (mpc5200_pcmciaide_write_block,
diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
index 8062474c8d..84c38424e6 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
@@ -551,12 +551,13 @@ int mpc5200_uart_pollRead(
 }
 
 
-int mpc5200_uart_pollWrite(
+ssize_t mpc5200_uart_pollWrite(
   int minor,
   const char *buf,
-  int len
+  size_t len
 )
 {
+  size_t retval = len;
   const char *tmp_buf = buf;
   struct mpc5200_psc *psc =
     (struct mpc5200_psc *)(&mpc5200.psc[psc_minor_to_regset[minor]]);
@@ -572,15 +573,14 @@ int mpc5200_uart_pollWrite(
     tmp_buf++;
 
   }
-  return 0;
+  return retval;
 
 }
 
-
-int mpc5200_uart_write(
+ssize_t mpc5200_uart_write(
   int         minor,
   const char *buf,
-  int len
+  size_t len
 )
 {
   int frame_len = len;
@@ -648,7 +648,7 @@ static int A_BSP_get_char(void)
    */
   #if !defined(HAS_UBOOT)
     if (console_initialized == false)
-     return;
+     return -1;
   #endif
 
   return mpc5200_uart_pollRead(0);
diff --git a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog
index 074421c5b3..2cefc9a222 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-16      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+	* startup/bspstart.c: warning removal
+
 2009-11-12	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* INSTALL: Remove.
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
index 9ca78b959b..88e61f38d1 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
@@ -71,6 +71,8 @@
 
 #include <stdio.h>
 
+LINKER_SYMBOL(intrStack_start);
+LINKER_SYMBOL(intrStack_size);
 /*
  *  Driver configuration parameters
  */
@@ -170,8 +172,6 @@ BSP_output_char_function_type BSP_output_char = DirectUARTWrite;
 void bsp_start( void )
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
-  LINKER_SYMBOL(intrStack_start);
-  LINKER_SYMBOL(intrStack_size);
   ppc_cpu_id_t myCpu;
   ppc_cpu_revision_t myCpuRevision;
 
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 5560144064..940b6158e4 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/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-23	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* vectors/vectors.h, vectors/vectors_init.c, vectors/vectors.S,
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
index 09b1d3943b..b6148164fc 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
@@ -83,7 +83,7 @@
 #include <bsp/mbx.h>
 
 static int _EPPCBug_pollRead( int minor );
-static int _EPPCBug_pollWrite( int minor, const char *buf, int len );
+static ssize_t _EPPCBug_pollWrite( int minor, const char *buf, size_t len );
 static void _BSP_output_char( char c );
 static rtems_status_code do_poll_read( rtems_device_major_number major, rtems_device_minor_number minor, void * arg);
 static rtems_status_code do_poll_write( rtems_device_major_number major, rtems_device_minor_number minor, void * arg);
@@ -214,16 +214,16 @@ static int _EPPCBug_pollRead(
  *
  *  Return value: IGNORED
  */
-static int _EPPCBug_pollWrite(
+static ssize_t _EPPCBug_pollWrite(
   int minor,
   const char *buf,
-  int len
+  size_t len
 )
 {
   extern volatile m8xx_t m8xx;
 
   volatile int simask;
-  int i, retval;
+  int i;
   ISR_Level level;
 
   struct {
@@ -249,8 +249,6 @@ static int _EPPCBug_pollWrite(
     } u;
   } volatile output_params;
 
-  retval = -1;
-
   input_params.clun = 0;
   input_params.reserved = 0;
 
@@ -315,7 +313,7 @@ static int _EPPCBug_pollWrite(
   /* Return something */
   m8xx.simask = simask;
   _ISR_Enable( level );
-  return RTEMS_SUCCESSFUL;
+  return len;
 
 error:
   m8xx.simask = simask;
@@ -422,7 +420,7 @@ static rtems_status_code do_poll_write(
 
 #if NVRAM_CONFIGURE == 1
 
-  int (*pollWrite)(int minor, const char *buf, int len);
+  ssize_t (*pollWrite)(int minor, const char *buf, size_t len);
 
   if ( (nvram->console_mode & 0x06) == 0x04 )
     pollWrite = _EPPCBug_pollWrite;
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index 09d06133c6..a62913f473 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/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-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* Makefile.am, preinstall.am: Update for exception support changes.
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/console.c b/c/src/lib/libbsp/powerpc/score603e/console/console.c
index 60baac3bb5..c2e9952f3d 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/console.c
+++ b/c/src/lib/libbsp/powerpc/score603e/console/console.c
@@ -254,10 +254,10 @@ rtems_device_driver console_initialize(
  *  Console Termios output entry point.
  *
  */
-int console_write_support(
+ssize_t console_write_support(
   int   minor,
   const char *buf,
-  int   len)
+  size_t   len)
 {
   int nwrite = 0;
   volatile uint8_t         *csr;
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/c/src/lib/libbsp/powerpc/shared/console/uart.c
index 3e89701666..81cada4062 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/uart.c
@@ -554,8 +554,8 @@ BSP_uart_termios_set(int uart, void *p)
   return;
 }
 
-int
-BSP_uart_termios_write_polled(int minor, const char *buf, int len)
+ssize_t
+BSP_uart_termios_write_polled(int minor, const char *buf, size_t len)
 {
   int uart=minor;	/* could differ, theoretically */
   int nwrite;
@@ -569,8 +569,8 @@ BSP_uart_termios_write_polled(int minor, const char *buf, int len)
   return nwrite;
 }
 
-int
-BSP_uart_termios_write_com(int minor, const char *buf, int len)
+ssize_t
+BSP_uart_termios_write_com(int minor, const char *buf, size_t len)
 {
   int uart=minor;	/* could differ, theoretically */
   assert(buf != NULL);
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.h b/c/src/lib/libbsp/powerpc/shared/console/uart.h
index a067003638..405d2ea637 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.h
+++ b/c/src/lib/libbsp/powerpc/shared/console/uart.h
@@ -15,26 +15,26 @@
 #include <sys/ioctl.h>
 #include <rtems/libio.h>
 
-void BSP_uart_init(int uart, int baud, int hwFlow);
-void BSP_uart_set_baud(int uart, int baud);
-void BSP_uart_intr_ctrl(int uart, int cmd);
-void BSP_uart_throttle(int uart);
-void BSP_uart_unthrottle(int uart);
-int  BSP_uart_polled_status(int uart);
-void BSP_uart_polled_write(int uart, int val);
-int  BSP_uart_polled_read(int uart);
-void BSP_uart_termios_set(int uart, void *ttyp);
-int  BSP_uart_termios_write_com(int minor, const char *buf, int len);
-int  BSP_uart_termios_read_com (int minor);
-void BSP_uart_termios_isr_com1(void *unused);
-void BSP_uart_termios_isr_com2(void *unused);
-void BSP_uart_dbgisr_com1(void);
-void BSP_uart_dbgisr_com2(void);
-int  BSP_uart_install_isr(int uart, rtems_irq_hdl handler);
-int  BSP_uart_remove_isr(int uart, rtems_irq_hdl handler);
-int  BSP_uart_termios_write_polled(int minor, const char *buf, int len);
-int  BSP_uart_get_break_cb(int uart, rtems_libio_ioctl_args_t *arg);
-int  BSP_uart_set_break_cb(int uart, rtems_libio_ioctl_args_t *arg);
+void     BSP_uart_init(int uart, int baud, int hwFlow);
+void     BSP_uart_set_baud(int uart, int baud);
+void     BSP_uart_intr_ctrl(int uart, int cmd);
+void     BSP_uart_throttle(int uart);
+void     BSP_uart_unthrottle(int uart);
+int      BSP_uart_polled_status(int uart);
+void     BSP_uart_polled_write(int uart, int val);
+int      BSP_uart_polled_read(int uart);
+void     BSP_uart_termios_set(int uart, void *ttyp);
+ssize_t  BSP_uart_termios_write_com(int minor, const char *buf, size_t len);
+int      BSP_uart_termios_read_com (int minor);
+void     BSP_uart_termios_isr_com1(void *unused);
+void     BSP_uart_termios_isr_com2(void *unused);
+void     BSP_uart_dbgisr_com1(void);
+void     BSP_uart_dbgisr_com2(void);
+int      BSP_uart_install_isr(int uart, rtems_irq_hdl handler);
+int      BSP_uart_remove_isr(int uart, rtems_irq_hdl handler);
+ssize_t BSP_uart_termios_write_polled(int minor, const char *buf, size_t len);
+int      BSP_uart_get_break_cb(int uart, rtems_libio_ioctl_args_t *arg);
+int      BSP_uart_set_break_cb(int uart, rtems_libio_ioctl_args_t *arg);
 
 extern unsigned BSP_poll_char_via_serial(void);
 extern void BSP_output_char_via_serial(const char val);
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
index 0920fed553..226ad27d6a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/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-06	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Add RTEMS_BSP_LINKCMDS.
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
index 90ac1a4aed..80f1cbd412 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
@@ -776,8 +776,8 @@ sccPollRead (int minor)
  * Polling devices:
  *	Transmit all characters.
  */
-static int
-sccInterruptWrite (int minor, const char *buf, int len)
+static ssize_t
+sccInterruptWrite (int minor, const char *buf, size_t len)
 {
   int chan = minor;
 
@@ -802,12 +802,13 @@ sccInterruptWrite (int minor, const char *buf, int len)
   return 0;
 }
 
-static int
-sccPollWrite (int minor, const char *buf, int len)
+static ssize_t
+sccPollWrite (int minor, const char *buf, size_t len)
 {
   static char txBuf[CONS_CHN_CNT][SCC_TXBD_CNT];
   int chan = minor;
   int bd_used;
+  size_t retval = len;
 
   while (len--) {
     while (sccPrepTxBd[chan]->status & M8xx_BD_READY)
@@ -829,7 +830,7 @@ sccPollWrite (int minor, const char *buf, int len)
       sccPrepTxBd[chan]++;
     }
   }
-  return 0;
+  return retval;
 }
 
 /*