From f6ef96c2739580c6d91e7fadd22859c2910d4711 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 10 Aug 2009 16:05:17 +0000 Subject: 2009-08-10 Joel Sherrill * fileio/system.h, ticker/system.h, ticker/ticker.scn: Convert calls to legacy routine rtems_clock_get( RTEMS_CLOCK_GET_xxx, ..) to rtems_clock_get_xxx(). --- testsuites/samples/ChangeLog | 6 ++++++ testsuites/samples/fileio/system.h | 3 +-- testsuites/samples/ticker/system.h | 4 +--- testsuites/samples/ticker/ticker.scn | 28 ++++++++++++++-------------- 4 files changed, 22 insertions(+), 19 deletions(-) (limited to 'testsuites/samples') diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog index 44dc8fcf6e..16f7746405 100644 --- a/testsuites/samples/ChangeLog +++ b/testsuites/samples/ChangeLog @@ -1,3 +1,9 @@ +2009-08-10 Joel Sherrill + + * fileio/system.h, ticker/system.h, ticker/ticker.scn: Convert calls to + legacy routine rtems_clock_get( RTEMS_CLOCK_GET_xxx, ..) to + rtems_clock_get_xxx(). + 2009-08-10 Joel Sherrill * ticker/tasks.c: Convert calls to legacy routine rtems_clock_get( diff --git a/testsuites/samples/fileio/system.h b/testsuites/samples/fileio/system.h index 13b6ecb8c7..3620eacdb2 100644 --- a/testsuites/samples/fileio/system.h +++ b/testsuites/samples/fileio/system.h @@ -106,8 +106,7 @@ rtems_task Init( static inline uint32_t get_ticks_per_second( void ) { - rtems_interval ticks_per_second; - (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticks_per_second ); return ticks_per_second; + return rtems_clock_get_ticks_per_second(); } diff --git a/testsuites/samples/ticker/system.h b/testsuites/samples/ticker/system.h index 4f72faa49d..a87ba2c901 100644 --- a/testsuites/samples/ticker/system.h +++ b/testsuites/samples/ticker/system.h @@ -94,11 +94,9 @@ extern rtems_name Task_name[ 4 ]; /* array of task names */ static inline uint32_t get_ticks_per_second( void ) { - rtems_interval ticks_per_second; - (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticks_per_second ); return ticks_per_second; + return rtems_clock_get_ticks_per_second(); } - /* * This allows us to view the "Test_task" instantiations as a set * of numbered tasks by eliminating the number of application diff --git a/testsuites/samples/ticker/ticker.scn b/testsuites/samples/ticker/ticker.scn index 35952e6170..b1a434abb6 100644 --- a/testsuites/samples/ticker/ticker.scn +++ b/testsuites/samples/ticker/ticker.scn @@ -1,16 +1,16 @@ *** CLOCK TICK TEST *** -TA1 - tm_get - 09:00:00 12/31/1988 -TA2 - tm_get - 09:00:00 12/31/1988 -TA3 - tm_get - 09:00:00 12/31/1988 -TA1 - tm_get - 09:00:05 12/31/1988 -TA1 - tm_get - 09:00:10 12/31/1988 -TA2 - tm_get - 09:00:10 12/31/1988 -TA1 - tm_get - 09:00:15 12/31/1988 -TA3 - tm_get - 09:00:15 12/31/1988 -TA1 - tm_get - 09:00:20 12/31/1988 -TA2 - tm_get - 09:00:20 12/31/1988 -TA1 - tm_get - 09:00:25 12/31/1988 -TA1 - tm_get - 09:00:30 12/31/1988 -TA2 - tm_get - 09:00:30 12/31/1988 -TA3 - tm_get - 09:00:30 12/31/1988 +TA1 - clock_get_tod - 09:00:00 12/31/1988 +TA2 - clock_get_tod - 09:00:00 12/31/1988 +TA3 - clock_get_tod - 09:00:00 12/31/1988 +TA1 - clock_get_tod - 09:00:05 12/31/1988 +TA1 - clock_get_tod - 09:00:10 12/31/1988 +TA2 - clock_get_tod - 09:00:10 12/31/1988 +TA1 - clock_get_tod - 09:00:15 12/31/1988 +TA3 - clock_get_tod - 09:00:15 12/31/1988 +TA1 - clock_get_tod - 09:00:20 12/31/1988 +TA2 - clock_get_tod - 09:00:20 12/31/1988 +TA1 - clock_get_tod - 09:00:25 12/31/1988 +TA1 - clock_get_tod - 09:00:30 12/31/1988 +TA2 - clock_get_tod - 09:00:30 12/31/1988 +TA3 - clock_get_tod - 09:00:30 12/31/1988 *** END OF CLOCK TICK TEST *** -- cgit v1.2.3