diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-02 07:52:30 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-02 07:52:30 +0000 |
| commit | 36c187a0cd858d21361e5a5837518f8df94361d3 (patch) | |
| tree | 1bddf9b6b39dd12739dc68411a175277fd2f6392 /cpukit/score/cpu/nios2/nios2-isr-set-level.c | |
| parent | 2011-09-01 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-36c187a0cd858d21361e5a5837518f8df94361d3.tar.bz2 | |
2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/nios2-utility.h: Avoid redefines with Altera HAL.
Declare _Nios2_ISR_Set_level().
* nios2-context-initialize.c: Use _Nios2_ISR_Set_level().
* nios2-isr-set-level.c: Define _Nios2_ISR_Set_level().
Diffstat (limited to 'cpukit/score/cpu/nios2/nios2-isr-set-level.c')
| -rw-r--r-- | cpukit/score/cpu/nios2/nios2-isr-set-level.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cpukit/score/cpu/nios2/nios2-isr-set-level.c b/cpukit/score/cpu/nios2/nios2-isr-set-level.c index 6c73944866..2ae92c3ae3 100644 --- a/cpukit/score/cpu/nios2/nios2-isr-set-level.c +++ b/cpukit/score/cpu/nios2/nios2-isr-set-level.c @@ -21,10 +21,8 @@ #include <rtems/score/interr.h> #include <rtems/score/nios2-utility.h> -void _CPU_ISR_Set_level( uint32_t new_level ) +uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status ) { - uint32_t status = _Nios2_Get_ctlreg_status(); - switch ( _Nios2_Get_ISR_status_mask() ) { case NIOS2_ISR_STATUS_MASK_IIC: if ( new_level == 0 ) { @@ -50,5 +48,14 @@ void _CPU_ISR_Set_level( uint32_t new_level ) break; } + return status; +} + +void _CPU_ISR_Set_level( uint32_t new_level ) +{ + uint32_t status = _Nios2_Get_ctlreg_status(); + + status = _Nios2_ISR_Set_level( new_level, status ); + _Nios2_Set_ctlreg_status( status ); } |