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

	PR 779/bsp
	* clock/p_clock.c, console/console.c, console/uart.c, console/uart.h,
	irq/irq.c, irq/irq.h, irq/irq_init.c:
	powerpc: add parameter to new exception interrupt handlers

3 files changed, 11 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c
index 9a86ebf97b..d99463b184 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/console.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/console.c
@@ -54,9 +54,9 @@ int BSPBaseBaud    = BSP_UART_BAUD_BASE;
 static int  conSetAttr(int minor, const struct termios *);
 
 typedef struct TtySTblRec_ {
-		char	*name;
-		void	(*isr)(void); /* STUPID API doesn't pass a parameter :-( */
-} TtySTblRec, *TtySTbl;
+		char	      *name;
+		rtems_irq_hdl isr;
+} TtySTblRec, *TtySTbl;               
 
 static TtySTblRec ttyS[]={
 		{ "/dev/ttyS0",
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/c/src/lib/libbsp/powerpc/shared/console/uart.c
index dc09a73608..ab48bb399d 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/uart.c
@@ -692,14 +692,18 @@ BSP_uart_termios_isr_com(int uart)
     }
 }
 
+/*
+ * XXX - Note that this can now be one isr with the uart
+ *       passed as the parameter. 
+ */
 void
-BSP_uart_termios_isr_com1(void)
+BSP_uart_termios_isr_com1(void *unused)
 {
 	BSP_uart_termios_isr_com(BSP_UART_COM1);
 }
 
 void
-BSP_uart_termios_isr_com2(void)
+BSP_uart_termios_isr_com2(void *unused)
 {
 	BSP_uart_termios_isr_com(BSP_UART_COM2);
 }
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.h b/c/src/lib/libbsp/powerpc/shared/console/uart.h
index 0ac66e69b3..10d32a820a 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.h
+++ b/c/src/lib/libbsp/powerpc/shared/console/uart.h
@@ -25,8 +25,8 @@ void BSP_uart_polled_write(int uart, int val);
 int  BSP_uart_polled_read(int uart);
 void BSP_uart_termios_set(int uart, void *ttyp);
 int  BSP_uart_termios_write_com(int minor, const char *buf, int len);
-void BSP_uart_termios_isr_com1();
-void BSP_uart_termios_isr_com2();
+void BSP_uart_termios_isr_com1(void *unused);
+void BSP_uart_termios_isr_com2(void *unused);
 void BSP_uart_dbgisr_com1(void);
 void BSP_uart_dbgisr_com2(void);
 int  BSP_uart_install_isr(int uart, rtems_irq_hdl handler);