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 /cpukit/score/cpu | |
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 'cpukit/score/cpu')
-rw-r--r-- | cpukit/score/cpu/arm/armv7m-isr-vector-install.c | 4 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/nios2-mpu-disable-protected.c | 4 | ||||
-rw-r--r-- | cpukit/score/cpu/or1k/cpu.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cpukit/score/cpu/arm/armv7m-isr-vector-install.c b/cpukit/score/cpu/arm/armv7m-isr-vector-install.c index ca3eeb3590..cb3abc91a9 100644 --- a/cpukit/score/cpu/arm/armv7m-isr-vector-install.c +++ b/cpukit/score/cpu/arm/armv7m-isr-vector-install.c @@ -35,12 +35,12 @@ void _CPU_ISR_install_vector( { uint32_t level; - _ISR_Disable( level ); + _ISR_Local_disable( level ); if ( old_handler != NULL ) { *old_handler = _ARMV7M_Get_exception_handler( (int) vector ); } _ARMV7M_Set_exception_handler( (int) vector, new_handler ); - _ISR_Enable( level ); + _ISR_Local_enable( level ); } #endif /* ARM_MULTILIB_ARCH_V7M */ diff --git a/cpukit/score/cpu/nios2/nios2-mpu-disable-protected.c b/cpukit/score/cpu/nios2/nios2-mpu-disable-protected.c index a8e39df9c7..05602cd257 100644 --- a/cpukit/score/cpu/nios2/nios2-mpu-disable-protected.c +++ b/cpukit/score/cpu/nios2/nios2-mpu-disable-protected.c @@ -30,9 +30,9 @@ uint32_t _Nios2_MPU_Disable_protected( void ) ISR_Level level; uint32_t config; - _ISR_Disable( level ); + _ISR_Local_disable( level ); config = _Nios2_MPU_Disable(); - _ISR_Enable( level ); + _ISR_Local_enable( level ); return config; } diff --git a/cpukit/score/cpu/or1k/cpu.c b/cpukit/score/cpu/or1k/cpu.c index 3cf6f6ba81..fe933f0cbb 100644 --- a/cpukit/score/cpu/or1k/cpu.c +++ b/cpukit/score/cpu/or1k/cpu.c @@ -88,7 +88,7 @@ void _CPU_ISR_install_vector( ISR_Level level; - _ISR_Disable( level ); + _ISR_Local_disable( level ); current_handler = table [vector]; @@ -102,7 +102,7 @@ void _CPU_ISR_install_vector( table [vector] = new_handler; } - _ISR_Enable( level ); + _ISR_Local_enable( level ); } void _CPU_Install_interrupt_stack( void ) |