diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-04-18 17:21:58 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-04-18 17:21:58 +0000 |
| commit | 68f4e5f48c52c4ed5a41547d51ae39fefe3ce181 (patch) | |
| tree | 583a5e4a36351e5bc52abe85d6f345dac96d5230 /c/src/lib/libbsp/i386/pc386 | |
| parent | 2005-04-18 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-68f4e5f48c52c4ed5a41547d51ae39fefe3ce181.tar.bz2 | |
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
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/clock/ckinit.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/console.c | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/serial_mouse.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/timer/timer.c | 3 |
6 files changed, 22 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index c088d49b8c..b5acab64f1 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -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. diff --git a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c index a4ed222b91..e904a125fc 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c +++ b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c @@ -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}; diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c index a4010f568e..7679cca602 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console.c +++ b/c/src/lib/libbsp/i386/pc386/console/console.c @@ -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) diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c index d0e4f11ca8..697b921e05 100644 --- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c +++ b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c @@ -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. diff --git a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c index 5eb9c5500a..011c1169c5 100644 --- a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c +++ b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c @@ -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}; diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c index 210dd7f6f2..88fa4d69b8 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/timer.c +++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c @@ -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, |