2011-06-11 Joel Sherrill <joel.sherrill@oarcorp.com>

	* sp09/screen02.c, sp09/screen13.c, sp09/sp09.scn, sp29/init.c,
	sp30/sp30.scn, sp32/init.c, spclockget/init.c: Avoid use of
	deprecated rtems_clock_get() except in spclockget().

3 files changed, 10 insertions, 29 deletions

diff --git a/testsuites/sptests/sp09/screen02.c b/testsuites/sptests/sp09/screen02.c
index 4536a500a4..ce9c2a8014 100644
--- a/testsuites/sptests/sp09/screen02.c
+++ b/testsuites/sptests/sp09/screen02.c
@@ -6,7 +6,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -121,28 +121,10 @@ void Screen2()
   fatal_directive_status(
     status,
     RTEMS_INVALID_ADDRESS,
-    "rtems_clock_get sull pointer"
+    "rtems_clock_set sull pointer"
   );
   puts( "TA1 - rtems_clock_set - RTEMS_INVALID_ADDRESS" );
 
-  /* NULL parameter */
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_clock_get null pointer"
-  );
-  puts( "TA1 - rtems_clock_get - RTEMS_INVALID_ADDRESS" );
-
-  /* arbitrary bad value for switch */
-  status = rtems_clock_get( 0xff, &tv );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_clock_get bad case"
-  );
-  puts( "TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER" );
-
   /* wake when NULL param */
   status = rtems_task_wake_when( NULL );
   fatal_directive_status(
@@ -156,7 +138,7 @@ void Screen2()
   status = rtems_task_wake_when( &time );
   if ( status == RTEMS_SUCCESSFUL ) {
     puts(
-     "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED -- "
+     "TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED -- "
          "DID BSP SET THE TIME OF DAY?"
     );
   } else {
diff --git a/testsuites/sptests/sp09/screen13.c b/testsuites/sptests/sp09/screen13.c
index 5fb68b1d24..8f62f32adc 100644
--- a/testsuites/sptests/sp09/screen13.c
+++ b/testsuites/sptests/sp09/screen13.c
@@ -6,7 +6,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -85,8 +85,8 @@ void Screen13()
   print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
   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" );
+  directive_failed( status, "rtems_clock_get_tod" );
+  print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
 
   build_time( &time, 12, 31, 2100, 23, 59, 59, 0 );
   status = rtems_clock_set( &time );
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index 896b9b0b2a..c26d7e6a53 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -35,8 +35,6 @@ TA1 - rtems_clock_get_tod_timeval - RTEMS_INVALID_ADDRESS
 TA1 - rtems_clock_get_tod_timeval - RTEMS_NOT_DEFINED
 TA1 - rtems_clock_set_nanoseconds_extension - RTEMS_INVALID_ADDRESS
 TA1 - rtems_clock_set - RTEMS_INVALID_ADDRESS
-TA1 - rtems_clock_get - RTEMS_INVALID_ADDRESS
-TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER
 TA1 - rtems_task_wake_when - RTEMS_INVALID_ADDRESS
 TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED
 TA1 - rtems_timer_fire_when - RTEMS_NOT_DEFINED
@@ -175,8 +173,9 @@ TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
 TA3 - rtems_message_queue_receive - woke up with RTEMS_OBJECT_WAS_DELETED
 TA3 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
 <pause - screen 9>
-TA1 - rtems_interrupt_catch - bad handler RTEMS_INVALID_ADDRESS -- SKIPPED
-TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS - SKIPPED
+TA1 - rtems_interrupt_catch - RTEMS_INVALID_NUMBER
+TA1 - rtems_interrupt_catch - bad handler RTEMS_INVALID_ADDRESS
+TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS
 TA1 - rtems_signal_send - RTEMS_INVALID_ID
 TA1 - rtems_signal_send - RTEMS_INVALID_NUMBER
 TA1 - rtems_signal_send - RTEMS_NOT_DEFINED
@@ -286,7 +285,7 @@ TA1 - rtems_io_write - RTEMS_INVALID_NUMBER
 TA1 - rtems_clock_set - 23:59:59   12/31/2000 - 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_tod - 17:31:44   11/25/1964 - RTEMS_SUCCESSFUL
 TA1 - rtems_clock_set - 23:59:59   12/31/2099 - RTEMS_SUCCESSFUL