fixed some warnings

3 files changed, 11 insertions, 4 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
index 567d851e41..f09455cc65 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
@@ -1,6 +1,7 @@
 2010-03-27	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* network/smsc9218i.c tests/tests.c: Removed warnings
+	* clock/clock-config.c: remove warning
 
 2010-03-25	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
index 7daae561d3..a968a3e5ef 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
@@ -43,7 +43,8 @@ rtems_isr Clock_isr( rtems_vector_number vector);
     EMIOS.CH [MPC55XX_CLOCK_EMIOS_CHANNEL].CSR.R = csr.R; \
  } while (0)
 
-static void mpc55xx_clock_handler_install( void)
+static void mpc55xx_clock_handler_install( rtems_isr_entry isr, 
+					   rtems_isr_entry *old_isr)
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
 
@@ -52,9 +53,10 @@ static void mpc55xx_clock_handler_install( void)
     "clock",
     RTEMS_INTERRUPT_UNIQUE,
     MPC55XX_INTC_MIN_PRIORITY,
-    (rtems_interrupt_handler) Clock_isr,
+    (rtems_interrupt_handler) isr,
     NULL
   );
+ *old_isr = NULL;
   RTEMS_CHECK_SC_VOID( sc, "install clock interrupt handler");
 }
 
@@ -139,7 +141,7 @@ static uint32_t mpc55xx_clock_nanoseconds_since_last_tick( void)
 #define Clock_driver_support_initialize_hardware() mpc55xx_clock_initialize()
 
 #define Clock_driver_support_install_isr( isr, old_isr) \
-  mpc55xx_clock_handler_install()
+  mpc55xx_clock_handler_install(isr,&old_isr)
 
 #define Clock_driver_support_shutdown_hardware() mpc55xx_clock_cleanup()
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c
index 4f27426d36..9ad148799e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c
@@ -41,6 +41,7 @@
 
 #undef USE_DSPI_READER_WRITER
 
+#if defined(USE_DSPI_READER_WRITER)
 static rtems_driver_address_table test_mpc55xx_drv_ops = {
 	initialization_entry : NULL,
 	open_entry : NULL,
@@ -54,6 +55,7 @@ static rtems_libi2c_drv_t test_mpc55xx_dspi_drv = {
 	ops : &test_mpc55xx_drv_ops,
 	size : sizeof( rtems_libi2c_drv_t)
 };
+#endif /* defined(USE_DSPI_READER_WRITER) */
 
 #define MPC55XX_TEST_DSPI_ADDRESS 0
 
@@ -71,13 +73,13 @@ static rtems_id test_mpc55xx_dspi_ping;
 
 static rtems_id test_mpc55xx_dspi_pong;
 
+#if defined(USE_DSPI_READER_WRITER)
 static unsigned char test_mpc55xx_dspi_writer_outbuf [2] [MPC55XX_TEST_DSPI_BUFSIZE_CACHE_PROOF] __attribute__ ((aligned (32)));
 
 static unsigned char test_mpc55xx_dspi_writer_inbuf [MPC55XX_TEST_DSPI_BUFSIZE_CACHE_PROOF] __attribute__ ((aligned (32)));
 
 static unsigned char test_mpc55xx_dspi_reader_inbuf [MPC55XX_TEST_DSPI_BUFSIZE_CACHE_PROOF] __attribute__ ((aligned (32)));
 
-#if defined(USE_DSPI_READER_WRITER)
 static rtems_task test_mpc55xx_dspi_writer( rtems_task_argument arg)
 {
 	rtems_status_code sc = RTEMS_SUCCESSFUL;
@@ -554,6 +556,7 @@ rtems_task test_sd_card( rtems_task_argument arg)
 static char inbuf [BUFSIZE];
 static char outbuf [BUFSIZE];
 
+#if 0
 static void test_mpc55xx_edma_done( mpc55xx_edma_channel_entry *e, uint32_t error_status)
 {
 	rtems_semaphore_release( e->id);
@@ -623,6 +626,7 @@ static rtems_status_code test_mpc55xx_edma(void)
 
 	return RTEMS_SUCCESSFUL;
 }
+#endif /* 0 */
 
 #include <stdlib.h>