diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2011-04-21 19:04:50 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2011-04-21 19:04:50 +0000 |
| commit | 85f5c14bd0c18bbf9a29fa9d92ecbe95c6be0af6 (patch) | |
| tree | 014e0f780353e53864d710153d1ea92b8988115a /c/src/lib/libcpu/sh | |
| parent | 2011-04-20 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-85f5c14bd0c18bbf9a29fa9d92ecbe95c6be0af6.tar.bz2 | |
2011-04-21 Jennifer Averett <Jennifer.Averett@OARcorp.com
PR 1777/cpukit
* src/lib/libbsp/powerpc/shared/startup/panic.c,
src/lib/libcpu/sh/sh7032/score/cpu_asm.c,
src/lib/libcpu/sh/sh7045/score/cpu_asm.c,
src/lib/libcpu/sh/sh7750/score/cpu_asm.c,
src/lib/libcpu/sh/shgdb/score/cpu_asm.c: Consolidated access to
_Thread_Dispatch_disable_level.
Diffstat (limited to 'c/src/lib/libcpu/sh')
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c | 6 |
4 files changed, 12 insertions, 12 deletions
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 229bbd07b9..89d7cb19b2 100644 --- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c @@ -134,7 +134,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level++; + _Thread_Dispatch_increment_disable_level(); #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) if ( _ISR_Nest_level == 0 ) @@ -156,7 +156,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level--; + _Thread_Dispatch_decrement_disable_level(); _ISR_Nest_level--; @@ -172,7 +172,7 @@ void __ISR_Handler( uint32_t vector) if ( _ISR_Nest_level ) return; - if ( _Thread_Dispatch_disable_level ) { + if ( _Thread_Dispatch_in_critical_section() ) { return; } 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 4aa57fe97d..a13e9dad51 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c @@ -136,7 +136,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level++; + _Thread_Dispatch_increment_disable_level(); #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) if ( _ISR_Nest_level == 0 ) @@ -158,7 +158,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level--; + _Thread_Dispatch_decrement_disable_level(); _ISR_Nest_level--; @@ -174,7 +174,7 @@ void __ISR_Handler( uint32_t vector) if ( _ISR_Nest_level ) return; - if ( _Thread_Dispatch_disable_level ) { + if ( _Thread_Dispatch_in_critical_section() ) { return; } diff --git a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c index f1a4446bba..eea55f44ad 100644 --- a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c @@ -60,7 +60,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level++; + _Thread_Dispatch_increment_disable_level(); #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) if ( _ISR_Nest_level == 0 ) @@ -82,7 +82,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level--; + _Thread_Dispatch_decrement_disable_level(); _ISR_Nest_level--; @@ -97,7 +97,7 @@ void __ISR_Handler( uint32_t vector) if ( _ISR_Nest_level ) return; - if ( _Thread_Dispatch_disable_level ) { + if ( _Thread_Dispatch_in_critical_section() ) { return; } diff --git a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c index 1a5a490fc6..3c908309a5 100644 --- a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c @@ -33,7 +33,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level++; + _Thread_Dispatch_increment_disable_level(); #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) if ( _ISR_Nest_level == 0 ) @@ -55,7 +55,7 @@ void __ISR_Handler( uint32_t vector) _ISR_Disable( level ); - _Thread_Dispatch_disable_level--; + _Thread_Dispatch_decrement_disable_level(); _ISR_Nest_level--; @@ -71,7 +71,7 @@ void __ISR_Handler( uint32_t vector) if ( _ISR_Nest_level ) return; - if ( _Thread_Dispatch_disable_level ) { + if ( _Thread_Dispatch_in_critical_section() ) { return; } |