2011-02-18 Joel Sherrill <joel.sherrill@oarcorp.com>

	* tm26/task1.c, tm27/task1.c: Adjust for name changes.

3 files changed, 33 insertions, 17 deletions

diff --git a/testsuites/tmtests/ChangeLog b/testsuites/tmtests/ChangeLog
index c38e6038d9..54dc9bee24 100644
--- a/testsuites/tmtests/ChangeLog
+++ b/testsuites/tmtests/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-18	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* tm26/task1.c, tm27/task1.c: Adjust for name changes.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index c6054f71f7..f05556a063 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -235,15 +235,17 @@ rtems_task Middle_task(
   rtems_task_argument argument
 )
 {
+  Chain_Control   *ready_queues;
+
   thread_dispatch_no_fp_time = benchmark_timer_read();
 
   _Thread_Set_state( _Thread_Executing, STATES_SUSPENDED );
 
   Middle_tcb   = _Thread_Executing;
 
+  ready_queues      = (Chain_Control *) _Scheduler.information;
   _Thread_Executing =
-        (Thread_Control *) 
-        _Chain_First(&_Scheduler.Ready_queues.priority[LOW_PRIORITY]);
+        (Thread_Control *) _Chain_First(&ready_queues[LOW_PRIORITY]);
 
   /* do not force context switch */
 
@@ -263,6 +265,9 @@ rtems_task Low_task(
 )
 {
   Thread_Control *executing;
+  Chain_Control  *ready_queues;
+
+  ready_queues      = (Chain_Control *) _Scheduler.information;
 
   context_switch_no_fp_time = benchmark_timer_read();
 
@@ -280,8 +285,7 @@ rtems_task Low_task(
   context_switch_another_task_time = benchmark_timer_read();
 
   _Thread_Executing =
-        (Thread_Control *) 
-        _Chain_First(&_Scheduler.Ready_queues.priority[FP1_PRIORITY]);
+        (Thread_Control *) _Chain_First(&ready_queues[FP1_PRIORITY]);
 
   /* do not force context switch */
 
@@ -300,16 +304,17 @@ rtems_task Floating_point_task_1(
   rtems_task_argument argument
 )
 {
-  Thread_Control *executing;
+  Chain_Control   *ready_queues;
+  Thread_Control  *executing;
   FP_DECLARE;
 
   context_switch_restore_1st_fp_time = benchmark_timer_read();
 
   executing = _Thread_Executing;
 
+  ready_queues      = (Chain_Control *) _Scheduler.information;
   _Thread_Executing =
-        (Thread_Control *) 
-        _Chain_First(&_Scheduler.Ready_queues.priority[FP2_PRIORITY]);
+        (Thread_Control *) _Chain_First(&ready_queues[FP2_PRIORITY]);
 
   /* do not force context switch */
 
@@ -331,9 +336,9 @@ rtems_task Floating_point_task_1(
 
   executing = _Thread_Executing;
 
+  ready_queues      = (Chain_Control *) _Scheduler.information;
   _Thread_Executing =
-       (Thread_Control *)
-       _Chain_First(&_Scheduler.Ready_queues.priority[FP2_PRIORITY]);
+        (Thread_Control *) _Chain_First(&ready_queues[FP2_PRIORITY]);
 
   /* do not force context switch */
 
@@ -354,6 +359,7 @@ rtems_task Floating_point_task_2(
   rtems_task_argument argument
 )
 {
+  Chain_Control  *ready_queues;
   Thread_Control *executing;
   FP_DECLARE;
 
@@ -361,9 +367,9 @@ rtems_task Floating_point_task_2(
 
   executing = _Thread_Executing;
 
+  ready_queues      = (Chain_Control *) _Scheduler.information;
   _Thread_Executing =
-       (Thread_Control *)
-       _Chain_First(&_Scheduler.Ready_queues.priority[FP1_PRIORITY]);
+        (Thread_Control *) _Chain_First(&ready_queues[FP1_PRIORITY]);
 
   FP_LOAD( 1.0 );
 
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index 2f4cdfc2ef..150c4c5e08 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -91,6 +91,8 @@ rtems_task Task_1(
   rtems_task_argument argument
 )
 {
+  Chain_Control   *ready_queues;
+
   Install_tm27_vector( Isr_handler );
 
   /*
@@ -170,8 +172,9 @@ rtems_task Task_1(
 
   _Thread_Dispatch_disable_level = 0;
 
-  _Thread_Heir = (rtems_tcb *) 
-        _Chain_Last(&_Scheduler.Ready_queues.priority[LOW_PRIORITY]);
+  ready_queues      = (Chain_Control *) _Scheduler.information;
+  _Thread_Executing =
+        (Thread_Control *) _Chain_First(&ready_queues[LOW_PRIORITY]);
 
   _Thread_Dispatch_necessary = 1;
 
@@ -199,6 +202,8 @@ rtems_task Task_2(
   rtems_task_argument argument
 )
 {
+  Chain_Control   *ready_queues;
+
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
   while ( Interrupt_occurred == 0 );
 #endif
@@ -228,8 +233,9 @@ rtems_task Task_2(
 
   _Thread_Dispatch_disable_level = 0;
 
-  _Thread_Heir = (rtems_tcb *)
-      _Chain_First(&_Scheduler.Ready_queues.priority[LOW_PRIORITY]);
+  ready_queues      = (Chain_Control *) _Scheduler.information;
+  _Thread_Executing =
+        (Thread_Control *) _Chain_First(&ready_queues[LOW_PRIORITY]);
 
   _Thread_Dispatch_necessary = 1;