summaryrefslogtreecommitdiffstats
path: root/testsuites/itrontests
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-08-12 20:50:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-08-12 20:50:24 +0000
commit6d1e9b8bf96792f670124d2bbc9e880269c03672 (patch)
tree3b0b0647611eedcdef0d3cfbe7c13e67699d48bf /testsuites/itrontests
parent2009-08-12 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-6d1e9b8bf96792f670124d2bbc9e880269c03672.tar.bz2
2009-08-12 Joel Sherrill <joel.sherrill@oarcorp.com>
* itrontask01/task1.c, itrontask02/dormant.c, itrontask03/task1.c, itrontask03/task2.c, itrontask03/task3.c, itrontask04/task3.c: Eliminate test routines TICKS_PER_SECOND and get_ticks_per_second() in favor of new rtems_clock_get_ticks_per_second().
Diffstat (limited to 'testsuites/itrontests')
-rw-r--r--testsuites/itrontests/ChangeLog7
-rw-r--r--testsuites/itrontests/itrontask01/task1.c5
-rw-r--r--testsuites/itrontests/itrontask02/dormant.c4
-rw-r--r--testsuites/itrontests/itrontask03/task1.c6
-rw-r--r--testsuites/itrontests/itrontask03/task2.c4
-rw-r--r--testsuites/itrontests/itrontask03/task3.c4
-rw-r--r--testsuites/itrontests/itrontask04/task3.c4
7 files changed, 21 insertions, 13 deletions
diff --git a/testsuites/itrontests/ChangeLog b/testsuites/itrontests/ChangeLog
index b36c8b830e..deb1a5c068 100644
--- a/testsuites/itrontests/ChangeLog
+++ b/testsuites/itrontests/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-12 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * itrontask01/task1.c, itrontask02/dormant.c, itrontask03/task1.c,
+ itrontask03/task2.c, itrontask03/task3.c, itrontask04/task3.c:
+ Eliminate test routines TICKS_PER_SECOND and get_ticks_per_second()
+ in favor of new rtems_clock_get_ticks_per_second().
+
2009-08-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* itrontask01/task1.c: Convert calls to legacy routine rtems_clock_get(
diff --git a/testsuites/itrontests/itrontask01/task1.c b/testsuites/itrontests/itrontask01/task1.c
index 01bdc28cc7..9b3616d434 100644
--- a/testsuites/itrontests/itrontask01/task1.c
+++ b/testsuites/itrontests/itrontask01/task1.c
@@ -8,7 +8,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
@@ -47,7 +47,8 @@ void Task_2_through_4()
printf(name);
print_time( " - rtems_clock_get_tod - ", &time, "\n" );
- status = rtems_task_wake_after( tid_index * 5 * TICKS_PER_SECOND );
+ status = rtems_task_wake_after(
+ tid_index * 5 * rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
}
}
diff --git a/testsuites/itrontests/itrontask02/dormant.c b/testsuites/itrontests/itrontask02/dormant.c
index 4dcb55261f..f6c2bf0e13 100644
--- a/testsuites/itrontests/itrontask02/dormant.c
+++ b/testsuites/itrontests/itrontask02/dormant.c
@@ -8,7 +8,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
@@ -37,7 +37,7 @@ void Non_Dormant_task()
while (TRUE) {
puts( "NON-DORMANT - Sleep for 2 minutes" );
- status = rtems_task_wake_after( 120*TICKS_PER_SECOND );
+ status = rtems_task_wake_after( 120*rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
}
}
diff --git a/testsuites/itrontests/itrontask03/task1.c b/testsuites/itrontests/itrontask03/task1.c
index ac7c929762..f5f75bb456 100644
--- a/testsuites/itrontests/itrontask03/task1.c
+++ b/testsuites/itrontests/itrontask03/task1.c
@@ -7,7 +7,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
@@ -28,7 +28,7 @@ void Task_1()
*/
puts( "TA1 - rtems_task_wake_after - sleep 1 second" );
- status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
+ status = rtems_task_wake_after( 1*rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
status = chg_pri( TA3_ID , 2 );
@@ -49,7 +49,7 @@ void Task_1()
*/
puts( "TA1 - rtems_task_wake_after - sleep for 5 seconds" );
- status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
+ status = rtems_task_wake_after( 5*rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
puts( "*** END OF ITRON TASK TEST 3 ***" );
diff --git a/testsuites/itrontests/itrontask03/task2.c b/testsuites/itrontests/itrontask03/task2.c
index ea5384da3a..2541a80f66 100644
--- a/testsuites/itrontests/itrontask03/task2.c
+++ b/testsuites/itrontests/itrontask03/task2.c
@@ -9,7 +9,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
@@ -26,6 +26,6 @@ void Task_2()
rtems_status_code status;
puts( "TA2 - rtems_task_wake_after - sleep 1 minute" );
- status = rtems_task_wake_after( 60*TICKS_PER_SECOND );
+ status = rtems_task_wake_after( 60*rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after in TA2" );
}
diff --git a/testsuites/itrontests/itrontask03/task3.c b/testsuites/itrontests/itrontask03/task3.c
index f2c1ca0a03..7e394d99c3 100644
--- a/testsuites/itrontests/itrontask03/task3.c
+++ b/testsuites/itrontests/itrontask03/task3.c
@@ -8,7 +8,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
@@ -29,7 +29,7 @@ void Task_3()
*/
puts( "TA3 - rtems_task_wake_after - sleep 5 seconds" );
- status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
+ status = rtems_task_wake_after( 5*rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after in TA3" );
diff --git a/testsuites/itrontests/itrontask04/task3.c b/testsuites/itrontests/itrontask04/task3.c
index aba0c25914..3864f6f01b 100644
--- a/testsuites/itrontests/itrontask04/task3.c
+++ b/testsuites/itrontests/itrontask04/task3.c
@@ -8,7 +8,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
@@ -43,7 +43,7 @@ void Task_3()
*/
puts( "TA3 - rtems_task_wake_after - sleep 1 second" );
- status = rtems_task_wake_after( TICKS_PER_SECOND );
+ status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after in TA3" );
}