2009-08-12 Joel Sherrill <joel.sherrill@oarcorp.com>

	* sp02/task1.c, sp02/task2.c, sp02/task3.c, sp03/task2.c, sp05/task1.c,
	sp05/task2.c, sp05/task3.c, sp06/task1.c, sp06/task2.c,
	sp09/screen02.c, sp09/screen04.c, sp09/screen06.c, sp09/screen07.c,
	sp09/screen10.c, sp09/screen12.c, sp09/screen13.c, sp09/screen14.c,
	sp11/task1.c, sp11/task2.c, sp12/pridrv.c, sp12/pritask.c,
	sp12/task1.c, sp13/task1.c, sp13/task2.c, sp14/task1.c, sp16/task1.c,
	sp16/task4.c, sp19/fptask.c, sp19/task1.c, sp22/task1.c,
	sp24/task1.c, sp26/task1.c, sp29/init.c, sp30/task1.c, sp31/task1.c,
	sp33/init.c, sp45/init.c, sp46/init.c, sp50/init.c,
	spintrcritical06/init.c, spwatchdog/task1.c: Eliminate test routines
	TICKS_PER_SECOND and get_ticks_per_second() in favor of new
	rtems_clock_get_ticks_per_second().

3 files changed, 13 insertions, 14 deletions

diff --git a/testsuites/sptests/sp12/pridrv.c b/testsuites/sptests/sp12/pridrv.c
index 1bd4491909..ec4f6f6179 100644
--- a/testsuites/sptests/sp12/pridrv.c
+++ b/testsuites/sptests/sp12/pridrv.c
@@ -11,7 +11,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -73,7 +73,7 @@ void Priority_test_driver(
       );
       directive_failed( status, "rtems_task_start loop" );
 
-      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 loop" );
 
       if ( priority_base == PRIORITY_INHERIT_BASE_PRIORITY ) {
@@ -100,7 +100,7 @@ void Priority_test_driver(
     }
   }
 
-  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 after loop" );
 
   if ( priority_base == 0 ) {
@@ -115,13 +115,12 @@ void Priority_test_driver(
     status = rtems_task_resume( Priority_task_id[ 5 ] );
     directive_failed( status, "rtems_task_resume" );
 
-    status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+    status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
     directive_failed( status, "rtems_task_wake_after so PRI5 can run" );
 
     status = rtems_task_delete( Priority_task_id[ 5 ] );
     directive_failed( status, "rtems_task_delete of PRI5" );
-  }
-  else {
+  } else {
     for ( index = 1 ; index <= 5 ; index++ ) {
       status = rtems_task_delete( Priority_task_id[ index ] );
       directive_failed( status, "rtems_task_delete loop" );
diff --git a/testsuites/sptests/sp12/pritask.c b/testsuites/sptests/sp12/pritask.c
index bd20f181eb..a4786b7e29 100644
--- a/testsuites/sptests/sp12/pritask.c
+++ b/testsuites/sptests/sp12/pritask.c
@@ -7,7 +7,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -32,7 +32,7 @@ rtems_task Priority_task(
   its_priority = Task_priority[ its_index ];
 
   if ( its_priority < 3 )
-    timeout = 5 * TICKS_PER_SECOND;
+    timeout = 5 * rtems_clock_get_ticks_per_second();
   else
     timeout = RTEMS_NO_TIMEOUT;
 
diff --git a/testsuites/sptests/sp12/task1.c b/testsuites/sptests/sp12/task1.c
index 7d16c2881b..1f5a072a61 100644
--- a/testsuites/sptests/sp12/task1.c
+++ b/testsuites/sptests/sp12/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
@@ -62,7 +62,7 @@ rtems_task Task_1(
   puts( "TA1 - got SM1" );
 
   puts( "TA1 - 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" );
 
 rtems_test_pause();
@@ -77,7 +77,7 @@ rtems_test_pause();
   status = rtems_semaphore_obtain(
     Semaphore_id[ 1 ],
     RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND
+    10 * rtems_clock_get_ticks_per_second()
   );
   directive_failed( status, "rtems_semaphore_obtain of SM1" );
   puts( "TA1 - got SM1" );
@@ -87,7 +87,7 @@ rtems_test_pause();
   directive_failed( status, "rtems_semaphore_release of SM2" );
 
   puts( "TA1 - 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" );
 
 rtems_test_pause();
@@ -123,7 +123,7 @@ rtems_test_pause();
   directive_failed( status, "rtems_task_start of TA5" );
 
   puts( "TA1 - 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" );
 
   puts( "TA1 - rtems_task_delete - delete TA4" );
@@ -135,7 +135,7 @@ rtems_test_pause();
   directive_failed( status, "rtems_semaphore_release on SM1" );
 
   puts( "TA1 - 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" );
 
   puts( "TA1 - rtems_semaphore_delete - delete SM1" );