2005-04-18 Eric Valette <eric.valette@free.fr>

* clock/ckinit.c, console/console.c, console/ps2_mouse.c,
	console/serial_mouse.c, timer/timer.c: Added parameter to irq handler
This commit is contained in:
Jennifer Averett
2005-04-18 17:21:58 +00:00
parent 88d9950835
commit 68f4e5f48c
6 changed files with 22 additions and 6 deletions
+5
View File
@@ -1,3 +1,8 @@
2005-04-18 Eric Valette <eric.valette@free.fr>
* clock/ckinit.c, console/console.c, console/ps2_mouse.c,
console/serial_mouse.c, timer/timer.c: Added parameter to irq handler
2005-02-18 Joel Sherrill <joel@OARcorp.com>
* console/keyboard.h: Add include file and cleanup file header.
@@ -171,6 +171,7 @@ int clockIsOn(const rtems_irq_connect_data* unused)
static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER,
clockIsr,
0,
clockOn,
clockOff,
clockIsOn};
@@ -86,10 +86,11 @@ static int isr_is_on(const rtems_irq_connect_data *);
extern int rtems_kbpoll( void );
static rtems_irq_connect_data console_isr_data = {BSP_KEYBOARD,
keyboard_interrupt,
isr_on,
isr_off,
isr_is_on};
keyboard_interrupt,
0,
isr_on,
isr_off,
isr_is_on};
static void
isr_on(const rtems_irq_connect_data *unused)
@@ -96,7 +96,11 @@ static int isr_is_on(const rtems_irq_connect_data *irq)
}
static rtems_irq_connect_data ps2_isr_data = { AUX_IRQ,
ps2_mouse_interrupt, isr_on, isr_off, isr_is_on };
ps2_mouse_interrupt,
0,
isr_on,
isr_off,
isr_is_on };
/*
* Wait for keyboard controller input buffer to drain.
@@ -18,6 +18,9 @@
* MODIFICATION/HISTORY:
*
* $Log$
* Revision 1.7 2004/04/21 16:01:33 ralf
* Remove duplicate white lines.
*
* Revision 1.6 2004/04/21 10:42:44 ralf
* Remove stray white spaces.
*
@@ -92,6 +95,7 @@ static rtems_irq_connect_data serial_mouse_isr_data =
{
BSP_UART_IRQ,
BSP_ISR_FUNC,
0,
isr_on,
isr_off,
isr_is_on};
+2 -1
View File
@@ -189,7 +189,8 @@ timerOn(const rtems_raw_irq_connect_data* used)
static int
timerIsOn(const rtems_raw_irq_connect_data *used)
{
return BSP_irq_enabled_at_i8259s(used->idtIndex - BSP_IRQ_VECTOR_BASE);}
return BSP_irq_enabled_at_i8259s(used->idtIndex - BSP_IRQ_VECTOR_BASE);
}
static rtems_raw_irq_connect_data timer_raw_irq_data = {
BSP_PERIODIC_TIMER + BSP_IRQ_VECTOR_BASE,