From 247131632173158cb2668d4e5c7464951b668067 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 18 May 2016 08:06:54 +0200 Subject: 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. --- c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c') diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c index 649c89de89..99d9cc9a6a 100644 --- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c @@ -111,14 +111,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; } @@ -131,7 +131,7 @@ void __ISR_Handler( uint32_t vector) { ISR_Level level; - _ISR_Disable( level ); + _ISR_Local_disable( level ); _Thread_Dispatch_disable(); @@ -147,13 +147,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() ); @@ -166,7 +166,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; -- cgit v1.2.3