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().

42 files changed, 152 insertions, 131 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 89fc9aea88..50091e88e0 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,20 @@
 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().
+
+2009-08-12	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* sp65/init.c: Add semi-colon to end of rtems_semaphore_create call.
 	Change attributes to priority ceiling. Use directive_failed, not
 	assert. Configure a semaphore not a region.
diff --git a/testsuites/sptests/sp02/task1.c b/testsuites/sptests/sp02/task1.c
index 7682ee5208..026cbc0fa0 100644
--- a/testsuites/sptests/sp02/task1.c
+++ b/testsuites/sptests/sp02/task1.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
@@ -30,7 +30,7 @@ rtems_task Task_1(
   uint32_t    previous_priority;
 
   puts( "TA1 - rtems_task_wake_after - sleep 1 second" );
-  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" );
 
   status = rtems_task_ident( Task_name[ 2 ], RTEMS_SEARCH_ALL_NODES, &tid2 );
@@ -63,7 +63,7 @@ rtems_task Task_1(
   directive_failed( status, "rtems_task_delete of TA2" );
 
   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 TEST 2 ***" );
diff --git a/testsuites/sptests/sp02/task2.c b/testsuites/sptests/sp02/task2.c
index 0cb045d568..1ade96f1b1 100644
--- a/testsuites/sptests/sp02/task2.c
+++ b/testsuites/sptests/sp02/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
@@ -28,6 +28,6 @@ rtems_task 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/sptests/sp02/task3.c b/testsuites/sptests/sp02/task3.c
index 97bfc1637c..41c08144ce 100644
--- a/testsuites/sptests/sp02/task3.c
+++ b/testsuites/sptests/sp02/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
@@ -27,7 +27,7 @@ rtems_task Task_3(
   rtems_status_code status;
 
   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" );
 
   puts( "TA3 - rtems_task_delete - delete self" );
diff --git a/testsuites/sptests/sp03/task2.c b/testsuites/sptests/sp03/task2.c
index 2ec0504cc3..b985bb69e2 100644
--- a/testsuites/sptests/sp03/task2.c
+++ b/testsuites/sptests/sp03/task2.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
@@ -28,7 +28,7 @@ rtems_task Task_2(
   rtems_time_of_day time;
 
   while( FOREVER ) {
-    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" );
 
     status = rtems_clock_get_tod( &time );
diff --git a/testsuites/sptests/sp05/task1.c b/testsuites/sptests/sp05/task1.c
index 21a89873de..328a2a3788 100644
--- a/testsuites/sptests/sp05/task1.c
+++ b/testsuites/sptests/sp05/task1.c
@@ -10,7 +10,7 @@
  *
  *  NOTE: The rtems_task_suspend() directives fail on the first iteration.
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -40,7 +40,7 @@ rtems_task Task_1(
   for ( pass=1 ; pass <= 3 ; pass++ ) {
 
     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 of TA1" );
 
     puts( "TA1 - rtems_task_suspend - suspend TA3" );
@@ -60,7 +60,7 @@ rtems_task Task_1(
     directive_failed( status, "rtems_task_resume of TA2" );
 
     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_suspend - suspend TA2" );
diff --git a/testsuites/sptests/sp05/task2.c b/testsuites/sptests/sp05/task2.c
index 13d17602e6..aa1fa6af74 100644
--- a/testsuites/sptests/sp05/task2.c
+++ b/testsuites/sptests/sp05/task2.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
@@ -32,7 +32,7 @@ rtems_task Task_2(
 
   while( FOREVER ) {
     puts( "TA2 - rtems_task_wake_after - sleep 1 second" );
-    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 of TA2" );
   }
 }
diff --git a/testsuites/sptests/sp05/task3.c b/testsuites/sptests/sp05/task3.c
index 3b86f8627c..e6b1941b4f 100644
--- a/testsuites/sptests/sp05/task3.c
+++ b/testsuites/sptests/sp05/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
@@ -32,7 +32,7 @@ rtems_task Task_3(
 
   while( FOREVER ) {
     puts( "TA3 - rtems_task_wake_after - sleep 1 second" );
-    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 of TA3" );
   }
 }
diff --git a/testsuites/sptests/sp06/task1.c b/testsuites/sptests/sp06/task1.c
index bf0c0e3873..e5ae84510c 100644
--- a/testsuites/sptests/sp06/task1.c
+++ b/testsuites/sptests/sp06/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
@@ -41,18 +41,18 @@ rtems_task Task_1(
     status = rtems_task_restart( Task_id[ 3 ], Restart_argument );
     directive_failed( status, "rtems_task_restart of TA3" );
 
-    status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
+    status = rtems_task_wake_after( 2 * rtems_clock_get_ticks_per_second() );
     directive_failed( status, "rtems_task_wake_after" );
   }
 
-  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" );
 
   puts( "TA1 - rtems_task_restart - restarting TA2" );
   status = rtems_task_restart( Task_id[ 2 ], Restart_argument );
   directive_failed( status, "rtems_task_restart TA2" );
 
-  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" );
 
   puts( "TA1 - rtems_task_restart - restarting self" );
diff --git a/testsuites/sptests/sp06/task2.c b/testsuites/sptests/sp06/task2.c
index b7d1d8df63..2214623dd3 100644
--- a/testsuites/sptests/sp06/task2.c
+++ b/testsuites/sptests/sp06/task2.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
@@ -27,13 +27,13 @@ rtems_task_argument argument;
 
   puts( "TA2 - is beginning to run" );
   if ( argument == Argument ) {
-    status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
+    status = rtems_task_wake_after( 2 * rtems_clock_get_ticks_per_second() );
     directive_failed( status, "rtems_task_wake_after" );
   }
 
   while( FOREVER ) {
     puts( "TA2 - rtems_task_wake_after - sleep 1/2 second" );
-    status = rtems_task_wake_after( TICKS_PER_SECOND / 2 );
+    status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() / 2 );
     directive_failed( status, "rtems_task_wake_after" );
   }
 }
diff --git a/testsuites/sptests/sp09/screen02.c b/testsuites/sptests/sp09/screen02.c
index e2b3ec320a..113dbf27e9 100644
--- a/testsuites/sptests/sp09/screen02.c
+++ b/testsuites/sptests/sp09/screen02.c
@@ -6,7 +6,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -170,7 +170,10 @@ void Screen2()
   );
   puts( " - RTEMS_INVALID_CLOCK" );
 
-  build_time( &time, 2, 5, 1988, 8, 30, 45, TICKS_PER_SECOND + 1 );
+  build_time(
+    &time, 2, 5, 1988, 8, 30, 45,
+    rtems_clock_get_ticks_per_second() + 1
+  );
   print_time( "TA1 - rtems_clock_set - ", &time, "" );
   status = rtems_clock_set( &time );
   fatal_directive_status(
@@ -188,7 +191,11 @@ void Screen2()
 
 /* rtems_task_wake_when */
 
-  build_time( &time, 2, 5, 1988, 8, 30, 48, TICKS_PER_SECOND + 1 );
+  build_time(
+    &time,
+    2, 5, 1988, 8, 30, 48,
+    rtems_clock_get_ticks_per_second() + 1
+  );
   time.second += 3;
   puts( "TA1 - rtems_task_wake_when - TICKINVALID - sleep about 3 seconds" );
 
diff --git a/testsuites/sptests/sp09/screen04.c b/testsuites/sptests/sp09/screen04.c
index 56c011b4b7..01094eeb76 100644
--- a/testsuites/sptests/sp09/screen04.c
+++ b/testsuites/sptests/sp09/screen04.c
@@ -56,7 +56,7 @@ void Screen4()
   status = rtems_event_receive(
     RTEMS_EVENT_16,
     RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     &event_out
   );
   fatal_directive_status(
@@ -75,7 +75,7 @@ void Screen4()
   puts( "TA1 - rtems_event_send - RTEMS_INVALID_ID" );
 
   puts( "TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL" );
-  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" );
 
   build_time( &time, 2, 5, 1988, 8, 30, 45, 0 );
diff --git a/testsuites/sptests/sp09/screen06.c b/testsuites/sptests/sp09/screen06.c
index ba30d6710e..f95a5de4db 100644
--- a/testsuites/sptests/sp09/screen06.c
+++ b/testsuites/sptests/sp09/screen06.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
@@ -58,7 +58,7 @@ void Screen6()
   status = rtems_semaphore_obtain(
     Semaphore_id[ 1 ],
     RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND
+    3 * rtems_clock_get_ticks_per_second()
   );
   fatal_directive_status(
     status,
diff --git a/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c
index 0401421b23..445b94d8d3 100644
--- a/testsuites/sptests/sp09/screen07.c
+++ b/testsuites/sptests/sp09/screen07.c
@@ -6,7 +6,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -211,7 +211,7 @@ void Screen7()
     (long (*)[4]) buffer,
     &size,
     RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND
+    3 * rtems_clock_get_ticks_per_second()
   );
   fatal_directive_status(
     status,
diff --git a/testsuites/sptests/sp09/screen10.c b/testsuites/sptests/sp09/screen10.c
index c9c88a31ee..7a1136236f 100644
--- a/testsuites/sptests/sp09/screen10.c
+++ b/testsuites/sptests/sp09/screen10.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
@@ -150,7 +150,7 @@ void Screen10()
   status = rtems_rate_monotonic_period( Period_id[ 1 ], 5 );
   directive_failed( status, "rtems_rate_monotonic_period restart" );
 
-  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" );
 
   status = rtems_rate_monotonic_period( Period_id[ 1 ], 5 );
diff --git a/testsuites/sptests/sp09/screen12.c b/testsuites/sptests/sp09/screen12.c
index e48aa06eaf..701c26963a 100644
--- a/testsuites/sptests/sp09/screen12.c
+++ b/testsuites/sptests/sp09/screen12.c
@@ -6,7 +6,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -269,7 +269,7 @@ void Screen12()
     Region_id[ 1 ],
     128,
     RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     &segment_address_3
   );
   fatal_directive_status(
diff --git a/testsuites/sptests/sp09/screen13.c b/testsuites/sptests/sp09/screen13.c
index d3084bfada..e09275555f 100644
--- a/testsuites/sptests/sp09/screen13.c
+++ b/testsuites/sptests/sp09/screen13.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
@@ -70,7 +70,7 @@ void Screen13()
   status = rtems_clock_set( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
   status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
@@ -79,7 +79,7 @@ void Screen13()
   status = rtems_clock_set( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
   status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
@@ -88,7 +88,8 @@ void Screen13()
   status = rtems_clock_set( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
+    5 * rtems_clock_get_ticks_per_second(),
   status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
@@ -97,7 +98,7 @@ void Screen13()
   status = rtems_clock_set( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
   status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
@@ -106,7 +107,7 @@ void Screen13()
   status = rtems_clock_set( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
   status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
diff --git a/testsuites/sptests/sp09/screen14.c b/testsuites/sptests/sp09/screen14.c
index 75a17107c5..acdf5da074 100644
--- a/testsuites/sptests/sp09/screen14.c
+++ b/testsuites/sptests/sp09/screen14.c
@@ -6,7 +6,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
@@ -95,7 +95,7 @@ void Screen14()
 
   status = rtems_timer_fire_after(
     rtems_build_id( 1, 1, 1, 256 ),
-    5 * TICKS_PER_SECOND,
+    5 * rtems_clock_get_ticks_per_second(),
     Delayed_routine,
     NULL
   );
@@ -220,7 +220,7 @@ void Screen14()
 
   status = rtems_timer_server_fire_after(
     rtems_build_id( 1, 1, 1, 256 ),
-    5 * TICKS_PER_SECOND,
+    5 * rtems_clock_get_ticks_per_second(),
     Delayed_routine,
     NULL
   );
diff --git a/testsuites/sptests/sp11/task1.c b/testsuites/sptests/sp11/task1.c
index 812993cb17..4aea85188f 100644
--- a/testsuites/sptests/sp11/task1.c
+++ b/testsuites/sptests/sp11/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
@@ -58,7 +58,7 @@ rtems_task Task_1(
   status = rtems_event_receive(
     RTEMS_EVENT_14,
     RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND,
+    10 * rtems_clock_get_ticks_per_second(),
     &eventout
   );
   directive_failed( status, "rtems_event_receive" );
@@ -77,7 +77,7 @@ rtems_test_pause();
   puts( "TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds");
   status = rtems_timer_fire_after(
     Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
+    5 * rtems_clock_get_ticks_per_second(),
     TA1_send_18_to_self_5_seconds,
     NULL
   );
@@ -136,7 +136,7 @@ rtems_test_pause();
   puts( "TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds");
   status = rtems_timer_fire_after(
     Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
+    5 * rtems_clock_get_ticks_per_second(),
     TA1_send_18_to_self_5_seconds,
     NULL
   );
@@ -149,7 +149,7 @@ rtems_test_pause();
   puts( "TA1 - rtems_event_send - send RTEMS_EVENT_8 to self after 60 seconds");
   status = rtems_timer_fire_after(
     Timer_id[ 1 ],
-    60 * TICKS_PER_SECOND,
+    60 * rtems_clock_get_ticks_per_second(),
     TA1_send_8_to_self_60_seconds,
     NULL
   );
@@ -158,7 +158,7 @@ rtems_test_pause();
   puts( "TA1 - rtems_event_send - send RTEMS_EVENT_9 to self after 60 seconds");
   status = rtems_timer_fire_after(
     Timer_id[ 2 ],
-    60 * TICKS_PER_SECOND,
+    60 * rtems_clock_get_ticks_per_second(),
     TA1_send_9_to_self_60_seconds,
     NULL
   );
@@ -169,7 +169,7 @@ rtems_test_pause();
   );
   status = rtems_timer_fire_after(
     Timer_id[ 3 ],
-    60 * TICKS_PER_SECOND,
+    60 * rtems_clock_get_ticks_per_second(),
     TA1_send_10_to_self,
     NULL
   );
@@ -188,7 +188,7 @@ rtems_test_pause();
   puts( "TA1 - rtems_event_send - send RTEMS_EVENT_1 every second" );
   status = rtems_timer_fire_after(
     Timer_id[ 1 ],
-    TICKS_PER_SECOND,
+    rtems_clock_get_ticks_per_second(),
     TA1_send_1_to_self_every_second,
     NULL
   );
diff --git a/testsuites/sptests/sp11/task2.c b/testsuites/sptests/sp11/task2.c
index 1d569541b0..8166449a1e 100644
--- a/testsuites/sptests/sp11/task2.c
+++ b/testsuites/sptests/sp11/task2.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
@@ -28,7 +28,7 @@ rtems_task Task_2(
   rtems_time_of_day time;
   rtems_status_code status;
 
-  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" );
 
   puts( "TA2 - rtems_event_receive - waiting forever on RTEMS_EVENT_16" );
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" );
diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
index 471f861d4d..2e79205fd4 100644
--- a/testsuites/sptests/sp13/task1.c
+++ b/testsuites/sptests/sp13/task1.c
@@ -80,7 +80,7 @@ rtems_task Task_1(
   directive_failed( status, "rtems_message_queue_send" );
 
   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" );
 
   Fill_buffer( "BUFFER 3 TO Q 1", buffer );
@@ -89,7 +89,7 @@ rtems_task Task_1(
   directive_failed( status, "rtems_message_queue_send" );
 
   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();
@@ -106,7 +106,7 @@ rtems_test_pause();
     buffer,
     &size,
     RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND
+    10 * rtems_clock_get_ticks_per_second()
   );
   directive_failed( status, "rtems_message_queue_receive" );
   puts_nocr( "TA1 - buffer received: " );
@@ -123,7 +123,7 @@ rtems_test_pause();
   directive_failed( status, "rtems_message_queue_send" );
 
   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();
@@ -337,7 +337,7 @@ rtems_test_pause();
                                            big_receive_buffer,
                                            &size,
                                            RTEMS_DEFAULT_OPTIONS,
-                                           1 * TICKS_PER_SECOND);
+                                           1 * rtems_clock_get_ticks_per_second());
       directive_failed(status, "rtems_message_queue_receive exact size");
       if (size != queue_size)
       {
diff --git a/testsuites/sptests/sp13/task2.c b/testsuites/sptests/sp13/task2.c
index 699ef83ee6..cfe8e7d4bc 100644
--- a/testsuites/sptests/sp13/task2.c
+++ b/testsuites/sptests/sp13/task2.c
@@ -8,7 +8,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -110,7 +110,7 @@ rtems_task Task_2(
     buffer,
     &size,
     RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND
+    10 * rtems_clock_get_ticks_per_second()
   );
   directive_failed( status, "rtems_message_queue_receive" );
   puts_nocr( "TA2 - buffer received: " );
diff --git a/testsuites/sptests/sp14/task1.c b/testsuites/sptests/sp14/task1.c
index 92577b11a4..5196b34e77 100644
--- a/testsuites/sptests/sp14/task1.c
+++ b/testsuites/sptests/sp14/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
@@ -75,7 +75,7 @@ rtems_test_pause();
   puts( "TA1 - sending signal to RTEMS_SELF from timer" );
   status = rtems_timer_fire_after(
     Timer_id[ 1 ],
-    TICKS_PER_SECOND / 2,
+    rtems_clock_get_ticks_per_second() / 2,
     Signal_3_to_task_1,
     (void *) Task_1
   );
diff --git a/testsuites/sptests/sp16/task1.c b/testsuites/sptests/sp16/task1.c
index 6107199fb0..5fe4058663 100644
--- a/testsuites/sptests/sp16/task1.c
+++ b/testsuites/sptests/sp16/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
@@ -98,7 +98,7 @@ rtems_test_pause();
     Region_id[ 1 ],
     3072,
     RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND,
+    10 * rtems_clock_get_ticks_per_second(),
     &segment_address_4
   );
   directive_failed( status, "rtems_region_get_segment" );
@@ -151,7 +151,7 @@ rtems_test_pause();
   directive_failed( status, "rtems_task_start of TA5" );
 
   puts( "TA1 - rtems_task_wake_after - yield processor" );
-  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" );
 
   puts_nocr(
@@ -163,7 +163,7 @@ rtems_test_pause();
   new_line;
 
   puts( "TA1 - rtems_task_wake_after - yield processor" );
-  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" );
 
   puts_nocr( "TA1 - rtems_region_get_segment - wait 10 seconds for 3K " );
@@ -172,7 +172,7 @@ rtems_test_pause();
     Region_id[ 1 ],
     3072,
     RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND,
+    10 * rtems_clock_get_ticks_per_second(),
     &segment_address_4
   );
   directive_failed( status, "rtems_region_get_segment" );
@@ -181,7 +181,7 @@ rtems_test_pause();
   new_line;
 
   puts( "TA1 - rtems_task_wake_after - yield processor" );
-  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" );
 
   puts( "TA1 - rtems_task_delete - delete TA4" );
diff --git a/testsuites/sptests/sp16/task4.c b/testsuites/sptests/sp16/task4.c
index 5fd63149d5..99f9536865 100644
--- a/testsuites/sptests/sp16/task4.c
+++ b/testsuites/sptests/sp16/task4.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
@@ -44,7 +44,7 @@ rtems_task Task_4(
   Put_address_from_area_1( segment_address_1 );
   new_line;
 
-  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" );
 
   puts( "TA4 - rtems_region_get_segment - wait on 3K segment from region 1" );
diff --git a/testsuites/sptests/sp19/fptask.c b/testsuites/sptests/sp19/fptask.c
index 210bc44f27..44b42308c3 100644
--- a/testsuites/sptests/sp19/fptask.c
+++ b/testsuites/sptests/sp19/fptask.c
@@ -90,7 +90,7 @@ rtems_task FP_task(
      */
     if (time.second >= 4)
     {
-      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" );
     }
   }
diff --git a/testsuites/sptests/sp19/task1.c b/testsuites/sptests/sp19/task1.c
index b076208d23..2d4e193ef2 100644
--- a/testsuites/sptests/sp19/task1.c
+++ b/testsuites/sptests/sp19/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
@@ -51,7 +51,7 @@ rtems_task Task_1(
     INTEGER_CHECK( INTEGER_factors[ task_index ] );
 
     status = rtems_task_wake_after(
-      ( task_number( tid ) ) * 5 * TICKS_PER_SECOND
+      ( task_number( tid ) ) * 5 * rtems_clock_get_ticks_per_second()
     );
     directive_failed( status, "rtems_task_wake_after" );
   }
diff --git a/testsuites/sptests/sp22/task1.c b/testsuites/sptests/sp22/task1.c
index 1f3a00a248..930a2b6001 100644
--- a/testsuites/sptests/sp22/task1.c
+++ b/testsuites/sptests/sp22/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
@@ -42,7 +42,7 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
@@ -59,14 +59,14 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
   directive_failed( status, "rtems_timer_fire_after" );
 
   puts( "TA1 - rtems_task_wake_after - 1 second" );
-  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" );
 
   Print_time();
@@ -99,7 +99,7 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
@@ -140,7 +140,7 @@ rtems_task Task_1(
   directive_failed( status, "rtems_timer_fire_when" );
 
   puts( "TA1 - rtems_task_wake_after - 1 second" );
-  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" );
 
   Print_time();
diff --git a/testsuites/sptests/sp24/task1.c b/testsuites/sptests/sp24/task1.c
index efeb862410..73544440c5 100644
--- a/testsuites/sptests/sp24/task1.c
+++ b/testsuites/sptests/sp24/task1.c
@@ -8,7 +8,7 @@
  *  If the times are skewed from these values, then the calendar time
  *  does not correspond correctly with the number of ticks.
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -34,7 +34,7 @@ rtems_task Task_1_through_3(
   while ( FOREVER )  {
     status = rtems_timer_fire_after(
       Timer_id[ argument ],
-      task_number( tid ) * 5 * TICKS_PER_SECOND,
+      task_number( tid ) * 5 * rtems_clock_get_ticks_per_second(),
       Resume_task,
       NULL
     );
diff --git a/testsuites/sptests/sp26/task1.c b/testsuites/sptests/sp26/task1.c
index 4de36dea31..9349d28d0a 100644
--- a/testsuites/sptests/sp26/task1.c
+++ b/testsuites/sptests/sp26/task1.c
@@ -111,7 +111,7 @@ startTask (rtems_id tid, rtems_task_entry entry_point)
 void
 task1 (void)
 {
-  rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
+  ticksPerSecond = rtems_clock_get_ticks_per_second();
   createTask ('1', &taskId1);
   createTask ('2', &taskId2);
   startTask (taskId1, subTask1);
diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
index c608539522..45bc49b770 100644
--- a/testsuites/sptests/sp29/init.c
+++ b/testsuites/sptests/sp29/init.c
@@ -81,7 +81,7 @@ rtems_task Init (rtems_task_argument ignored)
 	puts( "*** SP29 - SIMPLE SEMAPHORE TEST ***" );
 	puts( "This test only prints on errors." );
 
-	sc = rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
+        ticksPerSecond = rtems_clock_get_ticks_per_second();
 	if (sc != RTEMS_SUCCESSFUL) {
 		printf ("Can't get ticks per second: %s\n", rtems_status_text (sc));
 		exit (1);
diff --git a/testsuites/sptests/sp30/task1.c b/testsuites/sptests/sp30/task1.c
index e187e9d260..4232657a08 100644
--- a/testsuites/sptests/sp30/task1.c
+++ b/testsuites/sptests/sp30/task1.c
@@ -8,7 +8,7 @@
  *  If the times are skewed from these values, then the calendar time
  *  does not correspond correctly with the number of ticks.
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -34,7 +34,7 @@ rtems_task Task_1_through_3(
   while ( FOREVER )  {
     status = rtems_timer_server_fire_after(
       Timer_id[ argument ],
-      (task_number( tid ) - 1) * 5 * TICKS_PER_SECOND,
+      (task_number( tid ) - 1) * 5 * rtems_clock_get_ticks_per_second(),
       Resume_task,
       (void *) &tid
     );
diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c
index cccbe2d0e8..7fde2ce4c9 100644
--- a/testsuites/sptests/sp31/task1.c
+++ b/testsuites/sptests/sp31/task1.c
@@ -63,17 +63,17 @@ rtems_task Task_1(
 
   puts( "TA1 - rtems_timer_server_fire_after - 1 second" );
   status = rtems_timer_server_fire_after(
-    tmid, TICKS_PER_SECOND, Should_not_fire_TSR, NULL );
+    tmid, rtems_clock_get_ticks_per_second(), Should_not_fire_TSR, NULL );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   puts( "TA1 - rtems_task_wake_after - 1/2 second" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND / 2 );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() / 2 );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   directive_failed( status, "rtems_timer_server_fire_after" );
   puts( "TA1 - rtems_timer_server_fire_after - timer 2 in 1/2 second" );
   status = rtems_timer_server_fire_after(
-    tmid2, TICKS_PER_SECOND / 2, Should_not_fire_TSR, NULL );
+    tmid2, rtems_clock_get_ticks_per_second() / 2, Should_not_fire_TSR, NULL );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   if ( TSR_fired ) {
@@ -93,12 +93,12 @@ rtems_task Task_1(
 /* now check that rescheduling an active timer works OK. */
   puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 30 seconds" );
   status = rtems_timer_server_fire_after(
-    tmid, 30 * TICKS_PER_SECOND, Delayed_resume, NULL );
+    tmid, 30 * rtems_clock_get_ticks_per_second(), Delayed_resume, NULL );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   puts( "TA1 - rtems_timer_server_fire_after - timer 2 in 60 seconds" );
   status = rtems_timer_server_fire_after(
-    tmid2, 60 * TICKS_PER_SECOND, Delayed_resume, NULL );
+    tmid2, 60 * rtems_clock_get_ticks_per_second(), Delayed_resume, NULL );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   status = rtems_timer_get_information( tmid, &info );
@@ -108,12 +108,12 @@ rtems_task Task_1(
     _Timer_Server->Timer.initial + _Timer_Server->Timer.start_time );
 
   puts( "TA1 - rtems_task_wake_after - 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_timer_wake_after" );
 
   puts( "TA1 - rtems_timer_server_fire_after - timer 2 in 60 seconds" );
   status = rtems_timer_server_fire_after(
-    tmid2, 60 * TICKS_PER_SECOND, Delayed_resume, NULL );
+    tmid2, 60 * rtems_clock_get_ticks_per_second(), Delayed_resume, NULL );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   status = rtems_timer_get_information( tmid, &info );
@@ -126,12 +126,12 @@ rtems_task Task_1(
     (_Timer_Server->Timer.initial + _Timer_Server->Timer.start_time) );
 
   puts( "TA1 - rtems_task_wake_after - 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_timer_wake_after" );
 
   puts( "TA1 - rtems_timer_server_fire_after - timer 2 in 60 seconds" );
   status = rtems_timer_server_fire_after(
-    tmid2, 60 * TICKS_PER_SECOND, Delayed_resume, NULL );
+    tmid2, 60 * rtems_clock_get_ticks_per_second(), Delayed_resume, NULL );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   status = rtems_timer_get_information( tmid, &info );
@@ -158,7 +158,7 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_server_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
@@ -175,14 +175,14 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_server_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   puts( "TA1 - rtems_task_wake_after - 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" );
 
   Print_time();
@@ -215,7 +215,7 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_server_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
@@ -256,7 +256,7 @@ rtems_task Task_1(
   directive_failed( status, "rtems_timer_server_fire_when" );
 
   puts( "TA1 - rtems_task_wake_after - 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" );
 
   Print_time();
diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c
index 1d812ad78c..2f3b5143fb 100644
--- a/testsuites/sptests/sp33/init.c
+++ b/testsuites/sptests/sp33/init.c
@@ -168,7 +168,7 @@ rtems_task Init(
   }
 
   puts( "Delay to let Waiters block" ); 
-  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");
 
   /* Release tasks which were waiting */
@@ -182,7 +182,7 @@ rtems_task Init(
   }
 
   puts( "Delay to let Waiters print a message" ); 
-  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");
 
   /*  Create some tasks to wait for the barrier */
@@ -205,7 +205,7 @@ rtems_task Init(
   }
 
   puts( "Delay to let Waiters block" ); 
-  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");
 
   puts( "Delete barrier" );
@@ -213,7 +213,7 @@ rtems_task Init(
   directive_failed(status, "rtems_barrier_delete");
 
   puts( "Delay to let Waiters print a message" ); 
-  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");
 
   /* Create barrier with automatic release */
@@ -243,7 +243,7 @@ rtems_task Init(
   }
 
   puts( "Delay to let task wait on barrier" ); 
-  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");
 
   /* the end */
diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c
index ed10d7c87d..0fbc879011 100644
--- a/testsuites/sptests/sp45/init.c
+++ b/testsuites/sptests/sp45/init.c
@@ -40,7 +40,7 @@ rtems_timer_service_routine Malloc_From_TSR(
   free( (void *) TSR_malloc_ptr );
 
   puts( "TSR: delaying with rtems_task_wake_after" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND / 2 );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() / 2 );
   directive_failed( status, "rtems_task_wake_after" );
 }
 
@@ -85,14 +85,14 @@ rtems_task Init(
   puts( "TA1 - rtems_timer_server_fire_after - timer 1 in 1 seconds" );
   status = rtems_timer_server_fire_after(
     Timer_id[ 1 ],
-    1 * TICKS_PER_SECOND,
+    1 * rtems_clock_get_ticks_per_second(),
     Malloc_From_TSR,
     NULL
   );
   directive_failed( status, "rtems_timer_server_fire_after" );
 
   puts( "TA1 - rtems_task_wake_after - 2 second" );
-  status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
+  status = rtems_task_wake_after( 2 * rtems_clock_get_ticks_per_second() );
   directive_failed( status, "rtems_task_wake_after" );
 
   if ( TSR_fired == 2 &&
diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c
index f3163677af..e9f90eeabc 100644
--- a/testsuites/sptests/sp46/init.c
+++ b/testsuites/sptests/sp46/init.c
@@ -93,7 +93,7 @@ rtems_task Init(
 
   rtems_cpu_usage_reset();
 
-  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" );
 
   /*
diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c
index 36f8476d6e..79b66f0349 100644
--- a/testsuites/sptests/sp50/init.c
+++ b/testsuites/sptests/sp50/init.c
@@ -23,7 +23,7 @@ rtems_timer_service_routine Timer_Routine( rtems_id id, void *ignored )
 
   sc = rtems_timer_server_fire_after(
     id,
-    get_ticks_per_second(),
+    rtems_clock_get_ticks_per_second(),
     Timer_Routine,
     NULL
   );
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index 7d3275c81f..ab22ce2025 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -142,7 +142,6 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS       2
 #define CONFIGURE_MAXIMUM_TIMERS      1
 #define CONFIGURE_MAXIMUM_SEMAPHORES  1
-#define CONFIGURE_MICROSECONDS_PER_TICK  1000
 #define CONFIGURE_INIT_TASK_PRIORITY  INIT_PRIORITY
 #define CONFIGURE_INIT_TASK_MODE      RTEMS_PREEMPT
 #define CONFIGURE_MICROSECONDS_PER_TICK  2000
diff --git a/testsuites/sptests/spwatchdog/task1.c b/testsuites/sptests/spwatchdog/task1.c
index f035b8df6a..3e2902380e 100644
--- a/testsuites/sptests/spwatchdog/task1.c
+++ b/testsuites/sptests/spwatchdog/task1.c
@@ -41,7 +41,7 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
@@ -58,14 +58,14 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
   directive_failed( status, "rtems_timer_fire_after" );
 
   puts( "TA1 - rtems_task_wake_after - 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" );
 
   Print_time();
@@ -102,7 +102,7 @@ rtems_task Task_1(
   puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
   status = rtems_timer_fire_after(
     tmid,
-    3 * TICKS_PER_SECOND,
+    3 * rtems_clock_get_ticks_per_second(),
     Delayed_resume,
     NULL
   );
@@ -143,7 +143,7 @@ rtems_task Task_1(
   directive_failed( status, "rtems_timer_fire_when" );
 
   puts( "TA1 - rtems_task_wake_after - 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" );
 
   Print_time();