2009-07-01 Joel Sherrill <joel.sherrill@OARcorp.com>

	* sp01/sp01.doc, sp01/task1.c, sp16/sp16.doc, sp16/task5.c: Bypass
	RTEMS_MILLISECONDS_TO_TICKS and RTEMS_MICROSECONDS_TO_TICKS to
	improve coverage.

5 files changed, 26 insertions, 3 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 97a288e951..127a4c05f6 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,11 @@
 2009-07-01	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* sp01/sp01.doc, sp01/task1.c, sp16/sp16.doc, sp16/task5.c: Bypass
+	RTEMS_MILLISECONDS_TO_TICKS and RTEMS_MICROSECONDS_TO_TICKS to
+	improve coverage.
+
+2009-07-01	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* sp01/task1.c: Use RTEMS_MILLISECONDS_TO_TICKS to improve coverage.
 
 2009-06-24	Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/testsuites/sptests/sp01/sp01.doc b/testsuites/sptests/sp01/sp01.doc
index b3757cafa6..0944fe8235 100644
--- a/testsuites/sptests/sp01/sp01.doc
+++ b/testsuites/sptests/sp01/sp01.doc
@@ -37,6 +37,9 @@ concepts:
 
   g.  Verifies that a task can get the task identification number of itself.
 
+  h.  Verifies implementation of SuperCore TOD_MILLISECONDS_TO_TICKS.  Normal
+      computation in applications is via a macro at the Classic API level.
+
 output:
  "TA1" is printed once every 5 seconds.  "TA2" is printed once
  every 10 seconds.  "TA3" is printed once every 15 seconds.
diff --git a/testsuites/sptests/sp01/task1.c b/testsuites/sptests/sp01/task1.c
index 6565feb839..7866369f59 100644
--- a/testsuites/sptests/sp01/task1.c
+++ b/testsuites/sptests/sp01/task1.c
@@ -32,7 +32,13 @@ rtems_task Task_1_through_3(
   status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
   directive_failed( status, "rtems_task_ident" );
 
-  ticks = RTEMS_MILLISECONDS_TO_TICKS( task_number( tid ) * 5 * 1000 );
+  /*
+   * Use TOD_MILLISECONDS_TO_TICKS not RTEMS_MILLISECONDS_TO_TICKS to
+   * test C implementation in SuperCore -- not macro version used 
+   * everywhere else.
+   */
+  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" );
diff --git a/testsuites/sptests/sp16/sp16.doc b/testsuites/sptests/sp16/sp16.doc
index 44853ab48e..d7882f5af4 100644
--- a/testsuites/sptests/sp16/sp16.doc
+++ b/testsuites/sptests/sp16/sp16.doc
@@ -21,3 +21,6 @@ directives:
 concepts:
 
   a.  This test checks out the region manager.
+
+  b.  Verifies implementation of SuperCore TOD_MICROSECONDS_TO_TICKS.  Normal
+      computation in applications is via a macro at the Classic API level.
diff --git a/testsuites/sptests/sp16/task5.c b/testsuites/sptests/sp16/task5.c
index f1ada1076f..bcdf0d481a 100644
--- a/testsuites/sptests/sp16/task5.c
+++ b/testsuites/sptests/sp16/task5.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,12 @@ rtems_task Task5(
   Put_address_from_area_1( segment_address_1 );
   new_line;
 
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
+  /*
+   * Use TOD_MICROSECONDS_TO_TICKS not RTEMS_MICROSECONDS_TO_TICKS to
+   * test C implementation in SuperCore -- not macro version used 
+   * everywhere else.
+   */
+  status = rtems_task_wake_after( TOD_MICROSECONDS_TO_TICKS( 1000000 ) );
   directive_failed( status, "rtems_task_wake_after" );
 
   puts( "TA5 - rtems_region_get_segment - wait on 3K segment from region 1" );