diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-18 08:06:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-20 07:50:37 +0200 |
| commit | 247131632173158cb2668d4e5c7464951b668067 (patch) | |
| tree | 4242eb55b8a0721d94b01357195ef9441f561d18 /c/src/lib/libcpu/sh/sh7045/score | |
| parent | score: Rename _ISR_Disable_without_giant() (diff) | |
| download | rtems-247131632173158cb2668d4e5c7464951b668067.tar.bz2 | |
score: Rename _ISR_Disable() and _ISR_Enable()
Rename _ISR_Disable() into _ISR_Local_disable(). Rename _ISR_Enable()
into _ISR_Local_enable(). Remove _Debug_Is_owner_of_giant().
This is a preparation to remove the Giant lock.
Update #2555.
Diffstat (limited to 'c/src/lib/libcpu/sh/sh7045/score')
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c index f7534269a6..47bc859dbd 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c @@ -112,14 +112,14 @@ unsigned int sh_set_irq_priority( /* * Set the interrupt priority register */ - _ISR_Disable( level ); + _ISR_Local_disable( level ); temp16 = read16( prioreg); temp16 &= ~( 15 << shiftcount); temp16 |= prio << shiftcount; write16( temp16, prioreg); - _ISR_Enable( level ); + _ISR_Local_enable( level ); return 0; } @@ -132,7 +132,7 @@ void __ISR_Handler( uint32_t vector) { ISR_Level level; - _ISR_Disable( level ); + _ISR_Local_disable( level ); _Thread_Dispatch_disable(); @@ -148,13 +148,13 @@ void __ISR_Handler( uint32_t vector) _ISR_Nest_level++; - _ISR_Enable( level ); + _ISR_Local_enable( level ); /* call isp */ if ( _ISR_Vector_table[ vector]) (*_ISR_Vector_table[ vector ])( vector ); - _ISR_Disable( level ); + _ISR_Local_disable( level ); _Thread_Dispatch_unnest( _Per_CPU_Get() ); @@ -167,7 +167,7 @@ void __ISR_Handler( uint32_t vector) stack_ptr = _old_stack_ptr; #endif - _ISR_Enable( level ); + _ISR_Local_enable( level ); if ( _ISR_Nest_level ) return; |