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

4 files changed, 36 insertions, 33 deletions

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 ***