diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 16:04:57 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 16:04:57 +0000 |
| commit | 1875546d632e42f263b6068991b5f55f4450baac (patch) | |
| tree | ddbb1c74fd3884380a2de66a2867d1e9235fbccf /testsuites/libtests | |
| parent | 2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-1875546d632e42f263b6068991b5f55f4450baac.tar.bz2 | |
2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* cpuuse/task1.c, termios/init.c: Convert calls to legacy routine
rtems_clock_get( RTEMS_CLOCK_GET_xxx, ..) to rtems_clock_get_xxx().
Diffstat (limited to 'testsuites/libtests')
| -rw-r--r-- | testsuites/libtests/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/libtests/cpuuse/task1.c | 8 | ||||
| -rw-r--r-- | testsuites/libtests/termios/init.c | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 9bd4f58bad..a53884f913 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,5 +1,10 @@ 2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com> + * cpuuse/task1.c, termios/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> + * cpuuse/task1.c, cpuuse/tswitch.c, malloctest/task1.c, stackchk/task1.c: Convert calls to legacy routine rtems_clock_get( RTEMS_CLOCK_GET_TOD, ..) to rtems_clock_get_tod(..). diff --git a/testsuites/libtests/cpuuse/task1.c b/testsuites/libtests/cpuuse/task1.c index bb2f32bc33..4d0d3667fd 100644 --- a/testsuites/libtests/cpuuse/task1.c +++ b/testsuites/libtests/cpuuse/task1.c @@ -40,14 +40,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" ); + 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" ); + 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/libtests/termios/init.c b/testsuites/libtests/termios/init.c index 214add8c33..f26cf3a1da 100644 --- a/testsuites/libtests/termios/init.c +++ b/testsuites/libtests/termios/init.c @@ -640,7 +640,7 @@ void do_raw_input( int vmin, int vtime ) printf( "Raw input test with VMIN=%d VTIME=%d\n", vmin, vtime ); - rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond ); + ticksPerSecond = rtems_clock_get_ticks_per_second(); if ( tcgetattr( fileno ( stdin ), &old ) < 0 ) { perror( "do_raw_input(): tcgetattr() failed" ); return; @@ -656,7 +656,7 @@ void do_raw_input( int vmin, int vtime ) } do { - rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then ); + then = rtems_clock_get_ticks_since_boot(); count = 0; for(;;) { nread = read( fileno( stdin ), cbuf, sizeof cbuf ); @@ -668,7 +668,7 @@ void do_raw_input( int vmin, int vtime ) if( nread != 0 ) break; } - rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now ); + now = rtems_clock_get_ticks_since_boot(); msec = (now - then) * 1000 / ticksPerSecond; printf( "Count:%-10lu Interval:%3u.%3.3d Char:", count, msec / 1000, msec % 1000 ); |