From 66402ef207a6e4a791525140d813ae5f0979e982 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 11 Oct 2014 19:09:52 -0500 Subject: m68k/mvme136: Fix warnings --- c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c | 30 +++--------- c/src/lib/libbsp/m68k/mvme136/console/console.c | 60 +++--------------------- c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 11 +++-- c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c | 12 ++--- c/src/lib/libbsp/m68k/mvme136/timer/timer.c | 2 +- 5 files changed, 25 insertions(+), 90 deletions(-) (limited to 'c/src/lib/libbsp/m68k/mvme136') diff --git a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c index febcb3070f..02115c431c 100644 --- a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c @@ -1,12 +1,9 @@ -/* Clock_init() - * +/* * This routine initializes the Z80386 1 on the MVME136 board. * The tick frequency is 1 millisecond. - * - * Input parameters: NONE - * - * Output parameters: NONE - * + */ + +/* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -43,18 +40,10 @@ rtems_isr_entry Old_ticker; void Clock_exit( void ); -/* - * These are set by clock driver during its init - */ - -rtems_device_major_number rtems_clock_major = ~0; -rtems_device_minor_number rtems_clock_minor; - /* * ISR Handler */ - -rtems_isr Clock_isr( +static rtems_isr Clock_isr( rtems_vector_number vector ) { @@ -69,7 +58,7 @@ rtems_isr Clock_isr( Clock_isrs -= 1; } -void Install_clock( +static void Install_clock( rtems_isr_entry clock_isr ) { @@ -121,12 +110,5 @@ rtems_device_driver Clock_initialize( { Install_clock( Clock_isr ); - /* - * make major/minor avail to others such as shared memory driver - */ - - rtems_clock_major = major; - rtems_clock_minor = minor; - return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/m68k/mvme136/console/console.c b/c/src/lib/libbsp/m68k/mvme136/console/console.c index 111fd7b893..ce8fa8de72 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme136/console/console.c @@ -1,7 +1,9 @@ /* * This file contains the MVME136 console IO package. - * - * COPYRIGHT (c) 1989-1999. + */ + +/* + * COPYRIGHT (c) 1989-2014. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -15,19 +17,10 @@ volatile struct r_m681_info *_Read_m681; /* M68681 read registers */ volatile struct w_m681_info *_Write_m681; /* M68681 write registers */ - - /* 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, @@ -51,41 +44,11 @@ rtems_device_driver console_initialize( 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 -) -{ - if ( !(_Read_m681->srb & RXRDYB) ) - return false; - - *ch = _Read_m681->rbb; - return true; -} - /* inbyte * * This routine reads a character from the UART. - * - * Input parameters: NONE - * - * Output parameters: NONE - * - * Return values: - * character read from UART */ - -char inbyte( void ) +static char inbyte( void ) { while ( !(_Read_m681->srb & RXRDYB) ); return _Read_m681->rbb; @@ -95,14 +58,8 @@ char inbyte( void ) * * 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 ) { @@ -121,7 +78,6 @@ void outbyte( /* * Open entry point */ - rtems_device_driver console_open( rtems_device_major_number major, rtems_device_minor_number minor, @@ -134,7 +90,6 @@ rtems_device_driver console_open( /* * Close entry point */ - rtems_device_driver console_close( rtems_device_major_number major, rtems_device_minor_number minor, @@ -147,7 +102,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, @@ -179,7 +133,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, @@ -210,7 +163,6 @@ rtems_device_driver console_write( /* * IO Control entry point */ - rtems_device_driver console_control( rtems_device_major_number major, rtems_device_minor_number minor, diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index bbdc6c1c45..e699c09399 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -1,8 +1,9 @@ -/* bsp.h - * +/* * This include file contains all MVME136 board IO definitions. - * - * COPYRIGHT (c) 1989-1999. + */ + +/* + * COPYRIGHT (c) 1989-2014. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -68,7 +69,7 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ rtems_isr_entry set_vector( - rtems_isr_entry handler, + rtems_isr_entry handle, rtems_vector_number vector, int type ); diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c index c04a97dcef..5d968b804e 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c @@ -13,16 +13,16 @@ #include #include -extern void start( void ); +void start(void); -void bsp_return_to_monitor_trap(void) +static rtems_isr bsp_return_to_monitor_trap(rtems_vector_number ignored) { register volatile void *start_addr; - m68k_set_vbr( 0 ); /* restore 135Bug vectors */ - __asm__ volatile( "trap #15" ); /* trap to 135Bug */ - __asm__ volatile( ".short 0x63" ); /* return to 135Bug (.RETURN) */ - /* restart program */ + m68k_set_vbr( 0 ); /* restore 135Bug vectors */ + __asm__ volatile( "trap #15" ); /* trap to 135Bug */ + __asm__ volatile( ".short 0x63" ); /* return to 135Bug (.RETURN) */ + /* restart program */ start_addr = start; __asm__ volatile ( "jmp %0@" : "=a" (start_addr) : "0" (start_addr) ); diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c index a445b7135a..a9bf322162 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c @@ -16,7 +16,7 @@ int Ttimer_val; bool benchmark_timer_find_average_overhead; -rtems_isr timerisr(void); +rtems_isr timerisr(rtems_vector_number); void benchmark_timer_initialize(void) { -- cgit v1.2.3