[rtems commit] mrm332: Tests now build and fewer warnings

[Joel Sherrill]

Module:    rtems
Branch:    master
Commit:    36601543db26f37326eb51e21509022d1df90ffd
Changeset: http://git.rtems.org/rtems/commit/?id=36601543db26f37326eb51e21509022d1df90ffd

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Sun Jun  1 18:18:28 2014 -0500

mrm332: Tests now build and fewer warnings

---

 c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c        |    7 ++++---
 c/src/lib/libbsp/m68k/mrm332/console/sci.c         |    6 ++++--
 c/src/lib/libbsp/m68k/mrm332/include/bsp.h         |    1 -
 .../libbsp/m68k/mrm332/startup/bsppredriverhook.c  |    8 ++------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
index d7ae0a3..5c48013 100644
--- a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
@@ -35,6 +35,9 @@ void Clock_exit( void );
 rtems_device_major_number rtems_clock_major = ~0;
 rtems_device_minor_number rtems_clock_minor;
 
+rtems_isr Clock_isr(rtems_vector_number vector);
+void Install_clock(rtems_isr_entry clock_isr);
+
 rtems_isr Clock_isr(rtems_vector_number vector)
 {
   Clock_driver_ticks += 1;
@@ -47,9 +50,7 @@ rtems_isr Clock_isr(rtems_vector_number vector)
     Clock_isrs -= 1;
 }
 
-void Install_clock(
-  rtems_isr_entry clock_isr
-)
+void Install_clock(rtems_isr_entry clock_isr)
 {
   Clock_driver_ticks = 0;
   Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.c b/c/src/lib/libbsp/m68k/mrm332/console/sci.c
index a671fb0..63f9e65 100644
--- a/c/src/lib/libbsp/m68k/mrm332/console/sci.c
+++ b/c/src/lib/libbsp/m68k/mrm332/console/sci.c
@@ -86,9 +86,9 @@
 #include <libchip/serial.h>
 #include <libchip/sersupp.h>
 #include "sci.h"
+#include <rtems/m68k/qsm.h>
 /*#include "../misc/include/cpu332.h" */
 
-
 /*****************************************************************************
   Section B - Manifest Constants
 *****************************************************************************/
@@ -152,6 +152,8 @@ rtems_device_driver SciControl(                        /* device driver api */
 rtems_device_driver SciRead (
     rtems_device_major_number, rtems_device_minor_number, void *);
 
+rtems_isr SciIsr( rtems_vector_number vector );
+
 int     SciInterruptOpen(int, int, void *);               /* termios api */
 int     SciInterruptClose(int, int, void *);              /* termios api */
 ssize_t SciInterruptWrite(int, const char *, size_t);     /* termios api */
@@ -1096,7 +1098,7 @@ rtems_device_driver SciWrite (
 {
     rtems_libio_rw_args_t *rw_args;             /* ptr to argument struct */
     uint8_t   *buffer;
-    uint16_t   length;
+    size_t     length;
 
     rw_args = (rtems_libio_rw_args_t *) arg;
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index 8468298..721e45e 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -29,7 +29,6 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <mrm332.h>
 #include <rtems/m68k/sim.h>
-#include <rtems/m68k/qsm.h>
 
 #define CONSOLE_SCI
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c b/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c
index 36bff6e..004a705 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c
+++ b/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c
@@ -1,10 +1,5 @@
 /*
- *  This routine starts the application.  It includes application,
- *  board, and monitor specific initialization and configuration.
- *  The generic CPU dependent initialization has been performed
- *  before this routine is invoked.
- *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -13,6 +8,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/bootcard.h>
 
 extern void Spurious_Initialize(void);