diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-25 22:36:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-25 22:36:25 +0000 |
| commit | 9bbba5401ccd33ffc2acfd6df16414792691801a (patch) | |
| tree | 525fcee816dbac52031b5ca47d123c35b3c5485f /c/src/lib/libbsp | |
| parent | 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-9bbba5401ccd33ffc2acfd6df16414792691801a.tar.bz2 | |
2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* console/console.c, ide/pcmcia_ide.c, startup/bspstart.c,
startup/imbx8xx.c: Fix some warnings.
Diffstat (limited to 'c/src/lib/libbsp')
5 files changed, 16 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index 472d2adc80..2f46f3f764 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,8 @@ +2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * console/console.c, ide/pcmcia_ide.c, startup/bspstart.c, + startup/imbx8xx.c: Fix some warnings. + 2010-03-27 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> * startup/start.S: removed bootcard calling warning diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c index b6148164fc..4145270b88 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c @@ -93,6 +93,9 @@ static void serial_putchar(const char c); BSP_output_char_function_type BSP_output_char = _BSP_null_char; +extern volatile m8xx_t m8xx; +extern struct rtems_termios_tty *ttyp[]; + /* * _EPPCBug_pollRead * @@ -111,8 +114,6 @@ static int _EPPCBug_pollRead( int minor ) { - extern volatile m8xx_t m8xx; - char c; volatile int simask; /* We must read and write m8xx.simask */ int retval; @@ -220,8 +221,6 @@ static ssize_t _EPPCBug_pollWrite( size_t len ) { - extern volatile m8xx_t m8xx; - volatile int simask; int i; ISR_Level level; @@ -875,7 +874,6 @@ rtems_device_driver console_open( { #if NVRAM_CONFIGURE == 1 /* Used to track termios private data for callbacks */ - extern struct rtems_termios_tty *ttyp[]; rtems_libio_open_close_args_t *args = arg; static const rtems_termios_callbacks sccEPPCBugCallbacks = { NULL, /* firstOpen */ diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ide/pcmcia_ide.c b/c/src/lib/libbsp/powerpc/mbx8xx/ide/pcmcia_ide.c index 1b537d5c32..ce377e03c5 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ide/pcmcia_ide.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ide/pcmcia_ide.c @@ -219,7 +219,7 @@ void mbx8xx_pcmciaide_read_block | Input Parameters: | \*-------------------------------------------------------------------------*/ int minor, - uint16_t block_size, + uint32_t block_size, rtems_blkdev_sg_buffer *bufs, uint32_t *cbuf, uint32_t *pos @@ -276,7 +276,7 @@ void mbx8xx_pcmciaide_write_block | Input Parameters: | \*-------------------------------------------------------------------------*/ int minor, - uint16_t block_size, + uint32_t block_size, rtems_blkdev_sg_buffer *bufs, uint32_t *cbuf, uint32_t *pos diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c index 2450f4f83f..57f7a4702b 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c @@ -27,6 +27,8 @@ SPR_RW(SPRG1) +int bsp_interrupt_initialize(void); + /* * Driver configuration parameters */ diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/imbx8xx.c b/c/src/lib/libbsp/powerpc/mbx8xx/startup/imbx8xx.c index ab3a821556..bf3c436680 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/imbx8xx.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/imbx8xx.c @@ -149,6 +149,10 @@ static uint32_t upmaTable[64] = { #endif }; +#if ( !defined(EPPCBUG_VECTORS) ) + extern uint32_t simask_copy; +#endif + /* * Initialize MBX8xx */ @@ -158,7 +162,6 @@ void _InitMBX8xx (void) uint32_t i; #endif register uint32_t r1; - extern uint32_t simask_copy; /* * Initialize the Debug Enable Register (DER) to an appropriate |