[PATCH 34/42] sparc/erc32: Fix warnings

[Joel Sherrill]

---
 c/src/lib/libbsp/sparc/erc32/console/debugputs.c    |  8 +-------
 c/src/lib/libbsp/sparc/erc32/include/bsp.h          | 16 ++++++++++++----
 c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c     |  6 ++++--
 c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c |  5 ++++-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c b/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
index 59fc68b..57c0004 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
@@ -1,8 +1,4 @@
 /*
- *  This file contains the TTY driver for the serial ports on the erc32.
- *
- *  This driver uses the termios pseudo driver.
- *
  *  COPYRIGHT (c) 1989-1999.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -20,7 +16,6 @@
  *
  *  This routine transmits a character using polling.
  */
-
 void console_outbyte_polled(
   int  port,
   unsigned char ch
@@ -41,7 +36,6 @@ void console_outbyte_polled(
  *
  *  This routine polls for a character.
  */
-
 int console_inbyte_nonblocking( int port )
 {
   int UStat;
@@ -83,7 +77,7 @@ int console_inbyte_nonblocking( int port )
 
 #include <rtems/bspIo.h>
 
-void BSP_output_char_f(char c) { console_outbyte_polled( 0, c ); }
+static void BSP_output_char_f(char c) { console_outbyte_polled( 0, c ); }
 
 BSP_output_char_function_type           BSP_output_char = BSP_output_char_f;
 BSP_polling_getchar_function_type       BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
index b1cc83e..4406826 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
@@ -6,10 +6,7 @@
  * @brief Global BSP Definitions.
  */
 
-/*  bsp.h
- *
- *  This include file contains all SPARC simulator definitions.
- *
+/*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -176,6 +173,17 @@ extern void BSP_shared_interrupt_unmask(int irq);
  */
 extern void BSP_shared_interrupt_mask(int irq);
 
+/*
+ *  Delay for the specified number of microseconds.
+ */
+void rtems_bsp_delay(int usecs);
+
+/*
+ * Prototypes for methods used across file boundaries
+ */
+void console_outbyte_polled(int  port, unsigned char ch);
+int console_inbyte_nonblocking(int port);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c b/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c
index 14590f5..afd42cb 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c
+++ b/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c
@@ -1,7 +1,9 @@
 /*
  *  ERC32 BSP Delay Method
- *
- *  COPYRIGHT (c) 1989-2011.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c
index d4822818..9cf73d9 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c
+++ b/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c
@@ -1,5 +1,7 @@
 /*  Installs the BSP pre-driver hook
- *
+ */
+
+/*
  *  COPYRIGHT (c) 2011
  *  Aeroflex Gaisler
  *
@@ -9,6 +11,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/bootcard.h>
 
 /*
  *  bsp_predriver_hook
-- 
1.9.3