From 85f5c14bd0c18bbf9a29fa9d92ecbe95c6be0af6 Mon Sep 17 00:00:00 2001
From: Jennifer Averett <Jennifer.Averett@OARcorp.com>
Date: Thu, 21 Apr 2011 19:04:50 +0000
Subject: 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.
---
 c/ChangeLog                                     | 10 ++++++++++
 c/src/lib/libbsp/powerpc/shared/startup/panic.c |  6 ++++--
 c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c      |  6 +++---
 c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c      |  6 +++---
 c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c      |  6 +++---
 c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c       |  6 +++---
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/c/ChangeLog b/c/ChangeLog
index 4a83cf49fd..d339c39f96 100644
--- a/c/ChangeLog
+++ b/c/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/panic.c b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
index 78818c75f9..7845bec735 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/panic.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
@@ -9,6 +9,8 @@
 #include <rtems/bspIo.h>
 #include <rtems/error.h>
 #include <libcpu/stackTrace.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/thread.inl>
 
 static void
 rebootQuestion(void)
@@ -101,10 +103,10 @@ void _BSP_Fatal_error(unsigned int v)
       printk("  UNKNOWN (0x%x)\n",THESRC);
   break;
   }
-  if ( _Thread_Dispatch_disable_level )
+  if ( _Thread_Dispatch_in_critical_section() )
     printk(
       "  Error occurred in a Thread Dispatching DISABLED context (level %i)\n",
-      _Thread_Dispatch_disable_level);
+      _Thread_Dispatch_get_disable_level());
   else
     printk("enabled\n");
 
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;
   }
 
-- 
cgit v1.2.3