diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-06-01 18:18:28 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-06-01 18:18:28 -0500 |
commit | 36601543db26f37326eb51e21509022d1df90ffd (patch) | |
tree | 0b931922f9dcbe19bce62cecd7e863915de65214 /c/src/lib/libbsp/m68k | |
parent | m68k/shared/misc/memProbe.c: Add prototype to eliminate warning (diff) | |
download | rtems-36601543db26f37326eb51e21509022d1df90ffd.tar.bz2 |
mrm332: Tests now build and fewer warnings
Diffstat (limited to 'c/src/lib/libbsp/m68k')
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/console/sci.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/include/bsp.h | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c | 8 |
4 files changed, 10 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c index d7ae0a3c05..5c48013b1c 100644 --- a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c @@ -35,6 +35,9 @@ void Clock_exit( void ); rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; +rtems_isr Clock_isr(rtems_vector_number vector); +void Install_clock(rtems_isr_entry clock_isr); + rtems_isr Clock_isr(rtems_vector_number vector) { Clock_driver_ticks += 1; @@ -47,9 +50,7 @@ rtems_isr Clock_isr(rtems_vector_number vector) Clock_isrs -= 1; } -void Install_clock( - rtems_isr_entry clock_isr -) +void Install_clock(rtems_isr_entry clock_isr) { Clock_driver_ticks = 0; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000; diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.c b/c/src/lib/libbsp/m68k/mrm332/console/sci.c index a671fb0f6b..63f9e653e3 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/sci.c +++ b/c/src/lib/libbsp/m68k/mrm332/console/sci.c @@ -86,9 +86,9 @@ #include <libchip/serial.h> #include <libchip/sersupp.h> #include "sci.h" +#include <rtems/m68k/qsm.h> /*#include "../misc/include/cpu332.h" */ - /***************************************************************************** Section B - Manifest Constants *****************************************************************************/ @@ -152,6 +152,8 @@ rtems_device_driver SciControl( /* device driver api */ rtems_device_driver SciRead ( rtems_device_major_number, rtems_device_minor_number, void *); +rtems_isr SciIsr( rtems_vector_number vector ); + int SciInterruptOpen(int, int, void *); /* termios api */ int SciInterruptClose(int, int, void *); /* termios api */ ssize_t SciInterruptWrite(int, const char *, size_t); /* termios api */ @@ -1096,7 +1098,7 @@ rtems_device_driver SciWrite ( { rtems_libio_rw_args_t *rw_args; /* ptr to argument struct */ uint8_t *buffer; - uint16_t length; + size_t length; rw_args = (rtems_libio_rw_args_t *) arg; diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index 84682986b8..721e45ec76 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -29,7 +29,6 @@ extern "C" { #include <rtems/iosupp.h> #include <mrm332.h> #include <rtems/m68k/sim.h> -#include <rtems/m68k/qsm.h> #define CONSOLE_SCI diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c b/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c index 36bff6eb87..004a7052e0 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c +++ b/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.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 @@ -13,6 +8,7 @@ */ #include <bsp.h> +#include <bsp/bootcard.h> extern void Spurious_Initialize(void); |