summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-08-29 14:47:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-08-29 14:47:09 +0000
commiteeec72f8836336f497790a402c76612120a49680 (patch)
treed454c040f5f6947551f14dc41d3d231a014acb93 /c
parent2000-08-29 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-eeec72f8836336f497790a402c76612120a49680.tar.bz2
2000-08-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* cpu.c: Spacing issues. * rtems/score/cpu.h: Removed warning by setting _level.
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/score/cpu/arm/cpu.c9
-rw-r--r--c/src/exec/score/cpu/arm/rtems/score/cpu.h1
2 files changed, 6 insertions, 4 deletions
diff --git a/c/src/exec/score/cpu/arm/cpu.c b/c/src/exec/score/cpu/arm/cpu.c
index bb97346fe3..09caf9299e 100644
--- a/c/src/exec/score/cpu/arm/cpu.c
+++ b/c/src/exec/score/cpu/arm/cpu.c
@@ -13,7 +13,7 @@
#include <rtems/system.h>
#include <rtems.h>
-#include <bspio.h>
+#include <bspIo.h>
#include <rtems/score/isr.h>
#include <rtems/score/wkspace.h>
#include <rtems/score/thread.h>
@@ -155,11 +155,12 @@ extern void _Exception_Handler_Abort();
void rtems_exception_init_mngt()
{
+ ISR_Level level;
_CPU_ISR_Disable(level);
- _CPU_ISR_install_vector(ARM_EXCEPTION_UNDEF, _Exception_Handler_Undef_Swi, NULL);
- _CPU_ISR_install_vector(ARM_EXCEPTION_SWI, _Exception_Handler_Undef_Swi, NULL);
- _CPU_ISR_install_vector(ARM_EXCEPTION_PREF_ABORT, _Exception_Handler_Abort , NULL);
+ _CPU_ISR_install_vector(ARM_EXCEPTION_UNDEF, _Exception_Handler_Undef_Swi, NULL);
+ _CPU_ISR_install_vector(ARM_EXCEPTION_SWI, _Exception_Handler_Undef_Swi, NULL);
+ _CPU_ISR_install_vector(ARM_EXCEPTION_PREF_ABORT, _Exception_Handler_Abort , NULL);
_CPU_ISR_install_vector(ARM_EXCEPTION_DATA_ABORT, _Exception_Handler_Abort , NULL);
_CPU_ISR_install_vector(ARM_EXCEPTION_FIQ, _Exception_Handler_Abort , NULL);
_CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _Exception_Handler_Abort , NULL);
diff --git a/c/src/exec/score/cpu/arm/rtems/score/cpu.h b/c/src/exec/score/cpu/arm/rtems/score/cpu.h
index 820b72a0be..5e664818ea 100644
--- a/c/src/exec/score/cpu/arm/rtems/score/cpu.h
+++ b/c/src/exec/score/cpu/arm/rtems/score/cpu.h
@@ -525,6 +525,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
*/
#define _CPU_ISR_Disable( _level ) \
{ \
+ (_level) = 0; \
asm volatile ("MRS r0, cpsr \n" ); \
asm volatile ("ORR r0, r0, #0xc0 \n" ); \
asm volatile ("MSR cpsr, r0 \n" ); \