diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 16:04:41 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 16:04:41 +0000 |
commit | 05b9f81761c5a301ba8c3218a7465bceb12ee635 (patch) | |
tree | f95b4a7f20b3e52b1e67be46a4c154a4c06b0b6c | |
parent | 2009-08-10 Roxana Leontie <roxana.leontie@gmail.com> (diff) | |
download | rtems-05b9f81761c5a301ba8c3218a7465bceb12ee635.tar.bz2 |
2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* sp04/task1.c, sp09/screen02.c, sp09/screen04.c, sp09/sp09.scn,
sp38/init.c: Convert calls to legacy routine rtems_clock_get(
RTEMS_CLOCK_GET_xxx, ..) to rtems_clock_get_xxx().
-rw-r--r-- | testsuites/sptests/ChangeLog | 6 | ||||
-rw-r--r-- | testsuites/sptests/sp04/task1.c | 8 | ||||
-rw-r--r-- | testsuites/sptests/sp09/screen02.c | 20 | ||||
-rw-r--r-- | testsuites/sptests/sp09/screen04.c | 6 | ||||
-rw-r--r-- | testsuites/sptests/sp09/sp09.scn | 8 | ||||
-rw-r--r-- | testsuites/sptests/sp38/init.c | 6 |
6 files changed, 30 insertions, 24 deletions
diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 3aeef1be94..237cbffdbb 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,5 +1,11 @@ 2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com> + * sp04/task1.c, sp09/screen02.c, sp09/screen04.c, sp09/sp09.scn, + sp38/init.c: Convert calls to legacy routine rtems_clock_get( + RTEMS_CLOCK_GET_xxx, ..) to rtems_clock_get_xxx(). + +2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com> + * sp01/sp01.scn, sp01/task1.c, sp03/task1.c, sp03/task2.c, sp04/task1.c, sp04/tswitch.c, sp09/screen02.c, sp09/screen13.c, sp09/screen14.c, sp09/sp09.scn, sp11/sp11.scn, sp11/task1.c, diff --git a/testsuites/sptests/sp04/task1.c b/testsuites/sptests/sp04/task1.c index 9a398d5c6f..54b933fc3b 100644 --- a/testsuites/sptests/sp04/task1.c +++ b/testsuites/sptests/sp04/task1.c @@ -52,14 +52,14 @@ rtems_task Task_1( status = rtems_task_suspend( Task_id[ 3 ] ); directive_failed( status, "rtems_task_suspend of TA3" ); - status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &start_time ); - directive_failed( status, "rtems_clock_get_tod" ); + status = rtems_clock_get_seconds_since_epoch( &start_time ); + directive_failed( status, "rtems_clock_get_seconds_since_epoch" ); puts( "TA1 - killing time" ); for ( ; ; ) { - status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &end_time ); - directive_failed( status, "rtems_clock_get_tod" ); + status = rtems_clock_get_seconds_since_epoch( &end_time ); + directive_failed( status, "rtems_clock_get_seconds_since_epoch" ); if ( end_time > (start_time + 2) ) break; diff --git a/testsuites/sptests/sp09/screen02.c b/testsuites/sptests/sp09/screen02.c index 7ca47ec85f..e2b3ec320a 100644 --- a/testsuites/sptests/sp09/screen02.c +++ b/testsuites/sptests/sp09/screen02.c @@ -39,35 +39,37 @@ void Screen2() RTEMS_NOT_DEFINED, "rtems_clock_get_tod before clock is set #1" ); - puts( "TA1 - rtems_clock_get_tod - TOD - RTEMS_NOT_DEFINED" ); + puts( "TA1 - rtems_clock_get_tod - RTEMS_NOT_DEFINED" ); } - status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &interval ); + status = rtems_clock_get_seconds_since_epoch( &interval ); if ( status == RTEMS_SUCCESSFUL ) { puts( - "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED -- DID BSP SET THE TIME OF DAY?" + "TA1 - rtems_clock_get_seconds_since_epoch - RTEMS_NOT_DEFINED -- " + "DID BSP SET THE TIME OF DAY?" ); } else { fatal_directive_status( status, RTEMS_NOT_DEFINED, - "rtems_clock_get before clock is set #2" + "rtems_clock_get_seconds_before_epoch" ); - puts( "TA1 - rtems_clock_get - SECONDS SINCE EPOCH - RTEMS_NOT_DEFINED" ); + puts( "TA1 - rtems_clock_get_seconds_since_epoch - RTEMS_NOT_DEFINED" ); } - status = rtems_clock_get( RTEMS_CLOCK_GET_TIME_VALUE, &tv ); + status = rtems_clock_get_tod_timeval( &tv ); if ( status == RTEMS_SUCCESSFUL ) { puts( - "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED -- DID BSP SET THE TIME OF DAY?" + "TA1 - rtems_clock_get_tod_timeval - RTEMS_NOT_DEFINED -- " + "DID BSP SET THE TIME OF DAY?" ); } else { fatal_directive_status( status, RTEMS_NOT_DEFINED, - "rtems_clock_get before clock is set #3" + "rtems_clock_get_timeval" ); - puts( "TA1 - rtems_clock_get - TIME VALUE - RTEMS_NOT_DEFINED" ); + puts( "TA1 - rtems_clock_get_tod_timeval - RTEMS_NOT_DEFINED" ); } /* arbitrary bad value for switch */ diff --git a/testsuites/sptests/sp09/screen04.c b/testsuites/sptests/sp09/screen04.c index ac9bca0a7e..56c011b4b7 100644 --- a/testsuites/sptests/sp09/screen04.c +++ b/testsuites/sptests/sp09/screen04.c @@ -6,7 +6,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -84,8 +84,8 @@ void Screen4() directive_failed( status, "rtems_clock_set" ); puts( " - RTEMS_SUCCESSFUL" ); - status = rtems_clock_get( RTEMS_CLOCK_GET_TIME_VALUE, &tv ); - directive_failed( status, "clock_get time value OK" ); + status = rtems_clock_get_tod_timeval( &tv ); + directive_failed( status, "clock_get_tod_timeval OK" ); seconds = tv.tv_sec; printf( "TA1 - current time - %s\n", ctime(&seconds) ); diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn index 42722050ac..e9bd2fe390 100644 --- a/testsuites/sptests/sp09/sp09.scn +++ b/testsuites/sptests/sp09/sp09.scn @@ -22,10 +22,10 @@ TA1 - rtems_task_start - RTEMS_INVALID_ID TA1 - rtems_task_start - RTEMS_INCORRECT_STATE TA1 - rtems_task_suspend - RTEMS_INVALID_ID <pause - screen 2> -TA1 - rtems_clock_get_tod - TOD - RTEMS_NOT_DEFINED -TA1 - rtems_clock_get_tod - SECONDS SINCE EPOCH - RTEMS_NOT_DEFINED -TA1 - rtems_clock_get_tod - TIME VALUE - RTEMS_NOT_DEFINED -TA1 - rtems_clock_get_tod - RTEMS_INVALID_NUMBER +TA1 - rtems_clock_get_tod - RTEMS_NOT_DEFINED +TA1 - rtems_clock_get_second_since_epoch - RTEMS_NOT_DEFINED +TA1 - rtems_clock_get_tod_timeval - RTEMS_NOT_DEFINED +TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED TA1 - rtems_timer_fire_when - RTEMS_NOT_DEFINED TA1 - rtems_clock_set - 08:30:45 02/05/1987 - RTEMS_INVALID_CLOCK diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c index 8943cd0042..645b81f535 100644 --- a/testsuites/sptests/sp38/init.c +++ b/testsuites/sptests/sp38/init.c @@ -66,8 +66,7 @@ rtems_task Init( /* * Get starting time */ - status = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &start ); - directive_failed( status, "rtems_clock_get start" ); + start = rtems_clock_get_ticks_since_boot(); status = rtems_signal_catch( signal_handler, RTEMS_DEFAULT_MODES ); directive_failed( status, "rtems_signal_catch" ); @@ -82,8 +81,7 @@ rtems_task Init( directive_failed( status, "timer_fire_after failed" ); while (1) { - status = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now ); - directive_failed( status, "rtems_clock_get now" ); + now = rtems_clock_get_ticks_since_boot(); if ( (now-start) > 100 ) { puts( "Signal from ISR did not get processed\n" ); rtems_test_exit( 0 ); |