2008-01-22 Joel Sherrill <joel.sherrill@OARcorp.com>

	* rtems/src/eventsurrender.c, rtems/src/ratemonperiod.c,
	score/src/threadqdequeue.c, score/src/threadqdequeuefifo.c,
	score/src/threadqdequeuepriority.c: Fix bugs encountered while
	testing and clean up more code.

1 files changed, 2 insertions, 13 deletions

diff --git a/cpukit/score/src/threadqdequeuefifo.c b/cpukit/score/src/threadqdequeuefifo.c
index d494b90b85..0ea36791fc 100644
--- a/cpukit/score/src/threadqdequeuefifo.c
+++ b/cpukit/score/src/threadqdequeuefifo.c
@@ -74,17 +74,6 @@ Thread_Control *_Thread_queue_Dequeue_fifo(
     return the_thread;
   }
 
-  switch ( the_thread_queue->sync_state ) {
-    case THREAD_BLOCKING_OPERATION_SYNCHRONIZED:
-    case THREAD_BLOCKING_OPERATION_SATISFIED:
-      _ISR_Enable( level );
-      return NULL;
-
-    case THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED:
-    case THREAD_BLOCKING_OPERATION_TIMEOUT:
-      the_thread_queue->sync_state = THREAD_BLOCKING_OPERATION_SATISFIED;
-      _ISR_Enable( level );
-      return _Thread_Executing;
-  }
-  return NULL;                /* this is only to prevent warnings */
+  _ISR_Enable( level );
+  return NULL;
 }