diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:23:30 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-12 15:23:30 +0000 |
| commit | 23f19746d441103205b99e50bdd8cc595c6b0f05 (patch) | |
| tree | 2c02d375af1f0bfa358cedd0ab89df5c093d768d /c/src/lib/libcpu/arm/lpc22xx | |
| parent | Fix entry. (diff) | |
| download | rtems-23f19746d441103205b99e50bdd8cc595c6b0f05.tar.bz2 | |
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* at91rm9200/irq/irq.c, lpc22xx/irq/irq.c, mc9328mxl/irq/irq.c,
s3c2400/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/libcpu/arm/lpc22xx')
| -rw-r--r-- | c/src/lib/libcpu/arm/lpc22xx/irq/irq.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c b/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c index 47b0af3a66..1592d88407 100644 --- a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c +++ b/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c @@ -35,9 +35,9 @@ static int isValidInterrupt(int irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_interrupt_level level; - rtems_irq_hdl *bsp_tbl; - int *vic_cntl; - static int irq_counter=0; + rtems_irq_hdl *bsp_tbl; + int *vic_cntl; + static int irq_counter = 0; bsp_tbl = (rtems_irq_hdl *)VICVectAddrBase; @@ -55,7 +55,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 @@ -76,7 +76,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) irq_counter++; - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } @@ -90,7 +90,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_interrupt_level level; - rtems_irq_hdl *bsp_tbl; + rtems_irq_hdl *bsp_tbl; bsp_tbl = (rtems_irq_hdl *)&VICVectAddr0; @@ -104,7 +104,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) return 0; } - _CPU_ISR_Disable(level); + rtems_interrupt_disable(level); VICIntEnClr = 1 << irq->name; @@ -119,8 +119,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) */ bsp_tbl[irq->name] = default_int_handler; - - _CPU_ISR_Enable(level); + rtems_interrupt_enable(level); return 1; } |