diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-24 22:10:20 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-24 22:10:20 +0000 |
commit | 9e15e9bfbaf0947442289a2d422d95b71db36f58 (patch) | |
tree | 6a35849de7fa9a7671e76d396157457799abfa79 /testsuites/sptests/sp19 | |
parent | Regenerate. (diff) | |
download | rtems-9e15e9bfbaf0947442289a2d422d95b71db36f58.tar.bz2 |
2011-07-24 Joel Sherrill <joel.sherrill@oarcorp.com>
* sp04/tswitch.c, sp07/task1.c, sp07/task2.c, sp09/screen07.c,
sp11/task1.c, sp11/task2.c, sp12/pridrv.c, sp12/pritask.c,
sp13/task1.c, sp14/asr.c, sp14/task1.c, sp19/first.c, sp19/fptask.c,
sp19/inttest.h, sp19/task1.c, sp20/task1.c, sp25/task1.c,
sp26/task1.c, sp28/init.c, sp29/init.c, sp31/task1.c, sp32/init.c,
sp33/init.c, sp34/changepri.c, sp36/strict_order_mut.c, sp37/init.c,
sp43/init.c, sp44/init.c, sp48/init.c, sp54/init.c, sp59/init.c,
sp65/init.c, sp68/init.c, spchain/init.c, spclockget/init.c,
spfatal03/testcase.h, spfatal07/testcase.h, spfatal_support/init.c:
Do not line length exceed 80 columns.
Diffstat (limited to 'testsuites/sptests/sp19')
-rw-r--r-- | testsuites/sptests/sp19/first.c | 29 | ||||
-rw-r--r-- | testsuites/sptests/sp19/fptask.c | 40 | ||||
-rw-r--r-- | testsuites/sptests/sp19/inttest.h | 18 | ||||
-rw-r--r-- | testsuites/sptests/sp19/task1.c | 20 |
4 files changed, 43 insertions, 64 deletions
diff --git a/testsuites/sptests/sp19/first.c b/testsuites/sptests/sp19/first.c index cbee33d91c..2699f345e2 100644 --- a/testsuites/sptests/sp19/first.c +++ b/testsuites/sptests/sp19/first.c @@ -1,15 +1,5 @@ -/* First_FP_task - * - * This routine serves as a floating point test task. It verifies the - * basic task switching capabilities of the executive when floating - * point is configured. - * - * Input parameters: - * argument - task argument - * - * Output parameters: NONE - * - * COPYRIGHT (c) 1989-1999. +/* + * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,13 +37,16 @@ rtems_task First_FP_task( FP_LOAD( FP_factors[ task_index ] ); put_name( Task_name[ task_index ], FALSE ); - printf( " - integer base = (0x%" PRIx32 ")\n", INTEGER_factors[ task_index ] ); + printf( + " - integer base = (0x%" PRIx32 ")\n", + INTEGER_factors[ task_index ] + ); put_name( Task_name[ task_index ], FALSE ); -#if ( RTEMS_HAS_HARDWARE_FP == 1 ) - printf( " - float base = (%g)\n", FP_factors[ task_index ] ); -#else - printf( " - float base = (NA)\n" ); -#endif + #if ( RTEMS_HAS_HARDWARE_FP == 1 ) + printf( " - float base = (%g)\n", FP_factors[ task_index ] ); + #else + printf( " - float base = (NA)\n" ); + #endif if ( argument == 0 ) { status = rtems_task_restart( RTEMS_SELF, 1 ); diff --git a/testsuites/sptests/sp19/fptask.c b/testsuites/sptests/sp19/fptask.c index d3acfce0c5..fe79f6d0e9 100644 --- a/testsuites/sptests/sp19/fptask.c +++ b/testsuites/sptests/sp19/fptask.c @@ -1,15 +1,5 @@ -/* FP_task - * - * This routine serves as a floating point test task. It verifies the - * basic task switching capabilities of the executive when floating - * point is configured. - * - * Input parameters: - * argument - task argument - * - * Output parameters: NONE - * - * COPYRIGHT (c) 1989-2009. +/* + * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -34,8 +24,8 @@ rtems_task FP_task( rtems_status_code status; rtems_id tid; rtems_time_of_day time; - uint32_t task_index; - uint32_t previous_seconds; + uint32_t task_index; + uint32_t previous_seconds; INTEGER_DECLARE; FP_DECLARE; @@ -48,13 +38,16 @@ rtems_task FP_task( FP_LOAD( FP_factors[ task_index ] ); put_name( Task_name[ task_index ], FALSE ); - printf( " - integer base = (0x%" PRIx32 ")\n", INTEGER_factors[ task_index ] ); + printf( + " - integer base = (0x%" PRIx32 ")\n", + INTEGER_factors[ task_index ] + ); put_name( Task_name[ task_index ], FALSE ); -#if ( RTEMS_HAS_HARDWARE_FP == 1 ) - printf( " - float base = (%g)\n", FP_factors[ task_index ] ); -#else - printf( " - float base = (NA)\n" ); -#endif + #if ( RTEMS_HAS_HARDWARE_FP == 1 ) + printf( " - float base = (%g)\n", FP_factors[ task_index ] ); + #else + printf( " - float base = (NA)\n" ); + #endif previous_seconds = (uint32_t)-1; @@ -64,7 +57,6 @@ rtems_task FP_task( directive_failed( status, "rtems_clock_get_tod" ); if ( time.second >= 16 ) { - if ( task_number( tid ) == 4 ) { puts( "TA4 - rtems_task_delete - self" ); status = rtems_task_delete( RTEMS_SELF ); @@ -78,8 +70,7 @@ rtems_task FP_task( rtems_test_exit( 0 ); } - if (previous_seconds != time.second) - { + if (previous_seconds != time.second) { put_name( Task_name[ task_index ], FALSE ); print_time( " - rtems_clock_get_tod - ", &time, "\n" ); previous_seconds = time.second; @@ -92,8 +83,7 @@ rtems_task FP_task( * so that we likely are interrupted * After that, we go to sleep for a second at a time */ - if (time.second >= 4) - { + if (time.second >= 4) { status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); directive_failed( status, "rtems_task_wake_after" ); } diff --git a/testsuites/sptests/sp19/inttest.h b/testsuites/sptests/sp19/inttest.h index bab14fef94..ed39f93d4c 100644 --- a/testsuites/sptests/sp19/inttest.h +++ b/testsuites/sptests/sp19/inttest.h @@ -1,6 +1,4 @@ -/* inttest.h - * - * XXX: ??? +/* * This include file contains the CPU dependent implementation * of the following routines needed to test RTEMS floating * point support: @@ -15,7 +13,7 @@ * inttest.h. These routines form the core of the * floating point context switch test. * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -103,10 +101,14 @@ } while (0) #define INTEGER_CHECK_ONE( _v, _base, _factor ) \ - if ( (_v) != ((_base) + (_factor)) ) { \ - printf("%" PRIu32 ": " #_v " wrong -- (0x%" PRIx32 " not 0x%" PRIx32 ")\n", \ - task_index, (_v), (_base + _factor)); \ - } + if ( (_v) != ((_base) + (_factor)) ) { \ + printf( \ + "%" PRIu32 ": " #_v " wrong -- (0x%" PRIx32 " not 0x%" PRIx32 ")\n", \ + task_index, \ + (_v), \ + (_base + _factor) \ + ); \ + } #define INTEGER_CHECK( _factor ) \ diff --git a/testsuites/sptests/sp19/task1.c b/testsuites/sptests/sp19/task1.c index 1d261f3f25..42a99fc4ed 100644 --- a/testsuites/sptests/sp19/task1.c +++ b/testsuites/sptests/sp19/task1.c @@ -1,14 +1,5 @@ -/* Task_1 - * - * This routine serves as a test task. It verifies the basic task - * switching capabilities of the executive. - * - * Input parameters: - * argument - task argument - * - * Output parameters: NONE - * - * COPYRIGHT (c) 1989-2009. +/* + * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -32,7 +23,7 @@ rtems_task Task_1( rtems_status_code status; rtems_id tid; rtems_time_of_day time; - uint32_t task_index; + uint32_t task_index; INTEGER_DECLARE; status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid ); @@ -43,7 +34,10 @@ rtems_task Task_1( INTEGER_LOAD( INTEGER_factors[ task_index ] ); put_name( Task_name[ task_index ], FALSE ); - printf( " - integer base = (0x%" PRIx32 ")\n", INTEGER_factors[ task_index ] ); + printf( + " - integer base = (0x%" PRIx32 ")\n", + INTEGER_factors[ task_index ] + ); while( FOREVER ) { status = rtems_clock_get_tod( &time ); |