2005-04-15 Jennifer Averett <jennifer.averett@oarcorp.com>

	* mpc6xx/clock/c_clock.c, mpc6xx/clock/c_clock.h,
	mpc8260/console-generic/console-generic.c: add parameter to new
	exception interrupt handlers in powerpc bsps

4 files changed, 22 insertions, 15 deletions

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 468cbf8185..c8041facf8 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-15      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * mpc6xx/clock/c_clock.c, mpc6xx/clock/c_clock.h,
+        mpc8260/console-generic/console-generic.c: add parameter to new
+        exception interrupt handlers in powerpc bsps
+
 2005-02-17	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* new-exceptions/cpu.c, rtems/powerpc/powerpc.h: 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
index b5cdd3f5d4..e2594ee9b6 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
@@ -74,7 +74,7 @@ void clockOn(void* unused)
  *
  */
 
-void clockIsr()
+void clockIsr(void *unused)
 {
 int decr;
   /*
@@ -201,7 +201,7 @@ rtems_device_driver Clock_control(
       (rtems_configuration_get_microseconds_per_tick()/1000);
 
     if      (args->command == rtems_build_name('I', 'S', 'R', ' '))
-      clockIsr();
+      clockIsr(NULL);
     else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
     {
 		Clock_initialize(major, minor, 0);
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
index a0fb10d729..229c7993b5 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
@@ -31,7 +31,7 @@
 
 extern void clockOff	(void* unused);
 extern void clockOn	(void* unused);
-extern void clockIsr	(void);
+extern void clockIsr	(void* unused);
 extern int  clockIsOn	(void* unused);
 
 /*
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c
index be270c36c5..42ba3da399 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c
+++ b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c
@@ -102,12 +102,12 @@ static rtems_isr_entry old_handler[NUM_PORTS];
 void m8xx_console_reserve_resources(rtems_configuration_table *);
 static int m8xx_smc_set_attributes(int, const struct termios*);
 static int m8xx_scc_set_attributes(int, const struct termios*);
-static rtems_isr m8xx_smc1_interrupt_handler();
-static rtems_isr m8xx_smc2_interrupt_handler();
-static rtems_isr m8xx_scc1_interrupt_handler();
-static rtems_isr m8xx_scc2_interrupt_handler();
-static rtems_isr m8xx_scc3_interrupt_handler();
-static rtems_isr m8xx_scc4_interrupt_handler();
+static rtems_isr m8xx_smc1_interrupt_handler(rtems_irq_hdl_param unused);
+static rtems_isr m8xx_smc2_interrupt_handler(rtems_irq_hdl_param unused);
+static rtems_isr m8xx_scc1_interrupt_handler(rtems_irq_hdl_param unused);
+static rtems_isr m8xx_scc2_interrupt_handler(rtems_irq_hdl_param unused);
+static rtems_isr m8xx_scc3_interrupt_handler(rtems_irq_hdl_param unused);
+static rtems_isr m8xx_scc4_interrupt_handler(rtems_irq_hdl_param unused);
 
 
 
@@ -352,7 +352,7 @@ m8xx_uart_setAttributes(
  */
 
 static void
-m8xx_scc1_interrupt_handler ()
+m8xx_scc1_interrupt_handler (rtems_irq_hdl_param unused)
 {
   int nb_overflow;
 
@@ -396,7 +396,7 @@ m8xx_scc1_interrupt_handler ()
 }
 
 static void
-m8xx_scc2_interrupt_handler ()
+m8xx_scc2_interrupt_handler (rtems_irq_hdl_param unused)
 {
   int nb_overflow;
 
@@ -441,7 +441,7 @@ m8xx_scc2_interrupt_handler ()
 
 
 static void
-m8xx_scc3_interrupt_handler ()
+m8xx_scc3_interrupt_handler (rtems_irq_hdl_param unused)
 {
   int nb_overflow;
 
@@ -487,7 +487,7 @@ m8xx_scc3_interrupt_handler ()
 
 
 static void
-m8xx_scc4_interrupt_handler ()
+m8xx_scc4_interrupt_handler (rtems_irq_hdl_param unused)
 {
   int nb_overflow;
 
@@ -531,7 +531,7 @@ m8xx_scc4_interrupt_handler ()
 }
 
 static void
-m8xx_smc1_interrupt_handler ()
+m8xx_smc1_interrupt_handler (rtems_irq_hdl_param unused)
 {
   int nb_overflow;
 
@@ -576,7 +576,7 @@ m8xx_smc1_interrupt_handler ()
 
 
 static void
-m8xx_smc2_interrupt_handler ()
+m8xx_smc2_interrupt_handler (rtems_irq_hdl_param unused)
 {
   int nb_overflow;
 
@@ -677,6 +677,7 @@ static rtems_irq_connect_data consoleIrqData =
 {
   BSP_CPM_IRQ_SCC1,
   (rtems_irq_hdl)m8xx_scc1_interrupt_handler,
+  NULL,
   (rtems_irq_enable) m8xx_scc_enable,
   (rtems_irq_disable) m8xx_scc_disable,
   (rtems_irq_is_enabled) m8xx_scc_isOn