diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-04 19:28:25 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-04 19:28:25 +0000 |
| commit | ef546c327033b5a60882d88064952aa10cd3a58c (patch) | |
| tree | 991095e44e731b10048a11108bfad92c6e68be1d /c/src/lib/libbsp/powerpc | |
| parent | 2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com> (diff) | |
| download | rtems-ef546c327033b5a60882d88064952aa10cd3a58c.tar.bz2 | |
2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>
* clock/p_clock.c, irq/irq.c, irq/irq_init.c: Addition of a parameter
to ISRs
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/clock/p_clock.c | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c | 8 |
4 files changed, 13 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index fcddd1d711..24047b3ba7 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,8 @@ +2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com> + + * clock/p_clock.c, irq/irq.c, irq/irq_init.c: Addition of a parameter + to ISRs + 2005-04-15 Jennifer Averett <jennifer.averett@oarcorp.com> PR 779/bsp diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/clock/p_clock.c b/c/src/lib/libbsp/powerpc/mbx8xx/clock/p_clock.c index b4bf7ca93e..0f91eb1dc7 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/clock/p_clock.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/clock/p_clock.c @@ -21,10 +21,11 @@ extern void clockOn(void*); extern void clockOff (void*); extern int clockIsOn(void*); -extern void Clock_isr(); +extern void Clock_isr(void*); static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER, (rtems_irq_hdl)Clock_isr, + 0, (rtems_irq_enable)clockOn, (rtems_irq_disable)clockOff, (rtems_irq_is_enabled)clockIsOn}; diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c index cac7f03954..7be6031d8f 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c @@ -467,7 +467,7 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) new_msr = msr | MSR_EE; _CPU_MSR_SET(new_msr); - rtems_hdl_tbl[irq].hdl(); + rtems_hdl_tbl[irq].hdl(rtems_hdl_tbl[irq].handle); _CPU_MSR_SET(msr); diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c index 98406a91b5..34bb02aab6 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c @@ -28,7 +28,9 @@ volatile unsigned int ppc_cached_irq_mask; /* * default on/off function */ -static void nop_func(){} +static void nop_func1(void *unused){} +static void nop_func2(){} + /* * default isOn function */ @@ -41,8 +43,8 @@ static int connected() {return 1;} static rtems_irq_connect_data rtemsIrq[BSP_IRQ_NUMBER]; static rtems_irq_global_settings initial_config; static rtems_irq_connect_data defaultIrq = { - /* vectorIdex, hdl , on , off , isOn */ - 0, nop_func , nop_func , nop_func , not_connected + /* vectorIdex, hdl , handle , on , off , isOn */ + 0, nop_func1 , 0 , nop_func2 , nop_func2 , not_connected }; static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={ /* |