[PATCH 02/11] m68k/shared and sim68000: Fix warnings

[Joel Sherrill]

---
 c/src/lib/libbsp/m68k/shared/bspspuriousinit.c          | 14 +++++---------
 c/src/lib/libbsp/m68k/shared/m68000spurious.c           | 17 ++++++-----------
 c/src/lib/libbsp/m68k/sim68000/console/debugio.c        | 13 ++++++-------
 c/src/lib/libbsp/m68k/sim68000/include/bsp.h            |  7 +++++++
 .../libbsp/m68k/sim68000/startup/spurious_assistant.c   | 10 +++++-----
 5 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/c/src/lib/libbsp/m68k/shared/bspspuriousinit.c b/c/src/lib/libbsp/m68k/shared/bspspuriousinit.c
index 12b3826..e60a403 100644
--- a/c/src/lib/libbsp/m68k/shared/bspspuriousinit.c
+++ b/c/src/lib/libbsp/m68k/shared/bspspuriousinit.c
@@ -1,10 +1,12 @@
 /*
- *  CXX Spurious Trap Handler Install Routine
+ *  M68000 Spurious Trap Handler Install Routine
  *
  *  This is just enough of a trap handler to let us know what
  *  the likely source of the trap was.
- *
- *  COPYRIGHT (c) 1989-1999.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -20,12 +22,6 @@
  *
  *  Install the spurious handler for most vectors.
  */
-
-rtems_isr bsp_spurious_handler(
-   rtems_vector_number  vector/*,
-   CPU_Interrupt_frame *isf */
-);
-
 void bsp_spurious_initialize(void)
 {
   uint32_t         vector;
diff --git a/c/src/lib/libbsp/m68k/shared/m68000spurious.c b/c/src/lib/libbsp/m68k/shared/m68000spurious.c
index e511ebb..aeffa45 100644
--- a/c/src/lib/libbsp/m68k/shared/m68000spurious.c
+++ b/c/src/lib/libbsp/m68k/shared/m68000spurious.c
@@ -1,10 +1,12 @@
 /*
- *  C3X Spurious Trap Handler
+ *  M68000 Spurious Trap Handler
  *
  *  This is just enough of a trap handler to let us know what
  *  the likely source of the trap was.
- *
- *  COPYRIGHT (c) 1989-1999.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -20,15 +22,8 @@
  *
  *  Print a message on the debug console and then die
  */
-
-void bsp_spurious_handler_assistant(
-  rtems_vector_number /*,
-  CPU_Interrupt_frame * */
-);
-
 rtems_isr bsp_spurious_handler(
-   rtems_vector_number  vector /*,
-   CPU_Interrupt_frame *isf */
+   rtems_vector_number  vector
 )
 {
 #if 0
diff --git a/c/src/lib/libbsp/m68k/sim68000/console/debugio.c b/c/src/lib/libbsp/m68k/sim68000/console/debugio.c
index 5f0f493..c9993ce 100644
--- a/c/src/lib/libbsp/m68k/sim68000/console/debugio.c
+++ b/c/src/lib/libbsp/m68k/sim68000/console/debugio.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
@@ -17,6 +12,10 @@
 #include <bsp.h>
 #include <rtems/bspIo.h>
 
-void debug_putc( char c ) { write( 2, &c, 1 ); }
+static void debug_putc( char c )
+{
+  write( 2, &c, 1 );
+}
+
 BSP_output_char_function_type BSP_output_char =  debug_putc;
 BSP_polling_getchar_function_type BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
index ba1254d..aeb8ded 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
@@ -34,6 +34,13 @@ extern "C" {
 
 rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
 
+/*
+ * Prototype for methods in the BSP that cross file boundaries.
+ */
+void bsp_spurious_initialize(void);
+void bsp_spurious_handler_assistant(rtems_vector_number vector);
+rtems_isr bsp_spurious_handler(rtems_vector_number vector);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/m68k/sim68000/startup/spurious_assistant.c b/c/src/lib/libbsp/m68k/sim68000/startup/spurious_assistant.c
index 8202d1f..032763e 100644
--- a/c/src/lib/libbsp/m68k/sim68000/startup/spurious_assistant.c
+++ b/c/src/lib/libbsp/m68k/sim68000/startup/spurious_assistant.c
@@ -1,7 +1,9 @@
 /*
  *  Spurious Trap Handler Assistant
- *
- *  COPYRIGHT (c) 1989-2000.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -17,10 +19,8 @@
  *
  *  We can't recover so just return to gdb.
  */
-
 void bsp_spurious_handler_assistant(
-  rtems_vector_number  vector/* ,
-  CPU_Interrupt_frame *isf */
+  rtems_vector_number  vector
 )
 {
   /* XXX do something here */
-- 
1.9.3