m68k/mvme147: Fix warnings

This commit is contained in:
Joel Sherrill
2014-10-15 17:54:02 -05:00
parent ef559c7cd7
commit 46dad9d465
3 changed files with 17 additions and 64 deletions

View File

@@ -1,6 +1,8 @@
/* /*
* This file contains the MVME147 console IO package. * This file contains the MVME147 console IO package.
* */
/*
* COPYRIGHT (c) 1989-1999. * COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR). * On-Line Applications Research Corporation (OAR).
* *
@@ -24,14 +26,7 @@
/* console_initialize /* console_initialize
* *
* This routine initializes the console IO driver. * This routine initializes the console IO driver.
*
* Input parameters: NONE
*
* Output parameters: NONE
*
* Return values:
*/ */
rtems_device_driver console_initialize( rtems_device_driver console_initialize(
rtems_device_major_number major, rtems_device_major_number major,
rtems_device_minor_number minor, rtems_device_minor_number minor,
@@ -52,46 +47,11 @@ rtems_device_driver console_initialize(
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }
/* is_character_ready
*
* This routine returns TRUE if a character is available.
*
* Input parameters: NONE
*
* Output parameters: NONE
*
* Return values:
*/
bool is_character_ready(
char *ch
)
{
uint8_t rr_0;
for ( ; ; ) {
Z8x30_READ_CONTROL( CONSOLE_CONTROL, RR_0, rr_0 );
if ( !(rr_0 & RR_0_RX_DATA_AVAILABLE) )
return false;
Z8x30_READ_DATA( CONSOLE_DATA, *ch );
return true;
}
}
/* inbyte /* inbyte
* *
* This routine reads a character from the SCC. * This routine reads a character from the SCC.
*
* Input parameters: NONE
*
* Output parameters: NONE
*
* Return values:
* character read from SCC
*/ */
static char inbyte( void )
char inbyte( void )
{ {
uint8_t rr_0; uint8_t rr_0;
char ch; char ch;
@@ -110,14 +70,8 @@ char inbyte( void )
* *
* This routine transmits a character out the SCC. It supports * This routine transmits a character out the SCC. It supports
* XON/XOFF flow control. * XON/XOFF flow control.
*
* Input parameters:
* ch - character to be transmitted
*
* Output parameters: NONE
*/ */
static void outbyte(
void outbyte(
char ch char ch
) )
{ {
@@ -152,7 +106,6 @@ void outbyte(
/* /*
* Open entry point * Open entry point
*/ */
rtems_device_driver console_open( rtems_device_driver console_open(
rtems_device_major_number major, rtems_device_major_number major,
rtems_device_minor_number minor, rtems_device_minor_number minor,
@@ -165,7 +118,6 @@ rtems_device_driver console_open(
/* /*
* Close entry point * Close entry point
*/ */
rtems_device_driver console_close( rtems_device_driver console_close(
rtems_device_major_number major, rtems_device_major_number major,
rtems_device_minor_number minor, rtems_device_minor_number minor,
@@ -178,7 +130,6 @@ rtems_device_driver console_close(
/* /*
* read bytes from the serial port. We only have stdin. * read bytes from the serial port. We only have stdin.
*/ */
rtems_device_driver console_read( rtems_device_driver console_read(
rtems_device_major_number major, rtems_device_major_number major,
rtems_device_minor_number minor, rtems_device_minor_number minor,
@@ -210,7 +161,6 @@ rtems_device_driver console_read(
/* /*
* write bytes to the serial port. Stdout and stderr are the same. * write bytes to the serial port. Stdout and stderr are the same.
*/ */
rtems_device_driver console_write( rtems_device_driver console_write(
rtems_device_major_number major, rtems_device_major_number major,
rtems_device_minor_number minor, rtems_device_minor_number minor,
@@ -241,7 +191,6 @@ rtems_device_driver console_write(
/* /*
* IO Control entry point * IO Control entry point
*/ */
rtems_device_driver console_control( rtems_device_driver console_control(
rtems_device_major_number major, rtems_device_major_number major,
rtems_device_minor_number minor, rtems_device_minor_number minor,

View File

@@ -1,7 +1,9 @@
/* /*
* This routine returns control to 147Bug. * This routine returns control to 147Bug.
* */
* COPYRIGHT (c) 1989-2010.
/*
* COPYRIGHT (c) 1989-2014.
* On-Line Applications Research Corporation (OAR). * On-Line Applications Research Corporation (OAR).
* *
* The license and distribution terms for this file may be * The license and distribution terms for this file may be
@@ -16,9 +18,11 @@
#include <bsp.h> #include <bsp.h>
#include <bsp/bootcard.h> #include <bsp/bootcard.h>
extern void start( void ); extern void start(void);
void bsp_return_to_monitor_trap(void) static rtems_isr bsp_return_to_monitor_trap(
rtems_vector_number vector
)
{ {
register volatile void *start_addr; register volatile void *start_addr;

View File

@@ -23,7 +23,7 @@
int Ttimer_val; int Ttimer_val;
bool benchmark_timer_find_average_overhead; bool benchmark_timer_find_average_overhead;
rtems_isr_entry timerisr(rtems_vector_number); rtems_isr timerisr(rtems_vector_number);
void benchmark_timer_initialize(void) void benchmark_timer_initialize(void)
{ {