diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:23:44 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:23:44 +0000 |
| commit | f93630db63c411300bd638e7406c45ca06431741 (patch) | |
| tree | 2681b1d89dd36b582125d481a593261d663efc0b /c/src/lib/libcpu/powerpc/mpc5xx/irq | |
| parent | 2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-f93630db63c411300bd638e7406c45ca06431741.tar.bz2 | |
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* mpc5xx/exceptions/raw_exception.c, mpc5xx/irq/irq.c,
mpc6xx/exceptions/raw_exception.c,
mpc8260/exceptions/raw_exception.c,
mpc8xx/exceptions/raw_exception.c, new-exceptions/raw_exception.c,
ppc403/ictrl/ictrl.c, ppc403/irq/ictrl.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/libcpu/powerpc/mpc5xx/irq')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c index ef457a67a2..ae3489de40 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c +++ b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c @@ -206,7 +206,7 @@ int CPU_irq_enabled_at_usiu(const rtems_irq_number irqLine) int CPU_install_rtems_irq_handler (const rtems_irq_connect_data* irq) { - unsigned int level; + rtems_interrupt_level level; if (!isValidInterrupt(irq->name)) { return 0; @@ -222,7 +222,7 @@ int CPU_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 @@ -254,7 +254,7 @@ int CPU_install_rtems_irq_handler (const rtems_irq_connect_data* irq) */ irq->on(irq); - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } @@ -271,7 +271,7 @@ int CPU_get_current_rtems_irq_handler (rtems_irq_connect_data* irq) int CPU_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) { - unsigned int level; + rtems_interrupt_level level; if (!isValidInterrupt(irq->name)) { return 0; @@ -286,7 +286,7 @@ int CPU_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); /* * Disable interrupt on device @@ -316,7 +316,7 @@ int CPU_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; } @@ -327,8 +327,8 @@ int CPU_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int CPU_rtems_irq_mngt_set (rtems_irq_global_settings* config) { - int i; - unsigned int level; + int i; + rtems_interrupt_level level; /* * Store various code accelerators @@ -337,7 +337,7 @@ int CPU_rtems_irq_mngt_set (rtems_irq_global_settings* config) default_rtems_entry = config->defaultEntry; rtems_hdl_tbl = config->irqHdlTbl; - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); /* * Start with UIMB IRQ @@ -387,7 +387,7 @@ int CPU_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; } |