From f2ad3d120b411fffb13890f20597d8e0c5345cf7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Sep 2008 22:06:22 +0000 Subject: 2008-09-03 Joel Sherrill * mp05/system.h, mp05/task1.c, mp06/system.h, mp06/task1.c, mp07/system.h, mp07/task1.c, mp14/evtask1.c, mp14/evtmtask.c, mp14/init.c, mp14/msgtask1.c, mp14/pttask1.c, mp14/smtask1.c, mp14/system.h: Convert to bool type. --- testsuites/mptests/ChangeLog | 7 +++++++ testsuites/mptests/mp05/system.h | 8 ++++---- testsuites/mptests/mp05/task1.c | 4 ++-- testsuites/mptests/mp06/system.h | 2 +- testsuites/mptests/mp06/task1.c | 6 +++--- testsuites/mptests/mp07/system.h | 2 +- testsuites/mptests/mp07/task1.c | 8 ++++---- testsuites/mptests/mp14/evtask1.c | 8 ++++---- testsuites/mptests/mp14/evtmtask.c | 4 ++-- testsuites/mptests/mp14/init.c | 4 ++-- testsuites/mptests/mp14/msgtask1.c | 6 +++--- testsuites/mptests/mp14/pttask1.c | 6 +++--- testsuites/mptests/mp14/smtask1.c | 6 +++--- testsuites/mptests/mp14/system.h | 2 +- 14 files changed, 40 insertions(+), 33 deletions(-) (limited to 'testsuites/mptests') diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index 403852fdcc..efffd4dbbf 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,3 +1,10 @@ +2008-09-03 Joel Sherrill + + * mp05/system.h, mp05/task1.c, mp06/system.h, mp06/task1.c, + mp07/system.h, mp07/task1.c, mp14/evtask1.c, mp14/evtmtask.c, + mp14/init.c, mp14/msgtask1.c, mp14/pttask1.c, mp14/smtask1.c, + mp14/system.h: Convert to bool type. + 2008-01-31 Joel Sherrill * mp01/init.c, mp02/init.c, mp03/init.c, mp04/init.c, mp05/init.c, diff --git a/testsuites/mptests/mp05/system.h b/testsuites/mptests/mp05/system.h index 70e8f09e37..9cd4cc97ef 100644 --- a/testsuites/mptests/mp05/system.h +++ b/testsuites/mptests/mp05/system.h @@ -51,12 +51,12 @@ TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ TEST_EXTERN rtems_id Timer_id[ 2 ]; /* array of timer ids */ TEST_EXTERN rtems_name Timer_name[ 2 ]; /* array of timer names */ -TEST_EXTERN volatile rtems_boolean Stop_Test; +TEST_EXTERN volatile bool Stop_Test; TEST_EXTERN uint32_t remote_node; -TEST_EXTERN rtems_id remote_tid; -TEST_EXTERN rtems_signal_set remote_signal; -TEST_EXTERN rtems_signal_set expected_signal; +TEST_EXTERN rtems_id remote_tid; +TEST_EXTERN rtems_signal_set remote_signal; +TEST_EXTERN rtems_signal_set expected_signal; TEST_EXTERN volatile uint32_t signal_count; TEST_EXTERN volatile uint32_t signal_caught; diff --git a/testsuites/mptests/mp05/task1.c b/testsuites/mptests/mp05/task1.c index 680b78640a..4a77fec531 100644 --- a/testsuites/mptests/mp05/task1.c +++ b/testsuites/mptests/mp05/task1.c @@ -30,7 +30,7 @@ rtems_timer_service_routine Stop_Test_TSR( void *ignored_address ) { - Stop_Test = TRUE; + Stop_Test = true; } rtems_task Test_task( @@ -39,7 +39,7 @@ rtems_task Test_task( { rtems_status_code status; - Stop_Test = FALSE; + Stop_Test = false; signal_caught = 0; signal_count = 0; diff --git a/testsuites/mptests/mp06/system.h b/testsuites/mptests/mp06/system.h index a22f24a70a..2d1d7df091 100644 --- a/testsuites/mptests/mp06/system.h +++ b/testsuites/mptests/mp06/system.h @@ -47,6 +47,6 @@ TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ TEST_EXTERN rtems_id Timer_id[ 4 ]; /* array of timer ids */ TEST_EXTERN rtems_name Timer_name[ 4 ]; /* array of timer names */ -TEST_EXTERN volatile rtems_boolean Stop_Test; +TEST_EXTERN volatile bool Stop_Test; /* end of include file */ diff --git a/testsuites/mptests/mp06/task1.c b/testsuites/mptests/mp06/task1.c index ec5ab571ca..83500c0e73 100644 --- a/testsuites/mptests/mp06/task1.c +++ b/testsuites/mptests/mp06/task1.c @@ -33,7 +33,7 @@ rtems_timer_service_routine Stop_Test_TSR( void *ignored_address ) { - Stop_Test = TRUE; + Stop_Test = true; } /*PAGE @@ -92,7 +92,7 @@ rtems_task Test_task( rtems_event_set event_out; rtems_event_set event_for_this_iteration; - Stop_Test = FALSE; + Stop_Test = false; remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1; puts_nocr( "Remote task's name is : " ); @@ -124,7 +124,7 @@ rtems_task Test_task( count = 0; for ( ; ; ) { - if ( Stop_Test == TRUE ) + if ( Stop_Test == true ) break; event_for_this_iteration = Event_set_table[ count % 32 ]; diff --git a/testsuites/mptests/mp07/system.h b/testsuites/mptests/mp07/system.h index a22f24a70a..2d1d7df091 100644 --- a/testsuites/mptests/mp07/system.h +++ b/testsuites/mptests/mp07/system.h @@ -47,6 +47,6 @@ TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ TEST_EXTERN rtems_id Timer_id[ 4 ]; /* array of timer ids */ TEST_EXTERN rtems_name Timer_name[ 4 ]; /* array of timer names */ -TEST_EXTERN volatile rtems_boolean Stop_Test; +TEST_EXTERN volatile bool Stop_Test; /* end of include file */ diff --git a/testsuites/mptests/mp07/task1.c b/testsuites/mptests/mp07/task1.c index f964506d04..6df4d80792 100644 --- a/testsuites/mptests/mp07/task1.c +++ b/testsuites/mptests/mp07/task1.c @@ -28,7 +28,7 @@ rtems_timer_service_routine Stop_Test_TSR( void *ignored_address ) { - Stop_Test = TRUE; + Stop_Test = true; } rtems_task Test_task( @@ -41,7 +41,7 @@ rtems_task Test_task( rtems_id remote_tid; rtems_event_set event_out; - Stop_Test = FALSE; + Stop_Test = false; remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1; puts_nocr( "Remote task's name is : " ); @@ -70,8 +70,8 @@ rtems_task Test_task( ); directive_failed( status, "rtems_timer_fire_after" ); - while ( Stop_Test == FALSE ) { - for ( count=DOT_COUNT ; count && (Stop_Test == FALSE) ; count-- ) { + while ( Stop_Test == false ) { + for ( count=DOT_COUNT ; count && (Stop_Test == false) ; count-- ) { status = rtems_event_receive( RTEMS_EVENT_16, RTEMS_DEFAULT_OPTIONS, diff --git a/testsuites/mptests/mp14/evtask1.c b/testsuites/mptests/mp14/evtask1.c index d8665e73ca..3703d93ced 100644 --- a/testsuites/mptests/mp14/evtask1.c +++ b/testsuites/mptests/mp14/evtask1.c @@ -59,8 +59,8 @@ rtems_task Test_task( if ( Multiprocessing_configuration.node == 1 ) { puts( "Sending events to remote task" ); - while ( Stop_Test == FALSE ) { - for ( count=EVENT_TASK_DOT_COUNT; Stop_Test == FALSE && count; count-- ) { + while ( Stop_Test == false ) { + for ( count=EVENT_TASK_DOT_COUNT; Stop_Test == false && count; count-- ) { status = rtems_event_send( remote_tid, RTEMS_EVENT_16 ); directive_failed( status, "rtems_event_send" ); } @@ -69,8 +69,8 @@ rtems_task Test_task( } puts( "Receiving events from remote task" ); - while ( Stop_Test == FALSE ) { - for ( count=EVENT_TASK_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) { + while ( Stop_Test == false ) { + for ( count=EVENT_TASK_DOT_COUNT ; Stop_Test == false && count ; count-- ) { status = rtems_event_receive( RTEMS_EVENT_16, RTEMS_DEFAULT_OPTIONS, diff --git a/testsuites/mptests/mp14/evtmtask.c b/testsuites/mptests/mp14/evtmtask.c index cad9a5e212..47e0ea6167 100644 --- a/testsuites/mptests/mp14/evtmtask.c +++ b/testsuites/mptests/mp14/evtmtask.c @@ -39,8 +39,8 @@ rtems_task Delayed_events_task( status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] ); directive_failed( status, "rtems_timer_create" ); - while ( Stop_Test == FALSE ) { - for ( count=DELAYED_EVENT_DOT_COUNT; Stop_Test == FALSE && count; count-- ){ + while ( Stop_Test == false ) { + for ( count=DELAYED_EVENT_DOT_COUNT; Stop_Test == false && count; count-- ){ status = rtems_timer_fire_after( Timer_id[ 1 ], 1, diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c index 3afcff4585..2f6036e317 100644 --- a/testsuites/mptests/mp14/init.c +++ b/testsuites/mptests/mp14/init.c @@ -31,7 +31,7 @@ rtems_timer_service_routine Stop_Test_TSR( void *ignored_address ) { - Stop_Test = TRUE; + Stop_Test = true; } rtems_task Init( @@ -46,7 +46,7 @@ rtems_task Init( Multiprocessing_configuration.node ); - Stop_Test = FALSE; + Stop_Test = false; status = rtems_timer_create( rtems_build_name('S', 'T', 'O', 'P'), diff --git a/testsuites/mptests/mp14/msgtask1.c b/testsuites/mptests/mp14/msgtask1.c index 567546f5b1..2cd32f37e7 100644 --- a/testsuites/mptests/mp14/msgtask1.c +++ b/testsuites/mptests/mp14/msgtask1.c @@ -65,10 +65,10 @@ rtems_task Message_queue_task( buffer_count = &Msg_buffer[ index ][3]; } - while ( Stop_Test == FALSE ) { + while ( Stop_Test == false ) { yield_count = 100; - for ( count=MESSAGE_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) { + for ( count=MESSAGE_DOT_COUNT ; Stop_Test == false && count ; count-- ) { status = rtems_message_queue_receive( Queue_id[ 1 ], (long (*)[4])Msg_buffer[ index ], @@ -91,7 +91,7 @@ rtems_task Message_queue_task( ); directive_failed( status, "rtems_message_queue_send" ); - if (Stop_Test == FALSE) + if (Stop_Test == false) if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) { status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); directive_failed( status, "rtems_task_wake_after" ); diff --git a/testsuites/mptests/mp14/pttask1.c b/testsuites/mptests/mp14/pttask1.c index c2322a3f87..ce3362bc79 100644 --- a/testsuites/mptests/mp14/pttask1.c +++ b/testsuites/mptests/mp14/pttask1.c @@ -48,15 +48,15 @@ rtems_task Partition_task( yield_count = 100; - while ( Stop_Test == FALSE ) { - for ( count=PARTITION_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) { + while ( Stop_Test == false ) { + for ( count=PARTITION_DOT_COUNT ; Stop_Test == false && count ; count-- ) { status = rtems_partition_get_buffer( Partition_id[ 1 ], &buffer ); directive_failed( status, "rtems_partition_get_buffer" ); status = rtems_partition_return_buffer( Partition_id[ 1 ], buffer ); directive_failed( status, "rtems_partition_return_buffer" ); - if (Stop_Test == FALSE) + if (Stop_Test == false) if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) { status = rtems_task_wake_after( 1 ); directive_failed( status, "rtems_task_wake_after" ); diff --git a/testsuites/mptests/mp14/smtask1.c b/testsuites/mptests/mp14/smtask1.c index eeda002a9d..3faefacfa1 100644 --- a/testsuites/mptests/mp14/smtask1.c +++ b/testsuites/mptests/mp14/smtask1.c @@ -44,9 +44,9 @@ rtems_task Semaphore_task( yield_count = 100; - while ( Stop_Test == FALSE ) { + while ( Stop_Test == false ) { - for ( count=SEMAPHORE_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) { + for ( count=SEMAPHORE_DOT_COUNT ; Stop_Test == false && count ; count-- ) { status = rtems_semaphore_obtain( Semaphore_id[ 1 ], RTEMS_DEFAULT_OPTIONS, @@ -57,7 +57,7 @@ rtems_task Semaphore_task( status = rtems_semaphore_release( Semaphore_id[ 1 ] ); directive_failed( status, "rtems_semaphore_release" ); - if ( Stop_Test == FALSE ) + if ( Stop_Test == false ) if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) { status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); directive_failed( status, "rtems_task_wake_after" ); diff --git a/testsuites/mptests/mp14/system.h b/testsuites/mptests/mp14/system.h index 06cfbda7f5..8305b8edc1 100644 --- a/testsuites/mptests/mp14/system.h +++ b/testsuites/mptests/mp14/system.h @@ -106,7 +106,7 @@ TEST_EXTERN uint32_t Msg_buffer[ 4 ][ 4 ]; extern rtems_multiprocessing_table Multiprocessing_configuration; -TEST_EXTERN volatile rtems_boolean Stop_Test; +TEST_EXTERN volatile bool Stop_Test; TEST_EXTERN rtems_id timer_id; #define EVENT_TASK_DOT_COUNT 100 -- cgit v1.2.3