diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2007-11-06 22:19:41 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2007-11-06 22:19:41 +0000 |
| commit | a4722f82b03d640131e911f1af70672e745ceb8a (patch) | |
| tree | 11b3636b49d63ce585f9c121acf825be232e05de /c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c | |
| parent | 2007-11-06 Till Straumann <strauman@slac.stanford.edu> (diff) | |
| download | rtems-a4722f82b03d640131e911f1af70672e745ceb8a.tar.bz2 | |
2007-11-06 Till Straumann <strauman@slac.stanford.edu>
* ep1a/irq/irq.c, gen5200/irq/irq.c, mbx8xx/irq/irq.c,
mpc8260ads/irq/irq.c, mvme5500/irq/irq.c, psim/irq/irq.c,
score603e/irq/irq.c, shared/irq/irq.c:
test for non-NULL-ness before calling 'on'/'off'
methods so that users don't have to provide
no-ops if they don't want this feature.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c index 496524b8db..60cc72e1a8 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c @@ -243,7 +243,8 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) /* * Enable interrupt on device */ - irq->on(irq); + if (irq->on) + irq->on(irq); rtems_interrupt_enable(level); @@ -299,7 +300,8 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) /* * Disable interrupt on device */ - irq->off(irq); + if (irq->off) + irq->off(irq); /* * restore the default irq value @@ -334,10 +336,12 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) for (i=BSP_CPM_IRQ_LOWEST_OFFSET; i < BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER ; i++) { if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) { BSP_irq_enable_at_cpm (i); - rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); + if (rtems_hdl_tbl[i].on) + rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); } else { - rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); + if (rtems_hdl_tbl[i].off) + rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); BSP_irq_disable_at_cpm (i); } } @@ -353,10 +357,12 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) for (i=BSP_SIU_IRQ_LOWEST_OFFSET; i < BSP_SIU_IRQ_LOWEST_OFFSET + BSP_SIU_IRQ_NUMBER ; i++) { if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) { BSP_irq_enable_at_siu (i); - rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); + if (rtems_hdl_tbl[i].on) + rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); } else { - rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); + if (rtems_hdl_tbl[i].off) + rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); BSP_irq_disable_at_siu (i); } } @@ -371,10 +377,12 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) */ for (i=BSP_PROCESSOR_IRQ_LOWEST_OFFSET; i < BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER; i++) { if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) { - rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); + if (rtems_hdl_tbl[i].on) + rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); } else { - rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); + if (rtems_hdl_tbl[i].off) + rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); } } rtems_interrupt_enable(level); |