diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:16:36 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:16:36 +0000 |
| commit | ec1d0b9ddb0315d91d42edfa92aa4d79b0770dc4 (patch) | |
| tree | e3bc0c9d18b6a02cf0b82d13d6c7490894a63c46 /c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c | |
| parent | 2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-ec1d0b9ddb0315d91d42edfa92aa4d79b0770dc4.tar.bz2 | |
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* irq/irq.c: Code outside of cpukit should use the public API for
rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
public API and directly accessing _CPU_ISR_Disable and
_CPU_ISR_Enable, they were bypassing the compiler memory barrier
directive which could lead to problems. This patch also changes the
type of the variable passed into these routines and addresses minor
style issues.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c index 655daed437..496524b8db 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c @@ -197,7 +197,7 @@ int BSP_irq_enabled_at_siu (const rtems_irq_number irqLine) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) { - unsigned int level; + rtems_interrupt_level level; if (!isValidInterrupt(irq->name)) { return 0; @@ -213,7 +213,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) return 0; } - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); /* * store the data provided by user @@ -245,7 +245,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) */ irq->on(irq); - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } @@ -261,7 +261,7 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) { - unsigned int level; + rtems_interrupt_level level; if (!isValidInterrupt(irq->name)) { return 0; @@ -276,7 +276,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) { return 0; } - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); if (is_cpm_irq(irq->name)) { /* @@ -306,7 +306,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) */ rtems_hdl_tbl[irq->name] = default_rtems_entry; - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } @@ -317,16 +317,17 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) { - int i; - unsigned int level; - /* - * Store various code accelerators - */ + int i; + rtems_interrupt_level level; + + /* + * Store various code accelerators + */ internal_config = config; default_rtems_entry = config->defaultEntry; rtems_hdl_tbl = config->irqHdlTbl; - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); /* * start with CPM IRQ */ @@ -376,7 +377,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); } } - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } |