From df0f27f655ad376e8e6e2205af8735a4308d8092 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 18 Feb 2011 15:12:55 +0000 Subject: 2011-02-18 Joel Sherrill * tm26/task1.c, tm27/task1.c: Adjust for name changes. --- testsuites/tmtests/tm26/task1.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'testsuites/tmtests/tm26/task1.c') 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 ); -- cgit v1.2.3