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

	* sp01/sp01.scn, sp01/task1.c, sp03/task1.c, sp03/task2.c,
	sp04/task1.c, sp04/tswitch.c, sp09/screen02.c, sp09/screen13.c,
	sp09/screen14.c, sp09/sp09.scn, sp11/sp11.scn, sp11/task1.c,
	sp11/task2.c, sp19/fptask.c, sp19/sp19.scn, sp19/task1.c,
	sp22/prtime.c, sp22/sp22.scn, sp22/task1.c, sp24/sp24.scn,
	sp24/task1.c, sp30/task1.c, sp31/prtime.c, sp31/sp31.scn,
	sp31/task1.c, spwatchdog/prtime.c, spwatchdog/spwatchdog.scn,
	spwatchdog/task1.c: Convert calls to legacy routine rtems_clock_get(
	RTEMS_CLOCK_GET_TOD, ..) to rtems_clock_get_tod(..).

29 files changed, 191 insertions, 176 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 453b88eb5d..3aeef1be94 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,15 @@
+2009-08-10	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* sp01/sp01.scn, sp01/task1.c, sp03/task1.c, sp03/task2.c,
+	sp04/task1.c, sp04/tswitch.c, sp09/screen02.c, sp09/screen13.c,
+	sp09/screen14.c, sp09/sp09.scn, sp11/sp11.scn, sp11/task1.c,
+	sp11/task2.c, sp19/fptask.c, sp19/sp19.scn, sp19/task1.c,
+	sp22/prtime.c, sp22/sp22.scn, sp22/task1.c, sp24/sp24.scn,
+	sp24/task1.c, sp30/task1.c, sp31/prtime.c, sp31/sp31.scn,
+	sp31/task1.c, spwatchdog/prtime.c, spwatchdog/spwatchdog.scn,
+	spwatchdog/task1.c: Convert calls to legacy routine rtems_clock_get(
+	RTEMS_CLOCK_GET_TOD, ..) to rtems_clock_get_tod(..).
+
 2009-08-07	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* sp28/init.c, sp28/sp28.scn: Update screen. Add a few missing error
diff --git a/testsuites/sptests/sp01/sp01.scn b/testsuites/sptests/sp01/sp01.scn
index 6d687d042a..44b0557d03 100644
--- a/testsuites/sptests/sp01/sp01.scn
+++ b/testsuites/sptests/sp01/sp01.scn
@@ -1,18 +1,18 @@
 *** TEST 1 ***
-TA1  - rtems_clock_get - 09:00:00   12/31/1988
-TA2  - rtems_clock_get - 09:00:00   12/31/1988
-TA3  - rtems_clock_get - 09:00:00   12/31/1988
-TA1  - rtems_clock_get - 09:00:05   12/31/1988
-TA2  - rtems_clock_get - 09:00:10   12/31/1988
-TA1  - rtems_clock_get - 09:00:10   12/31/1988
-TA3  - rtems_clock_get - 09:00:15   12/31/1988
-TA1  - rtems_clock_get - 09:00:15   12/31/1988
-TA2  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:25   12/31/1988
-TA3  - rtems_clock_get - 09:00:30   12/31/1988
-TA2  - rtems_clock_get - 09:00:30   12/31/1988
-TA1  - rtems_clock_get - 09:00:30   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:00   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:00   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:00   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:05   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:15   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:15   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:20   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:20   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:25   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:30   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:30   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:30   12/31/1988
 *** END OF TEST 1 ***
 
 NOTE: The order of the prints at each time interval is irrelevant.
diff --git a/testsuites/sptests/sp01/task1.c b/testsuites/sptests/sp01/task1.c
index 7866369f59..8fb495bb25 100644
--- a/testsuites/sptests/sp01/task1.c
+++ b/testsuites/sptests/sp01/task1.c
@@ -40,8 +40,8 @@ rtems_task Task_1_through_3(
   ticks = TOD_MILLISECONDS_TO_TICKS( task_number( tid ) * 5 * 1000 );
 
   while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod" );
 
     if ( time.second >= 35 ) {
       puts( "*** END OF TEST 1 ***" );
@@ -49,7 +49,7 @@ rtems_task Task_1_through_3(
     }
 
     put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
+    print_time( " - rtems_clock_get_tod - ", &time, "\n" );
 
     status = rtems_task_wake_after( ticks );
     directive_failed( status, "rtems_task_wake_after" );
diff --git a/testsuites/sptests/sp03/task1.c b/testsuites/sptests/sp03/task1.c
index 9dfe014d1b..fd30f47e95 100644
--- a/testsuites/sptests/sp03/task1.c
+++ b/testsuites/sptests/sp03/task1.c
@@ -36,8 +36,8 @@ rtems_task Task_1(
   print_time( " sets clock: ", &time, "\n" );
 
   while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod" );
 
     put_name( Task_name[ 1 ], FALSE );
     print_time( " going to sleep:  ", &time, "\n" );
diff --git a/testsuites/sptests/sp03/task2.c b/testsuites/sptests/sp03/task2.c
index 151440458a..2ec0504cc3 100644
--- a/testsuites/sptests/sp03/task2.c
+++ b/testsuites/sptests/sp03/task2.c
@@ -31,8 +31,8 @@ rtems_task Task_2(
     status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
     directive_failed( status, "rtems_task_wake_after" );
 
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod" );
 
     if ( time.second >= 17 ) {
       puts( "*** END OF TEST 3 *** " );
diff --git a/testsuites/sptests/sp04/task1.c b/testsuites/sptests/sp04/task1.c
index 35724ff83a..9a398d5c6f 100644
--- a/testsuites/sptests/sp04/task1.c
+++ b/testsuites/sptests/sp04/task1.c
@@ -53,13 +53,13 @@ rtems_task Task_1(
   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" );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   puts( "TA1 - killing time" );
 
   for ( ; ; ) {
     status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &end_time );
-    directive_failed( status, "rtems_clock_get" );
+    directive_failed( status, "rtems_clock_get_tod" );
 
     if ( end_time > (start_time + 2) )
       break;
@@ -84,14 +84,14 @@ rtems_task Task_1(
       );
       directive_failed( status, "rtems_task_mode" );
 
-      status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-      directive_failed( status, "rtems_clock_get" );
+      status = rtems_clock_get_tod( &time );
+      directive_failed( status, "rtems_clock_get_tod" );
 
       old_seconds = time.second;
 
       for ( seconds = 0 ; seconds < 6 ; ) {
-        status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-        directive_failed( status, "rtems_clock_get" );
+        status = rtems_clock_get_tod( &time );
+        directive_failed( status, "rtems_clock_get_tod" );
 
         if ( time.second != old_seconds ) {
           old_seconds = time.second;
diff --git a/testsuites/sptests/sp04/tswitch.c b/testsuites/sptests/sp04/tswitch.c
index 9323dda9a9..a8c2b208e6 100644
--- a/testsuites/sptests/sp04/tswitch.c
+++ b/testsuites/sptests/sp04/tswitch.c
@@ -47,8 +47,8 @@ rtems_extension Task_switch(
     case 3:
       Run_count[ index ] += 1;
 
-      status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-      directive_failed_with_level( status, "rtems_clock_get", 1 );
+      status = rtems_clock_get_tod( &time );
+      directive_failed_with_level( status, "rtems_clock_get_tod", 1 );
 
       if (taskSwitchLogIndex < (sizeof taskSwitchLog / sizeof taskSwitchLog[0])) {
         taskSwitchLog[taskSwitchLogIndex].taskIndex = index;
diff --git a/testsuites/sptests/sp09/screen02.c b/testsuites/sptests/sp09/screen02.c
index 648007b4e2..7ca47ec85f 100644
--- a/testsuites/sptests/sp09/screen02.c
+++ b/testsuites/sptests/sp09/screen02.c
@@ -27,18 +27,19 @@ void Screen2()
 
 /* errors before clock is set */
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  status = rtems_clock_get_tod( &time );
   if ( status == RTEMS_SUCCESSFUL ) {
     puts(
-     "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED -- DID BSP SET THE TIME OF DAY?"
+     "TA1 - rtems_clock_get_tod - RTEMS_NOT_DEFINED -- "
+         "DID BSP SET THE TIME OF DAY?"
     );
   } else {
     fatal_directive_status(
       status,
       RTEMS_NOT_DEFINED,
-      "rtems_clock_get before clock is set #1"
+      "rtems_clock_get_tod before clock is set #1"
     );
-    puts( "TA1 - rtems_clock_get - TOD - RTEMS_NOT_DEFINED" );
+    puts( "TA1 - rtems_clock_get_tod - TOD - RTEMS_NOT_DEFINED" );
   }
 
   status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &interval );
@@ -81,7 +82,8 @@ void Screen2()
   status = rtems_task_wake_when( &time );
   if ( status == RTEMS_SUCCESSFUL ) {
     puts(
-"TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED -- DID BSP SET THE TIME OF DAY?"
+     "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED -- "
+         "DID BSP SET THE TIME OF DAY?"
     );
   } else {
     fatal_directive_status(
@@ -215,7 +217,7 @@ void Screen2()
   );
   puts( " - RTEMS_INVALID_CLOCK" );
 
-  rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  rtems_clock_get_tod( &time );
   print_time( "TA1 - current time - ", &time, "\n" );
 
   time.month = 1;
diff --git a/testsuites/sptests/sp09/screen13.c b/testsuites/sptests/sp09/screen13.c
index 1f57cbce28..d3084bfada 100644
--- a/testsuites/sptests/sp09/screen13.c
+++ b/testsuites/sptests/sp09/screen13.c
@@ -71,16 +71,16 @@ void Screen13()
   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_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
+  print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
 
   build_time( &time, 12, 31, 1999, 23, 59, 59, 0 );
   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_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
 
@@ -89,25 +89,25 @@ void Screen13()
   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_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
+  print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
 
   build_time( &time, 12, 31, 2099, 23, 59, 59, 0 );
   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_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
+  print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
 
   build_time( &time, 12, 31, 1991, 23, 59, 59, 0 );
   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_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  status = rtems_clock_get_tod( &time );
   directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
+  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 d4cb40ae08..75a17107c5 100644
--- a/testsuites/sptests/sp09/screen14.c
+++ b/testsuites/sptests/sp09/screen14.c
@@ -141,9 +141,9 @@ void Screen14()
     " - RTEMS_INVALID_CLOCK\n"
   );
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-  print_time( "TA1 - rtems_clock_get       - ", &time, "\n" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
+  print_time( "TA1 - rtems_clock_get_tod       - ", &time, "\n" );
 
   build_time( &time, 2, 5, 1990, 8, 30, 45, 0 );
   status = rtems_timer_fire_when( Timer_id[ 1 ], &time, Delayed_routine, NULL );
@@ -266,12 +266,13 @@ void Screen14()
     " - RTEMS_INVALID_CLOCK\n"
   );
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-  print_time( "TA1 - rtems_clock_get       - ", &time, "\n" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
+  print_time( "TA1 - rtems_clock_get_tod       - ", &time, "\n" );
 
   build_time( &time, 2, 5, 1990, 8, 30, 45, 0 );
-  status = rtems_timer_server_fire_when( Timer_id[ 1 ], &time, Delayed_routine, NULL );
+  status = rtems_timer_server_fire_when(
+    Timer_id[ 1 ], &time, Delayed_routine, NULL );
   fatal_directive_status(
     status,
     RTEMS_INVALID_CLOCK,
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index 47cace0453..42722050ac 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -22,10 +22,10 @@ TA1 - rtems_task_start - RTEMS_INVALID_ID
 TA1 - rtems_task_start - RTEMS_INCORRECT_STATE
 TA1 - rtems_task_suspend - RTEMS_INVALID_ID
 <pause - screen 2>
-TA1 - rtems_clock_get - TOD - RTEMS_NOT_DEFINED
-TA1 - rtems_clock_get - SECONDS SINCE EPOCH - RTEMS_NOT_DEFINED
-TA1 - rtems_clock_get - TIME VALUE - RTEMS_NOT_DEFINED
-TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER
+TA1 - rtems_clock_get_tod - TOD - RTEMS_NOT_DEFINED
+TA1 - rtems_clock_get_tod - SECONDS SINCE EPOCH - RTEMS_NOT_DEFINED
+TA1 - rtems_clock_get_tod - TIME VALUE - RTEMS_NOT_DEFINED
+TA1 - rtems_clock_get_tod - RTEMS_INVALID_NUMBER
 TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED
 TA1 - rtems_timer_fire_when - RTEMS_NOT_DEFINED
 TA1 - rtems_clock_set - 08:30:45   02/05/1987 - RTEMS_INVALID_CLOCK
@@ -256,15 +256,15 @@ TA1 - rtems_io_open - RTEMS_INVALID_NUMBER
 TA1 - rtems_io_read - RTEMS_INVALID_NUMBER
 TA1 - rtems_io_write - RTEMS_INVALID_NUMBER
 TA1 - rtems_clock_set - 23:59:59   12/31/2000 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/2001 - RTEMS_SUCCESSFUL
+TA1 - rtems_clock_get_tod - 00:00:00   01/01/2001 - RTEMS_SUCCESSFUL
 TA1 - rtems_clock_set - 23:59:59   12/31/1999 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/2000 - RTEMS_SUCCESSFUL
+TA1 - rtems_clock_get_tod - 00:00:00   01/01/2000 - RTEMS_SUCCESSFUL
 TA1 - rtems_clock_set - 23:59:59   12/31/2100 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 17:31:44   11/25/1964 - RTEMS_SUCCESSFUL
+TA1 - rtems_clock_get_tod - 17:31:44   11/25/1964 - RTEMS_SUCCESSFUL
 TA1 - rtems_clock_set - 23:59:59   12/31/2099 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 17:31:44   11/25/1963 - RTEMS_SUCCESSFUL
+TA1 - rtems_clock_get_tod - 17:31:44   11/25/1963 - RTEMS_SUCCESSFUL
 TA1 - rtems_clock_set - 23:59:59   12/31/1991 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/1992 - RTEMS_SUCCESSFUL
+TA1 - rtems_clock_get_tod - 00:00:00   01/01/1992 - RTEMS_SUCCESSFUL
 <pause - screen 14>
 TA1 - rtems_timer_create - RTEMS_INVALID_NAME
 TA1 - rtems_timer_create - 1 - RTEMS_SUCCESSFUL
@@ -279,7 +279,7 @@ TA1 - rtems_timer_fire_after - RTEMS_INVALID_ID
 TA1 - rtems_timer_fire_when - RTEMS_INVALID_ID
 TA1 - rtems_timer_fire_after - RTEMS_INVALID_NUMBER
 TA1 - rtems_timer_fire_when - 08:30:45   02/05/1987 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_get       - 00:00:00   01/01/1992
+TA1 - rtems_clock_get_tod       - 00:00:00   01/01/1992
 TA1 - rtems_timer_fire_when - 08:30:45   02/05/1990 - before RTEMS_INVALID_CLOCK
 TA1 - rtems_timer_get_information - RTEMS_INVALID_ID
 TA1 - rtems_timer_server_fire_after - RTEMS_INCORRECT_STATE
@@ -291,6 +291,6 @@ TA1 - rtems_timer_server_fire_after - RTEMS_INVALID_ID
 TA1 - rtems_timer_server_fire_when - RTEMS_INVALID_ID
 TA1 - rtems_timer_server_fire_after - RTEMS_INVALID_NUMBER
 TA1 - rtems_timer_server_fire_when - 08:30:45   02/05/1987 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_get       - 00:00:00   01/01/1992
+TA1 - rtems_clock_get_tod       - 00:00:00   01/01/1992
 TA1 - rtems_timer_server_fire_when - 08:30:45   02/05/1990 - before RTEMS_INVALID_CLOCK
 *** END OF TEST 9 ***
diff --git a/testsuites/sptests/sp11/sp11.scn b/testsuites/sptests/sp11/sp11.scn
index db0469eb60..e367bb79e7 100644
--- a/testsuites/sptests/sp11/sp11.scn
+++ b/testsuites/sptests/sp11/sp11.scn
@@ -15,19 +15,19 @@ TA2 - rtems_event_send - sending RTEMS_EVENT_10 to self after 4 seconds
 TA2 - rtems_event_receive - waiting forever on RTEMS_EVENT_10
 TA1 - RTEMS_EVENT_14 received - eventout => 00004000
 TA1 - rtems_event_send - send RTEMS_EVENT_19 to TA2
-TA1 - rtems_clock_get - 08:15:00   02/12/1988
+TA1 - rtems_clock_get_tod - 08:15:00   02/12/1988
 <pause>
 TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds
 TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_18
 TA2 - RTEMS_EVENT_10 received - eventout => 00000400
-TA2 - rtems_clock_get - 08:15:05   02/12/1988
+TA2 - rtems_clock_get_tod - 08:15:05   02/12/1988
 TA2 - rtems_event_receive - RTEMS_PENDING_EVENTS
 TA2 - eventout => 00080000
 TA2 - rtems_event_receive - RTEMS_EVENT_19 - RTEMS_NO_WAIT
 TA2 - RTEMS_EVENT_19 received - eventout => 00080000
 TA2 - rtems_task_delete - deletes self
 TA1 - RTEMS_EVENT_18 received - eventout => 00040000
-TA1 - rtems_clock_get - 08:15:05   02/12/1988
+TA1 - rtems_clock_get_tod - 08:15:05   02/12/1988
 TA1 - rtems_event_send - send RTEMS_EVENT_3 to self
 TA1 - rtems_event_receive - RTEMS_EVENT_3 or RTEMS_EVENT_22 - NO_WAIT and ANY
 TA1 - RTEMS_EVENT_3 received - eventout => 00000008
diff --git a/testsuites/sptests/sp11/task1.c b/testsuites/sptests/sp11/task1.c
index 492b915617..812993cb17 100644
--- a/testsuites/sptests/sp11/task1.c
+++ b/testsuites/sptests/sp11/task1.c
@@ -68,9 +68,9 @@ rtems_task Task_1(
   status = rtems_event_send( Task_id[ 2 ], RTEMS_EVENT_19 );
   directive_failed( status, "rtems_event_send" );
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-  print_time( "TA1 - rtems_clock_get - ", &time, "\n" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
+  print_time( "TA1 - rtems_clock_get_tod - ", &time, "\n" );
 
 rtems_test_pause();
 
@@ -93,9 +93,9 @@ rtems_test_pause();
   directive_failed( status, "rtems_event_receive of 18" );
   printf( "TA1 - RTEMS_EVENT_18 received - eventout => %08x\n", eventout );
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "TA1 rtems_clock_get" );
-  print_time( "TA1 - rtems_clock_get - ", &time, "\n" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "TA1 rtems_clock_get_tod" );
+  print_time( "TA1 - rtems_clock_get_tod - ", &time, "\n" );
 
   puts( "TA1 - rtems_event_send - send RTEMS_EVENT_3 to self" );
   status = rtems_event_send( RTEMS_SELF, RTEMS_EVENT_3 );
@@ -204,8 +204,8 @@ rtems_test_pause();
     );
     directive_failed( status, "rtems_event_receive" );
 
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod" );
 
     printf( "TA1 - RTEMS_EVENT_1 received - eventout => %08x - ", eventout );
     print_time( "at ", &time, "\n" );
diff --git a/testsuites/sptests/sp11/task2.c b/testsuites/sptests/sp11/task2.c
index c8b394040f..1d569541b0 100644
--- a/testsuites/sptests/sp11/task2.c
+++ b/testsuites/sptests/sp11/task2.c
@@ -93,11 +93,11 @@ rtems_task Task_2(
   );
   directive_failed( status, "rtems_event_receive" );
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   printf( "TA2 - RTEMS_EVENT_10 received - eventout => %08x\n", eventout );
-  print_time( "TA2 - rtems_clock_get - ", &time, "\n" );
+  print_time( "TA2 - rtems_clock_get_tod - ", &time, "\n" );
 
   puts( "TA2 - rtems_event_receive - RTEMS_PENDING_EVENTS" );
   status = rtems_event_receive(
diff --git a/testsuites/sptests/sp19/fptask.c b/testsuites/sptests/sp19/fptask.c
index 5a1ba16438..210bc44f27 100644
--- a/testsuites/sptests/sp19/fptask.c
+++ b/testsuites/sptests/sp19/fptask.c
@@ -56,8 +56,8 @@ rtems_task FP_task(
 
   while( FOREVER ) {
 
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod" );
 
     if ( time.second >= 16 ) {
 
@@ -77,7 +77,7 @@ rtems_task FP_task(
     if (previous_seconds != time.second)
     {
       put_name( Task_name[ task_index ], FALSE );
-      print_time( " - rtems_clock_get - ", &time, "\n" );
+      print_time( " - rtems_clock_get_tod - ", &time, "\n" );
       previous_seconds = time.second;
     }
 
diff --git a/testsuites/sptests/sp19/sp19.scn b/testsuites/sptests/sp19/sp19.scn
index d70c8ad89a..9ce85c24c7 100644
--- a/testsuites/sptests/sp19/sp19.scn
+++ b/testsuites/sptests/sp19/sp19.scn
@@ -4,47 +4,47 @@ FP1  - float base = (6000.6)
 FP1  - integer base = (0x6000)
 FP1  - float base = (6000.6)
 TA1  - integer base = (0x1000)
-TA1  - rtems_clock_get - 09:00:00   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:00   12/31/1988
 TA2  - integer base = (0x2000)
-TA2  - rtems_clock_get - 09:00:00   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:00   12/31/1988
 TA3  - integer base = (0x3000)
-TA3  - rtems_clock_get - 09:00:00   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:00   12/31/1988
 TA4  - integer base = (0x4000)
 TA4  - float base = (4000.4)
-TA4  - rtems_clock_get - 09:00:00   12/31/1988
-TA4  - rtems_clock_get - 09:00:01   12/31/1988
-TA4  - rtems_clock_get - 09:00:02   12/31/1988
-TA4  - rtems_clock_get - 09:00:03   12/31/1988
-TA4  - rtems_clock_get - 09:00:04   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:00   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:01   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:02   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:03   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:04   12/31/1988
 TA5  - integer base = (0x5000)
 TA5  - float base = (5000.5)
-TA5  - rtems_clock_get - 09:00:04   12/31/1988
-TA1  - rtems_clock_get - 09:00:05   12/31/1988
-TA5  - rtems_clock_get - 09:00:05   12/31/1988
-TA4  - rtems_clock_get - 09:00:05   12/31/1988
-TA5  - rtems_clock_get - 09:00:06   12/31/1988
-TA4  - rtems_clock_get - 09:00:06   12/31/1988
-TA5  - rtems_clock_get - 09:00:07   12/31/1988
-TA4  - rtems_clock_get - 09:00:07   12/31/1988
-TA5  - rtems_clock_get - 09:00:08   12/31/1988
-TA4  - rtems_clock_get - 09:00:08   12/31/1988
-TA5  - rtems_clock_get - 09:00:09   12/31/1988
-TA4  - rtems_clock_get - 09:00:09   12/31/1988
-TA2  - rtems_clock_get - 09:00:10   12/31/1988
-TA1  - rtems_clock_get - 09:00:10   12/31/1988
-TA5  - rtems_clock_get - 09:00:10   12/31/1988
-TA4  - rtems_clock_get - 09:00:10   12/31/1988
-TA5  - rtems_clock_get - 09:00:11   12/31/1988
-TA4  - rtems_clock_get - 09:00:11   12/31/1988
-TA5  - rtems_clock_get - 09:00:12   12/31/1988
-TA4  - rtems_clock_get - 09:00:12   12/31/1988
-TA5  - rtems_clock_get - 09:00:13   12/31/1988
-TA4  - rtems_clock_get - 09:00:13   12/31/1988
-TA5  - rtems_clock_get - 09:00:14   12/31/1988
-TA4  - rtems_clock_get - 09:00:14   12/31/1988
-TA3  - rtems_clock_get - 09:00:15   12/31/1988
-TA1  - rtems_clock_get - 09:00:15   12/31/1988
-TA5  - rtems_clock_get - 09:00:15   12/31/1988
-TA4  - rtems_clock_get - 09:00:15   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:04   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:05   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:05   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:05   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:06   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:06   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:07   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:07   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:08   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:08   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:09   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:09   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:11   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:11   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:12   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:12   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:13   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:13   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:14   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:14   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:15   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:15   12/31/1988
+TA5  - rtems_clock_get_tod - 09:00:15   12/31/1988
+TA4  - rtems_clock_get_tod - 09:00:15   12/31/1988
 TA5 - rtems_task_delete - TA3
 *** END OF TEST 19 ***
diff --git a/testsuites/sptests/sp19/task1.c b/testsuites/sptests/sp19/task1.c
index e862c5f4f5..b076208d23 100644
--- a/testsuites/sptests/sp19/task1.c
+++ b/testsuites/sptests/sp19/task1.c
@@ -42,11 +42,11 @@ rtems_task Task_1(
   printf( " - integer base = (0x%x)\n", INTEGER_factors[ task_index ] );
 
   while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod" );
 
     put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
+    print_time( " - rtems_clock_get_tod - ", &time, "\n" );
 
     INTEGER_CHECK( INTEGER_factors[ task_index ] );
 
diff --git a/testsuites/sptests/sp22/prtime.c b/testsuites/sptests/sp22/prtime.c
index 18ce0b140d..77bb1515f0 100644
--- a/testsuites/sptests/sp22/prtime.c
+++ b/testsuites/sptests/sp22/prtime.c
@@ -23,9 +23,9 @@ void Print_time( void )
   rtems_time_of_day time;
   rtems_status_code status;
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   put_name( Task_name[ 1 ], FALSE );
-  print_time( "- rtems_clock_get - ", &time, "\n" );
+  print_time( "- rtems_clock_get_tod - ", &time, "\n" );
 }
diff --git a/testsuites/sptests/sp22/sp22.scn b/testsuites/sptests/sp22/sp22.scn
index c58b107f06..a34d845ec8 100644
--- a/testsuites/sptests/sp22/sp22.scn
+++ b/testsuites/sptests/sp22/sp22.scn
@@ -3,26 +3,26 @@ INIT - rtems_timer_create - creating timer 1
 INIT - timer 1 has id (0x12010001)
 TA1 - rtems_timer_ident - identing timer 1
 TA1 - timer 1 has id (0x12010001)
-TA1 - rtems_clock_get - 09:00:00   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:00   12/31/1988
 TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
 TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:03   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:03   12/31/1988
 TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
 TA1 - rtems_task_wake_after - 1 second
-TA1 - rtems_clock_get - 09:00:04   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:04   12/31/1988
 TA1 - rtems_timer_reset - timer 1
 TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:07   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:07   12/31/1988
 <pause>
 TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
 TA1 - rtems_timer_cancel - timer 1
-TA1 - rtems_clock_get - 09:00:07   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:07   12/31/1988
 TA1 - rtems_timer_fire_when - timer 1 in 3 seconds
 TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:10   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:10   12/31/1988
 TA1 - rtems_timer_fire_when - timer 1 in 3 seconds
 TA1 - rtems_task_wake_after - 1 second
-TA1 - rtems_clock_get - 09:00:11   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:11   12/31/1988
 TA1 - rtems_timer_cancel - timer 1
 TA1 - rtems_task_wake_after - YIELD (only task at priority)
 TA1 - timer_deleting - timer 1
diff --git a/testsuites/sptests/sp22/task1.c b/testsuites/sptests/sp22/task1.c
index 37ce3be043..1f3a00a248 100644
--- a/testsuites/sptests/sp22/task1.c
+++ b/testsuites/sptests/sp22/task1.c
@@ -113,8 +113,8 @@ rtems_task Task_1(
 
   Print_time();
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   time.second += 3;
 
@@ -130,8 +130,8 @@ rtems_task Task_1(
 
 /* when which is canceled */
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   time.second += 3;
 
diff --git a/testsuites/sptests/sp24/sp24.scn b/testsuites/sptests/sp24/sp24.scn
index 96a58f35e3..127919ffcd 100644
--- a/testsuites/sptests/sp24/sp24.scn
+++ b/testsuites/sptests/sp24/sp24.scn
@@ -1,16 +1,16 @@
 *** TEST 24 ***
-TA1  - rtems_clock_get - 09:00:00   12/31/1988
-TA2  - rtems_clock_get - 09:00:00   12/31/1988
-TA3  - rtems_clock_get - 09:00:00   12/31/1988
-TA1  - rtems_clock_get - 09:00:05   12/31/1988
-TA2  - rtems_clock_get - 09:00:10   12/31/1988
-TA1  - rtems_clock_get - 09:00:10   12/31/1988
-TA3  - rtems_clock_get - 09:00:15   12/31/1988
-TA1  - rtems_clock_get - 09:00:15   12/31/1988
-TA2  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:25   12/31/1988
-TA3  - rtems_clock_get - 09:00:30   12/31/1988
-TA2  - rtems_clock_get - 09:00:30   12/31/1988
-TA1  - rtems_clock_get - 09:00:30   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:00   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:00   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:00   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:05   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:10   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:15   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:15   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:20   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:20   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:25   12/31/1988
+TA3  - rtems_clock_get_tod - 09:00:30   12/31/1988
+TA2  - rtems_clock_get_tod - 09:00:30   12/31/1988
+TA1  - rtems_clock_get_tod - 09:00:30   12/31/1988
 *** END OF TEST 24 ***
diff --git a/testsuites/sptests/sp24/task1.c b/testsuites/sptests/sp24/task1.c
index 9d4e0cdc34..efeb862410 100644
--- a/testsuites/sptests/sp24/task1.c
+++ b/testsuites/sptests/sp24/task1.c
@@ -40,8 +40,8 @@ rtems_task Task_1_through_3(
     );
     directive_failed( status, "tm_fire_after failed" );
 
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get failed" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod failed" );
 
     if ( time.second >= 35 ) {
       puts( "*** END OF TEST 24 ***" );
@@ -49,7 +49,7 @@ rtems_task Task_1_through_3(
     }
 
     put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
+    print_time( " - rtems_clock_get_tod - ", &time, "\n" );
 
     status = rtems_task_suspend( RTEMS_SELF );
     directive_failed( status, "rtems_task_suspend" );
diff --git a/testsuites/sptests/sp30/task1.c b/testsuites/sptests/sp30/task1.c
index 54eeb144be..e187e9d260 100644
--- a/testsuites/sptests/sp30/task1.c
+++ b/testsuites/sptests/sp30/task1.c
@@ -40,8 +40,8 @@ rtems_task Task_1_through_3(
     );
     directive_failed( status, "rtems_timer_server_fire_after failed" );
 
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get failed" );
+    status = rtems_clock_get_tod( &time );
+    directive_failed( status, "rtems_clock_get_tod failed" );
 
     if ( time.second >= 35 ) {
       puts( "*** END OF TEST 30 ***" );
@@ -49,7 +49,7 @@ rtems_task Task_1_through_3(
     }
 
     put_name( Task_name[ task_number( tid ) - 1 ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
+    print_time( " - rtems_clock_get_tod - ", &time, "\n" );
 
     status = rtems_task_suspend( RTEMS_SELF );
     directive_failed( status, "rtems_task_suspend" );
diff --git a/testsuites/sptests/sp31/prtime.c b/testsuites/sptests/sp31/prtime.c
index 87b65bf4f8..d9f6a63220 100644
--- a/testsuites/sptests/sp31/prtime.c
+++ b/testsuites/sptests/sp31/prtime.c
@@ -23,9 +23,9 @@ void Print_time( void )
   rtems_time_of_day time;
   rtems_status_code status;
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   put_name( Task_name[ 1 ], FALSE );
-  print_time( "- rtems_clock_get - ", &time, "\n" );
+  print_time( "- rtems_clock_get_tod - ", &time, "\n" );
 }
diff --git a/testsuites/sptests/sp31/sp31.scn b/testsuites/sptests/sp31/sp31.scn
index afb11f9d27..e9b74969ed 100644
--- a/testsuites/sptests/sp31/sp31.scn
+++ b/testsuites/sptests/sp31/sp31.scn
@@ -26,26 +26,26 @@ Timer 1 scheduled for 3050 ticks since boot
 Timer Server scheduled for 3050 ticks since boot
 TA1 - rtems_timer_cancel - timer 1
 TA1 - rtems_timer_cancel - timer 2
-TA1 - rtems_clock_get - 09:00:02   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:02   12/31/1988
 TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds
 TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:05   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:05   12/31/1988
 TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds
 TA1 - rtems_task_wake_after - 1 second
-TA1 - rtems_clock_get - 09:00:06   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:06   12/31/1988
 TA1 - rtems_timer_reset - timer 1
 TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:09   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:09   12/31/1988
 <pause>
 TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds
 TA1 - rtems_timer_cancel - timer 1
-TA1 - rtems_clock_get - 09:00:07   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:07   12/31/1988
 TA1 - rtems_timer_server_fire_when - timer 1 in 3 seconds
 TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:10   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:10   12/31/1988
 TA1 - rtems_timer_server_fire_when - timer 1 in 3 seconds
 TA1 - rtems_task_wake_after - 1 second
-TA1 - rtems_clock_get - 09:00:11   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:11   12/31/1988
 TA1 - rtems_timer_cancel - timer 1
 TA1 - rtems_task_wake_after - YIELD (only task at priority)
 TA1 - timer_deleting - timer 1
diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c
index c59bf01558..cccbe2d0e8 100644
--- a/testsuites/sptests/sp31/task1.c
+++ b/testsuites/sptests/sp31/task1.c
@@ -229,8 +229,8 @@ rtems_task Task_1(
 
   Print_time();
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   time.second += 3;
 
@@ -246,8 +246,8 @@ rtems_task Task_1(
 
 /* when which is canceled */
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   time.second += 3;
 
diff --git a/testsuites/sptests/spwatchdog/prtime.c b/testsuites/sptests/spwatchdog/prtime.c
index 18ce0b140d..77bb1515f0 100644
--- a/testsuites/sptests/spwatchdog/prtime.c
+++ b/testsuites/sptests/spwatchdog/prtime.c
@@ -23,9 +23,9 @@ void Print_time( void )
   rtems_time_of_day time;
   rtems_status_code status;
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   put_name( Task_name[ 1 ], FALSE );
-  print_time( "- rtems_clock_get - ", &time, "\n" );
+  print_time( "- rtems_clock_get_tod - ", &time, "\n" );
 }
diff --git a/testsuites/sptests/spwatchdog/spwatchdog.scn b/testsuites/sptests/spwatchdog/spwatchdog.scn
index 5dd19aea37..3135c45c0f 100644
--- a/testsuites/sptests/spwatchdog/spwatchdog.scn
+++ b/testsuites/sptests/spwatchdog/spwatchdog.scn
@@ -6,13 +6,13 @@ INIT - rtems_timer_create - creating timer 1
 INIT - timer 1 has id (0x12010001)
 TA1 - rtems_timer_ident - identing timer 1
 TA1 - timer 1 has id (0x12010001)
-TA1 - rtems_clock_get - 09:00:00   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:00   12/31/1988
 TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
 TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:03   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:03   12/31/1988
 TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
 TA1 - rtems_task_wake_after - 1 second
-TA1 - rtems_clock_get - 09:00:04   12/31/1988
+TA1 - rtems_clock_get_tod - 09:00:04   12/31/1988
 TA1 - rtems_timer_reset - timer 1
 Watchdog Chain: _Watchdog_Ticks_chain 202F530
  300   300 20325D0 20131A0 0x12010001 0
diff --git a/testsuites/sptests/spwatchdog/task1.c b/testsuites/sptests/spwatchdog/task1.c
index a89e79243e..f035b8df6a 100644
--- a/testsuites/sptests/spwatchdog/task1.c
+++ b/testsuites/sptests/spwatchdog/task1.c
@@ -116,8 +116,8 @@ rtems_task Task_1(
 
   Print_time();
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   time.second += 3;
 
@@ -133,8 +133,8 @@ rtems_task Task_1(
 
 /* when which is canceled */
 
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
+  status = rtems_clock_get_tod( &time );
+  directive_failed( status, "rtems_clock_get_tod" );
 
   time.second += 3;