From 1ada6163d8ef88384b5f9626cad026ce018935b0 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 18 Jun 2010 02:56:26 +0000
Subject: Remove RTEMS_ITRON_API conditional blocks.

---
 cpukit/score/include/rtems/score/coresem.h |  2 +-
 cpukit/score/include/rtems/score/thread.h  |  2 +-
 cpukit/score/src/apiext.c                  |  3 ---
 cpukit/score/src/threadinitialize.c        |  3 ---
 cpukit/score/src/threadreset.c             |  3 ---
 cpukit/score/src/threadresume.c            | 12 ------------
 cpukit/score/src/threadsuspend.c           |  3 ---
 7 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/score/include/rtems/score/coresem.h
index ae3754129b..cf89e629d7 100644
--- a/cpukit/score/include/rtems/score/coresem.h
+++ b/cpukit/score/include/rtems/score/coresem.h
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#if defined(RTEMS_POSIX_API) || defined(RTEMS_ITRON_API)
+#if defined(RTEMS_POSIX_API)
   #define RTEMS_SCORE_CORESEM_ENABLE_SEIZE_BODY
 #endif
 
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 49239faf3d..c38a445d98 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -27,7 +27,7 @@
  */
 /**@{*/
 
-#if defined(RTEMS_POSIX_API) || defined(RTEMS_ITRON_API)
+#if defined(RTEMS_POSIX_API)
   #define RTEMS_SCORE_THREAD_ENABLE_EXHAUST_TIMESLICE
 #endif
 
diff --git a/cpukit/score/src/apiext.c b/cpukit/score/src/apiext.c
index 959b633f5c..266f320061 100644
--- a/cpukit/score/src/apiext.c
+++ b/cpukit/score/src/apiext.c
@@ -110,9 +110,6 @@ void _API_extensions_Run_postswitch( void )
      *  Currently the ITRON API is the only API which does not
      *  provide this hook.
      */
-#if defined(RTEMS_ITRON_API)
-    if ( the_extension->postswitch_hook )
-#endif
       (*the_extension->postswitch_hook)( _Thread_Executing );
   }
 }
diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c
index 3523c03f17..4afdbcb821 100644
--- a/cpukit/score/src/threadinitialize.c
+++ b/cpukit/score/src/threadinitialize.c
@@ -190,9 +190,6 @@ bool _Thread_Initialize(
   the_thread->current_state           = STATES_DORMANT;
   the_thread->Wait.queue              = NULL;
   the_thread->resource_count          = 0;
-  #if defined(RTEMS_ITRON_API)
-    the_thread->suspend_count         = 0;
-  #endif
   the_thread->real_priority           = priority;
   the_thread->Start.initial_priority  = priority;
   _Thread_Set_priority( the_thread, priority );
diff --git a/cpukit/score/src/threadreset.c b/cpukit/score/src/threadreset.c
index 847a4d1be2..691da0e97d 100644
--- a/cpukit/score/src/threadreset.c
+++ b/cpukit/score/src/threadreset.c
@@ -47,9 +47,6 @@ void _Thread_Reset(
 )
 {
   the_thread->resource_count   = 0;
-  #if defined(RTEMS_ITRON_API)
-    the_thread->suspend_count  = 0;
-  #endif
   the_thread->is_preemptible   = the_thread->Start.is_preemptible;
   the_thread->budget_algorithm = the_thread->Start.budget_algorithm;
   the_thread->budget_callout   = the_thread->Start.budget_callout;
diff --git a/cpukit/score/src/threadresume.c b/cpukit/score/src/threadresume.c
index cea8849537..fe8b6842de 100644
--- a/cpukit/score/src/threadresume.c
+++ b/cpukit/score/src/threadresume.c
@@ -62,18 +62,6 @@ void _Thread_Resume(
 
   _ISR_Disable( level );
 
-  #if defined(RTEMS_ITRON_API)
-    if ( force == true )
-      the_thread->suspend_count = 0;
-    else
-      the_thread->suspend_count--;
-
-    if ( the_thread->suspend_count > 0 ) {
-      _ISR_Enable( level );
-      return;
-    }
-  #endif
-
   current_state = the_thread->current_state;
   if ( current_state & STATES_SUSPENDED ) {
     current_state =
diff --git a/cpukit/score/src/threadsuspend.c b/cpukit/score/src/threadsuspend.c
index 3005cf7801..dd3f287e52 100644
--- a/cpukit/score/src/threadsuspend.c
+++ b/cpukit/score/src/threadsuspend.c
@@ -56,9 +56,6 @@ void _Thread_Suspend(
 
   ready = the_thread->ready;
   _ISR_Disable( level );
-  #if defined(RTEMS_ITRON_API)
-    the_thread->suspend_count++;
-  #endif
   if ( !_States_Is_ready( the_thread->current_state ) ) {
     the_thread->current_state =
        _States_Set( STATES_SUSPENDED, the_thread->current_state );
-- 
cgit v1.2.3