diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:15:32 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:15:32 +0000 |
commit | f3343c6e79cf46b37d46cbb332ba1cb494b68ca4 (patch) | |
tree | 3d9cef71e6ce6c73993e3d1c8b419d000789f9d6 /c/src/lib/libbsp/arm/gba | |
parent | 2007-09-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-f3343c6e79cf46b37d46cbb332ba1cb494b68ca4.tar.bz2 |
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* csb336/network/lan91c11x.c, csb337/startup/bspstart.c,
edb7312/irq/irq.c, gba/irq/irq.c, gba/irq/irq_init.c,
gp32/startup/bspstart.c, rtl22xx/startup/bspstart.c,
shared/abort/abort.c, shared/abort/simple_abort.c,
shared/irq/irq_init.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 '')
-rw-r--r-- | c/src/lib/libbsp/arm/gba/irq/irq.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/gba/irq/irq_init.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/arm/gba/irq/irq.c b/c/src/lib/libbsp/arm/gba/irq/irq.c index ab93d1b121..16bc667135 100644 --- a/c/src/lib/libbsp/arm/gba/irq/irq.c +++ b/c/src/lib/libbsp/arm/gba/irq/irq.c @@ -67,7 +67,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 new handler @@ -89,7 +89,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; } @@ -115,7 +115,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) if (*(HdlTable + irq->name) != irq->hdl) { return 0; } - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); /* * mask at INT controller level @@ -132,7 +132,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) */ *(HdlTable + irq->name) = default_int_handler; - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } diff --git a/c/src/lib/libbsp/arm/gba/irq/irq_init.c b/c/src/lib/libbsp/arm/gba/irq/irq_init.c index c2b5c1da03..136188804a 100644 --- a/c/src/lib/libbsp/arm/gba/irq/irq_init.c +++ b/c/src/lib/libbsp/arm/gba/irq/irq_init.c @@ -54,7 +54,7 @@ void rtems_irq_mngt_init(void) vectorTable = (uint32_t *)VECTOR_TABLE; - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); /* @todo Can't use exception vectors in GBA because they are already in GBA ROM BIOS */ /* First, connect the ISR_Handler for IRQ and FIQ interrupts */ |