From 6da91abb14cae67a17286197b0b3b3f1569dcaae Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Mon, 13 Oct 2014 14:09:16 -0500
Subject: m68k/idp: Fix warnings

---
 c/src/lib/libbsp/m68k/idp/console/console.c | 64 +++--------------------------
 c/src/lib/libbsp/m68k/idp/include/bsp.h     |  7 +++-
 c/src/lib/libbsp/m68k/idp/timer/timer.c     |  2 +-
 3 files changed, 12 insertions(+), 61 deletions(-)

(limited to 'c/src/lib/libbsp/m68k/idp')

diff --git a/c/src/lib/libbsp/m68k/idp/console/console.c b/c/src/lib/libbsp/m68k/idp/console/console.c
index dd41e70441..200d52e40b 100644
--- a/c/src/lib/libbsp/m68k/idp/console/console.c
+++ b/c/src/lib/libbsp/m68k/idp/console/console.c
@@ -1,6 +1,8 @@
 /*
  *  This file contains the Motorola IDP console IO package.
- *
+ */
+
+/*
  *  Written by Doug McBride, Colorado Space Grant College
  *  Based off of the board support packages of RTEMS
  *
@@ -21,14 +23,7 @@ rtems_isr C_Receive_ISR(rtems_vector_number vector);
 /*  console_initialize
  *
  *  This routine initializes the console IO driver.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:
  */
-
 rtems_device_driver console_initialize(
   rtems_device_major_number  major,
   rtems_device_minor_number  minor,
@@ -75,15 +70,8 @@ rtems_device_driver console_initialize(
 /*  is_character_ready
  *
  *  This routine returns TRUE if a character is available.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:
  */
-
-bool is_character_ready(
+static bool is_character_ready(
   char *ch,
   int   port
 )
@@ -95,41 +83,11 @@ bool is_character_ready(
   return true;
 }
 
-/*  quick_char_check
- *
- *  This routine returns TRUE if a character is available.
- *  It is different from above because it does not disturb the ring buffer
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- */
-
-bool quick_char_check(
-  int   port
-)
-{
-  if ( Ring_buffer_Is_empty( &Console_Buffer[ port ] ) )
-    return false;
-
-  return true;
-}
-
 /*  inbyte
  *
  *  This routine reads a character from the UART through a buffer.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- *    character read from UART
  */
-
-char inbyte(
+static char inbyte(
   int port
 )
 {
@@ -147,14 +105,8 @@ char inbyte(
  *
  *  This routine transmits a character out the M68681.  It supports
  *  XON/XOFF flow control.
- *
- *  Input parameters:
- *    ch  - character to be transmitted
- *
- *  Output parameters:  NONE
  */
-
-void outbyte(
+static void outbyte(
   char ch,
   int  port
 )
@@ -173,7 +125,6 @@ void outbyte(
 /*
  *  Open entry point
  */
-
 rtems_device_driver console_open(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
@@ -186,7 +137,6 @@ rtems_device_driver console_open(
 /*
  *  Close entry point
  */
-
 rtems_device_driver console_close(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
@@ -199,7 +149,6 @@ rtems_device_driver console_close(
 /*
  * read bytes from the serial port. We only have stdin.
  */
-
 rtems_device_driver console_read(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
@@ -234,7 +183,6 @@ rtems_device_driver console_read(
 /*
  * write bytes to the serial port. Stdout and stderr are the same.
  */
-
 rtems_device_driver console_write(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h
index 39d8c41437..e3c6a0d2a3 100644
--- a/c/src/lib/libbsp/m68k/idp/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h
@@ -44,10 +44,13 @@ rtems_isr_entry set_vector(
   int                 type
 );
 
-void init_pit( void );
+void rtems_bsp_delay(int num);
 
+/*
+ * Prototypes for methods inside the BSP that cross file boundaries.
+ */
+void init_pit( void );
 void transmit_char( char ch );
-
 void transmit_char_portb( char ch );
 
 #endif
diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c
index 23ffff7ee6..4de71f2550 100644
--- a/c/src/lib/libbsp/m68k/idp/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c
@@ -19,7 +19,7 @@
 int Ttimer_val;
 bool benchmark_timer_find_average_overhead;
 
-rtems_isr_entry timerisr(rtems_vector_number);
+rtems_isr timerisr(rtems_vector_number);
 
 void benchmark_timer_initialize(void)
 {
-- 
cgit v1.2.3