adapted to new prototype for *_write function

3 files changed, 10 insertions, 10 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c
index 19072a3781..16b44c2b94 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c
@@ -139,11 +139,10 @@ m5xx_uart_pollRead(
   return c;
 }
 
-int
-m5xx_uart_write(
+ssize_t m5xx_uart_write(
   int minor,
   const char *buf,
-  int len
+  size_t len
 )
 {
   volatile m5xxSCIRegisters_t *regs = sci_descs[minor].regs;
@@ -153,21 +152,22 @@ m5xx_uart_write(
   return 0;
 }
 
-int
-m5xx_uart_pollWrite(
+ssize_t m5xx_uart_pollWrite(
   int minor,
   const char *buf,
-  int len
+  size_t len
 )
 {
   volatile m5xxSCIRegisters_t *regs = sci_descs[minor].regs;
+  size_t retval = len;
 
   while ( len-- ) {
     while ( (regs->scsr & QSMCM_SCI_TDRE) == 0 )
       ;
     regs->scdr = *buf++;
   }
-  return 0;
+
+  return retval;
 }
 
 int
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h b/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
index 027754b709..e765d88731 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
@@ -24,8 +24,8 @@ void m5xx_uart_initialize(int minor);
 int m5xx_uart_firstOpen(int maj, int min, void *arg);
 int m5xx_uart_lastClose(int maj, int min, void *arg);
 int m5xx_uart_pollRead(int minor);
-int m5xx_uart_pollWrite(int minor, const char* buf, int len);
-int m5xx_uart_write(int minor, const char *buf, int len);
+ssize_t m5xx_uart_pollWrite(int minor, const char* buf, size_t len);
+ssize_t m5xx_uart_write    (int minor, const char *buf, size_t len);
 int m5xx_uart_setAttributes(int, const struct termios* t);
 
 #define NUM_PORTS	2	/* number of serial ports */
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c
index 443340a914..8ae7079489 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c
@@ -119,7 +119,7 @@ const static unsigned int USIU_IvectMask[CPU_USIU_IRQ_COUNT] =
  * is already set and that the tables it contains are still valid
  * and accessible.
  */
-static void compute_USIU_IvectMask_from_prio ()
+static void compute_USIU_IvectMask_from_prio (void)
 {
   /*
    * In theory this is feasible. No time to code it yet. See i386/shared/irq.c